Merge pull request #392 from Icinga:feature/updates_cpu_plugin_to_report_to_processes

LordHepipud · web-flow · commit 611d8a7d9644 · 2024-03-25T11:20:26.000+01:00
Feature: Adds support to Invoke-IcingaCheckCPU to report top 10 consuming process information

Adds support to `Invoke-IcingaCheckCPU` to report top CPU consuming process information as well as a switch to change the overall load from average to sum
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 *.log
 *.DS_Store
-.vscode
+.vscode
diff --git a/config/director/Invoke-IcingaCheckCPU.json b/config/director/Invoke-IcingaCheckCPU.json
diff --git a/config/director/Plugins_Bundle.json b/config/director/Plugins_Bundle.json
diff --git a/config/icinga/Invoke-IcingaCheckCPU.conf b/config/icinga/Invoke-IcingaCheckCPU.conf
@@ -48,6 +48,10 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
             }}
             order = 100
         }
+        "-NoPerfData" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"
+            order = 99
+        }
         "-Core" = {
             set_if = {{
                 var str = macro("$IcingaCheckCPU_String_Core$"); if (len(str) == 0) { return false; }; return true;
@@ -76,8 +80,12 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
             value = "$IcingaCheckCPU_Object_Critical$"
             order = 3
         }
-        "-NoPerfData" = {
-            set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"
+        "-OverallTotalAsSum" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"
+            order = 99
+        }
+        "-DisableProcessList" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"
             order = 99
         }
         "-OverallOnly" = {
@@ -87,6 +95,9 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
     }
     vars.IcingaCheckCPU_Switchparameter_OverallOnly = false
     vars.ifw_api_arguments = {
+        "DisableProcessList" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"
+        }
         "ThresholdInterval" = {
             value = "$IcingaCheckCPU_String_ThresholdInterval$"
         }
@@ -108,10 +119,15 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
         "NoPerfData" = {
             set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"
         }
+        "OverallTotalAsSum" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"
+        }
         "Verbosity" = {
             value = "$IcingaCheckCPU_Int32_Verbosity$"
         }
     }
+    vars.IcingaCheckCPU_Switchparameter_DisableProcessList = false
+    vars.IcingaCheckCPU_Switchparameter_OverallTotalAsSum = false
     vars.ifw_api_command = "invoke-icingacheckcpu"
     vars.IcingaCheckCPU_Switchparameter_NoPerfData = false
 }
diff --git a/config/icinga/Plugins_Bundle.conf b/config/icinga/Plugins_Bundle.conf
@@ -3153,7 +3153,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {
             order = 99
         }
         "-CriticalTotalSize" = {
-            description = "Checks the resulting file count of the provided filters and input and returns critical for the provided threshold.  Follows the Icinga plugin threshold guidelines."
+            description = "Checks the total folder size of all files of the provided filters and input and returns critical for the provided threshold.  Follows the Icinga plugin threshold guidelines."
             value = "$IcingaCheckDirectory_Object_CriticalTotalSize$"
             order = 7
         }
@@ -3353,7 +3353,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {
             order = 99
         }
         "-WarningTotalSize" = {
-            description = "Checks the resulting file count of the provided filters and input and returns warning for the provided threshold.  Follows the Icinga plugin threshold guidelines."
+            description = "Checks the total folder size of all files of the provided filters and input and returns warning for the provided threshold.  Follows the Icinga plugin threshold guidelines."
             value = "$IcingaCheckDirectory_Object_WarningTotalSize$"
             order = 6
         }
@@ -3363,7 +3363,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {
             order = 12
         }
         "-WarningLargestFile" = {
-            description = "Checks the largest file size found for the given filters and input and returns warning for the provided threshold.  Follows the Icinga plugin threshold guidelines."
+            description = "Checks the resulting file count of the provided filters and input and returns warning for the provided threshold.  Follows the Icinga plugin threshold guidelines."
             value = "$IcingaCheckDirectory_Object_WarningLargestFile$"
             order = 10
         }
@@ -3378,7 +3378,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {
             order = 9
         }
         "-CriticalAverageFile" = {
-            description = "Checks the resulting file count of the provided filters and input and returns critical for the provided threshold.  Follows the Icinga plugin threshold guidelines."
+            description = "Checks the average file size found for the given filters and input and returns critical for the provided threshold.  Follows the Icinga plugin threshold guidelines."
             value = "$IcingaCheckDirectory_Object_CriticalAverageFile$"
             order = 13
         }
