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

graph.js: Enable additional parameters for plots 

This makes the applications of the affected plots more versatile
and thus reduces the need for duplicate code.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-08-13 16:12:37 +02:00
parent 49cb6673d7
commit 24c64f5605
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,8 +66,8 @@ function setup_plot_zoom(plot, pdata, num_data_points) {
// Per router statistics
function network_graph(netif_stats, tx_label, rx_label) {
var netstat = $("#netstat");
function network_graph(netif_stats, field, tx_label, rx_label) {
var netstat = $("#"+field);
var tx = [], rx = [];
var len, i;
for (len=netif_stats.length, i=0; i<len; i++) {
@ -377,14 +377,14 @@ function airtime_graph() {
// Global statistics
function global_client_graph() {
var clientstat = $("#globclientstat");
function global_client_graph(indata,field) {
var clientstat = $("#"+field);
var clients = [];
var len, i;
for (len=global_stats.length, i=0; i<len; i++) {
for (len=indata.length, i=0; i<len; i++) {
try {
var client_value = global_stats[i].clients;
var date_value = global_stats[i].time.$date;
var client_value = indata[i].clients;
var date_value = indata[i].time.$date;
if(client_value != null) {
clients.push([date_value, client_value]);
}
@ -407,17 +407,17 @@ function global_client_graph() {
setup_plot_zoom(plot, pdata, len);
}
function global_router_graph() {
var memstat = $("#globrouterstat");
function global_router_graph(indata,field) {
var memstat = $("#"+field);
var offline = [], online = [], unknown = [], orphaned = [], total = [];
var len, i;
for (len=global_stats.length, i=0; i<len; i++) {
for (len=indata.length, i=0; i<len; i++) {
try {
var offline_value = global_stats[i].offline;
var online_value = global_stats[i].online;
var unknown_value = global_stats[i].unknown;
var orphaned_value = global_stats[i].orphaned;
var date_value = global_stats[i].time.$date;
var offline_value = indata[i].offline;
var online_value = indata[i].online;
var unknown_value = indata[i].unknown;
var orphaned_value = indata[i].orphaned;
var date_value = indata[i].time.$date;
if (offline_value == null) offline_value = 0;
if (online_value == null) online_value = 0;
if (unknown_value == null) unknown_value = 0;

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

@ -468,7 +468,7 @@
function load_netif_stats(netif) {
var starttimenetif = performance.now();
ajax_get_request(url_load_netif_stats + "?netif=" + netif, function(netifstats) {
network_graph(netifstats,"tx","rx");
network_graph(netifstats,"netstat","tx","rx");
console.debug("Loaded netif stats for "+netif+" in "+((performance.now() - starttimenetif)/1000).toFixed(3)+" seconds.");
});
}

6
ffmap/web/templates/statistics.html
View File

@ -236,13 +236,13 @@
var hoodstr = "";
{%- endif -%}
$(document).ready(function() {
global_client_graph();
global_router_graph();
global_client_graph(global_stats,"globclientstat");
global_router_graph(global_stats,"globrouterstat");
global_router_firmwares_graph();
global_router_models_graph("globroutermodelsstat","count");
global_router_models_graph("globroutermodelsperclient","clients");
{%- if not selectgw %}
network_graph(global_stats,"sent to clients","received from clients");
network_graph(global_stats,"netstat","sent to clients","received from clients");
{%- endif -%}
$("#hoodlist").DataTable({