Merge pull request #68 from Icinga/feature/wizard-improvement

Feature/wizard improvement

Author: LordHepipud

lib/core/framework/Install-IcingaFrameworkService.psm1

@@ -33,7 +33,7 @@ function Install-IcingaFrameworkService()
     );
 
     if ([string]::IsNullOrEmpty($Path)) {
-        Write-IcingaConsoleError 'No path specified for Framework service. Service will not be installed';
+        Write-IcingaConsoleWarning 'No path specified for Framework service. Service will not be installed';
         return;
     }
 

lib/core/icingaagent/firewall/Disable-IcingaFirewall.psm1

@@ -11,7 +11,7 @@ function Disable-IcingaFirewall()
         if ($Firewall.ExitCode -ne 0) {
             Write-IcingaConsoleError ([string]::Format('Failed to remove legacy firewall: {0}{1}', $Firewall.Message, $Firewall.Error));
         } else {
-            Write-IcingaConsoleNotice 'Successfully removed legacy Firewall rule';
+            Write-IcingaConsoleNotice 'Successfully removed legacy firewall rule';
         }
     }
 
@@ -24,7 +24,7 @@ function Disable-IcingaFirewall()
         if ($Firewall.ExitCode -ne 0) {
             Write-IcingaConsoleError ([string]::Format('Failed to remove Icinga firewall: {0}{1}', $Firewall.Message, $Firewall.Error));
         } else {
-            Write-IcingaConsoleNotice 'Successfully removed Icinga Firewall rule';
+            Write-IcingaConsoleNotice 'Successfully removed Icinga firewall rule';
         }
     }
 }

lib/core/icingaagent/installer/Install-IcingaAgentCertificates.psm1

@@ -39,7 +39,7 @@ function Install-IcingaAgentCertificates()
     }
 
     if ([string]::IsNullOrEmpty($Endpoint) -And [string]::IsNullOrEmpty($CACert)) {
-        Write-IcingaConsoleNotice 'Your host certificates have been generated successfully. Please either specify an endpoint to connect to or provide the path to a valid ca.crt.';
+        Write-IcingaConsoleWarning 'Your host certificates have been generated successfully. Please either specify an endpoint to connect to or provide the path to a valid ca.crt';
         return $TRUE;
     }
 
@@ -194,7 +194,7 @@ function Test-IcingaAgentCertificates()
         }
     }
 
-    Write-IcingaConsoleNotice 'Icinga host certificates are present and valid. No generation required.';
+    Write-IcingaConsoleNotice 'Icinga host certificates are present and valid. No generation required';
 
     return $TRUE;
 }

lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1

@@ -11,20 +11,20 @@ function Uninstall-IcingaAgent()
         return;
     }
 
-    Write-IcingaConsoleNotice 'Removing current installed Icinga Agent';
+    Write-IcingaConsoleNotice 'Removing current Icinga Agent';
 
     Stop-IcingaService 'icinga2';
 
     $Uninstaller = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('{0} /q', $IcingaData.Uninstaller)) -FlushNewLine;
 
     if ($Uninstaller.ExitCode -ne 0) {
-        Write-IcingaConsoleError ([string]::Format('Failed to remove Icinga 2 Agent: {0}{1}', $Uninstaller.Message, $Uninstaller.Error));
+        Write-IcingaConsoleError ([string]::Format('Failed to remove Icinga Agent: {0}{1}', $Uninstaller.Message, $Uninstaller.Error));
         return $FALSE;
     }
 
     if ($RemoveDataFolder) {
         [string]$IcingaProgramData = Join-Path -Path $Env:ProgramData -ChildPath 'icinga2';
-        Write-IcingaConsoleNotice -Message 'Removing Icinga 2 directoy from ProgramData: "{0}"' -Objects $IcingaProgramData;
+        Write-IcingaConsoleNotice -Message 'Removing Icinga Agent directory: "{0}"' -Objects $IcingaProgramData;
         if ((Remove-ItemSecure -Path $IcingaProgramData -Recurse -Force) -eq $FALSE) {
             return $FALSE;
         }

lib/core/icingaagent/misc/Disable-IcingaAgentFeature.psm1

@@ -9,7 +9,7 @@ function Disable-IcingaAgentFeature()
     }
 
     if ((Test-IcingaAgentFeatureEnabled -Feature $Feature) -eq $FALSE) {
-        Write-IcingaConsoleWarning ([string]::Format('This feature is already disabled [{0}]', $Feature));
+        Write-IcingaConsoleNotice ([string]::Format('This feature is already disabled [{0}]', $Feature));
         return;
     }
 

