Adding ports to checks pop/imap/smtp and new check dig

fixes #6531

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
This commit is contained in:
Jan Wagner 2014-06-22 14:21:11 +02:00 committed by Gunnar Beutner
parent ec903058ef
commit 582824e291
2 changed files with 30 additions and 0 deletions

View File

@ -1938,6 +1938,7 @@ Custom Attributes:
Name | Description Name | Description
---------------------|-------------- ---------------------|--------------
smtp_address | **Optional.** The host's address. Defaults to "$address$". smtp_address | **Optional.** The host's address. Defaults to "$address$".
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.
#### <a id="plugin-check-command-ssmtp"></a> ssmtp #### <a id="plugin-check-command-ssmtp"></a> ssmtp
@ -1961,6 +1962,7 @@ Custom Attributes:
Name | Description Name | Description
----------------|-------------- ----------------|--------------
imap_address | **Optional.** The host's address. Defaults to "$address$". imap_address | **Optional.** The host's address. Defaults to "$address$".
imap_port | **Optional.** The port that should be checked. Defaults to 143.
#### <a id="plugin-check-command-simap"></a> simap #### <a id="plugin-check-command-simap"></a> simap
@ -1982,6 +1984,7 @@ Custom Attributes:
Name | Description Name | Description
----------------|-------------- ----------------|--------------
pop_address | **Optional.** The host's address. Defaults to "$address$". pop_address | **Optional.** The host's address. Defaults to "$address$".
pop_port | **Optional.** The port that should be checked. Defaults to 110.
#### <a id="plugin-check-command-spop"></a> spop #### <a id="plugin-check-command-spop"></a> spop
@ -2131,6 +2134,17 @@ dns_server | **Optional.** The DNS server to query. Defaults to the se
dns_expected_answer | **Optional.** The answer to look for. A hostname must end with a dot. dns_expected_answer | **Optional.** The answer to look for. A hostname must end with a dot.
dns_authoritative | **Optional.** Expect the server to send an authoritative answer. dns_authoritative | **Optional.** Expect the server to send an authoritative answer.
#### <a id="plugin-check-command-dig"></a> dig
Check command object for the `check_dig` plugin.
Custom Attributes:
Name | Description
---------------------|--------------
dig_server | **Optional.** The DNS server to query. Defaults to "127.0.0.1".
dig_lookup | **Optional.** The address that should be looked up.
#### <a id="plugin-check-command-dhcp"></a> dhcp #### <a id="plugin-check-command-dhcp"></a> dhcp
Check command object for the `check_dhcp` plugin. Check command object for the `check_dhcp` plugin.

View File

@ -221,6 +221,7 @@ object CheckCommand "smtp" {
arguments = { arguments = {
"-H" = "$smtp_address$" "-H" = "$smtp_address$"
"-p" = "$smtp_port$"
"-f" = "$smtp_mail_from$" "-f" = "$smtp_mail_from$"
} }
@ -248,6 +249,7 @@ object CheckCommand "imap" {
arguments = { arguments = {
"-H" = "$imap_address$" "-H" = "$imap_address$"
"-p" = "$imap_port$"
} }
vars.imap_address = "$address$" vars.imap_address = "$address$"
@ -273,6 +275,7 @@ object CheckCommand "pop" {
arguments = { arguments = {
"-H" = "$pop_address$" "-H" = "$pop_address$"
"-p" = "$pop_port$"
} }
vars.pop_address = "$address$" vars.pop_address = "$address$"
@ -487,6 +490,19 @@ object CheckCommand "dns" {
vars.dns_expected_answer = "$address$" vars.dns_expected_answer = "$address$"
} }
object CheckCommand "dig" {
import "plugin-check-command"
command = PluginDir + "/check_dig"
arguments = {
"-H" = "$dig_server$",
"-l" = "$dig_lookup$",
}
vars.dig_server = "$address$"
}
object CheckCommand "nscp" { object CheckCommand "nscp" {
import "plugin-check-command" import "plugin-check-command"