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

Implements constant flow and alert ids

Browse source 
Enlarges AlertType size

Changes alerts database
This commit is contained in:
Simone Mainardi 2020-04-14 18:41:10 +02:00
parent 577a82d2eb
commit 4177ee61ab
64 changed files with 352 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

29
scripts/lua/modules/plugins_utils.lua
View file

@ -3,7 +3,6 @@
--
local plugins_utils = {}
local plugins_consts_utils = require("plugins_consts_utils")
local os_utils = require("os_utils")
local persistence = require("persistence")
@ -197,31 +196,6 @@ end
-- ##############################################
local function init_plugin_consts_ids(defs_dir, const_type)
for fname in pairs(ntop.readdir(defs_dir) or {}) do
if string.ends(fname, ".lua") then
local mod_fname = string.sub(fname, 1, string.len(fname) - 4)
plugins_consts_utils.request_id(const_type, mod_fname)
end
end
end
-- ##############################################
local function init_plugins(plugins)
for _, plugin in ipairs(plugins) do
init_plugin_consts_ids(os_utils.fixPath(plugin.path .. "/alert_definitions"), "alert")
end
plugins_consts_utils.assign_requested_ids("alert")
for _, plugin in ipairs(plugins) do
init_plugin_consts_ids(os_utils.fixPath(plugin.path .. "/status_definitions"), "flow")
end
plugins_consts_utils.assign_requested_ids("flow")
end
-- ##############################################
-- NOTE: cannot save the definitions to a single file via the persistance
-- module because they may contain functions (e.g. in the i18n_description)
local function load_definitions(defs_dir, runtime_path, validator)
@ -230,7 +204,6 @@ local function load_definitions(defs_dir, runtime_path, validator)
local mod_fname = string.sub(fname, 1, string.len(fname) - 4)
local full_path = os_utils.fixPath(defs_dir .. "/" .. fname)
local def_script = dofile(full_path)
-- Verify the definitions
if(type(def_script) ~= "table") then
traceError(TRACE_ERROR, TRACE_CONSOLE, string.format("Error loading definition from %s", full_path))
@ -561,8 +534,6 @@ function plugins_utils.loadPlugins(community_plugins_only)
alert_consts.resetDefinitions()
flow_consts.resetDefinitions()
init_plugins(plugins)
-- Load the plugins following the dependecies order
for _, plugin in ipairs(plugins) do
if community_plugins_only and plugin.edition ~= "community" then