Fix flexible downtimes expiry time and removal

fixes #12395

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index f13ea34e4f5b415da14b45c16019d1ca30a2e89f..73bf6afa31beff2d21ec657f2d0bf50cb72fee45 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -153,6 +153,10 @@ void Checkable::NotifyDowntimeInternal(const Downtime::Ptr& downtime)
 
 void Checkable::NotifyDowntimeEnd(const Downtime::Ptr& downtime)
 {
+       /* don't send notifications for flexible downtimes which never triggered */
+       if (!downtime->GetFixed() && !downtime->IsTriggered())
+               return;
+
        Checkable::Ptr checkable = downtime->GetCheckable();
 
        if (!checkable->IsPaused())

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index c903ab5db2ec109ab9995e5a8959b38a14490bbf..a17952672f45567e4a6f3670b859df9c0c6386a3 100644 (file)
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -180,7 +180,20 @@ bool Downtime::IsTriggered(void) const
 
 bool Downtime::IsExpired(void) const
 {
-       return (GetEndTime() < Utility::GetTime());
+       double now = Utility::GetTime();
+
+       if (GetFixed())
+               return (GetEndTime() < now);
+       else {
+               /* triggered flexible downtime not in effect anymore */
+               if (IsTriggered() && !IsInEffect())
+                       return true;
+               /* flexible downtime never triggered */
+               else if (!IsTriggered() && (GetEndTime() < now))
+                       return true;
+               else
+                       return false;
+       }
 }
 
 int Downtime::GetNextDowntimeID(void)