X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=be519599ad2cf33dbd4b23d2990f22e6b1ffdd6e;hb=45fea95bb898f254ea7e987d7417e9091885fbee;hp=2821b7604e50b91b6fb76aa93d02f4382ebd7793;hpb=09b59c841e16304b3f0826e6866e212bad922840;p=monitor.git diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index 2821b76..be51959 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -1,5 +1,5 @@ import turbogears as tg -from turbogears import controllers, expose, flash, exception_handler +from turbogears import controllers, expose, flash, exception_handler, redirect from turbogears import widgets from cherrypy import request, response import cherrypy @@ -7,14 +7,16 @@ import cherrypy # import logging # log = logging.getLogger("monitorweb.controllers") import re +import os 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 util from monitor import reboot +from monitor import bootman from monitor import scanapi +from monitor import config import time from monitor.wrapper.plccache import plcdb_hn2lb as site_hn2lb @@ -39,9 +41,16 @@ class NodeQueryFields(widgets.WidgetsList): hostname = widgets.CheckBox(label="Hostname") firewall = widgets.CheckBox(label="Firewall?") + ssh_status = widgets.CheckBox(label="SSH Status") + ssh_error = widgets.CheckBox(label="SSH Errors") dns_status = widgets.CheckBox(label="DNS Status") + nm_status = widgets.CheckBox(label="NM Status") + princeton_comon_dir = widgets.CheckBox(label="CoMon Dir") + princeton_comon_running = widgets.CheckBox(label="CoMon Running") + princeton_comon_procs = widgets.CheckBox(label="CoMon Processes") external_dns_status = widgets.CheckBox(label="Hostname Resolves?") kernel_version = widgets.CheckBox(label="Kernel") + bootcd_version = widgets.CheckBox(label="BootCD") observed_status = widgets.CheckBox(label="Observed Status") port_status = widgets.CheckBox(label="Port Status") rpms = widgets.CheckBox(label="RPM") @@ -168,6 +177,9 @@ def prep_pcu_for_display(pcu): agg.dns_short_status = 'Mismatch' return agg +class ActionListWidget(widgets.Widget): + pass + class NodeWidget(widgets.Widget): pass @@ -270,8 +282,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer): return dict(now=time.ctime(), query=rquery) - @expose(template="monitorweb.templates.nodelist", allow_json=True) - def node2(self, filter=None): + def node_query(self, filter): nhquery = HistoryNodeRecord.query.all() query = [] for nh in nhquery: @@ -286,10 +297,18 @@ class Root(controllers.RootController, MonitorXmlrpcServer): fb = FindbadNodeRecord.get_latest_by(hostname=q.hostname) agg = prep_node_for_display(fb) rquery.append(agg) + return rquery + @expose("cheetah:monitorweb.templates.nodelist_plain", as_format="plain", + accept_format="text/plain", content_type="text/plain") + @expose(template="monitorweb.templates.nodelist", allow_json=True) + def node2(self, filter=None): + rquery=self.node_query(filter) widget = NodeWidget(template='monitorweb.templates.node_template') return dict(now=time.ctime(), query=rquery, nodewidget=widget) + @expose("cheetah:monitorweb.templates.query_plain", as_format="plain", + accept_format="text/plain", content_type="text/plain") @expose(template="monitorweb.templates.query", allow_json=True) def query(self, **data): query = [] @@ -315,6 +334,8 @@ class Root(controllers.RootController, MonitorXmlrpcServer): else: agg = node.to_dict() agg.update(agg['plc_node_stats']) + if agg['kernel_version']: + agg['kernel_version'] = agg['kernel_version'].split()[2] if 'rpmvalue' in data and 'rpms' in data: if agg['rpms']: rpm_list = agg['rpms'].split() @@ -563,7 +584,8 @@ class Root(controllers.RootController, MonitorXmlrpcServer): for pcuid_key in pcus: pcuquery += [pcus[pcuid_key]] - return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, actions=actions_list, since=since, exceptions=exceptions) + actionlist_widget = ActionListWidget(template='monitorweb.templates.actionlist_template') + return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, actions=actions_list, actionlist_widget=actionlist_widget, since=since, exceptions=exceptions) # TODO: add form validation @@ -796,6 +818,14 @@ class Root(controllers.RootController, MonitorXmlrpcServer): 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 @@ -806,19 +836,46 @@ class Root(controllers.RootController, MonitorXmlrpcServer): return dict(results=results) @expose(template="monitorweb.templates.actionlist") - def actionlist(self, action_type='down_notice', since=7, loginbase=None): + def actionlist(self, since=7, action_type=None, loginbase=None): try: since = int(since) except: since = 7 + acts_query = ActionRecord.query.filter( + ActionRecord.date_created >= datetime.now() - timedelta(since) + ) 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()) + acts_query = acts_query.filter_by(loginbase=loginbase) + + if action_type: + acts_query = acts_query.filter(ActionRecord.action_type==action_type) + + acts = acts_query.order_by(ActionRecord.date_created.desc()) + query = [ a for a in acts ] return dict(actions=query, action_type=action_type, since=since) + + @cherrypy.expose() + def upload(self, log, **keywords): + hostname = None + logtype = None + logtype_list = ['bm.log', ] + + if 'hostname' in keywords: + hostname = keywords['hostname'] + if 'type' in keywords and keywords['type'] in logtype_list: + logtype = keywords['type'] + + if not hostname: return "" + if not logtype: return "unknown logtype: %s" % logtype + + short_target_filename = bootman.bootmanager_log_name(hostname) + abs_target_filename = os.path.join(config.MONITOR_BOOTMANAGER_LOG, short_target_filename) + print "write data: %s" % abs_target_filename + util.file.dumpFile(abs_target_filename, log.file.read()) + bootman.bootmanager_log_action(hostname, short_target_filename, logtype) + + print "redirecting 3" + + return dict()