@@ -3497,7 +3497,7 @@ object CheckCommand "Invoke-IcingaCheckUNCPath" {
 
     arguments += {
         "-WarningTotal" = {
-            description = "A warning threshold for the shares total free space in byte units, like '50GB:' Please note that this value is decreasing over time, therefor you will have to use the plugin handler and add ':' at the end of your input to check for 'current value < threshold' like in the previous example  Allowed units: B, KB, MB, GB, TB, PB, KiB, MiB, GiB, TiB, PiB"
+            description = "A warning threshold for the shares free space in either % or byte units, like '20%:' or '50GB:' Please note that this value is decreasing over time, therefor you will have to use the plugin handler and add ':' at the end of your input to check for 'current value < threshold' like in the previous example  Allowed units: %, B, KB, MB, GB, TB, PB, KiB, MiB, GiB, TiB, PiB"
             value = "$IcingaCheckUNCPath_Object_WarningTotal$"
             order = 8
         }
@@ -3882,7 +3882,7 @@ object CheckCommand "Invoke-IcingaCheckICMP" {
             order = 99
         }
         "-CriticalPl" = {
-            description = "Threshold on which the plugin will return 'CRITICAL' for the response time in ms"
+            description = "Threshold on which the plugin will return 'CRITICAL' for possible packet loss in %"
             value = "$IcingaCheckICMP_Object_CriticalPl$"
             order = 5
         }
@@ -4274,6 +4274,10 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
             }}
             order = 100
         }
+        "-NoPerfData" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"
+            order = 99
+        }
         "-Core" = {
             set_if = {{
                 var str = macro("$IcingaCheckCPU_String_Core$"); if (len(str) == 0) { return false; }; return true;
@@ -4302,8 +4306,12 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
             value = "$IcingaCheckCPU_Object_Critical$"
             order = 3
         }
-        "-NoPerfData" = {
-            set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"
+        "-OverallTotalAsSum" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"
+            order = 99
+        }
+        "-DisableProcessList" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"
             order = 99
         }
         "-OverallOnly" = {
@@ -4313,6 +4321,9 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
     }
     vars.IcingaCheckCPU_Switchparameter_OverallOnly = false
     vars.ifw_api_arguments = {
+        "DisableProcessList" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"
+        }
         "ThresholdInterval" = {
             value = "$IcingaCheckCPU_String_ThresholdInterval$"
         }
@@ -4334,10 +4345,15 @@ object CheckCommand "Invoke-IcingaCheckCPU" {
         "NoPerfData" = {
             set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"
         }
+        "OverallTotalAsSum" = {
+            set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"
+        }
         "Verbosity" = {
             value = "$IcingaCheckCPU_Int32_Verbosity$"
         }
     }
+    vars.IcingaCheckCPU_Switchparameter_DisableProcessList = false
+    vars.IcingaCheckCPU_Switchparameter_OverallTotalAsSum = false
     vars.ifw_api_command = "invoke-icingacheckcpu"
     vars.IcingaCheckCPU_Switchparameter_NoPerfData = false
 }
