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

Provide 1.x fallback using GetName() for address macros. 

Refs #5855
This commit is contained in:
Michael Friedrich 2014-04-05 17:45:28 +02:00
parent e309a5d330
commit 4966dfd241
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/icinga/host.cpp
View File

@ -261,6 +261,39 @@ bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
String key;
Dictionary::Ptr vars;
/* special treatment for address macros providing name fallback */
if (macro == "address" || macro == "address6") {
vars = GetVars();
String value;
if (vars && vars->Contains(macro))
value = vars->Get(key);
if (value.IsEmpty()) {
*result = GetName();
return true;
} else {
*result = value;
return true;
}
}
else if (macro == "host.vars.address" || macro == "host.vars.address6") {
key = macro.SubStr(10);
vars = GetVars();
String value;
if (vars && vars->Contains(macro))
value = vars->Get(key);
if (value.IsEmpty()) {
*result = GetName();
return true;
} else {
*result = value;
return true;
}
}
/* require prefix for object macros */
if (macro.SubStr(0, 5) == "host.") {
key = macro.SubStr(5);