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

Refactors alerts and flow statuses in builtin and plugins

Browse source 
Implements #3811
Implements #3812

Refactors builtin alerts

Refactors builtin flow statuses
This commit is contained in:
Simone Mainardi 2020-04-21 21:41:52 +02:00
parent 1c76667b21
commit 78b334e4eb
89 changed files with 680 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/lua/modules/alert_consts.lua
View file

@ -122,8 +122,16 @@ end
-- ##############################################
function alert_consts.getDefinititionsDir()
return(os_utils.fixPath(plugins_utils.getRuntimePath() .. "/alert_definitions"))
function alert_consts.getDefinititionDirs()
local dirs = ntop.getDirs()
return({
-- Path for ntopng-defined builtin alerts
os_utils.fixPath(dirs.installdir .. "/scripts/lua/modules/alert_definitions"),
-- Path for user-defined alerts written in plugins
os_utils.fixPath(plugins_utils.getRuntimePath() .. "/alert_definitions"),
}
)
end
-- ##############################################
@ -164,12 +172,7 @@ local function loadAlertsDefs()
end
end
local dirs = ntop.getDirs()
local defs_dirs = {alert_consts.getDefinititionsDir()}
if ntop.isPro() then
defs_dirs[#defs_dirs + 1] = alert_consts.getDefinititionsDir() .. "/pro"
end
local defs_dirs = alert_consts.getDefinititionDirs()
alert_consts.resetDefinitions()