X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=48ec3d24d3a4f5d468f30b6549f68af96a5385a7;hb=6c38b5cef7bf12fa4ade23ae1c54b3491797fb1d;hp=4a74782886c867c03b6527e6c6f6463cfad5b9d0;hpb=57fc3f2c580971f7a31c708764557d6273b83216;p=monitor.git diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index 4a74782..48ec3d2 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,12 +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_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 @@ -37,10 +41,22 @@ class NodeQueryFields(widgets.WidgetsList): hostname = widgets.CheckBox(label="Hostname") firewall = widgets.CheckBox(label="Firewall?") + fs_status = widgets.CheckBox(label="Filesystem Status") + ssh_status = widgets.CheckBox(label="SSH Status") + ssh_error = widgets.CheckBox(label="SSH Errors") dns_status = widgets.CheckBox(label="DNS Status") + iptables_status = widgets.CheckBox(label="IP Tables 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") + boot_server = widgets.CheckBox(label="Boot Server") observed_status = widgets.CheckBox(label="Observed Status") + uptime = widgets.CheckBox(label="Uptime") + traceroute = widgets.CheckBox(label="Traceroute") port_status = widgets.CheckBox(label="Port Status") rpms = widgets.CheckBox(label="RPM") rpmvalue = widgets.TextField(label="RPM Pattern") @@ -48,6 +64,7 @@ class NodeQueryFields(widgets.WidgetsList): class QueryForm(widgets.TableForm): template = """
" if 'rpmvalue' in data and 'rpms' in data: if agg['rpms']: rpm_list = agg['rpms'].split() @@ -463,10 +494,15 @@ class Root(controllers.RootController, MonitorXmlrpcServer): def simpleview(self, **data): return self.pre_view(**data) + @expose(template="monitorweb.templates.simpleview") + def pcuview(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() @@ -561,13 +597,14 @@ 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 @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): + def pcuviewold(self, loginbase=None, pcuid=None, hostname=None, since=20, **data): session.flush(); session.clear() sitequery=[] pcuquery=[] @@ -812,19 +849,47 @@ 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) + session.flush() + + print "redirecting 3" + + return dict()