From b8043c06c8f99637e72ef01ea58f175d22505699 Mon Sep 17 00:00:00 2001
From: akrus <akrus@flygroup.st>
Date: Fri, 22 Feb 2019 10:57:41 +0200
Subject: [PATCH] Add missing args for apache-status and fix a few typos

---
 doc/10-icinga-template-library.md | 22 +++++++++++++---------
 itl/plugins-contrib.d/web.conf    | 18 +++++++++++++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index f83066385..a11d1cd6e 100644
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -5317,15 +5317,19 @@ HTTP endpoint to monitor status metrics for the Apache webserver.
 
 Custom attributes passed as [command parameters](03-monitoring-basics.md#command-passing-parameters):
 
-Name                    | Description
-------------------------|----------------------------------------------------------------------------------
-apache_status_address	| **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, `address6` otherwise.
-apache_status_port	| **Optional.** the http port.
-apache_status_url	| **Optional.** URL to use, instead of the default (http://`apache_status_address`/server-status).
-apache_status_ssl	| **Optional.** set to use ssl connection
-apache_status_timeout	| **Optional.** timeout in seconds
-apache_status_warning	| **Optional.** Warning threshold (number of open slots, busy workers and idle workers that will cause a WARNING) like ':20,50,:50'.
-apache_status_critical	| **Optional.** Critical threshold (number of open slots, busy workers and idle workers that will cause a CRITICAL) like ':10,25,:20'.
+Name                            | Description
+--------------------------------|----------------------------------------------------------------------------------
+apache_status_address		| **Optional.** Host address. Defaults to "$address$" if the host's `address` attribute is set, `address6` otherwise.
+apache_status_port		| **Optional.** HTTP port.
+apache_status_uri		| **Optional.** URL to use, instead of the default (http://`apache_status_address`/server-status).
+apache_status_ssl		| **Optional.** Set to use SSL connection.
+apache_status_no_validate	| **Optional.** Skip SSL certificate validation.
+apache_status_username		| **Optional.** Username for basic auth.
+apache_status_password		| **Optional.** Password for basic auth.
+apache_status_timeout		| **Optional.** Timeout in seconds.
+apache_status_unreachable	| **Optional.** Return CRITICAL if socket timed out or http code >= 500.
+apache_status_warning		| **Optional.** Warning threshold (number of open slots, busy workers and idle workers that will cause a WARNING) like ':20,50,:50'.
+apache_status_critical		| **Optional.** Critical threshold (number of open slots, busy workers and idle workers that will cause a CRITICAL) like ':10,25,:20'.
 
 
 #### ssl_cert <a id="plugin-check-command-ssl_cert"></a>
diff --git a/itl/plugins-contrib.d/web.conf b/itl/plugins-contrib.d/web.conf
index 0585248f1..79769cb64 100644
--- a/itl/plugins-contrib.d/web.conf
+++ b/itl/plugins-contrib.d/web.conf
@@ -342,12 +342,20 @@ object CheckCommand "apache-status" {
 		}
 		"-s" = {
 			set_if = "$apache_status_ssl$"
-			description = "Wether we should use HTTPS instead of HTTP"
+			description = "Whether we should use HTTPS instead of HTTP"
 		}
 		"-u" = {
 			value = "$apache_status_uri$"
 			description = "Specific URL to use, instead of the default 'http://<apache_status_address>/server-status'"
 		}
+		"-U" = {
+			value = "$apache_status_username$"
+			description = "username for basic auth"
+		}
+		"-P" = {
+			value = "$apache_status_password$"
+			description = "password for basic auth"
+		}
 		"-w" = {
 			value = "$apache_status_warning$"
 			description = "number of open slots, busy workers and idle workers that will cause a WARNING"
@@ -360,6 +368,14 @@ object CheckCommand "apache-status" {
 			value = "$apache_status_timeout$"
 			description = "timeout in seconds"
 		}
+		"-N" = {
+			set_if = "$apache_status_no_validate$"
+			description = "do not validate the SSL certificate chain"
+		}
+		"-R" = {
+			set_if = "$apache_status_unreachable$"
+			description = "CRITICAL if socket timed out or http code >= 500"
+		}
 	}
 
 	vars.apache_status_address = "$check_address$"
-- 
2.40.0