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

Disabled resolving host macros for now.

This commit is contained in:
Gunnar Beutner 2012-07-14 20:06:32 +02:00
parent 59d4b2ef6b
commit e6b99c62a7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cib/nagioschecktask.cpp
View File

@ -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);