[checkmk-commits] Check_MK Git: check_mk: FIX: check_dns: parameter -A does not get an additional string

Module: check_mk Branch: master Commit: 03e86b6dcdf951d6578af231ae1bf2f98d74e2ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e86b6dcdf951… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 2 12:34:22 2013 +0200 FIX: check_dns: parameter -A does not get an additional string --- ChangeLog | 1 + checks/check_dns | 4 ++-- web/plugins/wato/active_checks.py | 18 ++++++------------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index a63d4c1..74b134c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * win_printers: Monitoring of printer queue on a windows printserver * FIX: hr_mem: handle virtual memory correct on some devices * FIX: apache_status agent plugin: now also works, if prog name contains slashes + * FIX: check_dns: parameter -A does not get an additional string Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/check_dns b/checks/check_dns index 0a29dfe..1cf1c07 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -34,8 +34,8 @@ def check_dns_arguments(params): if "expected_address" in settings: args += ' -a %s' % quote_shell_string(settings["expected_address"]) - if "expected_authority" in settings: - args += ' -A %s' % quote_shell_string(settings["expected_authority"]) + if settings.get("expected_authority"): + args += ' -A' if "response_time" in settings: args += ' -w %d' % int(settings["response_time"][0]) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 20bfb12..ef0b11a 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -54,19 +54,13 @@ register_rule(group, "must end with a dot (.) " )), ), ( "expected_authority", - TextAscii( - title = _("Expected Authority"), - allow_empty = False, - help = _("Optional expect the DNS server to be authoriative" - "for the lookup ")), + FixedValue( + value = True, + title = _("Expect Authoritative DNS Server"), + totext = _("Expect Authoritative"), + help = _("Optional expect the DNS server to be authoriative" + "for the lookup ")), ), - #( "expected_authority", - # FixedValue( - # value = True, - # title = _("Expect Authoritative DNS Server"), - # totext = _("DNS Server must be authoritative for the lookup"), - # ) - ( "response_time", Tuple( title = _("Expected response time"),