git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle the case where there is no data in db yet.
[monitor.git]
/
nodecommon.py
diff --git
a/nodecommon.py
b/nodecommon.py
index
a3117d8
..
082550b
100644
(file)
--- a/
nodecommon.py
+++ b/
nodecommon.py
@@
-1,14
+1,14
@@
import time
import struct
import time
import struct
-from
monitor.pcu
import reboot
+from
pcucontrol
import reboot
from monitor import util
from monitor import database
from monitor import util
from monitor import database
-from monitor.wrapper import plc
+from monitor.wrapper import plc
, plccache
from datetime import datetime
from datetime import datetime
-from
unified_
model import PersistFlags
+from
monitor.
model import PersistFlags
esc = struct.pack('i', 27)
RED = esc + "[1;31m"
esc = struct.pack('i', 27)
RED = esc + "[1;31m"
@@
-34,8
+34,8
@@
def blue(str):
return BLUE + str + NORMAL
def get_current_state(fbnode):
return BLUE + str + NORMAL
def get_current_state(fbnode):
- if '
state
' in fbnode:
- state = fbnode['
state
']
+ if '
observed_status
' in fbnode:
+ state = fbnode['
observed_status
']
else:
state = "none"
l = state.lower()
else:
state = "none"
l = state.lower()
@@
-112,40
+112,46
@@
def diff_time(timestamp, abstime=True):
t_str = "%s mnths ago" % int(t)
return t_str
t_str = "%s mnths ago" % int(t)
return t_str
-def nodegroup_display(node, fb, conf=None):
- if node['hostname'] in fb['nodes']:
- node['current'] = get_current_state(fb['nodes'][node['hostname']]['values'])
- else:
- node['current'] = 'none'
+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
-
if fb['nodes'][node['hostname']]['values'] == []
:
- return ""
+
def nodegroup_display(node, fbdata, conf=None)
:
+ node['current'] = get_current_state(fbdata)
- s = fb
['nodes'][node['hostname']]['values']['kernel
'].split()
+ s = fb
data['kernel_version
'].split()
if len(s) >=3:
if len(s) >=3:
- node['kernel'] = s[2]
+ node['kernel
_version
'] = s[2]
else:
else:
- node['kernel
'] = fb['nodes'][node['hostname']]['values']['kernel
']
+ node['kernel
_version'] = fbdata['kernel_version
']
- if '2.6' not in node['kernel
']: node['kernel
'] = ""
+ if '2.6' not in node['kernel
_version']: node['kernel_version
'] = ""
if conf and not conf.nocolor:
node['boot_state'] = color_boot_state(node['boot_state'])
node['current'] = color_boot_state(node['current'])
if conf and not conf.nocolor:
node['boot_state'] = color_boot_state(node['boot_state'])
node['current'] = color_boot_state(node['current'])
- #node['boot_state'] = node['boot_state']
- #node['current'] = node['current']
- node['pcu'] = fb['nodes'][node['hostname']]['values']['pcu']
+
+ if type(fbdata['plc_node_stats']['pcu_ids']) == type([]):
+ node['pcu'] = "PCU"
node['lastupdate'] = diff_time(node['last_contact'])
node['lastupdate'] = diff_time(node['last_contact'])
+
pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
try:
node['lc'] = diff_time(pf.last_changed)
except:
node['lc'] = "err"
pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
try:
node['lc'] = diff_time(pf.last_changed)
except:
node['lc'] = "err"
- ut = fb['nodes'][node['hostname']]['values']['comonstats']['uptime']
+
+ ut = fbdata['comon_stats']['uptime']
if ut != "null":
if ut != "null":
- ut = diff_time(float(fb
['nodes'][node['hostname']]['values']['comon
stats']['uptime']), False)
+ ut = diff_time(float(fb
data['comon_
stats']['uptime']), False)
node['uptime'] = ut
node['uptime'] = ut
- return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)35.35s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
+ return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel
_version
)35.35s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
def datetime_fromstr(str):
if '-' in str:
def datetime_fromstr(str):
if '-' in str:
@@
-166,7
+172,7
@@
def get_nodeset(config):
evaluates to.
"""
api = plc.getAuthAPI()
evaluates to.
"""
api = plc.getAuthAPI()
- l_nodes =
database.dbLoad("l_plcnodes")
+ l_nodes =
plccache.l_nodes
if config.nodelist:
f_nodes = util.file.getListFromFile(config.nodelist)
if config.nodelist:
f_nodes = util.file.getListFromFile(config.nodelist)
@@
-186,8
+192,9
@@
def get_nodeset(config):
# perform this query after the above options, so that the filter above
# does not break.
if config.nodeselect:
# perform this query after the above options, so that the filter above
# does not break.
if config.nodeselect:
- fb = database.dbLoad("findbad")
- l_nodes = node_select(config.nodeselect, fb['nodes'].keys(), fb)
+ fbquery = FindbadNodeRecord.get_all_latest()
+ node_list = [ n.hostname for n in fbquery ]
+ l_nodes = node_select(config.nodeselect, node_list, None)
return l_nodes
return l_nodes