add pcu_name to pcufailed_notice
[monitor.git] / web / MonitorWeb / monitorweb / controllers.py
index 984813b..4a74782 100644 (file)
@@ -9,19 +9,80 @@ import cherrypy
 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_xmlrpc import MonitorXmlrpcServer
 
 from monitor import reboot
 from monitor import scanapi
+import time
 
-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 *
 
+class ObjectQueryFields(widgets.WidgetsList):
+       """The WidgetsList defines the fields of the form."""
+       pass
+
+
+
+class NodeQueryFields(widgets.WidgetsList):
+       """The WidgetsList defines the fields of the form."""
+
+       object = widgets.RadioButtonList(label="Query Type", options=[('nodes', 'All Nodes'), 
+                                                                                                                         ('nodehistory', 'Single Node History'),
+                                                                                                                         #('sites', 'All Sites'),
+                                                                                                                         #('sitehistory', 'Single Site History'),
+                                                                                                                         ], default="nodes")
+       nodehistory_hostname = widgets.TextField(label="Hostname Node History", attrs={'size':30})
+
+       hostname = widgets.CheckBox(label="Hostname")
+       firewall = widgets.CheckBox(label="Firewall?")
+       dns_status = widgets.CheckBox(label="DNS Status")
+       external_dns_status = widgets.CheckBox(label="Hostname Resolves?")
+       kernel_version = widgets.CheckBox(label="Kernel")
+       observed_status = widgets.CheckBox(label="Observed Status")
+       port_status = widgets.CheckBox(label="Port Status")
+       rpms = widgets.CheckBox(label="RPM")
+       rpmvalue = widgets.TextField(label="RPM Pattern")
+
+class QueryForm(widgets.TableForm):
+    template = """
+    <form xmlns:py="http://purl.org/kid/ns#"
+        name="${name}"
+        action="${action}"
+        method="${method}"
+        class="tableform"
+        py:attrs="form_attrs"
+    >
+        <div py:for="field in hidden_fields"
+            py:replace="field.display(value_for(field), **params_for(field))"
+        />
+        <table border="0" cellspacing="0" cellpadding="2" py:attrs="table_attrs">
+            <tr py:for="i, field in enumerate(fields)"
+                class="${i%2 and 'odd' or 'even'}"
+            >
+                <th>
+                    <label class="fieldlabel" for="${field.field_id}" py:content="field.label" />
+                </th>
+                <td>
+                    <span py:replace="field.display(value_for(field), **params_for(field))" />
+                    <span py:if="error_for(field)" class="fielderror" py:content="error_for(field)" />
+                    <span py:if="field.help_text" class="fieldhelp" py:content="field.help_text" />
+                </td>
+            </tr>
+            <tr>
+                <td>&#160;</td>
+                <td py:content="submit.display(submit_text)" />
+            </tr>
+        </table>
+    </form>
+       """
+
+def getNodeQueryForm():
+       return QueryForm(fields=NodeQueryFields(), action="query")
+
+# make it easier group objects without invoking the elixir auto-write feature.
+class aggregate: pass
 
 
 def query_to_dict(query):
@@ -77,168 +138,255 @@ def format_pcu_shortstatus(pcu):
        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"
+               agg.loginbase = "unknown"
+
+       agg.pcuhist = HistoryPCURecord.query.get(pcu.plc_pcuid)
 
-       pcu.ports = format_ports(pcu.port_status, pcu.plc_pcu_stats['model'])
-       pcu.status = format_pcu_shortstatus(pcu)
+       agg.ports = format_ports(pcu.port_status, pcu.plc_pcu_stats['model'])
+       agg.status = format_pcu_shortstatus(pcu)
 
        #print pcu.entry_complete
-       pcu.entry_complete_str = 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":
-               pcu.dns_short_status = 'NoHost'
+               agg.dns_short_status = 'NoHost'
        elif pcu.dns_status == "DNS-OK":
-               pcu.dns_short_status = 'Ok'
+               agg.dns_short_status = 'Ok'
        elif pcu.dns_status == "DNS-NOENTRY":
