%define name monitor
# keep this version in sync with monitor/monitor_version.py
%define version 3.1
-%define taglevel 5
+%define taglevel 6
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
%changelog
+* Wed Aug 31 2011 Stephen Soltesz <soltesz@cs.princeton.edu> - monitor-3.1-6
+- Minor updates to work with pcucontrol.
+- Added action for some fprobe no-space errors.
+
* Wed Aug 31 2011 Stephen Soltesz <soltesz@cs.princeton.edu> - monitor-3.1-5
- account for new ok status type in PCUs
- include a percentage of nodes up as well as raw node-count
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
def nodeslow(self, filter='boot'):
print "NODE------------------"
print "befor-len: ", len( [ i for i in session] )
- session.flush(); session.clear()
+ session_clear_all()
print "after-len: ", len( [ i for i in session] )
fbquery = FindbadNodeRecord.get_all_latest()
query = []
def pre_view(self, **data):
- session.flush(); session.clear()
+ session_clear_all()
loginbase=None
loginbase_list=[]
@expose(template="monitorweb.templates.pcuview")
@exception_handler(nodeaction_handler,"isinstance(tg_exceptions,RuntimeError)")
def pcuviewold(self, loginbase=None, pcuid=None, hostname=None, since=20, **data):
- session.flush(); session.clear()
+ session_clear_all()
sitequery=[]
pcuquery=[]
nodequery=[]
def pcu(self, filter='all'):
print "PCUVIEW------------------"
print "befor-len: ", len( [ i for i in session] )
- session.flush(); session.clear()
+ session_clear_all()
print "after-len: ", len( [ i for i in session] )
fbquery = FindbadPCURecord.get_all_latest()
query = []
def site(self, filter='all'):
print "SITE------------------"
print "befor-len: ", len( [ i for i in session] )
- session.flush(); session.clear()
+ session_clear_all()
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()
%{zabbix_webdir}
%changelog
+* Wed Aug 31 2011 Stephen Soltesz <soltesz@cs.princeton.edu> - monitor-3.1-6
+- Minor updates to work with pcucontrol.
+- Added action for some fprobe no-space errors.
+
* Wed Aug 31 2011 Stephen Soltesz <soltesz@cs.princeton.edu> - monitor-3.1-5
- account for new ok status type in PCUs
- include a percentage of nodes up as well as raw node-count
%define module_current_branch 3.0
-%define taglevel 5
+%define taglevel 6
%define version 3.1