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

Fixes alerts starving in per-recipient queues

Browse source
This commit is contained in:
Simone Mainardi 2020-09-02 14:52:40 +02:00
parent 6fb8393117
commit 28caa3ac33
6 changed files with 64 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/plugins/webhook_alert_endpoint/alert_endpoints/webhook.lua
View file

@ -79,19 +79,20 @@ function webhook.dequeueRecipientAlerts(recipient, budget)
local start_time = os.time()
local sent = 0
local more_available = true
local budget_used = 0
local settings = recipient2sendMessageSettings(recipient)
-- Dequeue alerts up to budget x MAX_ALERTS_PER_EMAIL
-- Note: in this case budget is the number of email to send
while sent < budget and more_available do
-- Dequeue alerts up to budget x MAX_ALERTS_PER_REQUEST
-- Note: in this case budget is the number of webhook messages to send
while budget_used <= budget and more_available do
local diff = os.time() - start_time
if diff >= webhook.ITERATION_TIMEOUT then
break
end
-- Dequeue MAX_ALERTS_PER_EMAIL notifications
-- Dequeue MAX_ALERTS_PER_REQUEST notifications
local notifications = ntop.lrangeCache(recipient.export_queue, 0, MAX_ALERTS_PER_REQUEST-1)
if not notifications or #notifications == 0 then
@ -113,11 +114,11 @@ function webhook.dequeueRecipientAlerts(recipient, budget)
-- Remove the processed messages from the queue
ntop.ltrimCache(recipient.export_queue, #notifications, -1)
budget_used = budget_used + #notifications
sent = sent + 1
end
return {success=true}
return {success = true, more_available = more_available}
end
-- ##############################################