-               pcu.dns_short_status = 'NoEntry'
+               agg.dns_short_status = 'NoEntry'
        elif pcu.dns_status == "NO-DNS-OR-IP":
-               pcu.dns_short_status = 'NoHostOrIP'
+               agg.dns_short_status = 'NoHostOrIP'
        elif pcu.dns_status == "DNS-MISMATCH":
-               pcu.dns_short_status = 'Mismatch'
+               agg.dns_short_status = 'Mismatch'
+       return agg
 
 class NodeWidget(widgets.Widget):
        pass
 
-def prep_node_for_display(node):
-       if node.plc_pcuid:
-               pcu = FindbadPCURecord.get_latest_by(plc_pcuid=node.plc_pcuid)
+def prep_nodehist(node):
+       agg = aggregate()
+       agg.node = node
+       agg.loginbase = "unknown"
+       try:
+               agg.loginbase = PlcSite.query.get(node.plc_siteid).plc_site_stats['login_base']
+       except:
+               agg.loginbase = "exception"
+               
+
+       return agg
+
+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)
+
                if pcu:
-                       node.pcu_status = pcu.reboot_trial_status
-                       node.pcu_short_status = format_pcu_shortstatus(pcu)
-                       node.pcu = pcu
-                       prep_pcu_for_display(node.pcu)
+                       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_short_status = "none"
-                       node.pcu_status = "nodata"
-                       node.pcu = None
+                       agg.pcu_short_status = "none"
+                       agg.pcu_status = "nodata"
+                       agg.pcu = None
 
        else:
-               node.pcu_status = "nopcu"
-               node.pcu_short_status = "none"
-               node.pcu = 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:
-               node.loginbase = site_id2lb[node.plc_node_stats['site_id']]
+               agg.loginbase = PlcSite.query.get(node.plc_node_stats['site_id']).plc_site_stats['login_base']
        except:
-               node.loginbase = "unknown"
+               agg.loginbase = "unknown"
+
+       if agg.loginbase:
+               agg.site = HistorySiteRecord.by_loginbase(agg.loginbase)
 
-       if node.loginbase:
-               node.site = HistorySiteRecord.by_loginbase(node.loginbase)
-               if node.site is None:
+               if asofdate:
+                       agg.site = agg.site.get_as_of(asofdate)
+
+               if agg.site is None:
                        # TODO: need a cleaner fix for this...
-                       node.site = HistorySiteRecord.by_loginbase("pl")
-                       
+                       agg.site = HistorySiteRecord.by_loginbase("pl")
+                       if not agg.site:
+                               agg.site = HistorySiteRecord.by_loginbase("ple")
 
-       node.history = HistoryNodeRecord.by_hostname(node.hostname)
+       agg.history = HistoryNodeRecord.by_hostname(node.hostname)
+       if asofdate:
+               agg.history = agg.history.get_as_of(asofdate)
 
-       node.ports = format_ports(node.port_status)
+       agg.ports = format_ports(node.port_status)
 
        try:
                exists = node.plc_node_stats['last_contact']
        except:
+               # TODO: this should not assign to the fb object!
                node.plc_node_stats = {'last_contact' : None}
-
+       
+       return agg
 
 
 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.pcuview")
-       def nodeview(self, hostname=None):
-               nodequery=[]
-               if hostname:
-                       for node in FindbadNodeRecord.get_latest_by(hostname=hostname):
+       @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 = []
+               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)
+
+               widget = NodeWidget(template='monitorweb.templates.node_template')
+               return dict(now=time.ctime(), query=rquery, nodewidget=widget)
+
+       @expose(template="monitorweb.templates.query", allow_json=True)
+       def query(self, **data):
+               query = []
+
+               for k in data:
+                       print k, data[k]
+
+               fbquery = None
+               
+               if 'object' in data and data['object'] == "nodes":
+                       fbquery = FindbadNodeRecord.get_all_latest()
+               elif 'object' in data and data['object'] == "nodehistory": 
+                       hostname = data['nodehistory_hostname']
+                       data['date_checked'] = 'date_checked'
+                       fbrecord = FindbadNodeRecord.get_by(hostname=hostname)
+                       fbquery = fbrecord.versions[-500:]
+
+               if fbquery:
+                       for node in fbquery:
                                # NOTE: reformat some fields.
