From 34655d77d32c08c1f4d46840b9f4888633855e90 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 3 Aug 2016 18:28:09 +0200 Subject: [PATCH] Ensure to send recovery notifications if the was a problem notification before a downtime fixes #12293 --- lib/icinga/checkable-check.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index 831b51a17..91cdddea0 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -389,10 +389,17 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig NotifyFlapping(origin); } - /* Problem notifications */ - if (send_notification && !is_flapping) { + if (recovery) { + /* Recovery notifications must be sent any time. + * Users who where notified about a problem before + * will be filtered when processing the notification. + */ if (!IsPaused()) - OnNotificationsRequested(this, recovery ? NotificationRecovery : NotificationProblem, cr, "", "", MessageOrigin::Ptr()); + OnNotificationsRequested(this, NotificationRecovery, cr, "", "", MessageOrigin::Ptr()); + } else if (send_notification && !is_flapping) { + /* Problem notifications */ + if (!IsPaused()) + OnNotificationsRequested(this, NotificationProblem, cr, "", "", MessageOrigin::Ptr()); } }