@@ -4773,7 +4789,7 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {
 
     arguments += {
         "-WarningRollups" = {
-            description = "The warning threshold for the rollup update count on the Windows machine"
+            description = "The warning threshold for the total pending update count on the Windows machine"
             value = "$IcingaCheckUpdates_Object_WarningRollups$"
             order = 7
         }
@@ -4791,7 +4807,7 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {
             order = 99
         }
         "-CriticalOther" = {
-            description = "The critical threshold for all other updates on the Windows machine"
+            description = "The critical threshold for the total pending update count on the Windows machine"
             value = "$IcingaCheckUpdates_Object_CriticalOther$"
             order = 12
         }
@@ -4819,7 +4835,7 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {
             order = 100
         }
         "-WarningOther" = {
-            description = "The warning threshold for all other updates on the Windows machine"
+            description = "The warning threshold for the total pending update count on the Windows machine"
             value = "$IcingaCheckUpdates_Object_WarningOther$"
             order = 11
         }
@@ -4871,12 +4887,12 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {
             order = 2
         }
         "-WarningSecurity" = {
-            description = "The warning threshold for the security update count on the Windows machine"
+            description = "The warning threshold for the total pending update count on the Windows machine"
             value = "$IcingaCheckUpdates_Object_WarningSecurity$"
             order = 5
         }
         "-CriticalSecurity" = {
-            description = "The critical threshold for the security update count on the Windows machine"
+            description = "The critical threshold for the total pending update count on the Windows machine"
             value = "$IcingaCheckUpdates_Object_CriticalSecurity$"
             order = 6
         }
diff --git a/doc/31-Changelog.md b/doc/31-Changelog.md
@@ -11,14 +11,13 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 
 ### Bugfixes
 
+* [#375](https://github.com/Icinga/icinga-powershell-plugins/pull/375) Fixes a memory leak on the Icinga EventLog provider for fetching Windows EventLog information
 * [#384](https://github.com/Icinga/icinga-powershell-plugins/pull/384) Adds new data provider for Invoke-IcingaCheckProcess and extends functionality by adding a new 'ExcludeProcess' argument
 * [#386](https://github.com/Icinga/icinga-powershell-plugins/pull/386) Adds new provider for Invoke-IcingaCheckEventLog, to improve performance and fix memory leaks
 
-# 1.11.2 (tbd)
-
-### Bugfixes
+### Enhancements
 
-* [#375](https://github.com/Icinga/icinga-powershell-plugins/pull/375) Fixes a memory leak on the Icinga EventLog provider for fetching Windows EventLog information
+* [#366](https://github.com/Icinga/icinga-powershell-plugins/issues/366) Adds support to `Invoke-IcingaCheckCPU` to report top CPU consuming process information as well as a switch to change the overall load from average to sum
 
 # 1.11.1 (2023-11-07)
 
diff --git a/doc/plugins/04-Invoke-IcingaCheckCPU.md b/doc/plugins/04-Invoke-IcingaCheckCPU.md
@@ -29,6 +29,8 @@ To execute this plugin you will require to grant the following user permissions.
 | Core | String | false | * | Used to specify a single core to check for. For the average load across all cores use `_Total` |
 | SocketFilter | Array | false | @() | Allows to specify one or mutlitple sockets by using their socket id. Not matching socket id's will not be evaluated<br /> by the plugin. |
 | OverallOnly | SwitchParameter | false | False | If this flag is set, the Warning and Critical thresholds will only apply to the `Overall Load` metric instead of all<br /> returned cores. Requires that the plugin either fetches all cores with `*` or `Total` for the -Core argument |
+| OverallTotalAsSum | SwitchParameter | false | False | Changes the output of the overall total load to report the sum of all sockets combined instead of the default<br /> average of all sockets |
+| DisableProcessList | SwitchParameter | false | False | Disables the reporting of the top 10 CPU consuming process list |
 | NoPerfData | SwitchParameter | false | False |  |
 | Verbosity | Int32 | false | 0 | Changes the behavior of the plugin output which check states are printed:<br /> 0 (default): Only service checks/packages with state not OK will be printed<br /> 1: Only services with not OK will be printed including OK checks of affected check packages including Package config<br /> 2: Everything will be printed regardless of the check state<br /> 3: Identical to Verbose 2, but prints in addition the check package configuration e.g (All must be [OK]) |
 | ThresholdInterval | String |  |  | Change the value your defined threshold checks against from the current value to a collected time threshold of the Icinga for Windows daemon, as described [here](https://icinga.com/docs/icinga-for-windows/latest/doc/service/10-Register-Service-Checks/). An example for this argument would be 1m or 15m which will use the average of 1m or 15m for monitoring. |
diff --git a/plugins/Invoke-IcingaCheckCPU.psm1 b/plugins/Invoke-IcingaCheckCPU.psm1
@@ -36,6 +36,11 @@
 .PARAMETER OverallOnly
     If this flag is set, the Warning and Critical thresholds will only apply to the `Overall Load` metric instead of all
     returned cores. Requires that the plugin either fetches all cores with `*` or `Total` for the -Core argument
+.PARAMETER OverallTotalAsSum
+    Changes the output of the overall total load to report the sum of all sockets combined instead of the default
+    average of all sockets
+.PARAMETER DisableProcessList
+    Disables the reporting of the top 10 CPU consuming process list
 .PARAMETER Verbosity
     Changes the behavior of the plugin output which check states are printed:
     0 (default): Only service checks/packages with state not OK will be printed
@@ -54,18 +59,21 @@
 function Invoke-IcingaCheckCPU()
 {
     param (
-        $Warning             = $null,
-        $Critical            = $null,
-        [string]$Core        = '*',
-        [array]$SocketFilter = @(),
-        [switch]$OverallOnly = $FALSE,
+        $Warning                    = $null,
+        $Critical                   = $null,
+        [string]$Core               = '*',
+        [array]$SocketFilter        = @(),
+        [switch]$OverallOnly        = $FALSE,
+        [switch]$OverallTotalAsSum  = $FALSE,
+        [switch]$DisableProcessList = $FALSE,
         [switch]$NoPerfData,
         [ValidateSet(0, 1, 2, 3)]
-        [int]$Verbosity      = 0
+        [int]$Verbosity             = 0
     );
 
-    $CpuData    = Get-IcingaProviderDataValuesCpu;
-    $CpuPackage = New-IcingaCheckPackage -Name 'CPU Load' -OperatorAnd -Verbose $Verbosity;
+    $CpuData        = Get-IcingaProviderDataValuesCpu;
+    $CpuPackage     = New-IcingaCheckPackage -Name 'CPU Load' -OperatorAnd -Verbose $Verbosity;
+    $ProcessPackage = New-IcingaCheckPackage -Name 'Top 10 Process CPU usage' -OperatorAnd -Verbose 2 -IgnoreEmptyPackage;
 
     foreach ($socket in (Get-IcingaProviderElement $CpuData.Metrics)) {
         [string]$SocketId = $socket.Name.Replace('Socket #', '');
@@ -105,10 +113,16 @@ function Invoke-IcingaCheckCPU()
     }
 
     if ($Core -eq '*' -Or $Core -Like '*Total*') {
+        $TotalLoadValue = $CpuData.Metadata.TotalLoad;
+
+        if ($OverallTotalAsSum) {
+            $TotalLoadValue = $CpuData.Metadata.TotalLoadSum;
+        }
+
         $IcingaCheck = (
             New-IcingaCheck `
                 -Name 'Overall Load' `
-                -Value $CpuData.Metadata.TotalLoad `
+                -Value $TotalLoadValue `
                 -Unit '%' `
                 -MetricIndex 'totalload' `
                 -MetricName 'load'
@@ -117,5 +131,24 @@ function Invoke-IcingaCheckCPU()
         $CpuPackage.AddCheck($IcingaCheck);
     }
 
+    if ($DisableProcessList -eq $FALSE) {
+        $ProcessData   = Get-IcingaProviderDataValuesProcess;
+        [bool]$HasData = $FALSE;
+
+        foreach ($cpuProcess in (Get-IcingaProviderElement $ProcessData.Metadata.Hot.Cpu)) {
+            $HasData      = $TRUE;
+            $ProcessCheck = New-IcingaCheck -Name ([string]::Format('Process {0} with id {1}', $cpuProcess.Value.Name, $cpuProcess.Value.ProcessId)) -Value $cpuProcess.Value.CpuUsage -Unit '%' -NoPerfData;
+            $ProcessPackage.AddCheck($ProcessCheck);
+        }
+
+        if ($HasData -eq $FALSE) {
+            $ProcessCheck = New-IcingaCheck -Name 'Process Data' -NoPerfData;
+            $ProcessCheck.SetOk('No process with high CPU usage found', $TRUE) | Out-Null;
+            $ProcessPackage.AddCheck($ProcessCheck);
+        }
+
+        $CpuPackage.AddCheck($ProcessPackage);
+    }
+
     return (New-IcingaCheckResult -Name 'CPU Load' -Check $CpuPackage -NoPerfData $NoPerfData -Compile);
 }

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 *.log
 *.DS_Store
 -.vscode
 +.vscode
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`48`	`48`	`}}`
`49`	`49`	`order = 100`
`50`	`50`	`}`
	`51`	`+ "-NoPerfData" = {`
	`52`	`+ set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"`
	`53`	`+ order = 99`
	`54`	`+ }`
`51`	`55`	`"-Core" = {`
`52`	`56`	`set_if = {{`
`53`	`57`	`var str = macro("$IcingaCheckCPU_String_Core$"); if (len(str) == 0) { return false; }; return true;`
`@@ -76,8 +80,12 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`76`	`80`	`value = "$IcingaCheckCPU_Object_Critical$"`
`77`	`81`	`order = 3`
`78`	`82`	`}`
`79`		`- "-NoPerfData" = {`
`80`		`- set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"`
	`83`	`+ "-OverallTotalAsSum" = {`
	`84`	`+ set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"`
	`85`	`+ order = 99`
	`86`	`+ }`
	`87`	`+ "-DisableProcessList" = {`
	`88`	`+ set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"`
`81`	`89`	`order = 99`
`82`	`90`	`}`
`83`	`91`	`"-OverallOnly" = {`
`@@ -87,6 +95,9 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`87`	`95`	`}`
`88`	`96`	`vars.IcingaCheckCPU_Switchparameter_OverallOnly = false`
`89`	`97`	`vars.ifw_api_arguments = {`
	`98`	`+ "DisableProcessList" = {`
	`99`	`+ set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"`
	`100`	`+ }`
`90`	`101`	`"ThresholdInterval" = {`
`91`	`102`	`value = "$IcingaCheckCPU_String_ThresholdInterval$"`
`92`	`103`	`}`
`@@ -108,10 +119,15 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`108`	`119`	`"NoPerfData" = {`
`109`	`120`	`set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"`
`110`	`121`	`}`
	`122`	`+ "OverallTotalAsSum" = {`
	`123`	`+ set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"`
	`124`	`+ }`
`111`	`125`	`"Verbosity" = {`
`112`	`126`	`value = "$IcingaCheckCPU_Int32_Verbosity$"`
`113`	`127`	`}`
`114`	`128`	`}`
	`129`	`+ vars.IcingaCheckCPU_Switchparameter_DisableProcessList = false`
	`130`	`+ vars.IcingaCheckCPU_Switchparameter_OverallTotalAsSum = false`
`115`	`131`	`vars.ifw_api_command = "invoke-icingacheckcpu"`
`116`	`132`	`vars.IcingaCheckCPU_Switchparameter_NoPerfData = false`
`117`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3153,7 +3153,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {`
`3153`	`3153`	`order = 99`
`3154`	`3154`	`}`
`3155`	`3155`	`"-CriticalTotalSize" = {`
`3156`		`- description = "Checks the resulting file count of the provided filters and input and returns critical for the provided threshold. Follows the Icinga plugin threshold guidelines."`
	`3156`	`+ description = "Checks the total folder size of all files of the provided filters and input and returns critical for the provided threshold. Follows the Icinga plugin threshold guidelines."`
`3157`	`3157`	`value = "$IcingaCheckDirectory_Object_CriticalTotalSize$"`
`3158`	`3158`	`order = 7`
`3159`	`3159`	`}`
`@@ -3353,7 +3353,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {`
`3353`	`3353`	`order = 99`
`3354`	`3354`	`}`
`3355`	`3355`	`"-WarningTotalSize" = {`
`3356`		`- description = "Checks the resulting file count of the provided filters and input and returns warning for the provided threshold. Follows the Icinga plugin threshold guidelines."`
	`3356`	`+ description = "Checks the total folder size of all files of the provided filters and input and returns warning for the provided threshold. Follows the Icinga plugin threshold guidelines."`
`3357`	`3357`	`value = "$IcingaCheckDirectory_Object_WarningTotalSize$"`
`3358`	`3358`	`order = 6`
`3359`	`3359`	`}`
`@@ -3363,7 +3363,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {`
`3363`	`3363`	`order = 12`
`3364`	`3364`	`}`
`3365`	`3365`	`"-WarningLargestFile" = {`
`3366`		`- description = "Checks the largest file size found for the given filters and input and returns warning for the provided threshold. Follows the Icinga plugin threshold guidelines."`
	`3366`	`+ description = "Checks the resulting file count of the provided filters and input and returns warning for the provided threshold. Follows the Icinga plugin threshold guidelines."`
`3367`	`3367`	`value = "$IcingaCheckDirectory_Object_WarningLargestFile$"`
`3368`	`3368`	`order = 10`
`3369`	`3369`	`}`
`@@ -3378,7 +3378,7 @@ object CheckCommand "Invoke-IcingaCheckDirectory" {`
`3378`	`3378`	`order = 9`
`3379`	`3379`	`}`
`3380`	`3380`	`"-CriticalAverageFile" = {`
`3381`		`- description = "Checks the resulting file count of the provided filters and input and returns critical for the provided threshold. Follows the Icinga plugin threshold guidelines."`
	`3381`	`+ description = "Checks the average file size found for the given filters and input and returns critical for the provided threshold. Follows the Icinga plugin threshold guidelines."`
`3382`	`3382`	`value = "$IcingaCheckDirectory_Object_CriticalAverageFile$"`
`3383`	`3383`	`order = 13`
`3384`	`3384`	`}`
`@@ -3497,7 +3497,7 @@ object CheckCommand "Invoke-IcingaCheckUNCPath" {`
`3497`	`3497`
`3498`	`3498`	`arguments += {`
`3499`	`3499`	`"-WarningTotal" = {`
`3500`		`- description = "A warning threshold for the shares total free space in byte units, like '50GB:' Please note that this value is decreasing over time, therefor you will have to use the plugin handler and add ':' at the end of your input to check for 'current value < threshold' like in the previous example Allowed units: B, KB, MB, GB, TB, PB, KiB, MiB, GiB, TiB, PiB"`
	`3500`	`+ description = "A warning threshold for the shares free space in either % or byte units, like '20%:' or '50GB:' Please note that this value is decreasing over time, therefor you will have to use the plugin handler and add ':' at the end of your input to check for 'current value < threshold' like in the previous example Allowed units: %, B, KB, MB, GB, TB, PB, KiB, MiB, GiB, TiB, PiB"`
`3501`	`3501`	`value = "$IcingaCheckUNCPath_Object_WarningTotal$"`
`3502`	`3502`	`order = 8`
`3503`	`3503`	`}`
`@@ -3882,7 +3882,7 @@ object CheckCommand "Invoke-IcingaCheckICMP" {`
`3882`	`3882`	`order = 99`
`3883`	`3883`	`}`
`3884`	`3884`	`"-CriticalPl" = {`
`3885`		`- description = "Threshold on which the plugin will return 'CRITICAL' for the response time in ms"`
	`3885`	`+ description = "Threshold on which the plugin will return 'CRITICAL' for possible packet loss in %"`
`3886`	`3886`	`value = "$IcingaCheckICMP_Object_CriticalPl$"`
`3887`	`3887`	`order = 5`
`3888`	`3888`	`}`
`@@ -4274,6 +4274,10 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`4274`	`4274`	`}}`
`4275`	`4275`	`order = 100`
`4276`	`4276`	`}`
	`4277`	`+ "-NoPerfData" = {`
	`4278`	`+ set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"`
	`4279`	`+ order = 99`
	`4280`	`+ }`
`4277`	`4281`	`"-Core" = {`
`4278`	`4282`	`set_if = {{`
`4279`	`4283`	`var str = macro("$IcingaCheckCPU_String_Core$"); if (len(str) == 0) { return false; }; return true;`
`@@ -4302,8 +4306,12 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`4302`	`4306`	`value = "$IcingaCheckCPU_Object_Critical$"`
`4303`	`4307`	`order = 3`
`4304`	`4308`	`}`
`4305`		`- "-NoPerfData" = {`
`4306`		`- set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"`
	`4309`	`+ "-OverallTotalAsSum" = {`
	`4310`	`+ set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"`
	`4311`	`+ order = 99`
	`4312`	`+ }`
	`4313`	`+ "-DisableProcessList" = {`
	`4314`	`+ set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"`
`4307`	`4315`	`order = 99`
`4308`	`4316`	`}`
`4309`	`4317`	`"-OverallOnly" = {`
`@@ -4313,6 +4321,9 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`4313`	`4321`	`}`
`4314`	`4322`	`vars.IcingaCheckCPU_Switchparameter_OverallOnly = false`
`4315`	`4323`	`vars.ifw_api_arguments = {`
	`4324`	`+ "DisableProcessList" = {`
	`4325`	`+ set_if = "$IcingaCheckCPU_Switchparameter_DisableProcessList$"`
	`4326`	`+ }`
`4316`	`4327`	`"ThresholdInterval" = {`
`4317`	`4328`	`value = "$IcingaCheckCPU_String_ThresholdInterval$"`
`4318`	`4329`	`}`
`@@ -4334,10 +4345,15 @@ object CheckCommand "Invoke-IcingaCheckCPU" {`
`4334`	`4345`	`"NoPerfData" = {`
`4335`	`4346`	`set_if = "$IcingaCheckCPU_Switchparameter_NoPerfData$"`
`4336`	`4347`	`}`
	`4348`	`+ "OverallTotalAsSum" = {`
	`4349`	`+ set_if = "$IcingaCheckCPU_Switchparameter_OverallTotalAsSum$"`
	`4350`	`+ }`
`4337`	`4351`	`"Verbosity" = {`
`4338`	`4352`	`value = "$IcingaCheckCPU_Int32_Verbosity$"`
`4339`	`4353`	`}`
`4340`	`4354`	`}`
	`4355`	`+ vars.IcingaCheckCPU_Switchparameter_DisableProcessList = false`
	`4356`	`+ vars.IcingaCheckCPU_Switchparameter_OverallTotalAsSum = false`
`4341`	`4357`	`vars.ifw_api_command = "invoke-icingacheckcpu"`
`4342`	`4358`	`vars.IcingaCheckCPU_Switchparameter_NoPerfData = false`
`4343`	`4359`	`}`
`@@ -4773,7 +4789,7 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {`
`4773`	`4789`
`4774`	`4790`	`arguments += {`
`4775`	`4791`	`"-WarningRollups" = {`
`4776`		`- description = "The warning threshold for the rollup update count on the Windows machine"`
	`4792`	`+ description = "The warning threshold for the total pending update count on the Windows machine"`
`4777`	`4793`	`value = "$IcingaCheckUpdates_Object_WarningRollups$"`
`4778`	`4794`	`order = 7`
`4779`	`4795`	`}`
`@@ -4791,7 +4807,7 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {`
`4791`	`4807`	`order = 99`
`4792`	`4808`	`}`
`4793`	`4809`	`"-CriticalOther" = {`
`4794`		`- description = "The critical threshold for all other updates on the Windows machine"`
	`4810`	`+ description = "The critical threshold for the total pending update count on the Windows machine"`
`4795`	`4811`	`value = "$IcingaCheckUpdates_Object_CriticalOther$"`
`4796`	`4812`	`order = 12`
`4797`	`4813`	`}`
`@@ -4819,7 +4835,7 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {`
`4819`	`4835`	`order = 100`
`4820`	`4836`	`}`
`4821`	`4837`	`"-WarningOther" = {`
`4822`		`- description = "The warning threshold for all other updates on the Windows machine"`
	`4838`	`+ description = "The warning threshold for the total pending update count on the Windows machine"`
`4823`	`4839`	`value = "$IcingaCheckUpdates_Object_WarningOther$"`
`4824`	`4840`	`order = 11`
`4825`	`4841`	`}`
`@@ -4871,12 +4887,12 @@ object CheckCommand "Invoke-IcingaCheckUpdates" {`
`4871`	`4887`	`order = 2`
`4872`	`4888`	`}`
`4873`	`4889`	`"-WarningSecurity" = {`
`4874`		`- description = "The warning threshold for the security update count on the Windows machine"`
	`4890`	`+ description = "The warning threshold for the total pending update count on the Windows machine"`
`4875`	`4891`	`value = "$IcingaCheckUpdates_Object_WarningSecurity$"`
`4876`	`4892`	`order = 5`
`4877`	`4893`	`}`
`4878`	`4894`	`"-CriticalSecurity" = {`
`4879`		`- description = "The critical threshold for the security update count on the Windows machine"`
	`4895`	`+ description = "The critical threshold for the total pending update count on the Windows machine"`
`4880`	`4896`	`value = "$IcingaCheckUpdates_Object_CriticalSecurity$"`
`4881`	`4897`	`order = 6`
`4882`	`4898`	`}`