lib/core/icingaagent/misc/Enable-IcingaAgentFeature.psm1

@@ -9,7 +9,7 @@ function Enable-IcingaAgentFeature()
     }
 
     if ((Test-IcingaAgentFeatureEnabled -Feature $Feature)) {
-        Write-IcingaConsoleWarning ([string]::Format('This feature is already enabled [{0}]', $Feature));
+        Write-IcingaConsoleNotice ([string]::Format('This feature is already enabled [{0}]', $Feature));
         return;
     }
 

lib/core/icingaagent/misc/Move-IcingaAgentDefaultConfig.psm1

@@ -4,7 +4,7 @@ function Move-IcingaAgentDefaultConfig()
     $BackupFile = Join-Path -Path $ConfigDir -ChildPath 'ps_backup\backup_executed.key';
 
     if ((Test-Path $BackupFile)) {
-        Write-IcingaConsoleNotice 'A backup of your default configuration is not required. A backup was already made.';
+        Write-IcingaConsoleNotice 'A backup of your default configuration is not required. A backup was already made';
         return;
     }
 

lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1

@@ -12,7 +12,7 @@ function Set-IcingaAgentServicePermission()
     $NewSystemContent  = @();
 
     if ([string]::IsNullOrEmpty($ServiceUser)) {
-        Write-IcingaTestOutput -Severity 'FAILED' -Message 'There is no user assigned to the Icinga 2 service or the service is not yet installed';
+        Write-IcingaTestOutput -Severity 'Failed' -Message 'There is no user assigned to the Icinga 2 service or the service is not yet installed';
         return $FALSE;
     }
 

lib/core/icingaagent/setters/Set-IcingaAgentServicePermission.psm1

@@ -38,13 +38,13 @@ function Test-IcingaAcl()
         [string]$messageFormat = 'Directory "{0}" {1} by the Icinga Service User "{2}"';
         if ($UserFound) {
             if ($HasAccess) {
-                Write-IcingaTestOutput -Severity 'PASSED' -Message ([string]::Format($messageFormat, $Directory, 'is accessible and writeable', $ServiceUser));
+                Write-IcingaTestOutput -Severity 'Passed' -Message ([string]::Format($messageFormat, $Directory, 'is accessible and writeable', $ServiceUser));
             } else {
-                Write-IcingaTestOutput -Severity 'FAILED' -Message ([string]::Format($messageFormat, $Directory, 'is accessible but NOT writeable', $ServiceUser));
+                Write-IcingaTestOutput -Severity 'Failed' -Message ([string]::Format($messageFormat, $Directory, 'is accessible but NOT writeable', $ServiceUser));
                 Write-IcingaConsolePlain "\_ Please run the following command to fix this issue: Set-IcingaAcl -Directory '$Directory'";
             }
         } else {
-            Write-IcingaTestOutput -Severity 'FAILED' -Message ([string]::Format($messageFormat, $Directory, 'is not accessible', $ServiceUser));
+            Write-IcingaTestOutput -Severity 'Failed' -Message ([string]::Format($messageFormat, $Directory, 'is not accessible', $ServiceUser));
             Write-IcingaConsolePlain "\_ Please run the following command to fix this issue: Set-IcingaAcl -Directory '$Directory'";
         }
     }