From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 8 Jul 2012 08:20:54 +0000 (+0200)
Subject: Implemented extended service template format.
X-Git-Tag: v0.0.1~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ad1789e33a52674041a5fdca62f37a975c749aa;p=icinga2

Implemented extended service template format.
---

diff --git a/components/convenience/conveniencecomponent.cpp b/components/convenience/conveniencecomponent.cpp
index a3893aea9..18af2f0ce 100644
--- a/components/convenience/conveniencecomponent.cpp
+++ b/components/convenience/conveniencecomponent.cpp
@@ -54,6 +54,29 @@ void ConvenienceComponent::HostAddedHandler(const ConfigItem::Ptr& item)
 	HostCommittedHandler(item);
 }
 
+void ConvenienceComponent::CopyServiceAttributes(const Dictionary::Ptr& service, const ConfigItemBuilder::Ptr& builder)
+{
+	Dictionary::Ptr macros; 
+	if (service->GetProperty("macros", &macros))
+		builder->AddExpression("macros", OperatorPlus, macros);
+
+	long checkInterval;
+	if (service->GetProperty("check_interval", &checkInterval))
+		builder->AddExpression("check_interval", OperatorSet, checkInterval);
+
+	long retryInterval;
+	if (service->GetProperty("retry_interval", &retryInterval))
+		builder->AddExpression("retry_interval", OperatorSet, retryInterval);
+
+	Dictionary::Ptr sgroups;
+	if (service->GetProperty("servicegroups", &sgroups))
+		builder->AddExpression("servicegroups", OperatorPlus, sgroups);
+
+	Dictionary::Ptr checkers;
+	if (service->GetProperty("checkers", &checkers))
+		builder->AddExpression("checkers", OperatorSet, checkers);
+}
+
 void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
 {
 	if (item->GetType() != "host")
@@ -77,51 +100,44 @@ void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
 	if (serviceDescs) {
 		Dictionary::Iterator it;
 		for (it = serviceDescs->Begin(); it != serviceDescs->End(); it++) {
-			Variant desc = it->second;
+			string svcname = it->first;
+			Variant svcdesc = it->second;
 
-			ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(item->GetDebugInfo());
+			stringstream namebuf;
+			namebuf << item->GetName() << "-" << svcname;
+			string name = namebuf.str();
 
-			string name;
-
-			if (desc.GetType() == VariantString) {
-				stringstream namebuf;
-				namebuf << item->GetName() << "-" << string(desc);
-				name = namebuf.str();
-
-				builder->SetType("service");
-				builder->SetName(name);
-
-				builder->AddParent(desc);
-				builder->AddExpression("host_name", OperatorSet, item->GetName());
-				builder->AddExpression("alias", OperatorSet, string(desc));
-
-				Dictionary::Ptr macros;
-				if (host->GetProperty("macros", &macros))
-					builder->AddExpression("macros", OperatorPlus, macros);
+			ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(item->GetDebugInfo());
+			builder->SetType("service");
+			builder->SetName(name);
+			builder->AddExpression("host_name", OperatorSet, item->GetName());
+			builder->AddExpression("alias", OperatorSet, svcname);
 
-				long checkInterval;
-				if (host->GetProperty("check_interval", &checkInterval))
-					builder->AddExpression("check_interval", OperatorSet, checkInterval);
+			CopyServiceAttributes(host->GetProperties(), builder);
 
-				long retryInterval;
-				if (host->GetProperty("retry_interval", &retryInterval))
-					builder->AddExpression("retry_interval", OperatorSet, retryInterval);
+			if (svcdesc.GetType() == VariantString) {
+				builder->AddParent(svcdesc);
+			} else if (svcdesc.GetType() == VariantObject) {
+				Dictionary::Ptr service = dynamic_pointer_cast<Dictionary>(svcdesc.GetObject());
 
-				Dictionary::Ptr sgroups;
-				if (host->GetProperty("servicegroups", &sgroups))
-					builder->AddExpression("servicegroups", OperatorPlus, sgroups);
+				if (!service)
+					throw invalid_argument("Service description invalid.");
 
-				Dictionary::Ptr checkers;
-				if (host->GetProperty("checkers", &checkers))
-					builder->AddExpression("checkers", OperatorSet, checkers);
+				string parent;
+				if (!service->GetProperty("service", &parent))
+					parent = string(svcdesc);
 
-				ConfigItem::Ptr serviceItem = builder->Compile();
-				ConfigObject::Ptr service = serviceItem->Commit();
+				builder->AddParent(parent);
 
-				newServices->SetProperty(name, serviceItem);
+				CopyServiceAttributes(service, builder);
 			} else {
-				throw runtime_error("Not supported.");
+				throw invalid_argument("Service description must be either a string or a dictionary.");
 			}
+
+			ConfigItem::Ptr serviceItem = builder->Compile();
+			serviceItem->Commit();
+
+			newServices->SetProperty(name, serviceItem);
 		}
 	}
 
diff --git a/components/convenience/conveniencecomponent.h b/components/convenience/conveniencecomponent.h
index 8eb73e4ea..45684e19f 100644
--- a/components/convenience/conveniencecomponent.h
+++ b/components/convenience/conveniencecomponent.h
@@ -34,6 +34,7 @@ public:
 	virtual void Stop(void);
 
 private:
+	void CopyServiceAttributes(const Dictionary::Ptr& service, const ConfigItemBuilder::Ptr& builder);
 	void HostAddedHandler(const ConfigItem::Ptr& item);
 	void HostCommittedHandler(const ConfigItem::Ptr& item);
 	void HostRemovedHandler(const ConfigItem::Ptr& item);