changes for 3.0

[monitor.git] / showlatlon.py

diff --git a/showlatlon.py b/showlatlon.py
index 10367e4..ea0891c 100755 (executable)
--- a/showlatlon.py
+++ b/showlatlon.py
@@ -12,7 +12,6 @@ import comon
 from nodecommon import color_pcu_state, datetime_fromstr
 from nodehistory import get_filefromglob
 import time
-import traceback
 
 # region
 # total
@@ -29,11 +28,11 @@ def gethardwarequality(nodename, fb):
                for field in ['cpuspeed', 'memsize', 'disksize']:
                        if field not in cstat: cstat[field] = "null"
 
-               if cstat['cpuspeed'] != "null" and float(cstat['cpuspeed']) < 2.4:
+               if cstat['cpuspeed'] != "null" and float(cstat['cpuspeed']) < 2.2:
                        return "BAD" # "cpu_slow",
-               if cstat['memsize'] != "null" and float(cstat['memsize']) < 2.9:
+               if cstat['memsize'] != "null" and float(cstat['memsize']) < 2.8:
                        return "BAD" # "mem_small",
-               if cstat['disksize'] != "null" and float(cstat['disksize']) < 320.0:
+               if cstat['disksize'] != "null" and float(cstat['disksize']) < 250.0:
                        return "BAD" # "disk_small",
 
                if cstat['disksize'] == "null" and \
@@ -42,9 +41,9 @@ def gethardwarequality(nodename, fb):
                        return "N/A"
 
                try:
-                       if  float(cstat['cpuspeed']) >= 2.4 and \
-                               float(cstat['memsize']) >= 2.9 and \
-                               (cstat['disksize'] == "null" or float(cstat['disksize']) >= 320.0):
+                       if  float(cstat['cpuspeed']) >= 2.2 and \
+                               float(cstat['memsize']) >= 2.8 and \
+                               (cstat['disksize'] == "null" or float(cstat['disksize']) >= 250.0):
                                return "A-OK"
                except:
                        print cstat
@@ -83,8 +82,8 @@ def main():
                begin = time.strftime(format)
 
        d = datetime_fromstr(begin)
-       fbstr = get_filefromglob(d, "production.findbad")
-       fbpcustr = get_filefromglob(d, "production.findbadpcus")
+       fbstr = get_filefromglob(d, "production.findbad")[0]
+       fbpcustr = get_filefromglob(d, "production.findbadpcus")[0]
 
        l_plcnodes = database.dbLoad("l_plcnodes")
        l_plcsites = database.dbLoad("l_plcsites")
@@ -150,7 +149,6 @@ def main():
                                                'hardware' : gethardwarequality(hostname, fb),
                                                'pcuok' : color_pcu_state(fb['nodes'][hostname]['values']) }
                                        #except:
-                                       #       print traceback.print_exc()
                                        #       print args
                                        #       print fb['nodes'][hostname]['values']
                                        results.append("%(cc)7s %(status)8s %(hardware)8s %(pcuok)8s %(site)15s %(host)42s " % args)