ITL by_ssh add -E parameter

This adds the -E parameter to the by_ssh ITL CheckCommand definition.

refs #4094

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index d149a13dd4d9571d5560ca11fd6839e14f4fec65..769eea5a811f313783cba562ae2eed5bb6c83fed 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -208,21 +208,22 @@ commands on a remote host.
 
 Custom attributes passed as [command parameters](03-monitoring-basics.md#command-passing-parameters):
 
-Name            | Description
-----------------|--------------
-by_ssh_address  | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
-by_ssh_port     | **Optional.** The SSH port. Defaults to 22.
-by_ssh_command  | **Required.** The command that should be executed. Can be an array if multiple arguments should be passed to `check_by_ssh`.
-by_ssh_arguments| **Optional.** A dictionary with arguments for the command. This works exactly like the 'arguments' dictionary for ordinary CheckCommands.
-by_ssh_logname  | **Optional.** The SSH username.
-by_ssh_identity | **Optional.** The SSH identity.
-by_ssh_quiet    | **Optional.** Whether to suppress SSH warnings. Defaults to false.
-by_ssh_warn     | **Optional.** The warning threshold.
-by_ssh_crit     | **Optional.** The critical threshold.
-by_ssh_timeout  | **Optional.** The timeout in seconds.
-by_ssh_options  | **Optional.** Call ssh with '-o OPTION' (multiple options may be specified as an array).
-by_ssh_ipv4     | **Optional.** Use IPv4 connection. Defaults to false.
-by_ssh_ipv6     | **Optional.** Use IPv6 connection. Defaults to false.
+Name               | Description
+----------------   | --------------
+by_ssh_address     | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
+by_ssh_port        | **Optional.** The SSH port. Defaults to 22.
+by_ssh_command     | **Required.** The command that should be executed. Can be an array if multiple arguments should be passed to `check_by_ssh`.
+by_ssh_arguments   | **Optional.** A dictionary with arguments for the command. This works exactly like the 'arguments' dictionary for ordinary CheckCommands.
+by_ssh_logname     | **Optional.** The SSH username.
+by_ssh_identity    | **Optional.** The SSH identity.
+by_ssh_quiet       | **Optional.** Whether to suppress SSH warnings. Defaults to false.
+by_ssh_warn        | **Optional.** The warning threshold.
+by_ssh_crit        | **Optional.** The critical threshold.
+by_ssh_timeout     | **Optional.** The timeout in seconds.
+by_ssh_options     | **Optional.** Call ssh with '-o OPTION' (multiple options may be specified as an array).
+by_ssh_ipv4        | **Optional.** Use IPv4 connection. Defaults to false.
+by_ssh_ipv6        | **Optional.** Use IPv6 connection. Defaults to false.
+by_ssh_skip_stderr | **Optional.** Ignore all or (if specified) first n lines on STDERR.
 
 
 ### clamd <a id="plugin-check-command-clamd"></a>

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index b99b50958d7d128b152161af20272ae63d4972b8..dcf9771e93cc0163e5dc80337c5dcf125b0953dd 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -2207,6 +2207,10 @@ object CheckCommand "by_ssh" {
                        set_if = "$by_ssh_ipv6$"
                        description = "Use IPv6 only"
                }
+               "-E" = {
+                       value = "$by_ssh_skip_stderr$"
+                       description = "Ignore all or (if specified) first n lines on STDERR [optional]"
+               }
        }
 
        vars.by_ssh_address = "$check_address$"