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

api/alfred and router.html: Introduce detailed client stats 

This only works for routers with updated nodewatcher.

This requires changes to the MySQL database!

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-01-21 01:50:18 +01:00
parent ef9ea75c11
commit 1cffed9f79
4 changed files with 64 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmap/db/routers.py
View File

@ -66,6 +66,9 @@ mysql.execute("""
`sys_procrun` smallint(6) NOT NULL,
`sys_proctot` smallint(6) NOT NULL,
`clients` smallint(6) NOT NULL,
`clients_eth` smallint(6) DEFAULT NULL,
`clients_w2` smallint(6) DEFAULT NULL,
`clients_w5` smallint(6) DEFAULT NULL,
`wan_uplink` tinyint(1) NOT NULL,
`cpu` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`chipset` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
@ -202,7 +205,10 @@ mysql.execute("""
`sys_membuff` int(11) NOT NULL,
`sys_memfree` int(11) NOT NULL,
`loadavg` float NOT NULL,
`clients` smallint(6) NOT NULL
`clients` smallint(6) NOT NULL,
`clients_eth` smallint(6) DEFAULT NULL,
`clients_w2` smallint(6) DEFAULT NULL,
`clients_w5` smallint(6) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
""")

23
ffmap/routertools.py
View File

@ -128,13 +128,13 @@ def import_nodewatcher_xml(mysql, mac, xml, banned, netifdict):
mysql.execute("""
UPDATE router
SET status = %s, hostname = %s, last_contact = %s, sys_time = %s, sys_uptime = %s, sys_memfree = %s, sys_membuff = %s, sys_memcache = %s,
sys_loadavg = %s, sys_procrun = %s, sys_proctot = %s, clients = %s, wan_uplink = %s, cpu = %s, chipset = %s, hardware = %s, os = %s,
sys_loadavg = %s, sys_procrun = %s, sys_proctot = %s, clients = %s, clients_eth = %s, clients_w2 = %s, clients_w5 = %s, wan_uplink = %s, cpu = %s, chipset = %s, hardware = %s, os = %s,
batman = %s, kernel = %s, nodewatcher = %s, firmware = %s, firmware_rev = %s, description = %s, position_comment = %s, community = %s, hood = %s,
status_text = %s, contact = %s, lng = %s, lat = %s, neighbors = %s, reset = %s
WHERE id = %s
""",(
ru["status"],ru["hostname"],ru["last_contact"],ru["sys_time"],ru["sys_uptime"],ru["memory"]["free"],ru["memory"]["buffering"],ru["memory"]["caching"],
ru["sys_loadavg"],ru["processes"]["runnable"],ru["processes"]["total"],ru["clients"],ru["has_wan_uplink"],ru["cpu"],ru["chipset"],ru["hardware"],ru["os"],
ru["sys_loadavg"],ru["processes"]["runnable"],ru["processes"]["total"],ru["clients"],ru["clients_eth"],ru["clients_w2"],ru["clients_w5"],ru["has_wan_uplink"],ru["cpu"],ru["chipset"],ru["hardware"],ru["os"],
ru["batman_adv"],ru["kernel"],ru["nodewatcher"],ru["firmware"],ru["firmware_rev"],ru["description"],ru["position_comment"],ru["community"],ru["hood"],
ru["status_text"],ru["contact"],ru["lng"],ru["lat"],ru["visible_neighbours"],reset,router_id,))
@ -182,13 +182,13 @@ def import_nodewatcher_xml(mysql, mac, xml, banned, netifdict):
router_update["status"] = "online" # use 'online' here, as anything different is only evaluated if olddata is present
mysql.execute("""
INSERT INTO router (status, hostname, created, last_contact, sys_time, sys_uptime, sys_memfree, sys_membuff, sys_memcache,
sys_loadavg, sys_procrun, sys_proctot, clients, wan_uplink, cpu, chipset, hardware, os,
sys_loadavg, sys_procrun, sys_proctot, clients, clients_eth, clients_w2, clients_w5, wan_uplink, cpu, chipset, hardware, os,
batman, kernel, nodewatcher, firmware, firmware_rev, description, position_comment, community, hood,
status_text, contact, lng, lat, neighbors)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
""",(
ru["status"],ru["hostname"],created,ru["last_contact"],ru["sys_time"],ru["sys_uptime"],ru["memory"]["free"],ru["memory"]["buffering"],ru["memory"]["caching"],
ru["sys_loadavg"],ru["processes"]["runnable"],ru["processes"]["total"],ru["clients"],ru["has_wan_uplink"],ru["cpu"],ru["chipset"],ru["hardware"],ru["os"],
ru["sys_loadavg"],ru["processes"]["runnable"],ru["processes"]["total"],ru["clients"],ru["clients_eth"],ru["clients_w2"],ru["clients_w5"],ru["has_wan_uplink"],ru["cpu"],ru["chipset"],ru["hardware"],ru["os"],
ru["batman_adv"],ru["kernel"],ru["nodewatcher"],ru["firmware"],ru["firmware_rev"],ru["description"],ru["position_comment"],ru["community"],ru["hood"],
ru["status_text"],ru["contact"],ru["lng"],ru["lat"],ru["visible_neighbours"],))
router_id = mysql.cursor().lastrowid
@ -497,8 +497,8 @@ def new_router_stats(mysql, router_id, uptime, router_update, netifdict):
stattime = mysql.findone("SELECT time FROM router_stats WHERE router = %s ORDER BY time DESC LIMIT 1",(router_id,),"time")
if not stattime or (stattime + CONFIG["router_stat_mindiff_default"]) < time:
mysql.execute("""
INSERT INTO router_stats (time, router, sys_memfree, sys_membuff, sys_memcache, loadavg, sys_procrun, sys_proctot, clients)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
INSERT INTO router_stats (time, router, sys_memfree, sys_membuff, sys_memcache, loadavg, sys_procrun, sys_proctot, clients, clients_eth, clients_w2, clients_w5)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
""",(
time,
router_id,
@ -508,7 +508,11 @@ def new_router_stats(mysql, router_id, uptime, router_update, netifdict):
router_update["sys_loadavg"],
router_update["processes"]['runnable'],
router_update["processes"]['total'],
router_update["clients"],))
router_update["clients"],
router_update["clients_eth"],
router_update["clients_w2"],
router_update["clients_w5"],
))
netiftime = mysql.findone("SELECT time FROM router_stats_netif WHERE router = %s ORDER BY time DESC LIMIT 1",(router_id,),"time")
if not netiftime or (netiftime + CONFIG["router_stat_mindiff_netif"]) < time:
@ -654,6 +658,9 @@ def parse_nodewatcher_xml(xml):
"total": int(evalxpath(tree,"/data/system_data/processes/text()").split("/")[1]),
},
"clients": evalxpathint(tree,"/data/client_count/text()"),
"clients_eth": evalxpathint(tree,"/data/clients/*[starts-with(name(), 'eth')]/text()",None),
"clients_w2": evalxpathint(tree,"/data/clients/w2ap/text()",None),
"clients_w5": evalxpathint(tree,"/data/clients/w5ap/text()",None),
"has_wan_uplink": (
(len(tree.xpath("/data/system_data/vpn_active")) > 0
and evalxpathint(tree,"/data/system_data/vpn_active/text()") == 1)

39
ffmap/web/static/js/graph.js
View File

@ -254,28 +254,57 @@ function process_graph() {
function client_graph() {
var clientstat = $("#clientstat");
var clients = [];
var clients = [], clients_eth = [], clients_w2 = [], clients_w5 = [];
var len, i;
for (len=router_stats.length, i=0; i<len; i++) {
try {
var client_value = router_stats[i].clients;
var client_eth = router_stats[i].clients_eth;
var client_w2 = router_stats[i].clients_w2;
var client_w5 = router_stats[i].clients_w5;
var date_value = router_stats[i].time.$date;
if(client_value != null) {
clients.push([date_value, client_value]);
}
if(client_eth != null) {
clients_eth.push([date_value, client_eth]);
}
if(client_w2 != null) {
clients_w2.push([date_value, client_w2]);
}
if(client_w5 != null) {
clients_w5.push([date_value, client_w5]);
}
}
catch(TypeError) {
// pass
}
}
var pdata = [
{"label": "clients", "data": clients, "color": "#8CACC6", lines: {fill: true}}
];
var pdata = [];
if (clients_w2.length > 0) {
pdata.push(
{"label": "2.4 GHz", "data": clients_w2, "color": "#CB4B4B"}
);
}
if (clients_w5.length > 0) {
pdata.push(
{"label": "5 GHz", "data": clients_w5, "color": "#EDC240"}
);
}
if (clients_eth.length > 0) {
pdata.push(
{"label": "Ethernet", "data": clients_eth, "color": "#4DA74A"}
);
}
pdata.push(
{"label": "Total", "data": clients, "color": "#8CACC6"}
);
var plot = $.plot(clientstat, pdata, {
xaxis: {mode: "time", timezone: "browser"},
selection: {mode: "x"},
yaxis: {min: 0},
legend: {hideable: true},
legend: {noColumns: 4, hideable: true},
series: {downsample: {threshold: Math.floor(clientstat.width() * points_per_px)}}
});
setup_plot_zoom(plot, pdata, len);

9
ffmap/web/templates/router.html
View File

@ -30,6 +30,9 @@
font-weight:bold;
font-style:italic;
}
.clientinfo {
font-weight:bold;
}
/* hack to remove flex css on small single-column layout */
@media(max-width:991px) {
@ -159,7 +162,11 @@
<span style="color:#d90000"> &nbsp; - &nbsp; Router BLOCKED by KeyXchange!</span>
{%- endif -%}
</td></tr>
<tr><th>Clients</th><td>{{ router.clients }}</td></tr>
<tr><th>Clients</th><td><span class="clientinfo">{{ router.clients }}</span>
{%- if router.clients_eth or router.clients_w2 or router.clients_w5 %}
&nbsp; (Ethernet: <span class="clientinfo">{{ router.clients_eth }}</span>{%- if router.clients_w2 != None %}, 2.4 GHz: <span class="clientinfo">{{ router.clients_w2 }}</span>{%- endif -%}{%- if router.clients_w5 != None %}, 5 GHz: <span class="clientinfo">{{ router.clients_w5 }}</span>{%- endif -%})
{%- endif -%}
</td></tr>
</table>
</div>
</div>