Apply: Inherit zone from parent object.

Refs #6107
Icinga · May 9, 2014 · 020ca0b · 020ca0b
1 parent dade476
commit 020ca0b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp
@@ -80,6 +80,15 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
 		    di));
 	}
 
+	String zone = checkable->GetZone();
+
+	if (!zone.IsEmpty()) {
+		builder->AddExpression(make_shared<AExpression>(&AExpression::OpSet,
+		    make_shared<AExpression>(&AExpression::OpLiteral, "zone", di),
+		    make_shared<AExpression>(&AExpression::OpLiteral, zone, di),
+		    di));
+	}
+
 	builder->AddExpression(rule.GetExpression());
 
 	ConfigItem::Ptr dependencyItem = builder->Compile();

diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp
@@ -79,6 +79,15 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
 		    di));
 	}
 
+	String zone = checkable->GetZone();
+
+	if (!zone.IsEmpty()) {
+		builder->AddExpression(make_shared<AExpression>(&AExpression::OpSet,
+		    make_shared<AExpression>(&AExpression::OpLiteral, "zone", di),
+		    make_shared<AExpression>(&AExpression::OpLiteral, zone, di),
+		    di));
+	}
+
 	builder->AddExpression(rule.GetExpression());
 
 	ConfigItem::Ptr notificationItem = builder->Compile();

diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp
@@ -79,6 +79,15 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
 		    di));
 	}
 
+	String zone = checkable->GetZone();
+
+	if (!zone.IsEmpty()) {
+		builder->AddExpression(make_shared<AExpression>(&AExpression::OpSet,
+		    make_shared<AExpression>(&AExpression::OpLiteral, "zone", di),
+		    make_shared<AExpression>(&AExpression::OpLiteral, zone, di),
+		    di));
+	}
+
 	builder->AddExpression(rule.GetExpression());
 
 	ConfigItem::Ptr downtimeItem = builder->Compile();

diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp
@@ -70,6 +70,15 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule)
 	    make_shared<AExpression>(&AExpression::OpLiteral, rule.GetName(), di),
 	    di));
 
+	String zone = host->GetZone();
+
+	if (!zone.IsEmpty()) {
+		builder->AddExpression(make_shared<AExpression>(&AExpression::OpSet,
+		    make_shared<AExpression>(&AExpression::OpLiteral, "zone", di),
+		    make_shared<AExpression>(&AExpression::OpLiteral, zone, di),
+		    di));
+	}
+
 	builder->AddExpression(rule.GetExpression());
 
 	ConfigItem::Ptr serviceItem = builder->Compile();