Adding accept_cname to dns command definition.

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index 96c2983ae7c96e48f8e0dd6e03a452feb0a687ad..2ea03200a360197cbb5f5599015e5da4e39a8f15 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -325,6 +325,7 @@ dns_server           | **Optional.** The DNS server to query. Defaults to the se
 dns_query_type       | **Optional.** The DNS record query type where TYPE =(A, AAAA, SRV, TXT, MX, ANY). The default query type is 'A' (IPv4 host entry)
 dns_expected_answers | **Optional.** The answer(s) to look for. A hostname must end with a dot. Multiple answers must be defined as array.
 dns_authoritative    | **Optional.** Expect the server to send an authoritative answer.
+dns_accept_cname     | **Optional.** Accept cname responses as a valid result to a query.
 dns_wtime            | **Optional.** Return warning if elapsed time exceeds value.
 dns_ctime            | **Optional.** Return critical if elapsed time exceeds value.
 dns_timeout          | **Optional.** Seconds before connection times out. Defaults to 10.

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 57152ee1207ccf02e416fa8c115157914eaa0834..a63f9fbbc21efc5ff0b5c25b2331d6c27ebb77f0 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -1565,6 +1565,11 @@ object CheckCommand "dns" {
                }
                "-A" = {
                        set_if = "$dns_authoritative$"
+                       description = "Optionally expect the DNS server to be authoritative for the lookup"
+               }
+               "-n" = {
+                       set_if = "$dns_accept_cname$"
+                       description = "Optionally accept cname responses as a valid result to a query. The default is to ignore cname responses as part of the result"
                }
                "-w" = {
                        value = "$dns_wtime$"