X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=5fe87b1bcead170f8f2e35d5a5fca0b79bc2c8b0;hb=71a60ab5d0fe772616f3520e3161bf602f8d5963;hp=a1746c86049703ec859267f2762994c83fbe5956;hpb=2516780d9785aa0345b4120893fd9b94f85a0631;p=monitor.git diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index a1746c8..5fe87b1 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -108,12 +108,16 @@ def prep_pcu_for_display(pcu): class NodeWidget(widgets.Widget): pass -def prep_node_for_display(node): +def prep_node_for_display(node, pcuhash=None, preppcu=True, asofdate=None): agg = aggregate() agg.node = node - if node.plc_pcuid: - pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid) + if node.plc_pcuid and preppcu: + if pcuhash: + pcu = pcuhash[node.plc_pcuid] + else: + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid) + if pcu: agg.pcu_status = pcu.reboot_trial_status agg.pcu_short_status = format_pcu_shortstatus(pcu) @@ -141,6 +145,10 @@ def prep_node_for_display(node): if agg.loginbase: agg.site = HistorySiteRecord.by_loginbase(agg.loginbase) + + if asofdate: + agg.site = agg.site.get_as_of(asofdate) + if agg.site is None: # TODO: need a cleaner fix for this... agg.site = HistorySiteRecord.by_loginbase("pl") @@ -148,6 +156,8 @@ def prep_node_for_display(node): agg.site = HistorySiteRecord.by_loginbase("ple") agg.history = HistoryNodeRecord.by_hostname(node.hostname) + if asofdate: + agg.history = agg.history.get_as_of(asofdate) agg.ports = format_ports(node.port_status) @@ -167,6 +177,48 @@ class Root(controllers.RootController, MonitorXmlrpcServer): flash("Welcome To MyOps!") return dict(now=time.ctime()) + @expose(template="monitorweb.templates.nodelist") + def node2(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) + agg = prep_node_for_display(fb) + rquery.append(agg) + + #fbquery = FindbadNodeRecord.get_all_latest() + #fbpcus = FindbadPCURecord.get_all_latest() + #def fbtohash(fbpculist): + # h = {} + # for p in fbpculist: + # h[p.plc_pcuid] = p +# +# pcuhash = fbtohash(fbpcus) + +# query = [] +# for node in fbquery: +# # NOTE: reformat some fields. +# agg = prep_node_for_display(node, pcuhash) +# if not agg.history: +# continue +# +# if filter: +# if agg.history.status == filter: +# query.append(agg) +# else: +# query.append(agg) + + widget = NodeWidget(template='monitorweb.templates.node_template') + return dict(now=time.ctime(), query=rquery, nodewidget=widget) + @expose(template="monitorweb.templates.nodelist") def node(self, filter='boot'): print "NODE------------------" @@ -181,9 +233,6 @@ class Root(controllers.RootController, MonitorXmlrpcServer): # NOTE: reformat some fields. agg = prep_node_for_display(node) - #node.history.status - #print node.hostname - if not agg.history: continue @@ -197,9 +246,6 @@ class Root(controllers.RootController, MonitorXmlrpcServer): elif agg.history.status in ['debug', 'monitordebug']: filtercount['debug'] += 1 else: - # TODO: need a better fix. filtercount - # doesn't maps to GetBootStates() on - # 4.3 so this one fails quite often. if filtercount.has_key(agg.history.status): filtercount[agg.history.status] += 1 @@ -291,10 +337,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer): @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): - print "PCUVIEW------------------" - print "befor-len: ", len( [ i for i in session] ) session.flush(); session.clear() - print "after-len: ", len( [ i for i in session] ) sitequery=[] pcuquery=[] nodequery=[] @@ -313,6 +356,11 @@ class Root(controllers.RootController, MonitorXmlrpcServer): if 'exceptions' in data: exceptions = data['exceptions'] + if 'query' in data: + obj = data['query'] + if len(obj.split(".")) > 1: hostname = obj + else: loginbase=obj + if pcuid: print "pcuid: %s" % pcuid pcu = FindbadPCURecord.get_latest_by(plc_pcuid=pcuid) @@ -356,18 +404,26 @@ class Root(controllers.RootController, MonitorXmlrpcServer): return dict(query=query, pcu_id=pcu_id) + @expose(template="monitorweb.templates.nodescanhistory") + def nodescanhistory(self, hostname=None, length=10): + try: length = int(length) + except: length = 10 + + fbnode = FindbadNodeRecord.get_by(hostname=hostname) + # TODO: add links for earlier history if desired. + l = fbnode.versions[-length:] + l.reverse() + query=[] + for node in l: + agg = prep_node_for_display(node, pcuhash=None, preppcu=False, asofdate=node.timestamp) + query.append(agg) + + return dict(query=query, hostname=hostname) + @expose(template="monitorweb.templates.nodehistory") def nodehistory(self, hostname=None): query = [] if hostname: - #fbnode = FindbadNodeRecord.get_by(hostname=hostname) - ## TODO: add links for earlier history if desired. - #l = fbnode.versions[-100:] - #l.reverse() - #for node in l: - # prep_node_for_display(node) - # query.append(node) - fbnode = HistoryNodeRecord.get_by(hostname=hostname) l = fbnode.versions[-100:] l.reverse() @@ -462,6 +518,41 @@ class Root(controllers.RootController, MonitorXmlrpcServer): query.append(site) return dict(query=query, fc=filtercount) + @expose(template="monitorweb.templates.sitesummary") + def sitesummary(self, loginbase="princeton"): + nodequery = [] + for node in FindbadNodeRecord.query.filter_by(loginbase=loginbase): + agg = prep_node_for_display(node) + nodequery += [agg] + + return dict(nodequery=nodequery, loginbase=loginbase) + + @expose(template="monitorweb.templates.summary") + def summary(self, since=7): + sumdata = {} + sumdata['nodes'] = {} + sumdata['sites'] = {} + sumdata['pcus'] = {} + + def summarize(query, type): + for o in query: + if o.status not in sumdata[type]: + sumdata[type][o.status] = 0 + sumdata[type][o.status] += 1 + + fbquery = HistorySiteRecord.query.all() + summarize(fbquery, 'sites') + fbquery = HistoryPCURecord.query.all() + summarize(fbquery, 'pcus') + fbquery = HistoryNodeRecord.query.all() + summarize(fbquery, 'nodes') + + if 'monitordebug' in sumdata['nodes']: + d = sumdata['nodes']['monitordebug'] + del sumdata['nodes']['monitordebug'] + sumdata['nodes']['failboot'] = d + + return dict(sumdata=sumdata, setorder=['good', 'offline', 'down', 'online']) @expose(template="monitorweb.templates.actionsummary") def actionsummary(self, since=7):