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

Merges interface TCP stats timeseries pref with traffic pref

Browse source 
Fixes #3463
This commit is contained in:
Simone Mainardi 2020-02-28 12:15:49 +01:00
parent 906824a212
commit a12273b1b5
6 changed files with 6 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/lua/modules/ts_min_dump_utils.lua
View file

@ -324,7 +324,11 @@ function ts_dump.run_min_dump(_ifname, ifstats, iface_ts, config, when)
ts_dump.iface_update_stats_rrds(instant, _ifname, iface_point, verbose)
ts_dump.iface_update_general_stats(instant, iface_point, verbose)
ts_dump.iface_update_l4_stats(instant, iface_point, verbose)
ts_dump.iface_update_tcp_flags(instant, iface_point, verbose)
if not ifstats.has_seen_ebpf_events then
ts_dump.iface_update_tcp_flags(instant, iface_point, verbose)
ts_dump.iface_update_tcp_stats(instant, iface_point, verbose)
end
if config.interface_ndpi_timeseries_creation == "per_protocol" or config.interface_ndpi_timeseries_creation == "both" then
ts_dump.iface_update_ndpi_rrds(instant, _ifname, iface_point, verbose, config)
@ -333,14 +337,7 @@ function ts_dump.run_min_dump(_ifname, ifstats, iface_ts, config, when)
if config.interface_ndpi_timeseries_creation == "per_category" or config.interface_ndpi_timeseries_creation == "both" then
ts_dump.iface_update_categories_rrds(instant, _ifname, iface_point, verbose)
end
if((not ifstats.has_seen_ebpf_events) or (ifstats.type ~= "zmq")) then
-- TCP stats
if config.tcp_retr_ooo_lost_rrd_creation == "1" then
ts_dump.iface_update_tcp_stats(instant, iface_point, verbose)
end
end
-- create custom rrds
if ts_custom and ts_custom.iface_update_stats then
ts_custom.iface_update_stats(instant, _ifname, iface_point, verbose)
@ -384,7 +381,6 @@ function ts_dump.getConfig()
local config = {}
config.interface_ndpi_timeseries_creation = ntop.getPref("ntopng.prefs.interface_ndpi_timeseries_creation")
config.tcp_retr_ooo_lost_rrd_creation = ntop.getPref("ntopng.prefs.tcp_retr_ooo_lost_rrd_creation")
config.ndpi_flows_timeseries_creation = ntop.getPref("ntopng.prefs.ndpi_flows_rrd_creation")
config.user_scripts_rrd_creation = ntop.getPref("ntopng.prefs.user_scripts_rrd_creation") == "1"