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

Macro: Resolve prefixed custom vars and object attributes 

refs #10304
This commit is contained in:
Johannes Meyer 2015-10-05 13:18:10 +02:00
parent 0ed6e08175
commit 499a7d628f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/monitoring/library/Monitoring/Object/Macro.php
View File

@ -3,6 +3,9 @@
namespace Icinga\Module\Monitoring\Object; namespace Icinga\Module\Monitoring\Object;
use Exception;
use Icinga\Application\Logger;
/** /**
* Expand macros in string in the context of MonitoredObjects * Expand macros in string in the context of MonitoredObjects
*/ */
@ -60,11 +63,14 @@ class Macro
if (isset(self::$icingaMacros[$macro]) && isset($object->{self::$icingaMacros[$macro]})) { if (isset(self::$icingaMacros[$macro]) && isset($object->{self::$icingaMacros[$macro]})) {
return $object->{self::$icingaMacros[$macro]}; return $object->{self::$icingaMacros[$macro]};
} }
$customVar = strtolower($macro);
if (isset($object->customvars[$customVar])) { try {
return $object->customvars[$customVar]; $value = $object->$macro;
} catch (Exception $e) {
$value = null;
Logger::debug('Unable to resolve macro "%s". An error occured: %s', $macro, $e);
} }
return $macro; return $value !== null ? $value : $macro;
} }
} }