From 6586c6da2efcf13885062723540d8b5b7c9cf170 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 26 Jun 2013 13:30:26 +0200 Subject: [PATCH] configconvert: disable some debug leftovers $ find -type f -name '*.pm' | xargs sed -i 's/[^#]say Dumper/ #say Dumper/g' --- tools/configconvert/Icinga2/Convert.pm | 4 ++-- tools/configconvert/Icinga2/ExportIcinga2Cfg.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/configconvert/Icinga2/Convert.pm b/tools/configconvert/Icinga2/Convert.pm index a717d142d..040fe1e35 100644 --- a/tools/configconvert/Icinga2/Convert.pm +++ b/tools/configconvert/Icinga2/Convert.pm @@ -2343,7 +2343,7 @@ sub convert_2x { ###################################### # XXX FIXME if (defined($obj_1x_serviceescalation->{'servicegroup_name'})) { - say Dumper($obj_1x_serviceescalation); + #say Dumper($obj_1x_serviceescalation); my @service_names = obj_2x_get_service_arr_by_servicegroup_name($cfg_obj_2x, $obj_1x_serviceescalation->{'servicegroup_name'}); foreach my $serviceescalation_service_name (@service_names) { @@ -2352,7 +2352,7 @@ sub convert_2x { #say Dumper($serviceescalation_service_obj); # skip any templates which would create duplicates next if ($serviceescalation_service_obj->{'__I2CONVERT_IS_TEMPLATE'} == 1); - say Dumper($serviceescalation_service_name); + #say Dumper($serviceescalation_service_name); push @{$serviceescalation_service_obj->{'__I2CONVERT_NOTIFICATIONS'}}, $user_notification; diff --git a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm index 85fd2c078..84d52cee9 100644 --- a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm +++ b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm @@ -389,7 +389,7 @@ sub dump_service_2x { } if(defined($service_2x->{'__I2CONVERT_NOTIFICATION_FILTERS'})) { - say Dumper($service_2x); + #say Dumper($service_2x); foreach my $by (keys %{$service_2x->{'__I2CONVERT_NOTIFICATION_FILTERS'}}) { my $notification_filter = "notification_".$by."_filter = (". (join ' | ', @{$service_2x->{'__I2CONVERT_NOTIFICATION_FILTERS'}->{$by}}) .")"; dump_config_line($icinga2_cfg, "\t$notification_filter,"); -- 2.40.0