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

Uses new in-memory queues for alert recipients (avoid Redis)

Browse source
This commit is contained in:
Simone Mainardi 2020-09-08 18:36:18 +02:00
parent 2848d17b29
commit 9e99fa1403
16 changed files with 323 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/plugins/syslog_alert_endpoint/alert_endpoints/syslog.lua
View file

@ -64,8 +64,16 @@ end
-- ##############################################
-- Dequeue alerts from a recipient queue for sending notifications
function syslog.dequeueRecipientAlerts(recipient, budget)
local notifications = ntop.lrangeCache(recipient.export_queue, 0, budget - 1)
function syslog.dequeueRecipientAlerts(recipient, budget, high_priority)
local notifications = {}
for i = 1, budget do
local notification = ntop.recipient_dequeue(recipient.recipient_id, high_priority)
if notification then
notifications[#notifications + 1] = notification
else
break
end
end
if not notifications or #notifications == 0 then
return {success = true, more_available = false}
@ -89,14 +97,11 @@ function syslog.dequeueRecipientAlerts(recipient, budget)
-- Most recent notifications first
for _, notif in pairsByValues(sev_notifications, alert_utils.notification_timestamp_rev) do
syslog.sendMessage(notif, severity, recipient.endpoint_conf.endpoint_conf.syslog_alert_format)
syslog.sendMessage(notif, severity, recipient.endpoint_conf.syslog_alert_format)
end
end
end
-- Remove the processed messages from the queue
ntop.ltrimCache(recipient.export_queue, #notifications, -1)
return {success = true, more_available = true}
end
@ -109,7 +114,7 @@ function syslog.runTest(recipient)
alert_entity = alert_consts.alert_entities.test.entity_id,
}
local success = syslog.sendMessage(notif, "info", recipient.endpoint_conf.endpoint_conf.syslog_alert_format)
local success = syslog.sendMessage(notif, "info", recipient.endpoint_conf.syslog_alert_format)
local message_info = i18n("prefs.syslog_sent_successfully")
return success, message_info