Wait until the next check result if it's expected to arrive soon befo…

…re re-sending a suppressed notification refs #5919
Icinga · Jul 3, 2019 · 390ae61 · 390ae61
1 parent bfcd278
commit 390ae61
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
@@ -134,6 +134,17 @@ static void FireSuppressedNotifications(Checkable* checkable)
 					still_suppressed = checkable->IsInDowntime();
 				}
 
+				if (!still_suppressed && checkable->GetEnableActiveChecks()) {
+					auto threshold (checkable->GetCheckInterval() - 10);
+
+					if (threshold > 60)
+						threshold = 60;
+					else if (threshold < 0)
+						threshold = 0;
+
+					still_suppressed = checkable->GetNextCheck() <= Utility::GetTime() + threshold;
+				}
+
 				if (!still_suppressed) {
 					Checkable::OnNotificationsRequested(checkable, type, cr, "", "", nullptr);