Add http_expect_body_regex and http_ignore_body to command-plugins.conf.

Refs #6487

diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index bc7bf0d6fdadbf6ee1e2d39f13ccc07e234bfc2d..f9b331ebfa389e74d98f29bac445498ac40cdd77 100644 (file)
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -1851,16 +1851,18 @@ Check command object for the `check_http` plugin.
 
 Custom Attributes:
 
-Name               | Description
--------------------|--------------
-http_address       | **Optional.** The host's address. Defaults to "$address".
-http_vhost         | **Optional.** The virtual host that should be sent in the "Host" header.
-http_uri           | **Optional.** The request URI.
-http_port          | **Optional.** The TCP port. Defaults to 80 when not using SSL, 443 otherwise.
-http_ssl           | **Optional.** Whether to use SSL. Defaults to false.
-http_auth_pair    | **Optional.** Add 'username:password' authorization pair.
-http_warn_time     | **Optional.** The warning threshold.
-http_critical_time | **Optional.** The critical threshold.
+Name                     | Description
+-------------------------|--------------
+http_address             | **Optional.** The host's address. Defaults to "$address".
+http_vhost               | **Optional.** The virtual host that should be sent in the "Host" header.
+http_uri                 | **Optional.** The request URI.
+http_port                | **Optional.** The TCP port. Defaults to 80 when not using SSL, 443 otherwise.
+http_ssl                 | **Optional.** Whether to use SSL. Defaults to false.
+http_auth_pair           | **Optional.** Add 'username:password' authorization pair.
+http_ignore_body         | **Optional.** Don't download the body, just the headers.
+http_expect_body_regex   | **Optional.** A regular expression which the body must match against. Incompatible with http_ignore_body.
+http_warn_time           | **Optional.** The warning threshold.
+http_critical_time       | **Optional.** The critical threshold.
 
 #### <a id="plugin-check-command-ftp"></a> ftp
 

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 777ab0b8552c9a963f7edcb940506f9657df533f..bc1ccdb3f5acb75589d3fdf0f43c3bf29db46436 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -125,6 +125,10 @@ object CheckCommand "http" {
                        value = "$http_auth_pair$"
                        description = "Username:password on sites with basic authentication"
                }
+               "--no-body" = {
+                       set_if = "$http_ignore_body$"
+               }
+               "-r" = "$http_expect_body_regex$"
                "-w" = "$http_warn_time$"
                "-c" = "$http_critical_time$"
        }