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 6c271bdc57e842bd2420a5e6e831a480203e0f76..588617ac078fb47e919fb351733eff92b0710f65 100644 (file)
--- 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 949fe418ee20d0394475037a836a1e2204c2a53b..c201141c2b068a75149fbd7ffa5a5165b5332c63 100644 (file)
--- 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$"