From: Gunnar Beutner <gunnar@beutner.name>
Date: Sat, 14 Jul 2012 18:06:32 +0000 (+0200)
Subject: Disabled resolving host macros for now.
X-Git-Tag: v0.0.1~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6b99c62a7fcb92fd5750df4b25008541792e782;p=icinga2

Disabled resolving host macros for now.
---

diff --git a/cib/nagioschecktask.cpp b/cib/nagioschecktask.cpp
index 74b154a61..deda3a816 100644
--- a/cib/nagioschecktask.cpp
+++ b/cib/nagioschecktask.cpp
@@ -36,7 +36,10 @@ void NagiosCheckTask::ScriptFunc(const ScriptTask::Ptr& task, const vector<Varia
 
 	vector<Dictionary::Ptr> macroDicts;
 	macroDicts.push_back(service.GetMacros());
-	macroDicts.push_back(service.GetHost().GetMacros());
+	/* TODO: figure out whether we should replicate hosts to checkers,
+	 * for now we just rely on the convenience module to fill in host macros
+	 * for inline service definitions. */
+	//macroDicts.push_back(service.GetHost().GetMacros());
 	macroDicts.push_back(IcingaApplication::GetInstance()->GetMacros());
 	string command = MacroProcessor::ResolveMacros(checkCommand, macroDicts);