From 9517abba8406aa41409b5aafba83980d7f011a15 Mon Sep 17 00:00:00 2001 From: Jean-Louis Dupond Date: Tue, 9 Aug 2016 16:59:01 +0200 Subject: [PATCH] Add vars for all check_swap args fixes #12392 Signed-off-by: Gunnar Beutner --- itl/command-plugins.conf | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf index 0c0413355..676f9c9fc 100644 --- a/itl/command-plugins.conf +++ b/itl/command-plugins.conf @@ -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" { -- 2.40.0