vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 19:15:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Return 0 filled points instead of nil when no data is available on InfluxDB

Browse source 
This behaviour makes InfluxDB consistent with the RRD driver
This commit is contained in:
emanuele-f 2018-10-01 10:47:31 +02:00
parent 78a457e731
commit f82a8e9767
9 changed files with 99 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

26
httpdocs/js/graph_utils.js
View file

@ -644,17 +644,23 @@ function attachStackedChartCallback(chart, schema_name, chart_id, zoom_reset_id,
});
}
var total_cell = stats_table.find(".graph-val-total");
var average_cell = stats_table.find(".graph-val-average");
var min_cell = stats_table.find(".graph-val-min");
var max_cell = stats_table.find(".graph-val-max");
var perc_cell = stats_table.find(".graph-val-95percentile");
// fill the stats
if(stats.total)
stats_table.find(".graph-val-total").show().find("span").html(tot_formatter(stats.total));
if(stats.average)
stats_table.find(".graph-val-average").show().find("span").html(stats_formatter(stats.average));
if(stats.min_val)
stats_table.find(".graph-val-min").show().find("span").html(stats_formatter(stats.min_val) + " @ " + (new Date(res[0].values[stats.min_val_idx][0] * 1000)).format(datetime_format));
if(stats.max_val)
stats_table.find(".graph-val-max").show().find("span").html(stats_formatter(stats.max_val) + " @ " + (new Date(res[0].values[stats.max_val_idx][0] * 1000)).format(datetime_format));
if(stats["95th_percentile"]) {
stats_table.find(".graph-val-95percentile").show().find("span").html(stats_formatter(stats["95th_percentile"]));
if(stats.total || total_cell.is(':visible'))
total_cell.show().find("span").html(tot_formatter(stats.total));
if(stats.average || average_cell.is(':visible'))
average_cell.show().find("span").html(stats_formatter(stats.average));
if(stats.min_val || min_cell.is(':visible'))
min_cell.show().find("span").html(stats_formatter(stats.min_val) + " @ " + (new Date(res[0].values[stats.min_val_idx][0] * 1000)).format(datetime_format));
if(stats.max_val || max_cell.is(':visible'))
max_cell.show().find("span").html(stats_formatter(stats.max_val) + " @ " + (new Date(res[0].values[stats.max_val_idx][0] * 1000)).format(datetime_format));
if(stats["95th_percentile"] || perc_cell.is(':visible')) {
perc_cell.show().find("span").html(stats_formatter(stats["95th_percentile"]));
var values = makeFlatLineValues(data.start, data.step, data.count, stats["95th_percentile"]);

2
httpdocs/js/ntop.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
httpdocs/js/ntop.min.js.map
View file

File diff suppressed because one or more lines are too long