X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=5fe87b1bcead170f8f2e35d5a5fca0b79bc2c8b0;hb=71a60ab5d0fe772616f3520e3161bf602f8d5963;hp=95d9740b4246eaaec7877c72acf69c4e1c65ffe1;hpb=f9da3f16b608452f4166050e93044fbb20fc5e6d;p=monitor.git diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index 95d9740..5fe87b1 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -1,198 +1,496 @@ import turbogears as tg -from turbogears import controllers, expose, flash +from turbogears import controllers, expose, flash, exception_handler +from turbogears import widgets +from cherrypy import request, response +import cherrypy # from monitorweb import model # import logging # 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 +import time -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 -def format_ports(pcu): +from monitorweb.templates.links import * + + +# make it easier group objects without invoking the elixir auto-write feature. +class aggregate: pass + + +def query_to_dict(query): + """ take a url query string and chop it up """ + val = {} + query_fields = query.split('&') + for f in query_fields: + (k,v) = urllib.splitvalue(f) + val[k] = v + + return val + +def format_ports(data, pcumodel=None): retval = [] - if pcu.port_status and len(pcu.port_status.keys()) > 0 : - obj = reboot.model_to_object(pcu.plc_pcu_stats['model']) - for port in obj.supported_ports: + filtered_length=0 + + if pcumodel: + supported_ports=reboot.model_to_object(pcumodel).supported_ports + else: + # ports of a production node + supported_ports=[22,80,806] + + if data and len(data.keys()) > 0 : + for port in supported_ports: try: - state = pcu.port_status[str(port)] + state = data[str(port)] except: state = "unknown" + + if state == "filtered": + filtered_length += 1 retval.append( (port, state) ) if retval == []: retval = [( "Closed/Filtered", "state" )] + if filtered_length == len(supported_ports): + retval = [( "All Filtered", "state" )] + return retval def format_pcu_shortstatus(pcu): status = "error" - if pcu.reboot_trial_status == str(0): - status = "ok" - elif pcu.reboot_trial_status == "NetDown" or pcu.reboot_trial_status == "Not_Run": - status = pcu.reboot_trial_status - else: - status = "error" + if pcu: + if pcu.reboot_trial_status == str(0): + status = "Ok" + elif pcu.reboot_trial_status == "NetDown" or pcu.reboot_trial_status == "Not_Run": + status = pcu.reboot_trial_status + else: + status = "error" return status def prep_pcu_for_display(pcu): + agg = aggregate() + agg.pcu = pcu try: - pcu.loginbase = site_id2lb[pcu.plc_pcu_stats['site_id']] + agg.loginbase = PlcSite.query.get(pcu.plc_pcu_stats['site_id']).plc_site_stats['login_base'] except: - pcu.loginbase = "unknown" - - pcu.ports = format_ports(pcu) - pcu.status = format_pcu_shortstatus(pcu) + agg.loginbase = "unknown" + + agg.ports = format_ports(pcu.port_status, pcu.plc_pcu_stats['model']) + agg.status = format_pcu_shortstatus(pcu) + + #print pcu.entry_complete + agg.entry_complete_str = pcu.entry_complete + #pcu.entry_complete_str += "".join([ f[0] for f in pcu.entry_complete.split() ]) + if pcu.dns_status == "NOHOSTNAME": + agg.dns_short_status = 'NoHost' + elif pcu.dns_status == "DNS-OK": + agg.dns_short_status = 'Ok' + elif pcu.dns_status == "DNS-NOENTRY": + agg.dns_short_status = 'NoEntry' + elif pcu.dns_status == "NO-DNS-OR-IP": + agg.dns_short_status = 'NoHostOrIP' + elif pcu.dns_status == "DNS-MISMATCH": + agg.dns_short_status = 'Mismatch' + return agg + +class NodeWidget(widgets.Widget): + pass + +def prep_node_for_display(node, pcuhash=None, preppcu=True, asofdate=None): + agg = aggregate() + agg.node = node + + if node.plc_pcuid and preppcu: + if pcuhash: + pcu = pcuhash[node.plc_pcuid] + else: + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid) -def prep_node_for_display(node): - if node.plc_pcuid: - pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid).first() if pcu: - node.pcu_status = pcu.reboot_trial_status + agg.pcu_status = pcu.reboot_trial_status + agg.pcu_short_status = format_pcu_shortstatus(pcu) + agg.pcu = prep_pcu_for_display(pcu) else: - node.pcu_status = "nodata" - node.pcu_short_status = format_pcu_shortstatus(pcu) + agg.pcu_short_status = "none" + agg.pcu_status = "nodata" + agg.pcu = None else: - node.pcu_status = "nopcu" - node.pcu_short_status = "none" + agg.pcu_status = "nopcu" + agg.pcu_short_status = "none" + agg.pcu = None + if node.kernel_version: - node.kernel = node.kernel_version.split()[2] + agg.kernel = node.kernel_version.split()[2] else: - node.kernel = "" + agg.kernel = "" + + try: + agg.loginbase = PlcSite.query.get(node.plc_node_stats['site_id']).plc_site_stats['login_base'] + except: + agg.loginbase = "unknown" + + 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") + if not agg.site: + 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) try: - node.loginbase = site_id2lb[node.plc_node_stats['site_id']] + exists = node.plc_node_stats['last_contact'] except: - node.loginbase = "unknown" + # TODO: this should not assign to the fb object! + node.plc_node_stats = {'last_contact' : None} + return agg -class Root(controllers.RootController): + +class Root(controllers.RootController, MonitorXmlrpcServer): @expose(template="monitorweb.templates.welcome") def index(self): - import time # log.debug("Happy TurboGears Controller Responding For Duty") - flash("Your application is now running") + flash("Welcome To MyOps!") return dict(now=time.ctime()) - @expose(template="monitorweb.templates.nodeview") - 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] - - return dict(nodequery=nodequery) + @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'): - import time + def node(self, filter='boot'): + print "NODE------------------" + print "befor-len: ", len( [ i for i in session] ) + session.flush(); session.clear() + print "after-len: ", len( [ i for i in session] ) 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) + agg = prep_node_for_display(node) - # NOTE: count filters - if node.observed_status != 'DOWN': - filtercount[node.observed_status] += 1 - else: - if node.plc_node_stats['last_contact'] != None: - filtercount[node.observed_status] += 1 + if not agg.history: + continue + + if agg.history.status in ['down', 'offline']: + if node.plc_node_stats and node.plc_node_stats['last_contact'] != None: + filtercount['down'] += 1 else: filtercount['neverboot'] += 1 + elif agg.history.status in ['good', 'online']: + filtercount['boot'] += 1 + elif agg.history.status in ['debug', 'monitordebug']: + filtercount['debug'] += 1 + else: + if filtercount.has_key(agg.history.status): + filtercount[agg.history.status] += 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 node.plc_node_stats['last_contact'] == None: - query.append(node) - elif filter == "pending": - # TODO: look in message logs... - pass + if filter == "neverboot": + if not node.plc_node_stats or node.plc_node_stats['last_contact'] == None: + query.append(agg) elif filter == "all": - query.append(node) + query.append(agg) + elif filter == agg.history.status: + query.append(agg) + elif filter == 'boot': + query.append(agg) + - return dict(now=time.ctime(), query=query, fc=filtercount) + 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'] + else: + refurl = request.headers.get("Referer",link("pcu")) + print refurl + + # TODO: do this more intelligently... + uri_fields = urllib.splitquery(refurl) + if uri_fields[1] is not None: + val = query_to_dict(uri_fields[1]) + if 'pcuid' in val: + pcuid = val['pcuid'] + elif 'hostname' in val: + pcuid = FindbadNodeRecord.get_latest_by(hostname=val['hostname']).plc_pcuid + else: + pcuid=None + else: + pcuid=None + + cherry_trail = cherrypy._cputil.get_object_trail() + for i in cherry_trail: + print "trail: ", i + + print pcuid + 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] ) + if 'hostname' in data: + hostname = data['hostname'] + else: + flash("No hostname given in submitted data") + return + + if 'submit' in data or 'type' in data: + try: + action = data['submit'] + except: + action = data['type'] + else: + flash("No submit action given in submitted data") + return + + if action == "Reboot": + print "REBOOT: %s" % hostname + ret = reboot.reboot_str(str(hostname)) + print ret + if ret: raise RuntimeError("Error using PCU: " + str(ret)) + flash("Reboot appeared to work. Allow at most 5 minutes. Then run ExternalScan to check current status.") + + elif action == "ExternalScan": + scanapi.externalprobe(str(hostname)) + flash("External Scan Successful!") + elif action == "InternalScan": + scanapi.internalprobe(str(hostname)) + flash("Internal Scan Successful!") + else: + # unknown action + raise RuntimeError("Unknown action given") + return + + # TODO: add form validation @expose(template="monitorweb.templates.pcuview") - def pcuview(self, pcuid=None): + @exception_handler(nodeaction_handler,"isinstance(tg_exceptions,RuntimeError)") + def pcuview(self, loginbase=None, pcuid=None, hostname=None, since=20, **data): + session.flush(); session.clear() + sitequery=[] pcuquery=[] + nodequery=[] + actions=[] + exceptions = None + + try: since = int(since) + except: since = 7 + + for key in data: + print key, data[key] + + if 'submit' in data.keys() or 'type' in data.keys(): + if hostname: data['hostname'] = hostname + self.nodeaction(**data) + 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: - for pcu in FindbadPCURecord.get_latest_by(plc_pcuid=pcuid): - # NOTE: count filter - prep_pcu_for_display(pcu) - pcuquery += [pcu] + print "pcuid: %s" % pcuid + pcu = FindbadPCURecord.get_latest_by(plc_pcuid=pcuid) + loginbase = PlcSite.query.get(pcu.plc_pcu_stats['site_id']).plc_site_stats['login_base'] + + if hostname: + node = FindbadNodeRecord.get_latest_by(hostname=hostname) + loginbase = PlcSite.query.get(node.plc_node_stats['site_id']).plc_site_stats['login_base'] + + if loginbase: + actions = ActionRecord.query.filter_by(loginbase=loginbase + ).filter(ActionRecord.date_created >= datetime.now() - timedelta(since) + ).order_by(ActionRecord.date_created.desc()) + actions = [ a for a in actions ] + sitequery = [HistorySiteRecord.by_loginbase(loginbase)] + pcus = {} + for node in FindbadNodeRecord.query.filter_by(loginbase=loginbase): + # NOTE: reformat some fields. + agg = prep_node_for_display(node) + nodequery += [agg] + if agg.pcu: #.pcu.plc_pcuid: # not None + #pcu = FindbadPCURecord.get_latest_by(plc_pcuid=agg.plc_pcuid) + #prep_pcu_for_display(pcu) + pcus[agg.pcu.pcu.plc_pcuid] = agg.pcu + + for pcuid_key in pcus: + pcuquery += [pcus[pcuid_key]] + + return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, actions=actions, since=since, exceptions=exceptions) + + @expose(template="monitorweb.templates.pcuhistory") + def pcuhistory(self, pcu_id=None): + query = [] + if pcu_id: + fbnode = HistoryPCURecord.get_by(plc_pcuid=pcu_id) + l = fbnode.versions[-100:] + l.reverse() + for pcu in l: + #prep_node_for_display(node) + query.append(pcu) + + 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 = 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) - return dict(pcuquery=pcuquery) @expose(template="monitorweb.templates.pculist") def pcu(self, filter='all'): - import time + print "PCUVIEW------------------" + print "befor-len: ", len( [ i for i in session] ) + session.flush(); session.clear() + print "after-len: ", len( [ i for i in session] ) fbquery = FindbadPCURecord.get_all_latest() query = [] filtercount = {'ok' : 0, 'NetDown': 0, 'Not_Run' : 0, 'pending' : 0, 'all' : 0} for node in fbquery: # NOTE: count filter - if pcu.reboot_trial_status == str(0): + if node.reboot_trial_status == str(0): filtercount['ok'] += 1 - elif pcu.reboot_trial_status == 'NetDown' or pcu.reboot_trial_status == 'Not_Run': - filtercount[pcu.reboot_trial_status] += 1 + elif node.reboot_trial_status == 'NetDown' or node.reboot_trial_status == 'Not_Run': + filtercount[node.reboot_trial_status] += 1 else: filtercount['pending'] += 1 - prep_pcu_for_display(node) + pcuagg = prep_pcu_for_display(node) # NOTE: apply filter if filter == "all": - query.append(node) + query.append(pcuagg) elif filter == "ok" and node.reboot_trial_status == str(0): - query.append(node) + query.append(pcuagg) elif filter == node.reboot_trial_status: - query.append(node) + query.append(pcuagg) elif filter == "pending": # TODO: look in message logs... if node.reboot_trial_status != str(0) and \ node.reboot_trial_status != 'NetDown' and \ node.reboot_trial_status != 'Not_Run': - query.append(node) + query.append(pcuagg) return dict(query=query, fc=filtercount) - @expose(template="monitorweb.templates.siteview") - def siteview(self, loginbase='pl'): - # get site query - sitequery = [HistorySiteRecord.by_loginbase(loginbase)] - nodequery = [] - for plcnode in site_lb2hn[loginbase]: - for node in FindbadNodeRecord.get_latest_by(hostname=plcnode['hostname']): - # NOTE: reformat some fields. - prep_node_for_display(node) - nodequery += [node] - return dict(sitequery=sitequery, nodequery=nodequery, fc={}) - @expose(template="monitorweb.templates.sitelist") def site(self, filter='all'): - filtercount = {'good' : 0, 'down': 0, 'new' : 0, 'pending' : 0, 'all' : 0} + print "SITE------------------" + print "befor-len: ", len( [ i for i in session] ) + session.flush(); session.clear() + print "after-len: ", len( [ i for i in session] ) + filtercount = {'good' : 0, 'down': 0, 'online':0, 'offline' : 0, 'new' : 0, 'pending' : 0, 'all' : 0} fbquery = HistorySiteRecord.query.all() query = [] for site in fbquery: @@ -202,8 +500,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": @@ -212,71 +512,78 @@ 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) + @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): + from monitor.wrapper.emailTxt import mailtxt + + types = filter(lambda x: 'notice' in x, dir(mailtxt)) + results = {} + + try: since = int(since) + except: since = 7 + + for t in types: + acts = ActionRecord.query.filter(ActionRecord.action_type==t + ).filter(ActionRecord.date_created >= datetime.now() - timedelta(since)) + results[t] = acts.count() + return dict(results=results) @expose(template="monitorweb.templates.actionlist") - def action(self, filter='all'): - session.bind = metadata.bind - filtercount = {'active' : 0, 'acknowledged': 0, 'all' : 0} - # With Acknowledgement - sql_ack = 'SELECT DISTINCT h.host,t.description,t.priority,t.lastchange,a.message '+ \ - ' FROM triggers t,hosts h,items i,functions f, hosts_groups hg,escalations e,acknowledges a ' + \ - ' WHERE f.itemid=i.itemid ' + \ - ' AND h.hostid=i.hostid ' + \ - ' AND hg.hostid=h.hostid ' + \ - ' AND t.triggerid=f.triggerid ' + \ - ' AND t.triggerid=e.triggerid ' + \ - ' AND a.eventid=e.eventid ' + \ - ' AND t.status=' + str(defines.TRIGGER_STATUS_ENABLED) + \ - ' AND i.status=' + str(defines.ITEM_STATUS_ACTIVE) + \ - ' AND h.status=' + str(defines.HOST_STATUS_MONITORED) + \ - ' AND t.value=' + str(defines.TRIGGER_VALUE_TRUE) + \ - ' ORDER BY t.lastchange DESC'; - - # WithOUT Acknowledgement - sql_noack = 'SELECT DISTINCT h.host,t.description,t.priority,t.lastchange,e.eventid ' + \ - ' FROM triggers t,hosts h,items i,functions f, hosts_groups hg,escalations e,acknowledges a ' + \ - ' WHERE f.itemid=i.itemid ' + \ - ' AND h.hostid=i.hostid ' + \ - ' AND hg.hostid=h.hostid ' + \ - ' AND t.triggerid=f.triggerid ' + \ - ' AND t.triggerid=e.triggerid ' + \ - ' AND e.eventid not in (select eventid from acknowledges) ' + \ - ' AND t.status=' + str(defines.TRIGGER_STATUS_ENABLED) + \ - ' AND i.status=' + str(defines.ITEM_STATUS_ACTIVE) + \ - ' AND h.status=' + str(defines.HOST_STATUS_MONITORED) + \ - ' AND t.value=' + str(defines.TRIGGER_VALUE_TRUE) + \ - ' ORDER BY t.lastchange DESC'; - # for i in session.execute(sql): print i + def actionlist(self, action_type='down_notice', since=7, loginbase=None): - query=[] - replace = re.compile(' {.*}') - for sql,ack in [(sql_ack,True), (sql_noack,False)]: - result = session.execute(sql) - for row in result: - try: - newrow = [ site_hn2lb[row[0].lower()] ] + [ r for r in row ] - except: - print site_hn2lb.keys() - newrow = [ "unknown" ] + [ r for r in row ] - - newrow[2] = replace.sub("", newrow[2]) # strip {.*} expressions - - # NOTE: filter count - filtercount['all'] += 1 - if not ack: # for unacknowledged - filtercount['active'] += 1 - if filter == 'active': - query.append(newrow) - else: - filtercount['acknowledged'] += 1 - if filter == 'acknowledged': - query.append(newrow) - - if filter != "acknowledged" and filter != "active": - query.append(newrow) + try: since = int(since) + except: since = 7 - return dict(query=query, fc=filtercount) + if loginbase: + acts = ActionRecord.query.filter_by(loginbase=loginbase + ).filter(ActionRecord.date_created >= datetime.now() - timedelta(since) + ).order_by(ActionRecord.date_created.desc()) + else: + acts = ActionRecord.query.filter(ActionRecord.action_type==action_type + ).filter(ActionRecord.date_created >= datetime.now() - timedelta(since) + ).order_by(ActionRecord.date_created.desc()) + query = [ a for a in acts ] + + return dict(actions=query, action_type=action_type, since=since)