X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=printbadcsv.py;h=2f5036da874759b3920c6b00c1da4bd33ac7ac05;hb=8814d16dc60e8027c9a30963b47dd77b54efcdbf;hp=8911a0af1e5dfe8b1404dc27f2f7e8f1d25d0a30;hpb=66b2c2382b2c4550f962a7224466f26a23510820;p=monitor.git diff --git a/printbadcsv.py b/printbadcsv.py index 8911a0a..2f5036d 100755 --- a/printbadcsv.py +++ b/printbadcsv.py @@ -1,17 +1,19 @@ #!/usr/bin/python -import soltesz -from config import config -from optparse import OptionParser -from printbadbysite import * +from monitor import database +from monitor import config +import parser as parsermodule +from www.printbadnodes import * def main(): - db = soltesz.dbLoad(config.dbname) + db = database.dbLoad(config.dbname) + act= database.dbLoad("act_all") ## Field widths used for printing maxFieldLengths = { 'nodename' : -45, 'ping' : 6, 'ssh' : 6, + 'rt' : 10, 'pcu' : 7, 'category' : 9, 'state' : 5, @@ -29,18 +31,10 @@ def main(): d_n = db['nodes'] - l_nodes = d_n.keys() - - # category by site - #bysite = {} - #for nodename in l_nodes: - # if 'plcsite' in d_n[nodename]['values'] and \ - # 'login_base' in d_n[nodename]['values']['plcsite']: - # loginbase = d_n[nodename]['values']['plcsite']['login_base'] - # if loginbase not in bysite: - # bysite[loginbase] = [] - # d_n[nodename]['values']['nodename'] = nodename - # bysite[loginbase].append(d_n[nodename]['values']) + if config.display: + l_nodes = sys.argv[2:] + else: + l_nodes = d_n.keys() # d2 was an array of [{node}, {}, ...] # the bysite is a loginbase dict of [{node}, {node}] @@ -97,35 +91,55 @@ def main(): vals['kernel'] = "" continue + if 'pcu' in vals and vals['pcu'] == "PCU": + # check the health of the pcu. + s = pcu_state(vals['plcnode']['pcu_ids'][0]) + if s == 0: + vals['pcu'] = "UP-PCU" + else: + vals['pcu'] = "DN-PCU" + + vals['rt'] = " -" + if vals['nodename'] in act: + if len(act[vals['nodename']]) > 0 and 'rt' in act[vals['nodename']][0]: + if 'Status' in act[vals['nodename']][0]['rt']: + vals['rt'] = "%s %s" % (act[vals['nodename']][0]['rt']['Status'], + act[vals['nodename']][0]['rt']['id']) + str = format % vals fields = str.split() #print "