From e6b99c62a7fcb92fd5750df4b25008541792e782 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 14 Jul 2012 20:06:32 +0200 Subject: [PATCH] Disabled resolving host macros for now. --- cib/nagioschecktask.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 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); -- 2.40.0