Add the --timeout parameter to the check_ssh / ssh CheckCommand

fixes #6791

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>

diff --git a/AUTHORS b/AUTHORS
index ce02af8751a78fabdc25eca3d9883db3e8b7cc7a..656c1db44a587da0a54d3ac2f7f14d47ef401a48 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 Alexander Wirt <formorer@debian.org>
 Bernd Erk <bernd.erk@icinga.org>
 Carlos Cesario <carloscesario@gmail.com>
+Gaël Beaudoin <gaboo@gaboo.org>
 Gerd von Egidy <gerd@egidy.de>
 Gunnar Beutner <gunnar.beutner@netways.de>
 Ildar Hizbulin <hizel@vyborg.ru>

diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index d6ae9bafdee285583e9f7848795af4b6610f4e54..315982768197a87bba250413669682f84dfba1a2 100644 (file)
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -2035,6 +2035,7 @@ Name            | Description
 ----------------|--------------
 ssh_address     | **Optional.** The host's address. Defaults to "$address$".
 ssh_port        | **Optional.** The port that should be checked. Defaults to 22.
+ssh_timeout     | **Optional.** Seconds before connection times out. Defaults to 10.
 
 #### <a id="plugin-check-command-disk"></a> disk
 

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index cd9d95acf299bf2e2c2b22e2d11d0a8a2c22db2c..d33b05453bc27802f6f9ec5121daf7caff831d97 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -312,6 +312,7 @@ object CheckCommand "ssh" {
 
        arguments = {
                "-p" = "$ssh_port$"
+               "-t" = "$ssh_timeout$"
                "host" = {
                        value = "$ssh_address$"
                        skip_key = true