From be3de073848942591cf35cc71c514bf75fa21906 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 27 Jul 2009 16:19:22 +0000 Subject: [PATCH] add links for length of query for nodescanhistory view --- web/MonitorWeb/monitorweb/controllers.py | 26 ++++++++++++++++--- .../monitorweb/templates/nodescanhistory.kid | 18 ++++++++++++- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index 5fe87b1..0c80fee 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -177,7 +177,25 @@ class Root(controllers.RootController, MonitorXmlrpcServer): flash("Welcome To MyOps!") return dict(now=time.ctime()) - @expose(template="monitorweb.templates.nodelist") + @expose(template="monitorweb.templates.nodelist", allow_json=True) + def node3(self, filter=None): + nhquery = HistoryNodeRecord.query.all() + query = [] + for nh in nhquery: + if filter: + if nh.status == filter: + query.append(nh) + else: + query.append(nh) + + rquery=[] + for q in query: + fb = FindbadNodeRecord.get_latest_by(hostname=q.hostname) + rquery.append(fb) + + return dict(now=time.ctime(), query=rquery) + + @expose(template="monitorweb.templates.nodelist", allow_json=True) def node2(self, filter=None): nhquery = HistoryNodeRecord.query.all() query = [] @@ -407,7 +425,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer): @expose(template="monitorweb.templates.nodescanhistory") def nodescanhistory(self, hostname=None, length=10): try: length = int(length) - except: length = 10 + except: length = 21 fbnode = FindbadNodeRecord.get_by(hostname=hostname) # TODO: add links for earlier history if desired. @@ -418,7 +436,9 @@ class Root(controllers.RootController, MonitorXmlrpcServer): agg = prep_node_for_display(node, pcuhash=None, preppcu=False, asofdate=node.timestamp) query.append(agg) - return dict(query=query, hostname=hostname) + if 'length' in request.params: + del request.params['length'] + return dict(query=query, hostname=hostname, params=request.params) @expose(template="monitorweb.templates.nodehistory") def nodehistory(self, hostname=None): diff --git a/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid b/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid index 7e99d9d..03416e7 100644 --- a/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid +++ b/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid @@ -1,9 +1,10 @@ function nodelist_paginator(opts) { plekit_table_paginator(opts, "nodelist"); } + + + + + + + + + + + + + +
Last WeekLast MonthLast 1000
@@ -70,6 +82,10 @@ from links import *
+
-- 2.43.0