Config Conversion: s/user_macros/global_macros/g

diff --git a/tools/configconvert/Icinga2/Convert.pm b/tools/configconvert/Icinga2/Convert.pm
index 521269b52ce2d0d0560b032237b3d7b6ccd8660b..e8eb2d4356853a301e68f4c4b872caac28529fc0 100644 (file)
--- a/tools/configconvert/Icinga2/Convert.pm
+++ b/tools/configconvert/Icinga2/Convert.pm
@@ -876,7 +876,7 @@ sub convert_notificationcommand {
     my $objs_1x = shift;
     my $commands_1x = shift;
     my $obj_1x = shift;
-    my $user_macros_1x = shift;
+    my $global_macros_1x = shift;
     my $command_name_1x;
     my @commands = ();
     my $notification_commands_2x = ();
@@ -929,12 +929,12 @@ sub convert_notificationcommand {
                     # detect $USERn$ macros and replace them too XXX - this should be a global macro?
                     if ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/ ||
                         $commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(ADMIN\w+)\$/) {
-                        my @user_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/g);
+                        my @global_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/g);
                         my @admin_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(ADMIN\w+)\$/g);
-                        push @user_macros, @admin_macros;
+                        push @global_macros, @admin_macros;
 
-                        foreach my $macro_name (@user_macros) {
-                            $notification_commands_2x->{$notification_command_type}->{'command_macros'}->{$macro_name} = Icinga2::Utils::escape_str($user_macros_1x->{$macro_name});
+                        foreach my $macro_name (@global_macros) {
+                            $notification_commands_2x->{$notification_command_type}->{'command_macros'}->{$macro_name} = Icinga2::Utils::escape_str($global_macros_1x->{$macro_name});
                         }
                     }
 
@@ -954,7 +954,7 @@ sub convert_notificationcommand {
 sub convert_eventhandler {
     my $commands_1x = shift;
     my $obj_1x = shift;
-    my $user_macros_1x = shift;
+    my $global_macros_1x = shift;
     my $command_name_1x;
     my @commands = ();
     my $event_commands_2x = ();
@@ -977,12 +977,12 @@ sub convert_eventhandler {
             # detect $USERn$ macros and replace them too XXX - this should be a global macro?
             if ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/ ||
                 $commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(ADMIN\w+)\$/) {
-                my @user_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/g);
+                my @global_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/g);
                 my @admin_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(ADMIN\w+)\$/g);
-                push @user_macros, @admin_macros;
+                push @global_macros, @admin_macros;
 
-                foreach my $macro_name (@user_macros) {
-                    $event_commands_2x->{'command_macros'}->{$macro_name} = Icinga2::Utils::escape_str($user_macros_1x->{$macro_name});
+                foreach my $macro_name (@global_macros) {
+                    $event_commands_2x->{'command_macros'}->{$macro_name} = Icinga2::Utils::escape_str($global_macros_1x->{$macro_name});
                 }
             }
         }
