upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2026-02-03 04:09:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes the framework migration error on multi framework installation

Browse source
This commit is contained in:
Lord Hepipud 2023-05-26 13:57:36 +02:00
parent d91500fa4b
commit cb6aee0975
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/100-General/10-Changelog.md
View file

@ -15,9 +15,11 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#603](https://github.com/Icinga/icinga-powershell-framework/issues/603) Fixes service filter to handle exclude with wildcards instead of requiring the full service name (*not* applying to the display name)
* [#609](https://github.com/Icinga/icinga-powershell-framework/issues/609) Fixes config generator to never use `set_if = true` on Icinga 2/Icinga Director configuration
* [#615](https://github.com/Icinga/icinga-powershell-framework/issues/615) Fixes the framework migration tasks which fails in case multiple versions of the framework are installed, printing warnings in case there is
* [#617](https://github.com/Icinga/icinga-powershell-framework/issues/617) Fixes failing calls for plugins which use a switch argument like `-NoPerfData`, which is followed directly by the `-ThresholdInterval` argument
* [#621](https://github.com/Icinga/icinga-powershell-framework/pull/621) Fixes `-ThresholdInterval` key detection on newer systems
### Enhancements
* [#619](https://github.com/Icinga/icinga-powershell-framework/pull/619) Adds feature to securely read enum provider values with new function `Get-IcingaProviderEnumData`

18
lib/core/framework/Test-IcingaForWindowsMigration.psm1
View file

@ -8,10 +8,26 @@ function Test-IcingaForWindowsMigration()
return $FALSE;
}
[Version]$CurrentFrameworkVersion = (Get-Module -ListAvailable -Name icinga-powershell-framework).Version;
[string]$CurrentFrameworkRoot = Get-IcingaFrameworkRootPath;
[array]$ListOfFrameworks = (Get-Module -ListAvailable -Name icinga-powershell-framework);
[Version]$CurrentFrameworkVersion = $ListOfFrameworks[0].Version;
[string]$MigrationConfigPath = [string]::Format('Framework.Migrations.{0}', $MigrationVersion.ToString().Replace('.', ''));
$VersionMigrationApplied = Get-IcingaPowerShellConfig -Path $MigrationConfigPath;
if ($ListOfFrameworks.Count -gt 1) {
Write-IcingaConsoleWarning -Message 'Found multiple installations of the module "icinga-powershell-framework". Please check the list below and cleanup your installation to ensure system integrity'
foreach ($entry in $ListOfFrameworks) {
Write-Host ([string]::Format(' => Path "{0}" with version "{1}"', $entry.ModuleBase, $entry.Version));
# Ensure we use the correct version of the framework loaded within this session
if ($CurrentFrameworkRoot -eq $entry.ModuleBase) {
$CurrentFrameworkVersion = $entry.Version;
}
}
Write-IcingaConsoleWarning -Message 'This instance of Icinga for Windows will run with Framework version "{0}"' -Objects $CurrentFrameworkVersion.ToString();
}
# Migration for this version is already applied
if ($VersionMigrationApplied) {
return $FALSE;