From a911ac1847b704b9d28c319c34e38bdc412b1cd9 Mon Sep 17 00:00:00 2001 From: Lord Hepipud Date: Wed, 30 Oct 2019 09:32:22 +0100 Subject: [PATCH] Add NoPerfData and Units to Memory check --- lib/plugins/Invoke-IcingaCheckMemory.psm1 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/plugins/Invoke-IcingaCheckMemory.psm1 b/lib/plugins/Invoke-IcingaCheckMemory.psm1 index b714d59..6c5ecc3 100644 --- a/lib/plugins/Invoke-IcingaCheckMemory.psm1 +++ b/lib/plugins/Invoke-IcingaCheckMemory.psm1 @@ -44,16 +44,17 @@ function Invoke-IcingaCheckMemory() $WarningPercent = $null, [switch]$PageFile, [ValidateSet(0, 1, 2, 3)] - [int]$Verbosity = 0 + [int]$Verbosity = 0, + [switch]$NoPerfData ); $MemoryPackage = New-IcingaCheckPackage -Name 'Memory Usage' -OperatorAnd -Verbos $Verbosity; $MemoryData = (Get-IcingaMemoryPerformanceCounterFormated); - $MemoryPerc = New-IcingaCheck -Name 'Memory Percent' -Value $MemoryData.'Memory %' -NoPerfData; - $MemoryByte = New-IcingaCheck -Name 'Memory GigaByte' -Value $MemoryData.'Memory GigaByte' -NoPerfData; - $PageFile = New-IcingaCheck -Name 'PageFile Percent' -Value $MemoryData.'PageFile %' -NoPerfData; + $MemoryPerc = New-IcingaCheck -Name 'Memory Percent' -Value $MemoryData['Memory %'] -Unit '%'; + $MemoryByte = New-IcingaCheck -Name 'Memory GigaByte' -Value $MemoryData['Memory GigaByte'] -Unit 'GB'; + $PageFileCheck = New-IcingaCheck -Name 'PageFile Percent' -Value $MemoryData['PageFile %'] -Unit '%'; # PageFile To-Do $MemoryPerc.WarnOutOfRange($Warning).CritOutOfRange($Critical) | Out-Null; @@ -61,6 +62,7 @@ function Invoke-IcingaCheckMemory() $MemoryPackage.AddCheck($MemoryPerc); $MemoryPackage.AddCheck($MemoryByte); + $MemoryPackage.AddCheck($PageFileCheck); - return (New-IcingaCheckResult -Check $MemoryPackage -NoPerfData $TRUE -Compile); -} \ No newline at end of file + return (New-IcingaCheckResult -Check $MemoryPackage -NoPerfData $NoPerfData -Compile); +}