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

Add hyperlink to jump to the alert configuration

Browse source 
Closes #2936
This commit is contained in:
emanuele-f 2020-01-17 19:10:19 +01:00
parent 4779f80fa8
commit aca088ea13
14 changed files with 194 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -621,7 +621,13 @@ local function formatRawFlow(record, flow_json, skip_add_links)
time_bounds = {getAlertTimeBounds(record)}
end
local decoded = json.decode(flow_json) or {}
local decoded
if(type(flow_json) == "table") then
decoded = flow_json
else
decoded = json.decode(flow_json) or {}
end
if((type(decoded["status_info"]) == "string") and
(string.sub(decoded["status_info"], 1, 1) == "{")) then
@ -2132,17 +2138,19 @@ end
function formatAlertMessage(ifid, alert)
local msg
local alert_json = alert["alert_json"]
local configsets = user_scripts.getConfigsets()
if isEmptyString(alert_json) then
alert_json = {}
elseif(string.sub(alert_json, 1, 1) == "{") then
alert_json = json.decode(alert_json)
end
if(alert.alert_entity == alert_consts.alertEntity("flow") or (alert.alert_entity == nil)) then
msg = formatRawFlow(alert, alert["alert_json"])
msg = formatRawFlow(alert, alert_json)
else
msg = alert["alert_json"]
if isEmptyString(msg) then
msg = {}
elseif(string.sub(msg, 1, 1) == "{") then
msg = json.decode(msg)
end
msg = alert_json
local description = alertTypeDescription(alert.alert_type)
if(type(description) == "string") then
@ -2157,6 +2165,17 @@ function formatAlertMessage(ifid, alert)
return("")
end
local info = alert_json.alert_generation or (alert_json.status_info and alert_json.status_info.alert_generation)
if(info and msg and isAdministrator()) then
-- Ensure that the configset still exists
if configsets[info.confset_id] then
msg = msg .. ' <a href="'.. ntop.getHttpPrefix() ..'/lua/admin/edit_configset.lua?confset_id='..
info.confset_id ..'&subdir='.. info.subdir ..'&user_script='.. info.script_key ..'#all">'..
'<i class="fas fa-cog" title="'.. i18n("edit_configuration") ..'"></i></a>'
end
end
return(msg)
end