- fix UP/DOWN summary on nodes page.

[monitor.git] / web / MonitorWeb / monitorweb / controllers.py

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index be51959..48ec3d2 100644 (file)
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -41,9 +41,11 @@ class NodeQueryFields(widgets.WidgetsList):
 
        hostname = widgets.CheckBox(label="Hostname")
        firewall = widgets.CheckBox(label="Firewall?")
+       fs_status = widgets.CheckBox(label="Filesystem Status")
        ssh_status = widgets.CheckBox(label="SSH Status")
        ssh_error = widgets.CheckBox(label="SSH Errors")
        dns_status = widgets.CheckBox(label="DNS Status")
+       iptables_status = widgets.CheckBox(label="IP Tables Status")
        nm_status = widgets.CheckBox(label="NM Status")
        princeton_comon_dir = widgets.CheckBox(label="CoMon Dir")
        princeton_comon_running = widgets.CheckBox(label="CoMon Running")
@@ -51,7 +53,10 @@ class NodeQueryFields(widgets.WidgetsList):
        external_dns_status = widgets.CheckBox(label="Hostname Resolves?")
        kernel_version = widgets.CheckBox(label="Kernel")
        bootcd_version = widgets.CheckBox(label="BootCD")
+        boot_server = widgets.CheckBox(label="Boot Server")
        observed_status = widgets.CheckBox(label="Observed Status")
+       uptime = widgets.CheckBox(label="Uptime")
+       traceroute = widgets.CheckBox(label="Traceroute")
        port_status = widgets.CheckBox(label="Port Status")
        rpms = widgets.CheckBox(label="RPM")
        rpmvalue = widgets.TextField(label="RPM Pattern")
@@ -59,6 +64,7 @@ class NodeQueryFields(widgets.WidgetsList):
 class QueryForm(widgets.TableForm):
     template = """
     <form xmlns:py="http://purl.org/kid/ns#"
+        id="queryform"
         name="${name}"
         action="${action}"
         method="${method}"
@@ -336,6 +342,8 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
                                agg.update(agg['plc_node_stats'])
                                if agg['kernel_version']:
                                        agg['kernel_version'] = agg['kernel_version'].split()[2]
+                               if 'traceroute' in data and agg['traceroute']:
+                                       agg['traceroute'] = "<pre>" + agg['traceroute'] + "</pre>"
                                if 'rpmvalue' in data and 'rpms' in data:
                                        if agg['rpms']:
                                                rpm_list = agg['rpms'].split()
@@ -486,10 +494,15 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
        def simpleview(self, **data):
                return self.pre_view(**data)
 
+       @expose(template="monitorweb.templates.simpleview")
+       def pcuview(self, **data):
+               return self.pre_view(**data)
+
        @expose(template="monitorweb.templates.detailview")
        def detailview(self, **data):
                return self.pre_view(**data)
 
+
        def pre_view(self, **data):
                session.flush(); session.clear()
 
@@ -591,7 +604,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
        # TODO: add form validation
        @expose(template="monitorweb.templates.pcuview")
        @exception_handler(nodeaction_handler,"isinstance(tg_exceptions,RuntimeError)")
-       def pcuview(self, loginbase=None, pcuid=None, hostname=None, since=20, **data):
+       def pcuviewold(self, loginbase=None, pcuid=None, hostname=None, since=20, **data):
                session.flush(); session.clear()
                sitequery=[]
                pcuquery=[]
@@ -875,6 +888,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
                print "write data: %s" % abs_target_filename
                util.file.dumpFile(abs_target_filename, log.file.read())
                bootman.bootmanager_log_action(hostname, short_target_filename, logtype)
+               session.flush()
 
                print "redirecting 3"