@@ -997,7 +997,7 @@ sub convert_eventhandler {
 sub convert_checkcommand {
     my $commands_1x = shift;
     my $obj_1x = shift; #host or service
-    my $user_macros_1x = shift;
+    my $global_macros_1x = shift;
 
     my $command_1x;
     my $command_2x = {};
@@ -1033,12 +1033,12 @@ sub convert_checkcommand {
             # detect $USERn$ macros and replace them too XXX - this should be a global macro?
             if ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/ ||
                 $commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(ADMIN\w+)\$/) {
-                my @user_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/g);
+                my @global_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(USER\d+)\$/g);
                 my @admin_macros = ($commands_1x->{$command_1x_key}->{'command_line'} =~ /\$(ADMIN\w+)\$/g);
-                push @user_macros, @admin_macros;
+                push @global_macros, @admin_macros;
 
-                foreach my $macro_name (@user_macros) {
-                    $command_2x->{'command_macros'}->{$macro_name} = Icinga2::Utils::escape_str($user_macros_1x->{$macro_name});
+                foreach my $macro_name (@global_macros) {
+                    $command_2x->{'command_macros'}->{$macro_name} = Icinga2::Utils::escape_str($global_macros_1x->{$macro_name});
                 }
             }
 
@@ -1069,7 +1069,7 @@ sub convert_2x {
     my $icinga2_cfg = shift;
     my $cfg_obj_1x = shift;
     my $cfg_obj_cache_1x = shift;
-    my $user_macros_1x = shift;
+    my $global_macros_1x = shift;
 
     # build a new hashref with the actual 2.x config inside
     my $cfg_obj_2x = {};
@@ -1261,7 +1261,7 @@ sub convert_2x {
             ##########################################
             if (defined($obj_1x_service->{'event_handler'})) {
 
-                my $service_event_command_2x = Icinga2::Convert::convert_eventhandler(@$cfg_obj_1x{'command'}, $obj_1x_service, $user_macros_1x);
+                my $service_event_command_2x = Icinga2::Convert::convert_eventhandler(@$cfg_obj_1x{'command'}, $obj_1x_service, $global_macros_1x);
                 #say Dumper($service_event_command_2x);
 
                 # XXX do not add duplicate event commands, they must remain unique by their check_command origin!
@@ -1300,7 +1300,7 @@ sub convert_2x {
             ##########################################
             # map the service check_command to 2.x
             ##########################################
-            my $service_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_1x_service, $user_macros_1x);
+            my $service_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_1x_service, $global_macros_1x);
 
             #say Dumper($service_check_command_2x);
 
@@ -1522,7 +1522,7 @@ sub convert_2x {
         #   and link that service
         ####################################################
 
-        my $host_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_1x_host, $user_macros_1x);
+        my $host_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_1x_host, $global_macros_1x);
         #say Dumper($host_check_command_2x);
 
         if(defined($host_check_command_2x->{'check_command_name_1x'})) {
@@ -1572,7 +1572,7 @@ sub convert_2x {
         ####################################################
         # get all notification commands
         ####################################################
-        my $notification_commands_2x = Icinga2::Convert::convert_notificationcommand($cfg_obj_1x, @$cfg_obj_1x{'command'}, $obj_1x_contact, $user_macros_1x);
+        my $notification_commands_2x = Icinga2::Convert::convert_notificationcommand($cfg_obj_1x, @$cfg_obj_1x{'command'}, $obj_1x_contact, $global_macros_1x);
         #say Dumper($obj_1x_contact);
         #say Dumper($notification_commands_2x);
         #say Dumper("======================================");
@@ -2648,8 +2648,8 @@ sub convert_2x {
                 ######################################
                 # LINK HOST COMMAND WITH SERVICE CHECK
                 ######################################
-                my $service_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_2x_service, $user_macros_1x);
-                my $host_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_2x_host, $user_macros_1x);
+                my $service_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_2x_service, $global_macros_1x);
+                my $host_check_command_2x = Icinga2::Convert::convert_checkcommand(@$cfg_obj_1x{'command'}, $obj_2x_host, $global_macros_1x);
                 #say Dumper($host_check_command_2x);
 
                 # check if this service check is a possible match for __I2CONVERT_HOST_CHECK?

diff --git a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
index 3f2557de01f5525bcd3812f6fe2a9cb4194227ff..8667adfad06fb67ba3ccffb34e2f21da89a3494a 100644 (file)
--- a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
+++ b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
@@ -68,7 +68,7 @@ sub parse_icinga1_resource_cfg {
 
     my @cfg = Icinga2::Utils::slurp($file);
 
-    my $user_macros = {};
+    my $global_macros = {};
 
     foreach my $line (@cfg) {
         $line = Icinga2::Utils::strip($line);
@@ -82,29 +82,29 @@ sub parse_icinga1_resource_cfg {
         $macro_name =~ /\$(.*)\$/;
         $macro_name = $1;
 
-        $user_macros->{$macro_name} = $macro_value;
+        $global_macros->{$macro_name} = $macro_value;
     }
 
-    return $user_macros;
+    return $global_macros;
 
 }
 
-sub parse_icinga1_user_macros {
+sub parse_icinga1_global_macros {
     my $icinga1_cfg = shift;
 
     my ($icinga1_resource_file) = get_key_from_icinga1_main_cfg($icinga1_cfg, "resource_file");
 
     # resource.cfg
-    my $user_macros = parse_icinga1_resource_cfg($icinga1_resource_file);
+    my $global_macros = parse_icinga1_resource_cfg($icinga1_resource_file);
 
     # special attributes in icinga.cfg (admin_*)
     my ($admin_pager) = get_key_from_icinga1_main_cfg($icinga1_cfg, "admin_pager");
     my ($admin_email) = get_key_from_icinga1_main_cfg($icinga1_cfg, "admin_email");
 
-    $user_macros->{'ADMINPAGER'} = $admin_pager;
-    $user_macros->{'ADMINEMAIL'} = $admin_email;
+    $global_macros->{'ADMINPAGER'} = $admin_pager;
+    $global_macros->{'ADMINEMAIL'} = $admin_email;
 
-    return $user_macros;
+    return $global_macros;
 }
 
 sub parse_icinga1_object_cfg {

diff --git a/tools/configconvert/icinga2_convert_v1_v2.pl b/tools/configconvert/icinga2_convert_v1_v2.pl
index 4c778f05d531e32bb0ae92d4ef5408834d170bdd..701937c18d7cbbe3f0c05e91be5d2124f79ac0fd 100755 (executable)
--- a/tools/configconvert/icinga2_convert_v1_v2.pl
+++ b/tools/configconvert/icinga2_convert_v1_v2.pl
@@ -147,13 +147,13 @@ if ( !-f $icinga1_cfg) {
 # the import
 my $icinga1_cfg_obj = Icinga2::ImportIcinga1Cfg::parse_icinga1_objects($icinga1_cfg);
 my $icinga1_cfg_obj_cache = Icinga2::ImportIcinga1Cfg::parse_icinga1_objects_cache($icinga1_cfg);
-my $icinga1_user_macros = Icinga2::ImportIcinga1Cfg::parse_icinga1_user_macros($icinga1_cfg);
+my $icinga1_global_macros = Icinga2::ImportIcinga1Cfg::parse_icinga1_global_macros($icinga1_cfg);
 
 # the conversion magic inside
-my $icinga2_cfg_obj = Icinga2::Convert::convert_2x($icinga2_cfg, $icinga1_cfg_obj, $icinga1_cfg_obj_cache, $icinga1_user_macros);
+my $icinga2_cfg_obj = Icinga2::Convert::convert_2x($icinga2_cfg, $icinga1_cfg_obj, $icinga1_cfg_obj_cache, $icinga1_global_macros);
 
 # the export
-Icinga2::ExportIcinga2Cfg::dump_cfg_resource_2x($icinga2_cfg, $icinga1_user_macros);
+Icinga2::ExportIcinga2Cfg::dump_cfg_resource_2x($icinga2_cfg, $icinga1_global_macros);
 Icinga2::ExportIcinga2Cfg::dump_cfg_obj_2x($icinga2_cfg, $icinga2_cfg_obj);
 
 # vi: sw=4 ts=4 expandtab :