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

config conversion: Rename dependencies. 

refs #4741
This commit is contained in:
Michael Friedrich 2013-09-25 16:13:39 +02:00
parent d9508bb64c
commit 739f23f0fc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2351,7 +2351,6 @@ sub convert_2x {
$notification->{$notification_key}->{'__I2CONVERT_NOTIFICATION_FILTERS'} = $cfg_obj_2x->{'service'}->{$service_obj_2x_key}->{'__I2CONVERT_NOTIFICATION_FILTERS'}; $notification->{$notification_key}->{'__I2CONVERT_NOTIFICATION_FILTERS'} = $cfg_obj_2x->{'service'}->{$service_obj_2x_key}->{'__I2CONVERT_NOTIFICATION_FILTERS'};
$notification->{$notification_key}->{'__I2CONVERT_NOTIFICATION_INTERVAL'} = $cfg_obj_2x->{'service'}->{$service_obj_2x_key}->{'notification_interval'}; $notification->{$notification_key}->{'__I2CONVERT_NOTIFICATION_INTERVAL'} = $cfg_obj_2x->{'service'}->{$service_obj_2x_key}->{'notification_interval'};
$notification->{$notification_key}->{'__I2CONVERT_NOTIFICATION_PERIOD'} = $cfg_obj_2x->{'service'}->{$service_obj_2x_key}->{'notification_period'}; $notification->{$notification_key}->{'__I2CONVERT_NOTIFICATION_PERIOD'} = $cfg_obj_2x->{'service'}->{$service_obj_2x_key}->{'notification_period'};
say Dumper($notification);
} }
} }
#say Dumper($obj_2x_service); #say Dumper($obj_2x_service);

4
tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
View File

@ -357,7 +357,7 @@ sub dump_service_2x {
# servicedependencies (1.x deps) # servicedependencies (1.x deps)
#################################################### ####################################################
if(defined($service_2x->{'__I2CONVERT_PARENT_SERVICES'})) { if(defined($service_2x->{'__I2CONVERT_PARENT_SERVICES'})) {
dump_config_line($icinga2_cfg, "\tservicedependencies = ["); dump_config_line($icinga2_cfg, "\tservice_dependencies = [");
#say Dumper($service_2x); #say Dumper($service_2x);
# this is a hash with keys # this is a hash with keys
@ -551,7 +551,7 @@ sub dump_host_2x {
#################################################### ####################################################
if(defined($host_2x->{'__I2CONVERT_PARENT_HOSTNAMES'})) { if(defined($host_2x->{'__I2CONVERT_PARENT_HOSTNAMES'})) {
my $hostdependency_hosts = join '", "', @{$host_2x->{'__I2CONVERT_PARENT_HOSTNAMES'}}; my $hostdependency_hosts = join '", "', @{$host_2x->{'__I2CONVERT_PARENT_HOSTNAMES'}};
dump_config_line($icinga2_cfg, "\thostdependencies = [ \"$hostdependency_hosts\" ],"); dump_config_line($icinga2_cfg, "\thost_dependencies = [ \"$hostdependency_hosts\" ],");
} }
#################################################### ####################################################