X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=68f9d6a4d69b4de5ac6da151bb842e9897333bb2;hb=9b360f2de6da94fbc492b48ae0277892bddf7aa9;hp=bb0580b068302ae8d947a92172004ab4edb5fa1f;hpb=4df3989d4aee44cb6e36169ac69ba097436f7b15;p=monitor.git diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index bb0580b..68f9d6a 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -8,18 +8,20 @@ import cherrypy # log = logging.getLogger("monitorweb.controllers") import re from monitor.database.info.model import * -from monitor.database.zabbixapi.model import * -from monitor.database.dborm import zab_session as session -from monitor.database.dborm import zab_metadata as metadata +#from monitor.database.zabbixapi.model import * +#from monitor.database.dborm import zab_session as session +#from monitor.database.dborm import zab_metadata as metadata +from monitor_xmlrpc import MonitorXmlrpcServer + +from monitor import reboot +from monitor import scanapi -from pcucontrol import reboot from monitor.wrapper.plccache import plcdb_id2lb as site_id2lb from monitor.wrapper.plccache import plcdb_hn2lb as site_hn2lb from monitor.wrapper.plccache import plcdb_lb2hn as site_lb2hn from monitorweb.templates.links import * -from monitor import scanapi def query_to_dict(query): @@ -103,7 +105,7 @@ class NodeWidget(widgets.Widget): def prep_node_for_display(node): if node.plc_pcuid: - pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid).first() + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid) if pcu: node.pcu_status = pcu.reboot_trial_status node.pcu_short_status = format_pcu_shortstatus(pcu) @@ -132,6 +134,12 @@ def prep_node_for_display(node): if node.loginbase: node.site = HistorySiteRecord.by_loginbase(node.loginbase) + if node.site is None: + # TODO: need a cleaner fix for this... + node.site = HistorySiteRecord.by_loginbase("pl") + if not node.site: + node.site = HistorySiteRecord.by_loginbase("ple") + node.history = HistoryNodeRecord.by_hostname(node.hostname) @@ -144,7 +152,7 @@ def prep_node_for_display(node): -class Root(controllers.RootController): +class Root(controllers.RootController, MonitorXmlrpcServer): @expose(template="monitorweb.templates.welcome") def index(self): import time @@ -156,53 +164,94 @@ class Root(controllers.RootController): def nodeview(self, hostname=None): nodequery=[] if hostname: - for node in FindbadNodeRecord.get_latest_by(hostname=hostname): - # NOTE: reformat some fields. - prep_node_for_display(node) - nodequery += [node] + node = FindbadNodeRecord.get_latest_by(hostname=hostname) + # NOTE: reformat some fields. + prep_node_for_display(node) + nodequery += [node] - return self.pcuview(None, hostname) # dict(nodequery=nodequery) + return self.pcuview(None, None, hostname) # dict(nodequery=nodequery) @expose(template="monitorweb.templates.nodelist") - def node(self, filter='BOOT'): + def node(self, filter='boot'): import time fbquery = FindbadNodeRecord.get_all_latest() query = [] - filtercount = {'DOWN' : 0, 'BOOT': 0, 'DEBUG' : 0, 'neverboot' : 0, 'pending' : 0, 'all' : 0} + filtercount = {'down' : 0, 'boot': 0, 'debug' : 0, 'diagnose' : 0, 'disabled': 0, + 'neverboot' : 0, 'pending' : 0, 'all' : 0, None : 0} for node in fbquery: # NOTE: reformat some fields. prep_node_for_display(node) - # NOTE: count filters - if node.observed_status != 'DOWN': - filtercount[node.observed_status] += 1 - else: + #node.history.status + print node.hostname + + if node.history.status in ['down', 'offline']: if node.plc_node_stats and node.plc_node_stats['last_contact'] != None: - filtercount[node.observed_status] += 1 + filtercount['down'] += 1 else: filtercount['neverboot'] += 1 + elif node.history.status in ['good', 'online']: + filtercount['boot'] += 1 + elif node.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(node.history.status): + filtercount[node.history.status] += 1 + + ## NOTE: count filters + #if node.observed_status != 'DOWN': + # print node.hostname, node.observed_status + # if node.observed_status == 'DEBUG': + # if node.plc_node_stats['boot_state'] in ['debug', 'diagnose', 'disabled']: + # filtercount[node.plc_node_stats['boot_state']] += 1 + # else: + # filtercount['debug'] += 1 + # + # else: + # filtercount[node.observed_status] += 1 + #else: + # if node.plc_node_stats and node.plc_node_stats['last_contact'] != None: + # filtercount[node.observed_status] += 1 + # else: + # filtercount['neverboot'] += 1 # NOTE: apply filter - if filter == node.observed_status: - if filter == "DOWN": - if node.plc_node_stats['last_contact'] != None: - query.append(node) - else: - query.append(node) - elif filter == "neverboot": + if filter == "neverboot": if not node.plc_node_stats or node.plc_node_stats['last_contact'] == None: query.append(node) - elif filter == "pending": - # TODO: look in message logs... - pass elif filter == "all": query.append(node) + elif filter == node.history.status: + query.append(node) + elif filter == 'boot': + query.append(node) + + #if filter == node.observed_status: + # if filter == "DOWN": + # if node.plc_node_stats['last_contact'] != None: + # query.append(node) + # else: + # query.append(node) + #elif filter == "neverboot": + # if not node.plc_node_stats or node.plc_node_stats['last_contact'] == None: + # query.append(node) + #elif filter == "pending": + # # TODO: look in message logs... + # pass + #elif filter == node.plc_node_stats['boot_state']: + # query.append(node) + #elif filter == "all": + # query.append(node) widget = NodeWidget(template='monitorweb.templates.node_template') return dict(now=time.ctime(), query=query, fc=filtercount, nodewidget=widget) def nodeaction_handler(self, tg_exceptions=None): """Handle any kind of error.""" + print "NODEACTION_HANDLER------------------" if 'pcuid' in request.params: pcuid = request.params['pcuid'] @@ -217,7 +266,7 @@ class Root(controllers.RootController): if 'pcuid' in val: pcuid = val['pcuid'] elif 'hostname' in val: - pcuid = FindbadNodeRecord.get_latest_by(hostname=val['hostname']).first().plc_pcuid + pcuid = FindbadNodeRecord.get_latest_by(hostname=val['hostname']).plc_pcuid else: pcuid=None else: @@ -231,6 +280,7 @@ class Root(controllers.RootController): return self.pcuview(None, pcuid, **dict(exceptions=tg_exceptions)) def nodeaction(self, **data): + print "NODEACTION------------------" for item in data.keys(): print "%s %s" % ( item, data[item] ) @@ -254,7 +304,7 @@ class Root(controllers.RootController): ret = reboot.reboot_str(str(hostname)) print ret if ret: raise RuntimeError("Error using PCU: " + str(ret)) - flash("Reboot appeared to work. All at most 5 minutes. Run ExternalScan to check current status.") + flash("Reboot appeared to work. Allow at most 5 minutes. Then run ExternalScan to check current status.") elif action == "ExternalScan": scanapi.externalprobe(str(hostname)) @@ -271,9 +321,14 @@ class Root(controllers.RootController): @expose(template="monitorweb.templates.pcuview") @exception_handler(nodeaction_handler,"isinstance(tg_exceptions,RuntimeError)") def pcuview(self, loginbase=None, pcuid=None, hostname=None, **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=[] + actions=[] exceptions = None for key in data: @@ -286,15 +341,19 @@ class Root(controllers.RootController): exceptions = data['exceptions'] if loginbase: + actions = ActionRecord.query.filter_by(loginbase=loginbase + ).filter(ActionRecord.date_created >= datetime.now() - timedelta(14) + ).order_by(ActionRecord.date_created.desc()) + actions = [ a for a in actions ] sitequery = [HistorySiteRecord.by_loginbase(loginbase)] pcus = {} for plcnode in site_lb2hn[loginbase]: - for node in FindbadNodeRecord.get_latest_by(hostname=plcnode['hostname']): + node = FindbadNodeRecord.get_latest_by(hostname=plcnode['hostname']) # NOTE: reformat some fields. prep_node_for_display(node) nodequery += [node] if node.plc_pcuid: # not None - pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid).first() + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid) prep_pcu_for_display(pcu) pcus[node.plc_pcuid] = pcu @@ -303,37 +362,69 @@ class Root(controllers.RootController): if pcuid and hostname is None: print "pcuid: %s" % pcuid - for pcu in FindbadPCURecord.get_latest_by(plc_pcuid=pcuid): - # NOTE: count filter - prep_pcu_for_display(pcu) - pcuquery += [pcu] + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=pcuid) + # NOTE: count filter + prep_pcu_for_display(pcu) + pcuquery += [pcu] if 'site_id' in pcu.plc_pcu_stats: sitequery = [HistorySiteRecord.by_loginbase(pcu.loginbase)] if 'nodenames' in pcu.plc_pcu_stats: for nodename in pcu.plc_pcu_stats['nodenames']: print "query for %s" % nodename - q = FindbadNodeRecord.get_latest_by(hostname=nodename) - node = q.first() + node = FindbadNodeRecord.get_latest_by(hostname=nodename) print "%s" % node.port_status print "%s" % node.to_dict() - print "%s" % len(q.all()) if node: prep_node_for_display(node) nodequery += [node] if hostname and pcuid is None: - for node in FindbadNodeRecord.get_latest_by(hostname=hostname): + node = FindbadNodeRecord.get_latest_by(hostname=hostname) # NOTE: reformat some fields. prep_node_for_display(node) sitequery = [node.site] nodequery += [node] if node.plc_pcuid: # not None - pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid).first() + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid) prep_pcu_for_display(pcu) pcuquery += [pcu] - return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, exceptions=exceptions) + return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, actions=actions, exceptions=exceptions) + + @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() + for node in l: + #prep_node_for_display(node) + query.append(node) + + return dict(query=query, hostname=hostname) + + @expose(template="monitorweb.templates.sitehistory") + def sitehistory(self, loginbase=None): + query = [] + if loginbase: + fbsite = HistorySiteRecord.get_by(loginbase=loginbase) + # TODO: add links for earlier history if desired. + l = fbsite.versions[-100:] + l.reverse() + for site in l: + query.append(site) + return dict(query=query, loginbase=loginbase) + @expose(template="monitorweb.templates.pculist") def pcu(self, filter='all'): @@ -384,7 +475,7 @@ class Root(controllers.RootController): @expose(template="monitorweb.templates.sitelist") def site(self, filter='all'): - filtercount = {'good' : 0, 'down': 0, 'new' : 0, 'pending' : 0, 'all' : 0} + filtercount = {'good' : 0, 'down': 0, 'online':0, 'offline' : 0, 'new' : 0, 'pending' : 0, 'all' : 0} fbquery = HistorySiteRecord.query.all() query = [] for site in fbquery: @@ -394,8 +485,10 @@ class Root(controllers.RootController): filtercount['new'] += 1 elif not site.enabled: filtercount['pending'] += 1 - else: - filtercount[site.status] += 1 + elif site.status in ['good', 'online']: + filtercount['good'] += 1 + elif site.status in ['down', 'offline']: + filtercount['down'] += 1 # apply filter if filter == "all": @@ -404,7 +497,9 @@ class Root(controllers.RootController): query.append(site) elif filter == "pending" and not site.enabled: query.append(site) - elif filter == site.status: + elif filter == 'good' and site.status in ['good', 'online']: + query.append(site) + elif filter == 'down' and site.status in ['down', 'offline']: query.append(site) return dict(query=query, fc=filtercount)