tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure to send recovery notifications if the was a problem notification before a downtime

Browse Source 
fixes #12293
This commit is contained in:
Michael Friedrich 2016-08-03 18:28:09 +02:00
parent 83f07c7ee2
commit 34655d77d3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/icinga/checkable-check.cpp
View File

@ -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());
}
}