Merges interface TCP flags timeseries pref with traffic pref

Fixes #3462
This commit is contained in:
Simone Mainardi 2020-02-28 12:08:47 +01:00
parent 474fe19e07
commit cf7ef81bca
5 changed files with 1 additions and 18 deletions

View file

@ -324,6 +324,7 @@ 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 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)
@ -338,11 +339,6 @@ function ts_dump.run_min_dump(_ifname, ifstats, iface_ts, config, when)
if config.tcp_retr_ooo_lost_rrd_creation == "1" then
ts_dump.iface_update_tcp_stats(instant, iface_point, verbose)
end
-- TCP Flags
if config.tcp_flags_rrd_creation == "1" then
ts_dump.iface_update_tcp_flags(instant, iface_point, verbose)
end
end
-- create custom rrds
@ -388,7 +384,6 @@ function ts_dump.getConfig()
local config = {}
config.interface_ndpi_timeseries_creation = ntop.getPref("ntopng.prefs.interface_ndpi_timeseries_creation")
config.tcp_flags_rrd_creation = ntop.getPref("ntopng.prefs.tcp_flags_rrd_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"