git://git.onelab.eu / monitor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added firewall checks and notices
[monitor.git] / web / MonitorWeb / monitorweb / templates / pcuview.kid
diff --git a/web/MonitorWeb/monitorweb/templates/pcuview.kid b/web/MonitorWeb/monitorweb/templates/pcuview.kid
index ed0f9e8..bd6fa58 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/pcuview.kid
+++ b/web/MonitorWeb/monitorweb/templates/pcuview.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-layout_params['page_title'] = "Monitor PCU View"
+layout_params['page_title'] = "MyOps Detail View"
 from monitor.util import diff_time
 from monitor import config
 from time import mktime
@@ -76,7 +76,7 @@ from links import *
                        </tbody>
                </table>
        <div class="oneline" id="legend" py:if="len(pcuquery) == 0">
-               <em>There no PCUs associated with this host.</em>
+               <em>There are no PCUs associated with this host.</em>
        </div>
        <div class="oneline" id="legend" py:if="len(pcuquery) > 0">
                <em>Legend: </em>
@@ -143,12 +143,13 @@ from links import *
                        <thead>
                                <tr>
                                        <th mochi:format="int"></th>
-                                       <th>History</th>
+                                       <th>History (scan)</th>
                                        <th>Hostname</th>
+                                       <th>DNS</th>
                                        <th>last_contact (cached)</th>
                                        <th>last_checked</th>
                                        <th nowrap='true'>Port Status</th>
-                                       <th></th>
+                                       <th>Filter</th>
                                        <th></th>
                                        <th></th>
                                </tr>
@@ -156,17 +157,20 @@ from links import *
                        <tbody>
                                <tr py:for="i,agg in enumerate(nodequery)" class="${i%2 and 'odd' or 'even'}" >
                                        <td></td>
-                                       <td><a href="nodehistory?hostname=${agg.node.hostname}">history</a></td>
+                                       <td><a href="nodehistory?hostname=${agg.node.hostname}">status</a>
+                                               (<a href="nodescanhistory?hostname=${agg.node.hostname}">scan</a>) history</td>
                                        <td id="node-${agg.node.observed_status}" nowrap="true" >
                                                <a class="ext-link" href="${plc_node_uri_id(agg.node.plc_node_stats['node_id'])}">
                                                        <span class="icon">${agg.node.hostname}</span></a>
                                        </td>
+                                       <td py:content="agg.node.external_dns_status"></td>
                                        <td py:content="diff_time(agg.node.plc_node_stats['last_contact'])"></td>
                                        <td py:content="diff_time(mktime(agg.node.date_checked.timetuple()))"></td>
                                        <td>
                                                <span py:for="port,state in agg.ports" 
                                                id="port${state}" py:content="'%s, ' % port">80</span>
                                        </td>
+                                       <td py:content="agg.node.firewall"></td>
                                        <td>
                                                <!-- TODO: add some values/code to authenticate the operation.  -->
                                                <!--form action="${link('pcuview', hostname=agg.node.hostname)}" name="externalscan${i}" method='post'>
@@ -200,7 +204,7 @@ from links import *
                <div id="status_block" class="flash"
             py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
 
-       <h4>Actions Over the Last Week</h4>
+       <h4>Actions Over the Last ${since} Days</h4>
                <p py:if="actions and len(actions) == 0">
                        There are no recent actions taken for this site.
                </p>
monitor