Fix: Downtimes/Comments not being synced to child zones

fixes #11227

diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
index bbdeb2eeed0e18dd4446be6b1d37d1eea0b54030..b411a4143ac514987506b54790320a7eed406635 100644 (file)
--- a/lib/icinga/comment.cpp
+++ b/lib/icinga/comment.cpp
@@ -175,6 +175,11 @@ String Comment::AddComment(const Checkable::Ptr& checkable, CommentType entryTyp
        if (service)
                attrs->Set("service_name", service->GetShortName());
 
+       String zone = checkable->GetZoneName();
+
+       if (!zone.IsEmpty())
+               attrs->Set("zone", zone);
+
        String config = ConfigObjectUtility::CreateObjectConfig(Comment::TypeInstance, fullName, true, Array::Ptr(), attrs);
 
        Array::Ptr errors = new Array();

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index b7b17f0e43622f8eb63d3ddb50d10ed0a1d6c046..d7668f79564b9c7ab27d76d3c02aaba3974e1686 100644 (file)
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -223,6 +223,11 @@ String Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& auth
        if (service)
                attrs->Set("service_name", service->GetShortName());
 
+       String zone = checkable->GetZoneName();
+
+       if (!zone.IsEmpty())
+               attrs->Set("zone", zone);
+
        String config = ConfigObjectUtility::CreateObjectConfig(Downtime::TypeInstance, fullName, true, Array::Ptr(), attrs);
 
        Array::Ptr errors = new Array();