config conversion: Rename dependencies.

refs #4741

diff --git a/tools/configconvert/Icinga2/Convert.pm b/tools/configconvert/Icinga2/Convert.pm
index c39310e3716dd2b9fbcefb375af6a639383ae514..fa82f191c14df01cebda3090b4bf2c90e9a7185b 100644 (file)
--- a/tools/configconvert/Icinga2/Convert.pm
+++ b/tools/configconvert/Icinga2/Convert.pm
@@ -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_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'};
-                say Dumper($notification);
             }
         }
         #say Dumper($obj_2x_service);

diff --git a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
index 49ee8f152e0a96057f0f0080374e33d48616ca33..b06a8c7eabf15b8811072f9f42b858d36108ff3a 100644 (file)
--- a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
+++ b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
@@ -357,7 +357,7 @@ sub dump_service_2x {
     # servicedependencies (1.x deps)
     ####################################################
     if(defined($service_2x->{'__I2CONVERT_PARENT_SERVICES'})) {
-        dump_config_line($icinga2_cfg, "\tservicedependencies = [");
+        dump_config_line($icinga2_cfg, "\tservice_dependencies = [");
 
         #say Dumper($service_2x);
         # this is a hash with keys
@@ -551,7 +551,7 @@ sub dump_host_2x {
     ####################################################
     if(defined($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\" ],");
     }
 
     ####################################################