[checkmk-commits] fortinet_signatures: Minor cleanup of check parameters

Module: check_mk Branch: master Commit: fb3671f9f2ae70ec880444fef2e8333a8b1c9a9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb3671f9f2ae70… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 5 11:12:04 2018 +0200 fortinet_signatures: Minor cleanup of check parameters Change-Id: I5ad051ac5294b71a1eeb79c451cd76109ab15220 --- cmk/gui/plugins/wato/check_parameters.py | 80 ++++++++++---------------------- 1 file changed, 25 insertions(+), 55 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 8ac9113..a7986e8 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -109,68 +109,38 @@ register_check_parameters( "dict" ) -def transform_fortinet_signatures_to_gui(p): - for k in ["av_age", "av_ext_age", "ips_age", "ips_ext_age"]: - p.setdefault(k, None) - return p +def _vs_fortinet_signatures(title): + return Alternative( + title=_("%s" % title), + style="dropdown", + elements=[ + Tuple(title=_("Set levels"), + elements = [ + Age(title=_("Warning at"), default_value=86400), + Age(title=_("Critical at"), default_value=2*86400), + ]), + Tuple( + title=_("No levels"), + elements=[ + FixedValue(None, totext=""), + FixedValue(None, totext=""), + + ]), + ] + ) register_check_parameters( subgroup_networking, "fortinet_signatures", "Fortigate Signatures", - Transform(Dictionary( + Dictionary( elements = [ - ('av_age', Alternative( - title=_("Age of Anti-Virus signature"), - style="dropdown", - elements=[ - FixedValue(None, title=_("No levels"), totext=""), - Tuple(title=_("Set levels"), - elements = [ - Age(title=_("Warning at"), default_value = 86400), - Age(title=_("Critical at"), default_value = 2*86400), - ]), - ]), - ), - ('av_ext_age', Alternative( - title=_("Age of Anti-Virus signature extended database"), - style="dropdown", - elements=[ - FixedValue(None, title=_("No levels"), totext=""), - Tuple(title=_("Set levels"), - elements = [ - Age(title=_("Warning at"), default_value = 86400), - Age(title=_("Critical at"), default_value = 2*86400), - ]), - ]), - ), - ('ips_age', Alternative( - title=_("Age of Intrusion Prevention signature"), - style="dropdown", - elements=[ - FixedValue(None, title=_("No levels"), totext=""), - Tuple(title=_("Set levels"), - elements = [ - Age(title=_("Warning at"), default_value = 86400), - Age(title=_("Critical at"), default_value = 2*86400), - ]), - ]), - ), - ('ips_ext_age', Alternative( - title=_("Age of Intrusion Prevention signature extended database"), - style="dropdown", - elements=[ - FixedValue(None, title=_("No levels"), totext=""), - Tuple(title=_("Set levels"), - elements = [ - Age(title=_("Warning at"), default_value = 86400), - Age(title=_("Critical at"), default_value = 2*86400), - ]), - ]), - ), + ('av_age', _vs_fortinet_signatures("Age of Anti-Virus signature")), + ('av_ext_age', _vs_fortinet_signatures("Age of Anti-Virus signature extended database")), + ('ips_age', _vs_fortinet_signatures("Age of Intrusion Prevention signature")), + ('ips_ext_age', _vs_fortinet_signatures("Age of Intrusion Prevention signature extended database")), ], - optional_keys=[], - ), forth=transform_fortinet_signatures_to_gui), + ), None, "dict" )