From: Stephen Soltesz Date: Tue, 28 Oct 2008 17:52:03 +0000 (+0000) Subject: restructure some of the output, tweak links, ignore comon output for myplcs. X-Git-Tag: Monitor-1.0-12~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=195cf0357007cc54f54828b8ab5332b1cf6c369b;p=monitor.git restructure some of the output, tweak links, ignore comon output for myplcs. --- diff --git a/www/printbadnodes.py b/www/printbadnodes.py index 9b5692c..5525eff 100755 --- a/www/printbadnodes.py +++ b/www/printbadnodes.py @@ -225,7 +225,7 @@ def fields_to_html(fields, vals): #print "state: %s
" % pcu_state(vals['plcnode']['pcu_ids'][0]) #print "color: %s
" % pcu_colorMap[pcu_state(vals['plcnode']['pcu_ids'][0])] bgcolor = "bgcolor='%s'" % pcu_colorMap[pcu_state(vals['plcnode']['pcu_ids'][0])] - url = "PCU" % vals['plcnode']['pcu_ids'][0] + url = "PCU" % vals['plcnode']['pcu_ids'][0] r_str += "%s" % (bgcolor, url) else: r_str += "%s" % (bgcolor, f) @@ -238,6 +238,17 @@ def fields_to_html(fields, vals): def main(sitefilter, catfilter, statefilter, comonfilter, nodeonlyfilter): global fb + import os + import datetime + if nodeonlyfilter == None: + print "\n" + + try: + mtime = os.stat("/var/lib/monitor-server/production.findbad.pkl")[-2] + print "Last Updated: %s GMT" % datetime.datetime.fromtimestamp(mtime) + except: + pass + db = database.dbLoad(config.dbname) fb = database.dbLoad("findbadpcus") @@ -356,10 +367,12 @@ def main(sitefilter, catfilter, statefilter, comonfilter, nodeonlyfilter): if comonfilter != None: cmf = re.compile(comonfilter) else: cmf = None + + output_str = "" #l_loginbase = bysite.keys() #l_loginbase.sort() if nodeonlyfilter == None: - print "" + output_str += "

" prev_sitestring = "" for row in d2: @@ -376,16 +389,16 @@ def main(sitefilter, catfilter, statefilter, comonfilter, nodeonlyfilter): continue if nodeonlyfilter != None: - print vals['nodename'] + output_str += vals['nodename'] continue site_string = row['site_string'] if site_string != prev_sitestring: - print "" + output_str += "" else: - print "" + output_str += "" prev_sitestring = site_string @@ -441,15 +454,15 @@ def main(sitefilter, catfilter, statefilter, comonfilter, nodeonlyfilter): print >>sys.stderr, vals s = fields_to_html(str_fields, vals) - print s + output_str += s - print "\n" + output_str += "\n" if nodeonlyfilter == None: - print "

" - print site_string - print "

" + output_str += site_string + output_str += "

" - print "" + output_str += "

" keys = categories.keys() keys.sort() + print "" for cat in keys: print "" print "" % cat @@ -458,6 +471,10 @@ def main(sitefilter, catfilter, statefilter, comonfilter, nodeonlyfilter): if nodeonlyfilter == None: print "

Total %s

" + print output_str + if nodeonlyfilter == None: + print "\n" + if __name__ == '__main__': @@ -496,7 +513,7 @@ if __name__ == '__main__': config.cmpdays=False config.comon="sshstatus" - config.fields="nodename,ping,ssh,pcu,category,state,comonstats,kernel,bootcd" + config.fields="nodename,ping,ssh,pcu,category,state,kernel,bootcd" config.dbname="findbad" config.cmpping=False config.cmpdns=False @@ -505,11 +522,7 @@ if __name__ == '__main__': config.cmpcategory=False print "Content-Type: text/html\r\n" - if mynodeonly == None: - print "\n" if len(sys.argv) > 1: if sys.argv[1] == "ssherror": ssherror = True main(myfilter, mycategory, mystate, mycomon,mynodeonly) - if mynodeonly == None: - print "\n"