Send problem notification on downtime end if checkable is still not OK

refs #5919
Icinga · Jul 1, 2019 · faae237 · faae237
1 parent 58cb1e0
commit faae237
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
@@ -183,6 +183,18 @@ void Checkable::NotifyDowntimeEnd(const Downtime::Ptr& downtime)
 
 	if (!checkable->IsPaused())
 		OnNotificationsRequested(checkable, NotificationDowntimeEnd, checkable->GetLastCheckResult(), downtime->GetAuthor(), downtime->GetComment(), nullptr);
+
+	if (downtime->IsTriggered() && checkable->GetProblem() && checkable->GetStateType() == StateTypeHard) {
+		double nextNotification = Utility::GetTime() + 1;
+
+		for (auto& notification : checkable->GetNotifications()) {
+			auto types (notification->GetTypes());
+
+			if (types->Contains(NotificationProblem) && notification->GetNextNotification() > nextNotification) {
+				notification->SetNextNotification(nextNotification);
+			}
+		}
+	}
 }
 
 void Checkable::ValidateCheckInterval(const Lazy<double>& lvalue, const ValidationUtils& utils)