tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-04 20:34:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add timeout argument for pop, spop, imap, simap commands

Browse Source 
fixes #10219
This commit is contained in:
Michael Friedrich 2015-10-15 15:13:24 +02:00
parent 29bc5cb50a
commit c5ef9f9cbc
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/7-icinga-template-library.md
View File

@ -443,6 +443,7 @@ Name | Description
----------------|-------------- ----------------|--------------
imap_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise. imap_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
imap_port | **Optional.** The port that should be checked. Defaults to 143. imap_port | **Optional.** The port that should be checked. Defaults to 143.
imap_timeout | **Optional.** The timeout in seconds.
## <a id="plugin-check-command-ldap"></a> ldap ## <a id="plugin-check-command-ldap"></a> ldap
@ -635,6 +636,7 @@ Name | Description
----------------|-------------- ----------------|--------------
pop_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise. pop_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
pop_port | **Optional.** The port that should be checked. Defaults to 110. pop_port | **Optional.** The port that should be checked. Defaults to 110.
pop_timeout | **Optional.** The timeout in seconds.
## <a id="plugin-check-command-processes"></a> procs ## <a id="plugin-check-command-processes"></a> procs
@ -680,6 +682,7 @@ Name | Description
----------------|-------------- ----------------|--------------
simap_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise. simap_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
simap_port | **Optional.** The host's port. simap_port | **Optional.** The host's port.
simap_timeout | **Optional.** The timeout in seconds.
## <a id="plugin-check-command-smtp"></a> smtp ## <a id="plugin-check-command-smtp"></a> smtp
@ -782,6 +785,7 @@ Name | Description
----------------|-------------- ----------------|--------------
spop_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise. spop_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
spop_port | **Optional.** The host's port. spop_port | **Optional.** The host's port.
spop_timeout | **Optional.** The timeout in seconds.
## <a id="plugin-check-command-ssh"></a> ssh ## <a id="plugin-check-command-ssh"></a> ssh

4
itl/command-plugins.conf
View File

@ -557,6 +557,7 @@ object CheckCommand "imap" {
arguments = { arguments = {
"-H" = "$imap_address$" "-H" = "$imap_address$"
"-p" = "$imap_port$" "-p" = "$imap_port$"
"-t" = "$imap_timeout$"
} }
vars.imap_address = "$check_address$" vars.imap_address = "$check_address$"
@ -571,6 +572,7 @@ object CheckCommand "simap" {
arguments = { arguments = {
"-H" = "$simap_address$" "-H" = "$simap_address$"
"-p" = "$simap_port$" "-p" = "$simap_port$"
"-t" = "$simap_timeout$"
} }
vars.simap_address = "$check_address$" vars.simap_address = "$check_address$"
@ -585,6 +587,7 @@ object CheckCommand "pop" {
arguments = { arguments = {
"-H" = "$pop_address$" "-H" = "$pop_address$"
"-p" = "$pop_port$" "-p" = "$pop_port$"
"-t" = "$pop_timeout$"
} }
vars.pop_address = "$check_address$" vars.pop_address = "$check_address$"
@ -599,6 +602,7 @@ object CheckCommand "spop" {
arguments = { arguments = {
"-H" = "$spop_address$" "-H" = "$spop_address$"
"-p" = "$spop_port$" "-p" = "$spop_port$"
"-t" = "$spop_timeout$"
} }
vars.spop_address = "$check_address$" vars.spop_address = "$check_address$"