mirror of
https://github.com/Icinga/icinga-powershell-framework.git
synced 2025-12-20 23:00:35 -05:00
Fixes errors on encapsulated PowerShell calls
This commit is contained in:
parent
b85f282f0b
commit
02d1e71032
9 changed files with 17 additions and 2 deletions
|
|
@ -14,6 +14,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
|
||||||
### Bugfixes
|
### Bugfixes
|
||||||
|
|
||||||
* [#529](https://github.com/Icinga/icinga-powershell-framework/pull/529) Fixes package manifest reader for Icinga for Windows components on Windows 2012 R2 and older
|
* [#529](https://github.com/Icinga/icinga-powershell-framework/pull/529) Fixes package manifest reader for Icinga for Windows components on Windows 2012 R2 and older
|
||||||
|
* [#523](https://github.com/Icinga/icinga-powershell-framework/pull/523) Fixes errors on encapsulated PowerShell calls for missing Cmdlets `Write-IcingaConsoleError` and `Optimize-IcingaForWindowsMemory`
|
||||||
|
|
||||||
### Enhancements
|
### Enhancements
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ function Install-IcingaFrameworkComponent()
|
||||||
|
|
||||||
if ([string]::IsNullOrEmpty((Get-IcingaJEAContext)) -eq $FALSE) {
|
if ([string]::IsNullOrEmpty((Get-IcingaJEAContext)) -eq $FALSE) {
|
||||||
Write-IcingaConsoleNotice 'Updating Icinga JEA profile';
|
Write-IcingaConsoleNotice 'Updating Icinga JEA profile';
|
||||||
& powershell.exe -Command { Use-Icinga; Install-IcingaJEAProfile; } | Out-Null;
|
& powershell.exe -Command { Use-Icinga -Minimal; Install-IcingaJEAProfile; } | Out-Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Unload the module if it was loaded before
|
# Unload the module if it was loaded before
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ function Install-IcingaFrameworkUpdate()
|
||||||
if ([string]::IsNullOrEmpty((Get-IcingaJEAContext)) -eq $FALSE) {
|
if ([string]::IsNullOrEmpty((Get-IcingaJEAContext)) -eq $FALSE) {
|
||||||
Remove-IcingaFrameworkDependencyFile;
|
Remove-IcingaFrameworkDependencyFile;
|
||||||
Write-IcingaConsoleNotice 'Updating Icinga JEA profile';
|
Write-IcingaConsoleNotice 'Updating Icinga JEA profile';
|
||||||
& powershell.exe -Command { Use-Icinga; Install-IcingaJEAProfile; } | Out-Null;
|
& powershell.exe -Command { Use-Icinga -Minimal; Install-IcingaJEAProfile; } | Out-Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-IcingaConsoleNotice 'Framework update has been completed. Please start a new PowerShell instance now to complete the update';
|
Write-IcingaConsoleNotice 'Framework update has been completed. Please start a new PowerShell instance now to complete the update';
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ function Restart-IcingaService()
|
||||||
Write-IcingaConsoleNotice ([string]::Format('Restarting service "{0}"', $Service));
|
Write-IcingaConsoleNotice ([string]::Format('Restarting service "{0}"', $Service));
|
||||||
|
|
||||||
& powershell.exe -Command {
|
& powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$Service = $args[0];
|
$Service = $args[0];
|
||||||
try {
|
try {
|
||||||
Restart-Service "$Service" -ErrorAction Stop;
|
Restart-Service "$Service" -ErrorAction Stop;
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ function Start-IcingaService()
|
||||||
Write-IcingaConsoleNotice -Message 'Starting service "{0}"' -Objects $Service;
|
Write-IcingaConsoleNotice -Message 'Starting service "{0}"' -Objects $Service;
|
||||||
|
|
||||||
& powershell.exe -Command {
|
& powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$Service = $args[0];
|
$Service = $args[0];
|
||||||
try {
|
try {
|
||||||
Start-Service "$Service" -ErrorAction Stop;
|
Start-Service "$Service" -ErrorAction Stop;
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ function Stop-IcingaService()
|
||||||
Write-IcingaConsoleNotice -Message 'Stopping service "{0}"' -Objects $Service;
|
Write-IcingaConsoleNotice -Message 'Stopping service "{0}"' -Objects $Service;
|
||||||
|
|
||||||
& powershell.exe -Command {
|
& powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$Service = $args[0];
|
$Service = $args[0];
|
||||||
try {
|
try {
|
||||||
Stop-Service "$Service" -ErrorAction Stop;
|
Stop-Service "$Service" -ErrorAction Stop;
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,8 @@ function Install-IcingaAgent()
|
||||||
}
|
}
|
||||||
|
|
||||||
$InstallProcess = & powershell.exe -Command {
|
$InstallProcess = & powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$IcingaInstaller = $args[0];
|
$IcingaInstaller = $args[0];
|
||||||
$InstallTarget = $args[1];
|
$InstallTarget = $args[1];
|
||||||
$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $IcingaInstaller.InstallerPath, $InstallTarget)) -FlushNewLines;
|
$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $IcingaInstaller.InstallerPath, $InstallTarget)) -FlushNewLines;
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,8 @@ function Uninstall-IcingaAgent()
|
||||||
Stop-IcingaService -Service 'icinga2';
|
Stop-IcingaService -Service 'icinga2';
|
||||||
|
|
||||||
$Uninstaller = & powershell.exe -Command {
|
$Uninstaller = & powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$IcingaData = $args[0];
|
$IcingaData = $args[0];
|
||||||
$Uninstaller = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('{0} /q', $IcingaData.Uninstaller)) -FlushNewLine;
|
$Uninstaller = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('{0} /q', $IcingaData.Uninstaller)) -FlushNewLine;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -349,6 +349,8 @@ function Install-IcingaComponent()
|
||||||
}
|
}
|
||||||
|
|
||||||
$MSIData = & powershell.exe -Command {
|
$MSIData = & powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$DownloadDestination = $args[0];
|
$DownloadDestination = $args[0];
|
||||||
return (Read-IcingaMSIMetadata -File $DownloadDestination);
|
return (Read-IcingaMSIMetadata -File $DownloadDestination);
|
||||||
} -Args $DownloadDestination;
|
} -Args $DownloadDestination;
|
||||||
|
|
@ -369,6 +371,8 @@ function Install-IcingaComponent()
|
||||||
}
|
}
|
||||||
|
|
||||||
$InstallProcess = & powershell.exe -Command {
|
$InstallProcess = & powershell.exe -Command {
|
||||||
|
Use-Icinga -Minimal;
|
||||||
|
|
||||||
$DownloadDestination = $args[0];
|
$DownloadDestination = $args[0];
|
||||||
$InstallTarget = $args[1];
|
$InstallTarget = $args[1];
|
||||||
$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $DownloadDestination, $InstallTarget)) -FlushNewLines;
|
$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $DownloadDestination, $InstallTarget)) -FlushNewLines;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue