changes for 3.0

[monitor.git] / nodecommon.py

diff --git a/nodecommon.py b/nodecommon.py
index ba67625..2250492 100644 (file)
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -4,6 +4,7 @@ import reboot
 import time
 import util.file
 import plc
+from datetime import datetime 
 from monitor import database
 from unified_model import PersistFlags
 esc = struct.pack('i', 27)
@@ -74,6 +75,7 @@ def color_boot_state(l):
        elif  l == "down": return red(l)
        elif  l == "boot": return green(l)
        elif  l == "rins": return blue(l)
+       elif  l == "reinstall": return blue(l)
        else:
                return l
 
@@ -108,6 +110,16 @@ def diff_time(timestamp, abstime=True):
                t_str = "%s mnths ago" % int(t)
        return t_str
 
+def getvalue(fb, path):
+    indexes = path.split("/")
+    values = fb
+    for index in indexes:
+        if index in values:
+            values = values[index]
+        else:
+            return None
+    return values
+
 def nodegroup_display(node, fb, conf=None):
        if node['hostname'] in fb['nodes']:
                node['current'] = get_current_state(fb['nodes'][node['hostname']]['values'])
@@ -132,13 +144,16 @@ def nodegroup_display(node, fb, conf=None):
        node['pcu'] = fb['nodes'][node['hostname']]['values']['pcu']
        node['lastupdate'] = diff_time(node['last_contact'])
        pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
-       node['lc'] = diff_time(pf.last_changed)
+       try:
+               node['lc'] = diff_time(pf.last_changed)
+       except:
+               node['lc'] = "err"
        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
+       return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)35.35s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
 
 def datetime_fromstr(str):
        if '-' in str:
@@ -168,7 +183,7 @@ def get_nodeset(config):
                f_nodes = [config.node]
                l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
        elif config.nodegroup:
-               ng = api.GetNodeGroups({'name' : config.nodegroup})
+               ng = api.GetNodeGroups({'groupname' : config.nodegroup})
                l_nodes = api.GetNodes(ng[0]['node_ids'], ['hostname'])
        elif config.site:
                site = api.GetSites(config.site)
@@ -184,3 +199,13 @@ def get_nodeset(config):
 
        return l_nodes
        
+def email_exception(content=None):
+       import config
+       from unified_model import Message
+       import traceback
+       msg=traceback.format_exc() 
+       if content:
+               msg = content + "\n" + msg
+       m=Message("exception running monitor", msg, False)
+       m.send([config.cc_email])
+       return