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

Added proper unknown handling for min / max operator config

Browse source
This commit is contained in:
Lord Hepipud 2019-07-19 20:02:09 +02:00
parent 069ab8e4f8
commit a05a41ca86
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/icinga/checkresult/New-IcingaCheckPackage.psm1
View file

@ -80,7 +80,7 @@ function New-IcingaCheckPackage()
$this.exitcode = $IcingaEnums.IcingaExitCode.Ok; $this.exitcode = $IcingaEnums.IcingaExitCode.Ok;
} }
if ($Silent -eq $FALSE) { if ($Silent -eq $FALSE -And [int]$this.exitcode -ne $IcingaEnums.IcingaExitCode.Unknown) {
#Write-Host ([string]::Format('Check result for package {0} ({1}):{2}', $this.name, $this.GetPackageConfigMessage(), "`r`n")); #Write-Host ([string]::Format('Check result for package {0} ({1}):{2}', $this.name, $this.GetPackageConfigMessage(), "`r`n"));
$this.PrintOutputMessages(); $this.PrintOutputMessages();
} }
@ -106,6 +106,15 @@ function New-IcingaCheckPackage()
} }
$Check | Add-Member -membertype ScriptMethod -name 'CheckMinimumOk' -value { $Check | Add-Member -membertype ScriptMethod -name 'CheckMinimumOk' -value {
if ($this.opmin -gt $this.checks.Count) {
Write-Host ([string]::Format(
'Unknown: The minimum argument ({0}) is exceeding the amount of assigned checks ({1}) to this package "{2}"',
$this.opmin, $this.checks.Count, $this.name
));
$this.exitcode = $IcingaEnums.IcingaExitCode.Unknown;
return $FALSE;
}
[int]$okCount = $this.GetOkCount(); [int]$okCount = $this.GetOkCount();
if ($this.opmin -le $okCount) { if ($this.opmin -le $okCount) {
@ -116,6 +125,15 @@ function New-IcingaCheckPackage()
} }
$Check | Add-Member -membertype ScriptMethod -name 'CheckMaximumOk' -value { $Check | Add-Member -membertype ScriptMethod -name 'CheckMaximumOk' -value {
if ($this.opmax -gt $this.checks.Count) {
Write-Host ([string]::Format(
'Unknown: The maximum argument ({0}) is exceeding the amount of assigned checks ({1}) to this package "{2}"',
$this.opmax, $this.checks.Count, $this.name
));
$this.exitcode = $IcingaEnums.IcingaExitCode.Unknown;
return $FALSE;
}
[int]$okCount = $this.GetOkCount(); [int]$okCount = $this.GetOkCount();
if ($this.opmax -ge $okCount) { if ($this.opmax -ge $okCount) {
@ -225,6 +243,9 @@ function New-IcingaCheckPackage()
} }
$Check | Add-Member -membertype ScriptMethod -name 'GetWorstExitCode' -value { $Check | Add-Member -membertype ScriptMethod -name 'GetWorstExitCode' -value {
if ([int]$this.exitcode -eq [int]$IcingaEnums.IcingaExitCode.Unknown) {
return;
}
$worstCheck = $null; $worstCheck = $null;
foreach ($check in $this.checks) { foreach ($check in $this.checks) {
if ([int]$this.exitcode -lt $check.exitcode) { if ([int]$this.exitcode -lt $check.exitcode) {