]> granicus.if.org Git - icinga2/commitdiff
Re-enable host macros.
authorGunnar Beutner <gunnar.beutner@netways.de>
Tue, 17 Jul 2012 11:03:44 +0000 (13:03 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Tue, 17 Jul 2012 11:03:44 +0000 (13:03 +0200)
cib/nagioschecktask.cpp

index 6be960c703c91f52b2e22bef02a09851818a88bd..3a9688c257c7f884edd98d78fe701ecf8c1687f6 100644 (file)
@@ -40,10 +40,7 @@ void NagiosCheckTask::ScriptFunc(const ScriptTask::Ptr& task, const vector<Varia
 
        vector<Dictionary::Ptr> macroDicts;
        macroDicts.push_back(service.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(service.GetHost().GetMacros());
        macroDicts.push_back(IcingaApplication::GetInstance()->GetMacros());
        string command = MacroProcessor::ResolveMacros(checkCommand, macroDicts);