freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

api/alfred: Support loadavg5 

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-06-18 11:57:17 +02:00
parent 22df21dc7e
commit c01a3017a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmap/routertools.py
View File

@ -720,7 +720,6 @@ def parse_nodewatcher_xml(xml,statstime):
# system
"sys_time": datetime.datetime.fromtimestamp(evalxpathint(tree,"/data/system_data/local_time/text()")),
"sys_uptime": int(evalxpathfloat(tree,"/data/system_data/uptime/text()")),
"sys_loadavg": evalxpathfloat(tree,"/data/system_data/loadavg/text()"),
"memory": {
"free": evalxpathint(tree,"/data/system_data/memory_free/text()"),
"buffering": evalxpathint(tree,"/data/system_data/memory_buffering/text()"),
@ -761,6 +760,13 @@ def parse_nodewatcher_xml(xml,statstime):
router_update["v2"] = bool(router_update["hood"])
loadavg = evalxpathfloat(tree,"/data/system_data/loadavg/text()",None)
if not loadavg == None:
router_update["sys_loadavg"] = loadavg
else:
router_update["sys_loadavg"] = evalxpathfloat(tree,"/data/system_data/loadavg5/text()")
try:
lng = evalxpathfloat(tree,"/data/system_data/geo/lng/text()")
except ValueError: