X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=68df2eb8729ac352d3b36764a3465a6805e0f01d;hb=3b89b6f104b7e4e93e4c32a4d188664bb6b3e34f;hp=c46dc424567a31df4ec5baa1412c7b663310a88b;hpb=125c27b9121122663bada7e36eb2a00c95362d18;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index c46dc42..68df2eb 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -11,6 +11,7 @@ import os
 from monitor.database.info.model import *
 #from monitor.database.zabbixapi.model import *
 from monitor_xmlrpc import MonitorXmlrpcServer
+from controllers_local import LocalExtensions
 
 from monitor import util
 from monitor import reboot
@@ -53,15 +54,20 @@ 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")
+	install_date = widgets.CheckBox(label="Installation Date")
 	observed_status = widgets.CheckBox(label="Observed Status")
 	uptime = widgets.CheckBox(label="Uptime")
+	traceroute = widgets.CheckBox(label="Traceroute")
 	port_status = widgets.CheckBox(label="Port Status")
+	plc_pcuid = widgets.CheckBox(label="PCU ID")
 	rpms = widgets.CheckBox(label="RPM")
 	rpmvalue = widgets.TextField(label="RPM Pattern")
 
 class QueryForm(widgets.TableForm):
     template = """
     <form xmlns:py="http://purl.org/kid/ns#"
+        id="queryform"
         name="${name}"
         action="${action}"
         method="${method}"
@@ -260,7 +266,7 @@ def prep_node_for_display(node, pcuhash=None, preppcu=True, asofdate=None):
 	return agg
 
 
-class Root(controllers.RootController, MonitorXmlrpcServer):
+class Root(controllers.RootController, MonitorXmlrpcServer, LocalExtensions):
 	@expose(template="monitorweb.templates.welcome")
 	def index(self):
 		# log.debug("Happy TurboGears Controller Responding For Duty")
@@ -336,13 +342,19 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 					agg = node.__dict__.copy()
 				else:
 					agg = node.to_dict()
-				agg.update(agg['plc_node_stats'])
+                                if agg['plc_node_stats']:
+                                        agg.update(agg['plc_node_stats'])
+				if agg['install_date']:
+					agg['install_date'] = time.mktime(time.strptime(agg['install_date'], "%a %b %d %H:%M:%S %Y"))
 				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()
-						rpm_list = filter(lambda x: data['rpmvalue'] in x, rpm_list)
+						rpm_list = filter(lambda x: re.match(data['rpmvalue'], x, re.I),
+                                                                  rpm_list)
 						agg['rpms'] = " ".join(rpm_list)
 
 				query.append(agg)
@@ -489,10 +501,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()
 
@@ -594,7 +611,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=[]
@@ -654,7 +671,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 		query = []
 		if pcu_id:
 			fbnode = HistoryPCURecord.get_by(plc_pcuid=pcu_id)
-			l = fbnode.versions[-100:]
+			l = fbnode.versions[-1000:]
 			l.reverse()
 			for pcu in l:
 				#prep_node_for_display(node)
@@ -699,13 +716,15 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 		if loginbase:
 			fbsite = HistorySiteRecord.get_by(loginbase=loginbase)
 			# TODO: add links for earlier history if desired.
-			l = fbsite.versions[-100:]
+			l = fbsite.versions[-1000:]
 			l.reverse()
 			for site in l:
 				query.append(site)
 		return dict(query=query, loginbase=loginbase)
 
 
+	@expose("cheetah:monitorweb.templates.pculist_plain", as_format="plain", 
+		accept_format="text/plain", content_type="text/plain")
 	@expose(template="monitorweb.templates.pculist")
 	def pcu(self, filter='all'):
 		print "PCUVIEW------------------"
@@ -883,3 +902,4 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 		print "redirecting 3"
 
 		return dict()
+