vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix average calculation in top charts

Browse source
This commit is contained in:
emanuele-f 2018-06-27 20:46:46 +02:00
parent 5ecea0bf53
commit 98a5a6d527
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/lua/modules/graph_utils.lua
View file

@ -1270,7 +1270,7 @@ end
-- #################################################
function rrd2json_merge(ret, num, show_other)
function rrd2json_merge(ret, num, interval, show_other)
-- if we are expanding an interface view, we want to concatenate
-- jsons for single interfaces, and not for the view. Since view statistics
-- are in ret[1], it suffices to aggregate jsons from index i >= 2
@ -1280,13 +1280,12 @@ function rrd2json_merge(ret, num, show_other)
-- sort by "totalval" to get the top "num" results
local by_totalval = {}
local totalval = 0
local tot_avg = 0
for i = 1, #ret do
by_totalval[i] = ret[i].totalval
-- update total statistics, calculated on *all* the elements
totalval = totalval + ret[i].totalval
tot_avg = tot_avg + ret[i].average
end
local ctr = 0
@ -1337,7 +1336,7 @@ function rrd2json_merge(ret, num, show_other)
-- update the total with the sum of the totals of each timeseries
ret[1].totalval = totalval
-- update the average
ret[1].average = tot_avg / #ret
ret[1].average = totalval / interval
-- remove metrics that are no longer valid for merged rrds
for _, k in pairs({'minval', 'minval_time',
@ -1427,7 +1426,7 @@ function rrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json, expa
return(ret)
end
return rrd2json_merge(ret, num)
return rrd2json_merge(ret, num, end_time-start_time)
end
-- #################################################