tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enable host macros.

This commit is contained in:
Gunnar Beutner 2012-07-17 13:03:44 +02:00
parent 6707bfeb26
commit 0016c7b79d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cib/nagioschecktask.cpp
View 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);