Plugins: Add ftp and ups CheckCommand objects.

Refs #6225

Signed-off-by: Michael Friedrich <michael.friedrich@gmail.com>

diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index 85e914797fc51347f60fcfc319885cf3fd2fcb01..5e9bfedeb167f28c3aef8e3f192b131d6638d697 100644 (file)
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -1802,7 +1802,7 @@ Name            | Description
 udp_address     | **Optional.** The host's address. Defaults to "$address$".
 udp_port        | **Required.** The port that should be checked.
 
-#### <a id="plugin-check-command-http-ip"></a> http
+#### <a id="plugin-check-command-http"></a> http
 
 Check command object for the `check_http` plugin.
 
@@ -1818,6 +1818,16 @@ http_ssl           | **Optional.** Whether to use SSL. Defaults to false.
 http_warn_time     | **Optional.** The warning threshold.
 http_critical_time | **Optional.** The critical threshold.
 
+#### <a id="plugin-check-command-ftp"></a> ftp
+
+Check command object for the `check_ftp` plugin.
+
+Custom Attributes:
+
+Name               | Description
+-------------------|--------------
+ftp_address        | **Optional.** The host's address. Defaults to "$address".
+
 #### <a id="plugin-check-command-smtp"></a> smtp
 
 Check command object for the `check_smtp` plugin.
@@ -2035,6 +2045,18 @@ by_ssh_warn     | **Optional.** The warning threshold.
 by_ssh_crit     | **Optional.** The critical threshold.
 by_ssh_timeout  | **Optional.** The timeout in seconds.
 
+#### <a id="plugin-check-command-ups"></a> ups
+
+Check command object for the `check_ups` plugin.
+
+Custom Attributes:
+
+Name            | Description
+----------------|--------------
+ups_address     | **Optional.** The host's address. Defaults to "$address$".
+ups_name        | **Optional.** The UPS name. Defaults to `ups`.
+
+
 #### <a id="plugin-check-command-nrpe"></a> nrpe
 
 Check command object for the `check_nrpe` plugin.

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index de805bc0d0ea88ae368d4d6084b9a2c6eefdbe79..595561fbb596d007ace318fe70e51506fa6b88ae 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -129,6 +129,18 @@ object CheckCommand "http" {
        vars.http_ssl = false
 }
 
+object CheckCommand "ftp" {
+       import "plugin-check-command"
+
+       command = PluginDir + "/check_ftp"
+
+       arguments = {
+               "-H" = "$ftp_address$"
+       }
+
+       vars.ftp_address = "$address$"
+}
+
 object CheckCommand "smtp" {
        import "plugin-check-command"
 
@@ -402,6 +414,20 @@ object CheckCommand "by_ssh" {
        vars.by_ssh_quiet = false
 }
 
+object CheckCommand "ups" {
+       import "plugin-check-command"
+
+       command = PluginDir + "/check_ups"
+
+       arguments = {
+               "-H" = "$ups_address$"
+               "-u" = "$ups_name$"
+       }
+
+       vars.ups_address = "$address$"
+       vars.ups_name = "ups"
+}
+
 object CheckCommand "nrpe" {
        import "plugin-check-command"