Add sni option to http check

fixes #6605

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

diff --git a/doc/3-monitoring-basics.md b/doc/3-monitoring-basics.md
index 69a20caeea28bc7567516e1cb1a817ce7d31ef91..728656689c57bb1219a8185cb1a221ec4c617dfd 100644 (file)
--- a/doc/3-monitoring-basics.md
+++ b/doc/3-monitoring-basics.md
@@ -723,12 +723,24 @@ macro value can be resolved by Icinga 2.
         "-S" = {
           set_if = "$http_ssl$"
         }
+        "--sni" = {
+          set_if = "$http_sni$"
+        }
+        "-a" = {
+          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$"
       }
 
       vars.http_address = "$address$"
       vars.http_ssl = false
+      vars.http_sni = false
     }
 
 The example shows the `check_http` check command defining the most common

diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index 47d0406c5e14e8c6c27d05beae0c6fad8c508ba0..aa446880b2831fa741784fdf5ff32921a09c4de4 100644 (file)
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -795,12 +795,24 @@ Example:
         "-S" = {
           set_if = "$http_ssl$"
         }
+        "--sni" = {
+          set_if = "$http_sni$"
+        }
+        "-a" = {
+          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$"
       }
 
       vars.http_address = "$address$"
       vars.http_ssl = false
+      vars.http_sni = false
     }
 
 
@@ -1915,6 +1927,7 @@ http_vhost               | **Optional.** The virtual host that should be sent in
 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_sni                 | **Optional.** Whether to use SNI. 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.

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 2105013133053998744659f3a53bd441f25d4d0d..03243af67f6def0a42b31a89bfa3a8868e8e5d73 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -186,6 +186,9 @@ object CheckCommand "http" {
                "-S" = {
                        set_if = "$http_ssl$"
                }
+               "--sni" = {
+                       set_if = "$http_sni$"
+               }
                "-a" = {
                        value = "$http_auth_pair$"
                        description = "Username:password on sites with basic authentication"
@@ -200,6 +203,7 @@ object CheckCommand "http" {
 
        vars.http_address = "$address$"
        vars.http_ssl = false
+       vars.http_sni = false
 }
 
 object CheckCommand "ftp" {