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

Improve user scripts charts

Browse source 
Fixes #3020
This commit is contained in:
emanuele-f 2019-10-31 13:29:53 +01:00
parent 8db49f7268
commit e978a83151
18 changed files with 137 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

37
scripts/lua/modules/ts_5sec_dump_utils.lua
View file

@ -1,11 +1,12 @@
-- ########################################################
local ts_utils = require("ts_utils_core")
local user_scripts = require("user_scripts")
local ts_dump = {}
-- ########################################################
function ts_dump.iface_update_periodic_ht_state_update_stats(ifid, periodic_ht_state_update_stats)
function ts_dump.iface_update_periodic_ht_state_update_stats(when, ifid, periodic_ht_state_update_stats)
for ht_name, ht_stats in pairs(periodic_ht_state_update_stats) do
local num_calls = 0
local num_ms = 0
@ -25,15 +26,47 @@ end
-- ########################################################
function ts_dump.update_user_scripts_stats(when, ifid, verbose)
local all_scripts = {
flow = user_scripts.listScripts(user_scripts.script_types.flow, "flow"),
host = user_scripts.listScripts(user_scripts.script_types.traffic_element, "host"),
interface = user_scripts.listScripts(user_scripts.script_types.traffic_element, "interface"),
network = user_scripts.listScripts(user_scripts.script_types.traffic_element, "network"),
syslog = user_scripts.listScripts(user_scripts.script_types.syslog, "syslog"),
}
for subdir, rv in pairs(all_scripts) do
local total = {tot_elapsed = 0, tot_num_calls = 0}
for _, modkey in pairs(rv) do
local stats = user_scripts.getAccumulatedStats(ifid, subdir, modkey)
if(stats) then
ts_utils.append("user_script:duration", {ifid = ifid, user_script = modkey, subdir = subdir, num_ms = stats.tot_elapsed * 1000}, when, verbose)
ts_utils.append("user_script:num_calls", {ifid = ifid, user_script = modkey, subdir = subdir, num_calls = stats.tot_num_calls}, when, verbose)
total.tot_elapsed = total.tot_elapsed + stats.tot_elapsed
total.tot_num_calls = total.tot_num_calls + stats.tot_num_calls
end
end
ts_utils.append("user_script:total_stats", {ifid = ifid, subdir = subdir, num_ms = total.tot_elapsed * 1000, num_calls = total.tot_num_calls}, when, verbose)
end
end
-- ########################################################
function ts_dump.run_5sec_dump(ifid, periodic_ht_state_update_stats)
local iface_rrd_creation_enabled = (ntop.getPref("ntopng.prefs.ifid_"..ifid..".interface_rrd_creation") ~= "false")
and (ntop.getPref("ntopng.prefs.interface_rrd_creation") ~= "0")
local when = os.time()
if not iface_rrd_creation_enabled then
return
end
ts_dump.iface_update_periodic_ht_state_update_stats(ifid, periodic_ht_state_update_stats)
ts_dump.iface_update_periodic_ht_state_update_stats(when, ifid, periodic_ht_state_update_stats)
ts_dump.update_user_scripts_stats(when, ifid, verbose)
end
-- ########################################################