Downtime::AddDowntime(): place Downtimes in the same zone as the origin ScheduledDown...

(cherry picked from commit ce847324bc8abe4f36071633b999fa88ba2213f3)

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index 9f0adf7082a0220de23bb1816b090ec8e8427697..0f0a74ceb0ac6238a60e78200d61e390a8519e18 100644 (file)
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -267,7 +267,23 @@ String Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& auth
        if (service)
                attrs->Set("service_name", service->GetShortName());
 
-       String zone = checkable->GetZoneName();
+       String zone;
+
+       if (!scheduledDowntime.IsEmpty()) {
+               auto sdt (ScheduledDowntime::GetByName(scheduledDowntime));
+
+               if (sdt) {
+                       auto sdtZone (sdt->GetZone());
+
+                       if (sdtZone) {
+                               zone = sdtZone->GetName();
+                       }
+               }
+       }
+
+       if (zone.IsEmpty()) {
+               zone = checkable->GetZoneName();
+       }
 
        if (!zone.IsEmpty())
                attrs->Set("zone", zone);