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

Adds an engine id to the engaged alerts

Browse source
This commit is contained in:
Simone Mainardi 2017-04-24 12:22:47 +02:00
parent 43b3a7f078
commit 7b13e2e6a1
10 changed files with 219 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/lua/modules/alert_utils.lua
View file

@ -5,7 +5,7 @@
-- This file contains the description of all functions
-- used to trigger host alerts
local verbose = false
local verbose = true
local callback_utils = require "callback_utils"
alerts_granularity = {
@ -1628,7 +1628,7 @@ local function formatAlertMessage(ifid, entity_type, entity_value, atype, akey,
return "", "error"
end
local function engageReleaseAlert(engaged, ifid, entity_type, entity_value, atype, alert_key, entity_info, alert_info)
local function engageReleaseAlert(engaged, ifid, engine, entity_type, entity_value, atype, alert_key, entity_info, alert_info)
local alert_msg, alevel = formatAlertMessage(ifid, entity_type, entity_value, atype, akey, entity_info, alert_info)
local alert_type = alertType(atype)
local alert_level = alertLevel(alevel)
@ -1636,33 +1636,33 @@ local function engageReleaseAlert(engaged, ifid, entity_type, entity_value, atyp
if entity.source == "interface" then
if engaged then
return interface.engageInterfaceAlert(alert_key, alert_type, alert_level, alert_msg)
return interface.engageInterfaceAlert(engine, alert_key, alert_type, alert_level, alert_msg)
else
return interface.releaseInterfaceAlert(alert_key, alert_type, alert_level, alert_msg)
return interface.releaseInterfaceAlert(engine, alert_key, alert_type, alert_level, alert_msg)
end
elseif entity.source == "host" then
if engaged then
return interface.engageHostAlert(entity.value, alert_key, alert_type, alert_level, alert_msg)
return interface.engageHostAlert(engine, entity.value, alert_key, alert_type, alert_level, alert_msg)
else
return interface.releaseHostAlert(entity.value, alert_key, alert_type, alert_level, alert_msg)
return interface.releaseHostAlert(engine, entity.value, alert_key, alert_type, alert_level, alert_msg)
end
elseif entity.source == "network" then
if engaged then
return interface.engageNetworkAlert(entity.value, alert_key, alert_type, alert_level, alert_msg)
return interface.engageNetworkAlert(engine, entity.value, alert_key, alert_type, alert_level, alert_msg)
else
return interface.releaseNetworkAlert(entity.value, alert_key, alert_type, alert_level, alert_msg)
return interface.releaseNetworkAlert(engine, entity.value, alert_key, alert_type, alert_level, alert_msg)
end
end
end
local function engageAlert(ifid, entity_type, entity_value, atype, akey, entity_info, alert_info)
local function engageAlert(ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info)
if(verbose) then io.write("Engage Alert: "..entity_value.." "..atype.." "..akey.."\n") end
engageReleaseAlert(true, ifid, entity_type, entity_value, atype, akey, entity_info, alert_info)
engageReleaseAlert(true, ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info)
end
local function releaseAlert(ifid, entity_type, entity_value, atype, entity_info, alert_info)
local function releaseAlert(ifid, engine, entity_type, entity_value, atype, entity_info, alert_info)
if(verbose) then io.write("Release Alert: "..entity_value.." "..alert.atype.." "..alert.akey.."\n") end
engageReleaseAlert(false, ifid, entity_type, entity_value, atype, akey, entity_info, alert_info)
engageReleaseAlert(false, ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info)
end
local function getEngagedAlertsCache(granularity)
@ -1685,6 +1685,7 @@ end
local function check_entity_alerts(ifid, entity_type, entity_value, working_status, old_entity_info, entity_info)
if are_alerts_suppressed(entity_value, ifid) then return end
local engine = working_status.engine
local granularity = working_status.granularity
local engaged_cache = working_status.engaged_cache
local current_alerts = {}
@ -1735,7 +1736,7 @@ local function check_entity_alerts(ifid, entity_type, entity_value, working_stat
or (engaged_cache[entity_type][entity_value] == nil)
or (engaged_cache[entity_type][entity_value][atype] == nil)
or (engaged_cache[entity_type][entity_value][atype][akey] == nil)) then
engageAlert(ifid, entity_type, entity_value, atype, akey, entity_info, alert_info)
engageAlert(ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info)
working_status.dirty_cache = true
end
end
@ -1752,7 +1753,7 @@ local function check_entity_alerts(ifid, entity_type, entity_value, working_stat
alert_info = {}
end
releaseAlert(ifid, entity_type, entity_value, atype, akey, entity_info, alert_info)
releaseAlert(ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info)
working_status.dirty_cache = true
end
end
@ -1884,6 +1885,7 @@ function scanAlerts(granularity, ifname)
local working_status = {
granularity = granularity,
engine = alertEngine(granularity),
engaged_cache = getEngagedAlertsCache(granularity),
configured_thresholds = getConfiguredAlertsThresholds(ifname, granularity),
dirty_cache = false,

15
scripts/lua/modules/lua_utils.lua
View file

@ -373,6 +373,13 @@ alert_entity_keys = {
{ "Flow", 4, "flow" }
}
alert_engine_keys = {
{"1 Minute", 0, "min" },
{"5 Minutes", 1, "5mins" },
{"Hourly", 2, "hour" },
{"Daily", 3, "day" },
}
alert_functions_description = {
["active"] = "Active host time (seconds)",
["bytes"] = "Layer 2 bytes delta (sent + received)",
@ -430,6 +437,14 @@ function alertType(v)
return(_handleArray(typetable, v))
end
function alertEngine(v)
local enginetable = {}
for i, t in ipairs(alert_engine_keys) do
enginetable[#enginetable + 1] = {t[2], t[3]}
end
return(_handleArray(enginetable, v))
end
function alertLevel(v)
local leveltable = {}