diff --git a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm index f82fabfe6..de4c1bfff 100644 --- a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm +++ b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm @@ -203,24 +203,41 @@ sub dump_groups_2x { start_object_type_config_dump($icinga2_cfg, 'groups'); + if (!@$cfg_obj_2x{'hostgroup'}) { + goto SKIP_HOSTGROUPS; + } + foreach my $hostgroup_2x_key (keys %{@$cfg_obj_2x{'hostgroup'}}) { my $hostgroup_2x = @$cfg_obj_2x{'hostgroup'}->{$hostgroup_2x_key}; Icinga2::ExportIcinga2Cfg::dump_group_2x($icinga2_cfg, $hostgroup_2x); } +SKIP_HOSTGROUPS: + + if (!@$cfg_obj_2x{'servicegroup'}) { + goto SKIP_SERVICEGROUPS; + } + foreach my $servicegroup_2x_key (keys %{@$cfg_obj_2x{'servicegroup'}}) { my $servicegroup_2x = @$cfg_obj_2x{'servicegroup'}->{$servicegroup_2x_key}; Icinga2::ExportIcinga2Cfg::dump_group_2x($icinga2_cfg, $servicegroup_2x); } +SKIP_SERVICEGROUPS: + + if (!@$cfg_obj_2x{'usergroup'}) { + goto SKIP_USERGROUPS; + } + foreach my $usergroup_2x_key (keys %{@$cfg_obj_2x{'usergroup'}}) { my $usergroup_2x = @$cfg_obj_2x{'usergroup'}->{$usergroup_2x_key}; Icinga2::ExportIcinga2Cfg::dump_group_2x($icinga2_cfg, $usergroup_2x); } +SKIP_USERGROUPS: end_object_type_config_dump($icinga2_cfg); } diff --git a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm index d94a8a097..d8490bdb8 100644 --- a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm +++ b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm @@ -284,6 +284,7 @@ sub parse_icinga1_objects { my $cfg_objs = {}; foreach my $cfg_file (@cfg_files) { + print "Processing file '$cfg_file'...\n"; $cfg_objs = parse_icinga1_object_cfg($cfg_objs, $cfg_file); } diff --git a/tools/configconvert/Icinga2/Utils.pm b/tools/configconvert/Icinga2/Utils.pm index d41ae7772..6f432721b 100644 --- a/tools/configconvert/Icinga2/Utils.pm +++ b/tools/configconvert/Icinga2/Utils.pm @@ -87,9 +87,9 @@ sub slurp { <$fh>; } } elsif (! -r $file) { - die "$file not readable. check permissions/user!" + print " ERROR: $file not readable. check permissions/user!\n" } else { - die "$file does not exist"; + print " ERROR: $file does not exist\n"; } }