Merge pull request #9348 from Icinga/bugfix/suppressed-notifications-…

…host-dependency Take host state into account when sending suppressed notifications
Icinga · Apr 20, 2022 · 67dfefe · 67dfefe
2 parents 9644eff + 51cd7e7
commit 67dfefe
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
@@ -155,6 +155,17 @@ void Checkable::FireSuppressedNotifications()
 			}
 
 			auto threshold (cr->GetExecutionStart());
+			Host::Ptr host;
+			Service::Ptr service;
+			tie(host, service) = GetHostService(this);
+
+			if (service) {
+				ObjectLock oLock (host);
+
+				if (!host->GetProblem() && host->GetLastStateChange() >= threshold) {
+					return true;
+				}
+			}
 
 			for (auto& dep : GetDependencies()) {
 				auto parent (dep->GetParent());