www/printbadnodes.py

[monitor.git] / nodecommon.py

diff --git a/nodecommon.py b/nodecommon.py
index 9469b81..cef1247 100644 (file)
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -1,6 +1,9 @@
 
 import struct
 import reboot
+import time
+from monitor import database
+from unified_model import PersistFlags
 esc = struct.pack('i', 27)
 RED    = esc + "[1;31m"
 GREEN  = esc + "[1;32m"
@@ -73,12 +76,15 @@ def color_boot_state(l):
        else:
                return l
 
-def diff_time(timestamp):
+def diff_time(timestamp, abstime=True):
        import math
        now = time.time()
        if timestamp == None:
                return "unknown"
-       diff = now - timestamp
+       if abstime:
+               diff = now - timestamp
+       else:
+               diff = timestamp
        # return the number of seconds as a difference from current time.
        t_str = ""
        if diff < 60: # sec in min.
@@ -90,7 +96,7 @@ def diff_time(timestamp):
        elif diff < 60*60*24: # sec in day
                t = diff / (60*60)
                t_str = "%s hrs ago" % int(math.ceil(t))
-       elif diff < 60*60*24*7: # sec in week
+       elif diff < 60*60*24*14: # sec in week
                t = diff / (60*60*24)
                t_str = "%s days ago" % int(math.ceil(t))
        elif diff <= 60*60*24*30: # approx sec in month
@@ -124,37 +130,14 @@ def nodegroup_display(node, fb, conf=None):
        #node['current']        = node['current']
        node['pcu'] = fb['nodes'][node['hostname']]['values']['pcu']
        node['lastupdate'] = diff_time(node['last_contact'])
-
-       return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)20.20s... %(kernel)43s %(lastupdate)12s " % node
-
-from model import *
-import database
-
-def node_end_record(node):
-       act_all = database.dbLoad("act_all")
-       if node not in act_all:
-               del act_all
-               return False
-
-       if len(act_all[node]) == 0:
-               del act_all
-               return False
-
-       a = Action(node, act_all[node][0])
-       a.delField('rt')
-       a.delField('found_rt_ticket')
-       a.delField('second-mail-at-oneweek')
-       a.delField('second-mail-at-twoweeks')
-       a.delField('first-found')
-       rec = a.get()
-       rec['action'] = ["close_rt"]
-       rec['category'] = "UNKNOWN"
-       rec['stage'] = "monitor-end-record"
-       rec['time'] = time.time() - 7*60*60*24
-       act_all[node].insert(0,rec)
-       database.dbDump("act_all", act_all)
-       del act_all
-       return True
+       pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
+       node['lc'] = diff_time(pf.last_changed)
+       ut = fb['nodes'][node['hostname']]['values']['comonstats']['uptime']
+       if ut != "null":
+               ut = diff_time(float(fb['nodes'][node['hostname']]['values']['comonstats']['uptime']), False)
+       node['uptime'] = ut
+
+       return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)33s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
 
 def datetime_fromstr(str):
        if '-' in str: