upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-20 23:00:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes FQDN to IP wizard conversion question

Browse source
This commit is contained in:
Lord Hepipud 2020-05-22 12:08:42 +02:00
parent 7961a0d0d1
commit 2ac3de5267
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1
View file

@ -285,11 +285,15 @@ function Start-IcingaAgentInstallWizard()
if ((Get-IcingaAgentInstallerAnswerInput -Prompt ([string]::Format('Do you want to convert all possible provided FQDN address for endpoint/network configuration for Icinga 2 to plain IP-Address?', $CAPort)) -Default 'y').result -eq 1) { if ((Get-IcingaAgentInstallerAnswerInput -Prompt ([string]::Format('Do you want to convert all possible provided FQDN address for endpoint/network configuration for Icinga 2 to plain IP-Address?', $CAPort)) -Default 'y').result -eq 1) {
$InstallerArguments += "-ConvertEndpointIPConfig 1"; $InstallerArguments += "-ConvertEndpointIPConfig 1";
$ConvertEndpointIPConfig = $TRUE; $ConvertEndpointIPConfig = $TRUE;
$EndpointsConversion = Convert-IcingaEndpointsToIPv4 -NetworkConfig $Endpoints; if ($EndpointConnections.Count -eq 0) {
if ($EndpointsConversion.HasErrors) { $EndpointsConversion = Convert-IcingaEndpointsToIPv4 -NetworkConfig $Endpoints;
Write-Host 'Not all of your endpoints configuration could be converted and was therefor dropped'; } else {
$EndpointsConversion = Convert-IcingaEndpointsToIPv4 -NetworkConfig $EndpointConnections;
} }
$Endpoints = $EndpointsConversion.Network; if ($EndpointsConversion.HasErrors) {
Write-Host ([string]::Format('Not all of your endpoint configuration could be resolved and is not reachable by this host. These endpoints were dropped: {0}', ([string]::Join(', ', $EndpointsConversion.Unresolved))));
}
$EndpointConnections = $EndpointsConversion.Network;
} else { } else {
$InstallerArguments += "-ConvertEndpointIPConfig 0"; $InstallerArguments += "-ConvertEndpointIPConfig 0";
$ConvertEndpointIPConfig = $FALSE; $ConvertEndpointIPConfig = $FALSE;

15
lib/core/tools/Convert-IcingaEndpointsToIP.psm1
View file

@ -25,9 +25,10 @@ function Convert-IcingaEndpointsToIPv4()
[array]$NetworkConfig [array]$NetworkConfig
); );
[array]$ResolvedNetwork = @(); [array]$ResolvedNetwork = @();
[bool]$HasUnresolved = $FALSE; [array]$UnresolvedNetwork = @();
[string]$Domain = $ENV:UserDNSDomain; [bool]$HasUnresolved = $FALSE;
[string]$Domain = $ENV:UserDNSDomain;
foreach ($entry in $NetworkConfig) { foreach ($entry in $NetworkConfig) {
$Network = Get-IPConfigFromString -IPConfig $entry; $Network = Get-IPConfigFromString -IPConfig $entry;
@ -48,13 +49,15 @@ function Convert-IcingaEndpointsToIPv4()
); );
$ResolvedNetwork += $entry.Replace($Network.address, $ResolvedIP); $ResolvedNetwork += $entry.Replace($Network.address, $ResolvedIP);
} catch { } catch {
$HasUnresolved = $TRUE; $UnresolvedNetwork += $entry;
$HasUnresolved = $TRUE;
} }
} }
} }
return @{ return @{
'Network' = $ResolvedNetwork; 'Network' = $ResolvedNetwork;
'HasErrors' = $HasUnresolved; 'HasErrors' = $HasUnresolved;
'Unresolved' = $UnresolvedNetwork;
}; };
} }