Adds new start and stop Cmdlets for Icinga

LordHepipud · LordHepipud · commit 2f53844dda62 · 2024-09-19T12:28:22.000+02:00
diff --git a/doc/100-General/10-Changelog.md b/doc/100-General/10-Changelog.md
@@ -19,6 +19,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 ### Enhancements
 
 * [#756](https://github.com/Icinga/icinga-powershell-framework/pull/756) Adds feature to set process priority for Icinga for Windows to BelowNormal for improved Host performance
+* [#757](https://github.com/Icinga/icinga-powershell-framework/pull/757) Adds new Cmdlets `Start-Icinga`, `Stop-Icinga`, `Start-IcingaForWindows` and `Stop-IcingaForWindows` in addition to the existing Cmdlets `Restart-Icinga` and `Restart-IcingaForWindows`
 
 ## 1.13.0 Beta-1 (2024-08-30)
 
diff --git a/lib/core/framework/Install-IcingaForWindowsService.psm1 b/lib/core/framework/Install-IcingaForWindowsService.psm1
@@ -46,7 +46,7 @@ function Install-IcingaForWindowsService()
 
         if ($IfWService.Status -eq 'Running') {
             Write-IcingaConsoleNotice 'Stopping Icinga PowerShell service';
-            Stop-IcingaWindowsService;
+            Stop-IcingaForWindows;
             Start-Sleep -Seconds 1;
         }
 
@@ -93,7 +93,7 @@ function Install-IcingaForWindowsService()
     Set-IcingaServiceUser -User 'LocalSystem' -Service 'icingapowershell' | Out-Null;
     Restart-IcingaForWindows;
     Start-Sleep -Seconds 1;
-    Stop-IcingaWindowsService;
+    Stop-IcingaForWindows;
     Start-Sleep -Seconds 1;
 
     if ($IfWService.Status -eq 'Running') {
diff --git a/lib/core/framework/Install-IcingaFrameworkUpdate.psm1 b/lib/core/framework/Install-IcingaFrameworkUpdate.psm1
@@ -57,7 +57,7 @@ function Install-IcingaFrameworkUpdate()
 
     if ($ServiceStatus -eq 'Running') {
         Write-IcingaConsoleNotice 'Stopping Icinga PowerShell service';
-        Stop-IcingaWindowsService;
+        Stop-IcingaForWindows;
         Start-Sleep -Seconds 1;
     }
     if ($AgentStatus -eq 'Running') {
diff --git a/lib/core/framework/Invoke-IcingaForWindowsMigration.psm1 b/lib/core/framework/Invoke-IcingaForWindowsMigration.psm1
@@ -17,7 +17,7 @@ function Invoke-IcingaForWindowsMigration()
 
         Write-IcingaConsoleNotice 'Applying pending migrations required for Icinga for Windows v1.8.0';
         if ($ServiceStatus -eq 'Running') {
-            Stop-IcingaWindowsService;
+            Stop-IcingaForWindows;
         }
 
         $ApiChecks = Get-IcingaPowerShellConfig -Path 'Framework.Experimental.UseApiChecks';
@@ -46,7 +46,7 @@ function Invoke-IcingaForWindowsMigration()
         $ServiceStatus = (Get-Service 'icingapowershell' -ErrorAction SilentlyContinue).Status;
 
         if ($ServiceStatus -eq 'Running') {
-            Stop-IcingaWindowsService;
+            Stop-IcingaForWindows;
         }
 
         # Convert the time intervals for the background daemon services from the previous index handling
diff --git a/lib/core/framework/Uninstall-IcingaForWindowsService.psm1 b/lib/core/framework/Uninstall-IcingaForWindowsService.psm1
@@ -26,7 +26,7 @@ function Uninstall-IcingaForWindowsService()
 
     $ServiceData = Get-IcingaForWindowsServiceData;
 
-    Stop-IcingaWindowsService;
+    Stop-IcingaForWindows;
     Start-Sleep -Seconds 1;
 
     $ServiceCreation = Start-IcingaProcess -Executable 'sc.exe' -Arguments 'delete icingapowershell';
diff --git a/lib/core/installer/menu/manage/settings/services/ManageServices.psm1 b/lib/core/installer/menu/manage/settings/services/ManageServices.psm1
@@ -83,7 +83,7 @@ function Show-IcingaForWindowsMenuManageIcingaForWindowsServices()
                 'DisabledReason' = 'The Icinga for Windows service is either not installed or not running';
                 'AdminMenu'      = $TRUE;
                 'Action'         = @{
-                    'Command' = 'Stop-IcingaWindowsService';
+                    'Command' = 'Stop-IcingaForWindows';
                 }
             },
             @{
diff --git a/lib/core/jea/Deny-IcingaJEACommand.psm1 b/lib/core/jea/Deny-IcingaJEACommand.psm1
@@ -65,7 +65,7 @@ function Deny-IcingaJEACommand()
             'Restart-IcingaForWindows'.ToLower() {
                 return $TRUE;
             };
-            'Stop-IcingaWindowsService'.ToLower() {
+            'Stop-IcingaForWindows'.ToLower() {
                 return $TRUE;
             };
             'Stop-IcingaService'.ToLower() {
diff --git a/lib/core/repository/Install-IcingaComponent.psm1 b/lib/core/repository/Install-IcingaComponent.psm1
@@ -163,7 +163,7 @@ function Install-IcingaComponent()
 
                 if ($ServiceStatus -eq 'Running') {
                     Write-IcingaConsoleNotice 'Stopping Icinga for Windows service';
-                    Stop-IcingaWindowsService;
+                    Stop-IcingaForWindows;
                     Start-Sleep -Seconds 1;
                 }
                 if ($AgentStatus -eq 'Running') {
diff --git a/lib/core/windows/Restart-Icinga.psm1 b/lib/core/windows/Restart-Icinga.psm1
@@ -1,5 +1,5 @@
 function Restart-Icinga()
 {
-    Restart-IcingaService -Service 'icinga2';
-    Restart-IcingaForWindows;
+    Stop-Icinga;
+    Start-Icinga;
 }
diff --git a/lib/core/windows/Restart-IcingaWindowsService.psm1 b/lib/core/windows/Restart-IcingaWindowsService.psm1
@@ -1,16 +1,7 @@
 function Restart-IcingaForWindows()
 {
-    [string]$JeaPid = Get-IcingaJEAServicePid;
-
-    Stop-IcingaService -Service 'icingapowershell';
-
-    if ((Test-IcingaJEAServiceRunning -JeaPid $JeaPid)) {
-        Stop-IcingaJEAProcess -JeaPid $JeaPid;
-    }
-
-    Restart-IcingaService -Service 'icingapowershell';
-    # Update the process priority after each restart
-    Start-IcingaWindowsScheduledTaskProcessPriority;
+    Stop-IcingaForWindows;
+    Start-IcingaForWindows;
 }
 
 Set-Alias -Name 'Restart-IcingaWindowsService' -Value 'Restart-IcingaForWindows';
diff --git a/lib/core/windows/Start-Icinga.psm1 b/lib/core/windows/Start-Icinga.psm1
@@ -0,0 +1,5 @@
+function Start-Icinga()
+{
+    Start-IcingaService -Service 'icinga2';
+    Start-IcingaForWindows;
+}
diff --git a/lib/core/windows/Start-IcingaForWindows.psm1 b/lib/core/windows/Start-IcingaForWindows.psm1
@@ -0,0 +1,6 @@
+function Start-IcingaForWindows()
+{
+    Start-IcingaService -Service 'icingapowershell';
+    # Update the process priority after each restart
+    Start-IcingaWindowsScheduledTaskProcessPriority;
+}
diff --git a/lib/core/windows/Stop-Icinga.psm1 b/lib/core/windows/Stop-Icinga.psm1
@@ -0,0 +1,5 @@
+function Stop-Icinga()
+{
+    Stop-IcingaService -Service 'icinga2';
+    Stop-IcingaForWindows;
+}
diff --git a/lib/core/windows/Stop-IcingaWindowsService.psm1 b/lib/core/windows/Stop-IcingaWindowsService.psm1
@@ -1,4 +1,4 @@
-function Stop-IcingaWindowsService()
+function Stop-IcingaForWindows()
 {
     [string]$JeaPid = Get-IcingaJEAServicePid;
 
@@ -8,3 +8,5 @@ function Stop-IcingaWindowsService()
         Stop-Process -Id $JeaPid -Force;
     }
 }
+
+Set-Alias -Name 'Stop-IcingaWindowsService' -Value 'Stop-IcingaForWindows';
diff --git a/lib/core/windows/Uninstall-IcingaServiceUser.psm1 b/lib/core/windows/Uninstall-IcingaServiceUser.psm1
@@ -12,7 +12,7 @@ function Uninstall-IcingaServiceUser()
     Write-IcingaConsoleNotice 'Uninstalling user "{0}"' -Objects $IcingaUser;
 
     Stop-IcingaService 'icinga2';
-    Stop-IcingaWindowsService;
+    Stop-IcingaForWindows;
 
     Set-IcingaPowerShellConfig -Path 'Framework.Icinga.ServiceUser' -Value '';
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function Install-IcingaFrameworkUpdate()`
`57`	`57`
`58`	`58`	`if ($ServiceStatus -eq 'Running') {`
`59`	`59`	`Write-IcingaConsoleNotice 'Stopping Icinga PowerShell service';`
`60`		`- Stop-IcingaWindowsService;`
	`60`	`+ Stop-IcingaForWindows;`
`61`	`61`	`Start-Sleep -Seconds 1;`
`62`	`62`	`}`
`63`	`63`	`if ($AgentStatus -eq 'Running') {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ function Invoke-IcingaForWindowsMigration()`
`17`	`17`
`18`	`18`	`Write-IcingaConsoleNotice 'Applying pending migrations required for Icinga for Windows v1.8.0';`
`19`	`19`	`if ($ServiceStatus -eq 'Running') {`
`20`		`- Stop-IcingaWindowsService;`
	`20`	`+ Stop-IcingaForWindows;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`$ApiChecks = Get-IcingaPowerShellConfig -Path 'Framework.Experimental.UseApiChecks';`
`@@ -46,7 +46,7 @@ function Invoke-IcingaForWindowsMigration()`
`46`	`46`	`$ServiceStatus = (Get-Service 'icingapowershell' -ErrorAction SilentlyContinue).Status;`
`47`	`47`
`48`	`48`	`if ($ServiceStatus -eq 'Running') {`
`49`		`- Stop-IcingaWindowsService;`
	`49`	`+ Stop-IcingaForWindows;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`# Convert the time intervals for the background daemon services from the previous index handling`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ function Show-IcingaForWindowsMenuManageIcingaForWindowsServices()`
`83`	`83`	`'DisabledReason' = 'The Icinga for Windows service is either not installed or not running';`
`84`	`84`	`'AdminMenu' = $TRUE;`
`85`	`85`	`'Action' = @{`
`86`		`- 'Command' = 'Stop-IcingaWindowsService';`
	`86`	`+ 'Command' = 'Stop-IcingaForWindows';`
`87`	`87`	`}`
`88`	`88`	`},`
`89`	`89`	`@{`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ function Install-IcingaComponent()`
`163`	`163`
`164`	`164`	`if ($ServiceStatus -eq 'Running') {`
`165`	`165`	`Write-IcingaConsoleNotice 'Stopping Icinga for Windows service';`
`166`		`- Stop-IcingaWindowsService;`
	`166`	`+ Stop-IcingaForWindows;`
`167`	`167`	`Start-Sleep -Seconds 1;`
`168`	`168`	`}`
`169`	`169`	`if ($AgentStatus -eq 'Running') {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`function Restart-Icinga()`
`2`	`2`	`{`
`3`		`- Restart-IcingaService -Service 'icinga2';`
`4`		`- Restart-IcingaForWindows;`
	`3`	`+ Stop-Icinga;`
	`4`	`+ Start-Icinga;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function Stop-IcingaWindowsService()`
	`1`	`+function Stop-IcingaForWindows()`
`2`	`2`	`{`
`3`	`3`	`[string]$JeaPid = Get-IcingaJEAServicePid;`
`4`	`4`
`@@ -8,3 +8,5 @@ function Stop-IcingaWindowsService()`
`8`	`8`	`Stop-Process -Id $JeaPid -Force;`
`9`	`9`	`}`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+Set-Alias -Name 'Stop-IcingaWindowsService' -Value 'Stop-IcingaForWindows';`