tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 13:45:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10361 from Icinga/reset-no-more-notifications-only-on-recovery

Browse Source 
Notification: Reset internal states on (missed)recovery
This commit is contained in:
Yonas Habteab 2025-05-16 09:53:10 +02:00 committed by GitHub
commit 83a0f9d217
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/icinga/notification.cpp
View File

@ -223,6 +223,30 @@ void Notification::ResetNotificationNumber()
SetNotificationNumber(0); SetNotificationNumber(0);
} }
/**
* Check whether the given notification type is a Recovery or FlappingEnd notification and the Checkable object
* has already recovered.
*
* For the latter case, if the Checkable has recovered while it was in a Flapping state, the recovery notification
* will be silently discarded and leave some internal states of the Notification object that depend on it in an
* inconsistent state. So, use this helper function whether to reset one of these states.
*
* @param checkable The checkable object the notification is for
* @param cr The current check result passed to the notification
* @param type The requested notification type
*
* @return bool
*/
static bool IsRecoveryOrFlappingEndAndCheckableIsOK(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, NotificationType type)
{
if (type == NotificationRecovery) {
return true;
}
// Check whether missed the Checkable recovery because of its Flapping state.
return type == NotificationFlappingEnd && cr && checkable->IsStateOK(cr->GetState());
}
void Notification::BeginExecuteNotification(NotificationType type, const CheckResult::Ptr& cr, bool force, bool reminder, const String& author, const String& text) void Notification::BeginExecuteNotification(NotificationType type, const CheckResult::Ptr& cr, bool force, bool reminder, const String& author, const String& text)
{ {
String notificationName = GetName(); String notificationName = GetName();
@ -233,15 +257,18 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
<< "notifications of type '" << notificationTypeName << "notifications of type '" << notificationTypeName
<< "' for notification object '" << notificationName << "'."; << "' for notification object '" << notificationName << "'.";
if (type == NotificationRecovery) { Checkable::Ptr checkable = GetCheckable();
// Clear the last notified problem state per user if we're sending a recovery notification or if we're sending a
// flapping end notification and the checkable is already in an OK state. This is necessary since we might have
// missed the recovery notification due to the flapping state.
if (IsRecoveryOrFlappingEndAndCheckableIsOK(checkable, cr, type)) {
auto states (GetLastNotifiedStatePerUser()); auto states (GetLastNotifiedStatePerUser());
states->Clear(); states->Clear();
OnLastNotifiedStatePerUserCleared(this, nullptr); OnLastNotifiedStatePerUserCleared(this, nullptr);
} }
Checkable::Ptr checkable = GetCheckable();
if (!force) { if (!force) {
TimePeriod::Ptr tp = GetPeriod(); TimePeriod::Ptr tp = GetPeriod();
@ -338,7 +365,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
*/ */
{ {
ObjectLock olock(this); ObjectLock olock(this);
if (type == NotificationRecovery && GetInterval() <= 0) if (GetInterval() <= 0 && IsRecoveryOrFlappingEndAndCheckableIsOK(checkable, cr, type))
SetNoMoreNotifications(false); SetNoMoreNotifications(false);
} }
@ -389,7 +416,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
if (type == NotificationProblem && GetInterval() <= 0) if (type == NotificationProblem && GetInterval() <= 0)
SetNoMoreNotifications(true); SetNoMoreNotifications(true);
else if (type != NotificationCustom) else if (IsRecoveryOrFlappingEndAndCheckableIsOK(checkable, cr, type))
SetNoMoreNotifications(false); SetNoMoreNotifications(false);
if (type == NotificationProblem && GetInterval() > 0) if (type == NotificationProblem && GetInterval() > 0)
@ -488,7 +515,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
} }
/* if this was a recovery notification, reset all notified users */ /* if this was a recovery notification, reset all notified users */
if (type == NotificationRecovery) if (IsRecoveryOrFlappingEndAndCheckableIsOK(checkable, cr, type))
notifiedProblemUsers->Clear(); notifiedProblemUsers->Clear();
/* used in db_ido for notification history */ /* used in db_ido for notification history */