]> granicus.if.org Git - icinga2/commitdiff
Add vars for all check_swap args
authorJean-Louis Dupond <jean-louis@dupond.be>
Tue, 9 Aug 2016 14:59:01 +0000 (16:59 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 10 Aug 2016 12:52:31 +0000 (14:52 +0200)
fixes #12392

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
itl/command-plugins.conf

index 0c041335530dce436d7fd995c3edb10ed4a8d257..676f9c9fcd97d024a6342142b6f421a58ece223c 100644 (file)
@@ -1256,12 +1256,31 @@ object CheckCommand "swap" {
        command = [ PluginDir + "/check_swap" ]
 
        arguments = {
-               "-w" = "$swap_wfree$%"
-               "-c" = "$swap_cfree$%"
+               "-w" = {{
+                       if (macro("$swap_integer$")) {
+                               return macro("$swap_wfree$")
+                       } else {
+                               return macro("$swap_wfree$%")
+                       }
+               }}
+               "-c" = {{
+                       if (macro("$swap_integer$")) {
+                               return macro("$swap_cfree$")
+                       } else {
+                               return macro("$swap_cfree$%")
+                       }
+               }}
+               "-a" = {
+                       set_if = "$swap_allswaps$"
+               }
+               "-n" = "$swap_noswap$"
        }
 
-       vars.swap_wfree = 50
-       vars.swap_cfree = 25
+       vars.swap_wfree = "50%"
+       vars.swap_cfree = "25%"
+       vars.swap_integer = false
+       vars.swap_allswaps = false
+       vars.swap_noswap = "critical"
 }
 
 object CheckCommand "load" {