#!/usr/bin/python
-import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+from monitor.wrapper import plc
+api = plc.getAuthAPI()
-import soltesz
-import reboot
+from monitor import *
+from monitor import util
+from monitor import parser as parsermodule
+
+from monitor import database
+from monitor.pcu import reboot
import time
-from model import *
+from monitor.model import *
from nodecommon import *
+#from monitor.model import node_end_record, PersistFlags
-import config as configmodule
-
-from config import config as cfg
-from optparse import OptionParser
-
-parser = OptionParser()
+parser = parsermodule.getParser()
parser.set_defaults(node=None,
findbad=False,
endrecord=False)
help="Re-run findbad on the nodes we're going to check before acting.")
parser.add_option("", "--bootcd", dest="bootcd", action="store_true",
help="A stock help message for fetching a new BootCD from the PLC GUI.")
-config = cfg(parser)
-config.parse_args()
-
-def diff_time(timestamp):
- now = time.time()
- if timestamp == None:
- return "unknown"
- diff = now - timestamp
- # return the number of seconds as a difference from current time.
- t_str = ""
- if diff < 60: # sec in min.
- t = diff
- t_str = "%s sec ago" % t
- elif diff < 60*60: # sec in hour
- t = diff // (60)
- t_str = "%s min ago" % int(t)
- elif diff < 60*60*24: # sec in day
- t = diff // (60*60)
- t_str = "%s hours ago" % int(t)
- elif diff < 60*60*24*7: # sec in week
- t = diff // (60*60*24)
- t_str = "%s days ago" % int(t)
- elif diff < 60*60*24*30: # approx sec in month
- t = diff // (60*60*24*7)
- t_str = "%s weeks ago" % int(t)
- elif diff > 60*60*24*30: # approx sec in month
- t = diff // (60*60*24*7*30)
- t_str = "%s months ago" % int(t)
- return t_str
+config = parsermodule.parse_args(parser)
+
def plc_print_nodeinfo(plcnode):
url = "https://www.planet-lab.org/db/nodes/index.php?nodepattern="
diff_time(plcnode['last_contact']), plcnode['key'])
def fb_print_nodeinfo(fbnode):
+ pf = PersistFlags(fbnode['hostname'], 1, db='node_persistflags')
+ try:
+ fbnode['last_change'] = diff_time(pf.last_changed)
+ except:
+ fbnode['last_change'] = diff_time(time.time())
print " Checked: ",
if 'checked' in fbnode:
print "%11.11s " % diff_time(fbnode['checked'])
else:
print "Unknown"
- print "\t state | ssh | pcu | bootcd | category | kernel"
+ print "\t state | ssh | pcu | bootcd | category | last change | kernel"
if fbnode['bootcd']:
fbnode['bootcd'] = fbnode['bootcd'].split()[-1]
else:
fbnode['state'] = "none"
if len(fbnode['kernel'].split()) > 2:
fbnode['kernel'] = fbnode['kernel'].split()[2]
- print "\t %(state)5s | %(ssh)5.5s | %(pcu)5.5s | %(bootcd)6.6s | %(category)8.8s | %(kernel)s" % fbnode
+ print "\t %(state)5s | %(ssh)5.5s | %(pcu)5.5s | %(bootcd)6.6s | %(category)8.8s | %(last_change)11s | %(kernel)s" % fbnode
def act_print_nodeinfo(actnode, header):
if header[0]:
if 'rt' in actnode and 'Status' in actnode['rt']:
print "\t %5.5s %5.5s | %8.8s | %15.15s | %s" % \
(actnode['rt']['Status'], actnode['rt']['id'][7:],
- actnode['category'], actnode['action'][0],
- actnode['msg_format'][:-1])
+ actnode['category'], actnode['action'][0], actnode['info'][1:])
else:
if type(actnode['action']) == type([]):
action = actnode['action'][0]
# rerun findbad with the nodes in the given nodes.
import os
file = "findbad.txt"
- configmodule.setFileFromList(file, config.args)
+ util.file.setFileFromList(file, config.args)
os.system("./findbad.py --cachenodes --debug=0 --dbname=findbad --increment --nodelist %s" % file)
-fb = soltesz.dbLoad("findbad")
-act_all = soltesz.dbLoad("act_all")
-
for node in config.args:
config.node = node
plc_nodeinfo = api.GetNodes({'hostname': config.node}, None)[0]
- fb_nodeinfo = fb['nodes'][config.node]['values']
-
+ fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node)
+ fb_nodeinfo = fb_noderec.to_dict()
plc_print_nodeinfo(plc_nodeinfo)
+
+ fb_nodeinfo['hostname'] = node
fb_print_nodeinfo(fb_nodeinfo)
if fb_nodeinfo['pcu'] == "PCU":
pcu = reboot.get_pcu_values(fb_nodeinfo['plcnode']['pcu_ids'][0])
- pcu_print_info(pcu, config.node)
+ if pcu: pcu_print_info(pcu, config.node)
+ try:
+ act_all = database.dbLoad("act_all")
+ except:
+ act_all = {}
if config.node in act_all and len(act_all[config.node]) > 0:
header = [True]
#rec['stage'] = "monitor-end-record"
#rec['time'] = time.time() - 7*60*60*24
#act_all[config.node].insert(0,rec)
- #soltesz.dbDump("act_all", act_all)
+ #database.dbDump("act_all", act_all)
for act_nodeinfo in act_all[config.node]:
act_print_nodeinfo(act_nodeinfo, header)
git://git.onelab.eu / monitor.git / blobdiff