tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6963 from akrus/master 

Add missing args for apache-status and fix a few typos
This commit is contained in:
Michael Friedrich 2019-02-22 11:43:41 +01:00 committed by GitHub
parent 30d98b49eb b8043c06c8
commit 856d3a1b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/10-icinga-template-library.md
View File

@ -5318,12 +5318,16 @@ 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_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'.

18
itl/plugins-contrib.d/web.conf
View File

@ -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$"