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

Use alias for args name on config generation

Browse source
This commit is contained in:
Lord Hepipud 2021-10-28 17:27:06 +02:00
parent ba941c1eca
commit cf2125d7a2
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#377](https://github.com/Icinga/icinga-powershell-framework/issues/377) Fixes overhead for testing of modules being loaded, which returned invalid path values and wrong exceptions, which was unnecessary in first place * [#377](https://github.com/Icinga/icinga-powershell-framework/issues/377) Fixes overhead for testing of modules being loaded, which returned invalid path values and wrong exceptions, which was unnecessary in first place
* [#381](https://github.com/Icinga/icinga-powershell-framework/issues/381) Fixes Repository Hash generator for new repositories, which always returned the same hash regardless of the files inside * [#381](https://github.com/Icinga/icinga-powershell-framework/issues/381) Fixes Repository Hash generator for new repositories, which always returned the same hash regardless of the files inside
* [#386](https://github.com/Icinga/icinga-powershell-framework/pull/386) Fixes check command config generator for Icinga Director baskets/Icinga 2 conf files, in case we are using a check command with an alias as reference to a new name of a check command * [#386](https://github.com/Icinga/icinga-powershell-framework/pull/386) Fixes check command config generator for Icinga Director baskets/Icinga 2 conf files, in case we are using a check command with an alias as reference to a new name of a check command
* [#387](https://github.com/Icinga/icinga-powershell-framework/pull/387) Fixes config generator to use alias names for command arguments/parameters in case available instead of the real name
### Enhancements ### Enhancements

16
lib/core/tools/Convert-IcingaCheckArgumentToPSObject.psm1
View file

@ -1,7 +1,8 @@
function Convert-IcingaCheckArgumentToPSObject() function Convert-IcingaCheckArgumentToPSObject()
{ {
param ( param (
$Parameter = $null $Parameter = $null,
$CheckCommand = $null
); );
$ParamValue = New-Object -TypeName PSObject; $ParamValue = New-Object -TypeName PSObject;
@ -10,11 +11,22 @@ function Convert-IcingaCheckArgumentToPSObject()
return $ParamValue; return $ParamValue;
} }
$ParameterName = $Parameter.name;
if ([string]::IsNullOrEmpty($CheckCommand) -eq $FALSE) {
$CmdData = Get-Command $CheckCommand;
if ($CmdData.Parameters.ContainsKey($ParameterName)) {
if ($CmdData.Parameters[$ParameterName].Aliases.Count -ne 0) {
$ParameterName = $CmdData.Parameters[$ParameterName].Aliases[0];
}
}
}
$ParamValue | Add-Member -MemberType NoteProperty -Name 'type' -Value (New-Object -TypeName PSObject); $ParamValue | Add-Member -MemberType NoteProperty -Name 'type' -Value (New-Object -TypeName PSObject);
$ParamValue | Add-Member -MemberType NoteProperty -Name 'Description' -Value (New-Object -TypeName PSObject); $ParamValue | Add-Member -MemberType NoteProperty -Name 'Description' -Value (New-Object -TypeName PSObject);
$ParamValue | Add-Member -MemberType NoteProperty -Name 'Attributes' -Value (New-Object -TypeName PSObject); $ParamValue | Add-Member -MemberType NoteProperty -Name 'Attributes' -Value (New-Object -TypeName PSObject);
$ParamValue | Add-Member -MemberType NoteProperty -Name 'position' -Value $Parameter.position; $ParamValue | Add-Member -MemberType NoteProperty -Name 'position' -Value $Parameter.position;
$ParamValue | Add-Member -MemberType NoteProperty -Name 'Name' -Value $Parameter.name; $ParamValue | Add-Member -MemberType NoteProperty -Name 'Name' -Value $ParameterName;
$ParamValue | Add-Member -MemberType NoteProperty -Name 'required' -Value $Parameter.required; $ParamValue | Add-Member -MemberType NoteProperty -Name 'required' -Value $Parameter.required;
$ParamValue.type | Add-Member -MemberType NoteProperty -Name 'name' -Value $Parameter.type.name; $ParamValue.type | Add-Member -MemberType NoteProperty -Name 'name' -Value $Parameter.type.name;
$ParamValue.Description | Add-Member -MemberType NoteProperty -Name 'Text' -Value $Parameter.Description.Text; $ParamValue.Description | Add-Member -MemberType NoteProperty -Name 'Text' -Value $Parameter.Description.Text;

4
lib/core/tools/Get-IcingaCheckCommandConfig.psm1
View file

@ -183,7 +183,7 @@ function Get-IcingaCheckCommandConfig()
return; return;
} }
} }
$CheckParamList += (Convert-IcingaCheckArgumentToPSObject -Parameter $entry); $CheckParamList += (Convert-IcingaCheckArgumentToPSObject -Parameter $entry -CheckCommand $check);
} }
foreach ($arg in $ParameterList.Keys) { foreach ($arg in $ParameterList.Keys) {
@ -397,7 +397,7 @@ function Get-IcingaCheckCommandConfig()
$CheckParamList = @( $ThresholdIntervalArg ); $CheckParamList = @( $ThresholdIntervalArg );
foreach ($entry in $Data.parameters.parameter) { foreach ($entry in $Data.parameters.parameter) {
$CheckParamList += (Convert-IcingaCheckArgumentToPSObject -Parameter $entry); $CheckParamList += (Convert-IcingaCheckArgumentToPSObject -Parameter $entry -CheckCommand $check);
} }
foreach ($parameter in $CheckParamList) { foreach ($parameter in $CheckParamList) {