X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=b368df9af5dab4a53e98a5215c9825f7b5f469b2;hb=5dd8a0f356100ed9369f54ac764e058adc4c3c90;hp=7915ca1f3af455936d6c2af9f1fe6eee89f14297;hpb=e2e493681014a07579fee2719a683b364a72fe0a;p=monitor.git diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index 7915ca1..b368df9 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -11,15 +11,27 @@ import os from monitor.database.info.model import * #from monitor.database.zabbixapi.model import * from monitor_xmlrpc import MonitorXmlrpcServer +from controllers_local import LocalExtensions +from pcucontrol.reboot import pcu_name +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 from monitorweb.templates.links import * +def session_clear_all(): + session.flush() + try: + session.expunge_all() + except AttributeError: # SQLAlchemy < 0.5.1 + session.clear() + class ObjectQueryFields(widgets.WidgetsList): """The WidgetsList defines the fields of the form.""" pass @@ -38,9 +50,11 @@ 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") @@ -48,14 +62,20 @@ class NodeQueryFields(widgets.WidgetsList): 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") + install_date = widgets.CheckBox(label="Installation Date") observed_status = widgets.CheckBox(label="Observed Status") + uptime = widgets.CheckBox(label="Uptime") + traceroute = widgets.CheckBox(label="Traceroute") port_status = widgets.CheckBox(label="Port Status") + plc_pcuid = widgets.CheckBox(label="PCU ID") rpms = widgets.CheckBox(label="RPM") rpmvalue = widgets.TextField(label="RPM Pattern") class QueryForm(widgets.TableForm): template = """