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

Generalize periodic and flows callbacks

Browse source 
Now periodic callbacks are properly called even when alerts are disabled
The granularity filter and check_function has been replaced with a more generic hooks list
This commit is contained in:
emanuele-f 2019-10-07 19:00:51 +02:00
parent 6bcb8b18a2
commit ede9a7940a
47 changed files with 566 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

28
scripts/lua/modules/flow_callbacks_utils.lua
View file

@ -6,10 +6,11 @@ local dirs = ntop.getDirs()
package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path
local alerts_api = require "alerts_api"
local format_utils = require "format_utils"
local check_modules = require "check_modules"
local flow_callbacks_utils = {}
-- #################################
-- ##############################################
local function print_callbacks_config_tbody_simple_view(descr)
print[[<tbody>]]
@ -24,7 +25,7 @@ local function print_callbacks_config_tbody_simple_view(descr)
local has_modules = false
for _, check_module in pairsByKeys(descr["all"], asc) do
for _, check_module in pairsByKeys(descr.modules, asc) do
if check_module.gui then
if not has_modules then
has_modules = true
@ -89,7 +90,7 @@ local function print_callbacks_config_tbody_expert_view(descr)
local has_modules = false
for _, check_module in pairsByKeys(descr["all"], asc) do
for _, check_module in pairsByKeys(descr.modules, asc) do
if check_module.gui then
if not has_modules then
has_modules = true
@ -159,7 +160,9 @@ function flow_callbacks_utils.print_callbacks_config()
if _POST and _POST["show_advanced_prefs"] and _POST["show_advanced_prefs"] == "true" then
show_advanced_prefs = true
end
local descr = alerts_api.load_flow_check_modules(entity_type)
local ifid = interface.getId()
local descr = check_modules.load(ifid, "flow", nil, true --[[ also return disabled ]])
print [[
@ -167,6 +170,23 @@ function flow_callbacks_utils.print_callbacks_config()
<table id="callbacks_config_table" class="table table-bordered table-striped" style="clear: both">
<thead></thead>]]
if table.len(_POST) > 0 then
for mod_key, check_module in pairs(descr.modules) do
local pref_key = "enabled_" .. mod_key
local val = _POST[pref_key]
if(val ~= nil) then
if(val == "on") then
check_modules.enableModule(ifid, "flow", mod_key)
check_module.enabled = true
else
check_modules.disableModule(ifid, "flow", mod_key)
check_module.enabled = false
end
end
end
end
local has_modules
if show_advanced_prefs then