From: Bruno Lingner <mail@hugo.ro>
Date: Sat, 14 Nov 2015 12:08:21 +0000 (+0100)
Subject: Add by_ssh_options argument for the check_by_ssh plugin
X-Git-Tag: v2.5.0~722
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e02d2e1af12e9a1e12d292523ce8cdf82855a502;p=icinga2

Add by_ssh_options argument for the check_by_ssh plugin

fixes #10622

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
---

diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index 6c271bdc5..588617ac0 100644
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -128,6 +128,7 @@ by_ssh_quiet    | **Optional.** Whether to suppress SSH warnings. Defaults to fa
 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).
 
 ### <a id="plugin-check-command-clamd"></a> clamd
 
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 949fe418e..c201141c2 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -1369,6 +1369,10 @@ object CheckCommand "by_ssh" {
 		"-w" = "$by_ssh_warn$"
 		"-c" = "$by_ssh_crit$"
 		"-t" = "$by_ssh_timeout$"
+		"-o" = {
+			value = "$by_ssh_options$"
+			description = "Provide ssh options (may be repeated)"
+		}
 	}
 
 	vars.by_ssh_address = "$check_address$"