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

ITL: Add missing 'smtp' CheckCommand parameters 

fixes #9578

Signed-off-by: Michael Friedrich <michael.friedrich@gmail.com>
This commit is contained in:
Lennart Betz 2015-07-07 20:11:25 +02:00 committed by Michael Friedrich
parent 93b33c4743
commit 219631fbae
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,11 +680,24 @@ Check command object for the `check_smtp` plugin.
Custom attributes passed as [command parameters](3-monitoring-basics.md#command-passing-parameters): Custom attributes passed as [command parameters](3-monitoring-basics.md#command-passing-parameters):
Name | Description Name | Description
---------------------|-------------- ----------------------|--------------
smtp_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise. smtp_address | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
smtp_port | **Optional.** The port that should be checked. Defaults to 25. smtp_port | **Optional.** The port that should be checked. Defaults to 25.
smtp_mail_from | **Optional.** Test a MAIL FROM command with the given email address. smtp_mail_from | **Optional.** Test a MAIL FROM command with the given email address.
smtp_expect | **Optional.** String to expect in first line of server response (default: '220').
smtp_command | **Optional.** SMTP command (may be used repeatedly).
smtp_response | **Optional.** Expected response to command (may be used repeatedly).
smtp_helo_fqdn | **Optional.** FQDN used for HELO
smtp_certificate_age | **Optional.** Minimum number of days a certificate has to be valid.
smtp_starttls | **Optional.** Use STARTTLS for the connection.
smtp_authtype | **Optional.** SMTP AUTH type to check (default none, only LOGIN supported).
smtp_authuser | **Optional.** SMTP AUTH username.
smtp_authpass | **Optional.** SMTP AUTH password.
smtp_ignore_quit | **Optional.** Ignore failure when sending QUIT command to server.
smtp_warning | **Optional.** Response time to result in warning status (seconds).
smtp_critical | **Optional.** Response time to result in critical status (seconds).
smtp_timeout | **Optional.** Seconds before connection times out (default: 10).
## <a id="plugin-check-command-snmp"></a> snmp ## <a id="plugin-check-command-snmp"></a> snmp

13
itl/command-plugins.conf
View File

@ -517,6 +517,19 @@ object CheckCommand "smtp" {
"-H" = "$smtp_address$" "-H" = "$smtp_address$"
"-p" = "$smtp_port$" "-p" = "$smtp_port$"
"-f" = "$smtp_mail_from$" "-f" = "$smtp_mail_from$"
"-e" = "$smtp_expect$"
"-C" = "$smtp_command$"
"-R" = "$smtp_response$"
"-F" = "$smtp_helo_fqdn$"
"-D" = "$smtp_certificate_age$"
"-S" = "$smtp_starttls$"
"-A" = "$smtp_authtype$"
"-U" = "$smtp_authuser$"
"-P" = "$smtp_authpass$"
"-q" = "$smtp_ignore_quit$"
"-w" = "$smtp_warning$"
"-c" = "$smtp_critical$"
"-t" = "$smtp_timeout$"
} }
vars.smtp_address = "$check_address$" vars.smtp_address = "$check_address$"