-                               prep_node_for_display(node)
-                               nodequery += [node]
+                               if type(node) is not type(FindbadNodeRecord):
+                                       agg = node.__dict__.copy()
+                               else:
+                                       agg = node.to_dict()
+                               agg.update(agg['plc_node_stats'])
+                               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)
+                                               agg['rpms'] = " ".join(rpm_list)
+
+                               query.append(agg)
+
+               fields=data.copy()
+
+               try: 
+                       del fields['object']
+                       del fields['rpmvalue']
+                       del fields['nodehistory_hostname']
+               except: pass
+               return dict(now=time.ctime(), query=query, fields=fields, data=data, queryform=getNodeQueryForm())
+
+       @expose(template="monitorweb.templates.nodefast", allow_json=True)
+       def node(self, filter=None):
+               nhquery = HistoryNodeRecord.query.all()
+               query = []
+               for nh in nhquery:
+                       if filter:
+                               if nh.status == filter:
+                                       agg = prep_nodehist(nh)
+                                       query.append(agg)
+                       else:
+                               agg = prep_nodehist(nh)
+                               query.append(agg)
 
-               return self.pcuview(None, None, hostname) # dict(nodequery=nodequery)
+               return dict(now=time.ctime(), query=query)
 
        @expose(template="monitorweb.templates.nodelist")
