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

Unifies all internals timeseries in a single preference

Browse source 
Implements #3459
This commit is contained in:
Simone Mainardi 2020-02-28 15:00:14 +01:00
parent 717b2f88ce
commit ec724babcf
8 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ end
-- ########################################################
function ts_dump.update_hash_tables_stats(when, ifstats, verbose)
local function update_internals_hash_tables_stats(when, ifstats, verbose)
local hash_tables_stats = interface.getHashTablesStats()
for ht_name, ht_stats in pairs(hash_tables_stats) do
@ -178,7 +178,7 @@ end
-- ########################################################
function ts_dump.update_periodic_scripts_stats(when, ifstats, verbose)
function ts_dump.update_internals_periodic_activities_stats(when, ifstats, verbose)
local periodic_scripts_stats = interface.getPeriodicActivitiesStats()
local to_stdout = ntop.getPref("ntopng.prefs.periodic_activities_stats_to_stdout") == "1"
@ -274,7 +274,7 @@ end
-- ########################################################
local function update_user_scripts_stats(when, ifid, verbose)
local function update_internals_user_scripts_stats(when, ifid, verbose)
-- NOTE: flow scripts are monitored in 5sec.lua
local all_scripts = {
host = user_scripts.script_types.traffic_element,
@ -301,6 +301,8 @@ local function dumpTopTalkers(_ifname, ifstats, verbose)
end
end
-- ########################################################
function ts_dump.run_min_dump(_ifname, ifstats, iface_ts, config, when)
dumpTopTalkers(_ifname, ifstats, verbose)
@ -344,17 +346,18 @@ function ts_dump.run_min_dump(_ifname, ifstats, iface_ts, config, when)
end
end
-- Save internal hash tables states every minute
ts_dump.update_hash_tables_stats(when, ifstats, verbose)
-- Only if the internal telemetry preference is enabled...
if config.internals_rrd_creation then
-- Save internal hash tables states every minute
update_internals_hash_tables_stats(when, ifstats, verbose)
-- Save the traffic elements user scripts stats
if config.user_scripts_rrd_creation then
update_user_scripts_stats(when, ifstats.id, verbose)
-- Save the traffic elements user scripts stats
update_internals_user_scripts_stats(when, ifstats.id, verbose)
-- Save duration of periodic activities
ts_dump.update_internals_periodic_activities_stats(when, ifstats, verbose)
end
-- Save duration of periodic scripts
ts_dump.update_periodic_scripts_stats(when, ifstats, verbose)
-- Save Profile stats every minute
if ntop.isPro() and ifstats.profiles then -- profiles are only available in the Pro version
ts_dump.profiles_update_stats(when, ifstats, verbose)
@ -382,7 +385,7 @@ function ts_dump.getConfig()
config.interface_ndpi_timeseries_creation = ntop.getPref("ntopng.prefs.interface_ndpi_timeseries_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"
config.internals_rrd_creation = ntop.getPref("ntopng.prefs.internals_rrd_creation") == "1"
-- Interface RRD creation is on, with per-protocol nDPI
if isEmptyString(config.interface_ndpi_timeseries_creation) then config.interface_ndpi_timeseries_creation = "per_protocol" end