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

Rework alertEntity functions to avoid modules circular dependencies

Browse source 
Fixes #2975
This commit is contained in:
emanuele-f 2019-10-23 13:01:57 +02:00
parent 19f820f1bc
commit 10aa5542f8
30 changed files with 112 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/lua/rest/get/interface/data.lua
View file

@ -16,6 +16,7 @@ sendHTTPHeader('application/json')
local callback_utils = require("callback_utils")
local recording_utils = require("recording_utils")
local remote_assistance = require("remote_assistance")
local alert_consts = require("alert_consts")
local function userHasRestrictions()
local allowed_nets = ntop.getPref("ntopng.user." .. (_SESSION["user"] or "") .. ".allowed_nets")
@ -88,7 +89,7 @@ function dumpInterfaceStats(ifid)
res["has_alerts"] = ifstats["has_alerts"]
res["ts_alerts"] = {}
if ts_utils.getDriverName() == "influxdb" and system_scripts.hasAlerts({entity = alertEntity("influx_db")}) then
if ts_utils.getDriverName() == "influxdb" and system_scripts.hasAlerts({entity = alert_consts.alertEntity("influx_db")}) then
res["ts_alerts"]["influxdb"] = true
end
end