tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Config Conversion: Object macros start with name.

Browse Source 
refs #4700
This commit is contained in:
Michael Friedrich 2013-09-12 20:24:13 +02:00
parent a5fe44b81f
commit cc1dbbca0b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/configconvert/Icinga2/Convert.pm
View File

@ -854,7 +854,7 @@ sub resolve_macro_attribute {
}
else {
# XXX this is way too modular to actually work with macros not having any underscores and other magic
if ($macro_name =~ /HOST(\w+)/) {
if ($macro_name =~ /^HOST(\w+)/) {
$attr_name = lc $1;
Icinga2::Utils::debug("MACRO RESOLVER: found Host attribute '$macro_name'.");
@ -872,7 +872,7 @@ sub resolve_macro_attribute {
Icinga2::Utils::debug("MACRO RESOLVER: found $attr_name with value '$macro_value' on " . Dumper($obj));
return $macro_value;
}
elsif ($macro_name =~ /SERVICE(\w+)/) {
elsif ($macro_name =~ /^SERVICE(\w+)/) {
$attr_name = lc $1;
# if this is a host object, this macro is invalid! XXX
@ -884,7 +884,7 @@ sub resolve_macro_attribute {
Icinga2::Utils::debug("MACRO RESOLVER: found $attr_name with value '$macro_value' on " . Dumper($obj));
return $macro_value;
}
elsif ($macro_name =~ /CONTACT(\w+)/) {
elsif ($macro_name =~ /^CONTACT(\w+)/) {
$attr_name = lc $1;
# XXX is that possible from command arguments?
# http://docs.icinga.org/latest/en/macrolist.html#availabilitychart (NO)