Merge pull request #10187 from Icinga/state-before-suppression

Fix lost recovery notifications after recovery outside of notification time period
Icinga · Oct 24, 2024 · fb8badf · fb8badf
2 parents 7df6baf + 7d0a43f
commit fb8badf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
@@ -203,7 +203,7 @@ void Checkable::FireSuppressedNotifications()
 			 * If any of these conditions is not met, processing the suppressed notification is further delayed.
 			 */
 			if (!state_suppressed && GetStateType() == StateTypeHard && !IsLikelyToBeCheckedSoon() && !wasLastParentRecoveryRecent.Get()) {
-				if (NotificationReasonApplies(type)) {
+				if (cr->GetState() != GetStateBeforeSuppression()) {
 					Checkable::OnNotificationsRequested(this, type, cr, "", "", nullptr);
 				}
 				subtract |= NotificationRecovery|NotificationProblem;
@@ -266,12 +266,12 @@ bool Checkable::NotificationReasonApplies(NotificationType type)
 		case NotificationProblem:
 			{
 				auto cr (GetLastCheckResult());
-				return cr && !IsStateOK(cr->GetState()) && cr->GetState() != GetStateBeforeSuppression();
+				return cr && !IsStateOK(cr->GetState());
 			}
 		case NotificationRecovery:
 			{
 				auto cr (GetLastCheckResult());
-				return cr && IsStateOK(cr->GetState()) && cr->GetState() != GetStateBeforeSuppression();
+				return cr && IsStateOK(cr->GetState());
 			}
 		case NotificationFlappingStart:
 			return IsFlapping();