-       def node(self, filter='boot'):
-               import time
+       def nodeslow(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, '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)
 
-                       #node.history.status
-                       print node.hostname
+                       if not agg.history:
+                               continue
 
-                       if node.history.status in ['down', 'offline']:
+                       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 node.history.status in ['good', 'online']:
+                       elif agg.history.status in ['good', 'online']:
                                filtercount['boot'] += 1
-                       elif node.history.status in ['debug', 'monitordebug']:
+                       elif agg.history.status in ['debug', 'monitordebug']:
                                filtercount['debug'] += 1
                        else:
-                               filtercount[node.history.status] += 1
+                               if filtercount.has_key(agg.history.status):
+                                       filtercount[agg.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 == "neverboot":
                                if not node.plc_node_stats or node.plc_node_stats['last_contact'] == None:
-                                       query.append(node)
+                                       query.append(agg)
                        elif filter == "all":
-                               query.append(node)
-                       elif filter == node.history.status:
-                               query.append(node)
+                               query.append(agg)
+                       elif filter == agg.history.status:
+                               query.append(agg)
                        elif filter == 'boot':
-                               query.append(node)
+                               query.append(agg)
 
-                       #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)
@@ -311,20 +459,125 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
                        raise RuntimeError("Unknown action given")
                return
 
+       @expose(template="monitorweb.templates.simpleview")
+       def simpleview(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()
+
+               loginbase=None
+               loginbase_list=[]
+               hostname=None
+               pcuid=None
+               since=20
+               # if objtype is not None, then treat 'hostname' or 'loginbase' as a search pattern
+               objtype=None
+
+               exceptions = None
+               sitequery=[]
+               nodequery=[]
+               pcuquery=[]
+               actions=[]
+               actions_list=[]
+
+               for key in data:
+                       print key, data[key]
+
+               if 'query' in data:
+                       obj = data['query']
+                       fields = obj.split(":")
+                       if len(fields) > 1:
+                               objtype = fields[0]
+                               obj = fields[1].replace("*", "%")
+                               print "obj: %s"% obj
+
+                       if len(obj.split(".")) > 1 or objtype == "node": 
+                               hostname = obj
+                       else: 
+                               loginbase = obj
+
+               if 'loginbase' in data:
+                       loginbase = data['loginbase']
+
+               if 'hostname' in data:
+                       hostname = data['hostname']
+
+               if 'pcuid' in data:
+                       try: pcuid = int(data['pcuid'])
+                       except: pcuid = None
+
+               if 'since' in data:
+                       try: since = int(since)
+                       except: since = 20
+
+               if pcuid:
+                       print "pcuid: %s" % pcuid
+                       pcu = FindbadPCURecord.get_latest_by(plc_pcuid=pcuid)
+                       loginbase_list += [ PlcSite.query.get(pcu.plc_pcu_stats['site_id']).plc_site_stats['login_base'] ]
+
+               if hostname:
+                       if not objtype:
+                               nodes = [ FindbadNodeRecord.get_latest_by(hostname=hostname) ]
+                       else:
+                               nodes = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname.like(hostname)) 
+
+                       for node in nodes:
+                               lb = PlcSite.query.get(node.plc_node_stats['site_id']).plc_site_stats['login_base']
+                               if lb not in loginbase_list:
+                                       loginbase_list += [ lb ]
+
+               if loginbase:
+                       if not objtype:
+                               loginbase_list = [ loginbase ]
+                       else:
+                               loginbase_list = HistorySiteRecord.query.filter(HistorySiteRecord.loginbase.like(loginbase)) 
+                               loginbase_list = [ l.loginbase for l in loginbase_list ]
+                       
+
+               if loginbase_list:
+                       for loginbase in loginbase_list:
+                               actions = ActionRecord.query.filter_by(loginbase=loginbase
+                                                               ).filter(ActionRecord.date_created >= datetime.now() - timedelta(since)
+                                                               ).order_by(ActionRecord.date_created.desc())
+                               actions_list += [ a for a in actions ]
+                               site = HistorySiteRecord.by_loginbase(loginbase)
+                               if site:
+                                       sitequery.append(site)
+                               # NOTE: because a single pcu may be assigned to multiple hosts,
+                               # track unique pcus by their plc_pcuid, then turn dict into list
+                               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: 
+                                                       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_list, since=since, exceptions=exceptions)
+
+
        # 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, **data):
-               print "PCUVIEW------------------"
-               print "befor-len: ", len( [ i for i in session] )
+       def pcuview(self, loginbase=None, pcuid=None, hostname=None, since=20, **data):
                session.flush(); session.clear()
-               print "after-len: ", len( [ i for i in session] )
                sitequery=[]
                pcuquery=[]
                nodequery=[]
                actions=[]
                exceptions = None
 
+               try: since = int(since)
+               except: since = 7
+
                for key in data:
                        print key, data[key]
 
@@ -334,70 +587,76 @@ 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)
+                       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(14)
+                                                       ).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 plcnode in site_lb2hn[loginbase]:
-                                       node = FindbadNodeRecord.get_latest_by(hostname=plcnode['hostname'])
+                       for node in FindbadNodeRecord.query.filter_by(loginbase=loginbase):
                                        # 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)
-                                               prep_pcu_for_display(pcu)
-                                               pcus[node.plc_pcuid] = pcu
+                                       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]]
 
-               if pcuid and hostname is None:
-                       print "pcuid: %s" % pcuid
-                       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
-                                       node = FindbadNodeRecord.get_latest_by(hostname=nodename)
-                                       print "%s" % node.port_status
-                                       print "%s" % node.to_dict()
-                                       if node:
-                                               prep_node_for_display(node)
-                                               nodequery += [node]
-
-               if hostname and pcuid is None:
-                               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)
-                                       prep_pcu_for_display(pcu)
-                                       pcuquery += [pcu]
-                       
-               return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, actions=actions, exceptions=exceptions)
+               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 = 21
+
+               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)
+
+               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):
                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()
@@ -422,7 +681,10 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 
        @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}
@@ -436,39 +698,31 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
                        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'):
+               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 = []
@@ -497,67 +751,80 @@ 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):
+               from monitor.wrapper.emailTxt import mailtxt
+
+               types = filter(lambda x: 'notice' in x, dir(mailtxt))
+               results = {}
+
+               print mon_metadata.bind
+               if session.bind is None:
+                       #TODO: figure out why this value gets cleared out...
+                       session.bind = mon_metadata.bind
+               result = session.execute("select distinct(action_type) from actionrecord;")
+
+               types = [r[0] for r in result]
+
+               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,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 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)