config conversion: Rename group attributes.

refs #4741

diff --git a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
index 95da37b9d298a8a6a72d3ad94fb8f65dcba13561..2f8be27e19dcfaca83f9eb638964ba54b12afd02 100644 (file)
--- a/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
+++ b/tools/configconvert/Icinga2/ExportIcinga2Cfg.pm
@@ -345,9 +345,9 @@ sub dump_service_2x {
         #say Dumper($service_2x->{'servicegroups'});
         my $servicegroups = join '", "', @{$service_2x->{'servicegroups'}};
         if ($service_2x->{'__I2_CONVERT_SG_ADD'} == 1) {
-            dump_config_line($icinga2_cfg, "\tservicegroups += [ \"$servicegroups\" ],");
+            dump_config_line($icinga2_cfg, "\tgroups += [ \"$servicegroups\" ],");
         } else {
-            dump_config_line($icinga2_cfg, "\tservicegroups = [ \"$servicegroups\" ],");
+            dump_config_line($icinga2_cfg, "\tgroups = [ \"$servicegroups\" ],");
         }
         #say Dumper($service_description);
         #say Dumper($service_2x->{'servicegroups'});
@@ -538,9 +538,9 @@ sub dump_host_2x {
     if(defined($host_2x->{'hostgroups'})) {
         my $hostgroups = join '", "', @{$host_2x->{'hostgroups'}};
         if ($host_2x->{'__I2_CONVERT_HG_ADD'} == 1) {
-            dump_config_line($icinga2_cfg, "\thostgroups += [ \"$hostgroups\" ],");
+            dump_config_line($icinga2_cfg, "\tgroups += [ \"$hostgroups\" ],");
         } else {
-            dump_config_line($icinga2_cfg, "\thostgroups = [ \"$hostgroups\" ],");
+            dump_config_line($icinga2_cfg, "\tgroups = [ \"$hostgroups\" ],");
         }
     }
 
@@ -692,9 +692,9 @@ sub dump_host_2x {
             #say Dumper($service_2x->{'servicegroups'});
             my $servicegroups = join '", "', @{$service_2x->{'servicegroups'}};
             if ($service_2x->{'__I2_CONVERT_SG_ADD'} == 1) {
-                dump_config_line($icinga2_cfg, "\t\tservicegroups += [ \"$servicegroups\" ],");
+                dump_config_line($icinga2_cfg, "\t\tgroups += [ \"$servicegroups\" ],");
             } else {
-                dump_config_line($icinga2_cfg, "\t\tservicegroups = [ \"$servicegroups\" ],");
+                dump_config_line($icinga2_cfg, "\t\tgroups = [ \"$servicegroups\" ],");
             }
         }
 
@@ -993,6 +993,11 @@ sub dump_notification_2x {
         dump_config_line($icinga2_cfg, "\tusers = [ \"$service_users\" ],");
     }
 
+    if(defined($notification_2x->{'usergroups'}) && @{$notification_2x->{'usergroups'}} > 0) {
+        my $service_usergroups = join '", "', @{$notification_2x->{'usergroups'}};
+        dump_config_line($icinga2_cfg, "\tusergroups = [ \"$service_usergroups\" ],");
+    }
+
     # this is set for escalations
     if(defined($notification_2x->{'__I2CONVERT_NOTIFICATION_TIMES'}) && $notification_2x->{'__I2CONVERT_NOTIFICATION_TIMES'} != 0) {
         dump_config_line($icinga2_cfg, "\ttimes = {");