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

Migrate interface alerts to in-memory alerts

Browse source
This commit is contained in:
emanuele-f 2017-11-16 16:05:49 +01:00
parent 346627eb74
commit d85fc2b06b
5 changed files with 78 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/callbacks/startup.lua
View file

@ -71,6 +71,17 @@ end
-- ##################################################################
-- Remove the json dumps previously needed for alerts generation
for _, ifname in pairs(interface.getIfNames()) do
interface.select(ifname)
local ifid = getInterfaceId(ifname)
local alerts_status_path = fixPath(dirs.workingdir .. "/" .. ifid .. "/json/")
ntop.rmdir(alerts_status_path)
end
-- ##################################################################
initCustomnDPIProtoCategories()
loadHostBlackList()

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

@ -1835,37 +1835,25 @@ end
-- #################################
local function entity_threshold_status_rw(granularity, ifname_id, fname, to_write --[[nil if it's a read]], additional_path)
local basedir = fixPath(dirs.workingdir .. "/" .. ifname_id .. "/json/" .. granularity .. (additional_path and ("/"..additional_path) or ""))
local fpath = fixPath(basedir.."/"..fname)
if to_write ~= nil then
if not(ntop.exists(basedir)) then
ntop.mkdir(basedir)
end
-- Write new version
persistence.store(fpath, to_write)
elseif ntop.exists(fpath) then
-- Read old version
return persistence.load(fpath)
end
end
-- #################################
local function interface_threshold_status_rw(granularity, ifid, to_write)
return entity_threshold_status_rw(granularity, ifid, "iface_"..ifid.."_lastdump", to_write)
end
-- #################################
local function check_interface_alerts(ifid, working_status)
local ifstats = interface.getStats()
local entity_value = "iface_"..ifid
local old_entity_info = interface_threshold_status_rw(working_status.granularity, ifid) -- read old json
local new_entity_info = ifstats
local checkpoints = interface.checkpointInterface(ifid, working_status.engine) or {}
local old_entity_info = checkpoints["previous"] and j.decode(checkpoints["previous"])
local new_entity_info = checkpoints["current"] and j.decode(checkpoints["current"])
if new_entity_info == nil then
if warning_shown == false then
print("["..__FILE__().."]:["..__LINE__().."] Unexpected new_entity_info == nil")
tprint({
old_entity_info = old_entity_info,
granularity = working_status.granularity,
entity_value = entity_value,
ifname=getInterfaceName(ifid)})
end
return
end
if (old_entity_info ~= nil) and (old_entity_info.stats ~= nil) and (old_entity_info.stats.bytes ~= nil) then
-- wrap check
@ -1880,8 +1868,6 @@ local function check_interface_alerts(ifid, working_status)
end
check_entity_alerts(ifid, "interface", entity_value, working_status, old_entity_info, new_entity_info)
interface_threshold_status_rw(working_status.granularity, ifid, new_entity_info) -- write new json
end
local function check_networks_alerts(ifid, working_status)