vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-28 23:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix discovery alerts (#8132)

Browse source
This commit is contained in:
Alfredo Cardigliano 2023-12-27 15:58:08 +01:00
parent 8306731066
commit 6098dc87b0
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/lua/modules/format_utils.lua
View file

@ -578,11 +578,14 @@ end
-- This is a basic function used to format notifications
local function format_notification(notification, options)
local message = notification.message or ""
local handled = false
-- TODO: add the support to options
if notification.notification_type == "reports" and
(not options or not options.nohtml) then
message = format_report_email(notification)
handled = true
elseif (notification.notification_type == "vulnerability_scans") then
if(not options or not options.nohtml) then
@ -590,10 +593,11 @@ local function format_notification(notification, options)
else
message = format_no_html_vs_report_message(message)
end
handled = true
end
return message
return handled, message
end
-- ######################################################
@ -611,12 +615,16 @@ end
function format_utils.formatMessage(notification, options)
if not notification.score or notification.score == 0 then
-- In case it is just a message/report (so no score), format like a normal msg
return format_notification(notification, options)
else
-- In case it is an alert, format it by using the standard function
local alert_utils = require "alert_utils"
return alert_utils.formatAlertNotification(notification, options)
local handled, message format_notification(notification, options)
if handled then
return message
end
end
-- In case it is an alert, format it by using the standard function
local alert_utils = require "alert_utils"
return alert_utils.formatAlertNotification(notification, options)
end
-- ######################################################