[checkmk-commits] Consolidated log level valuespecs to dedicated type

Module: check_mk Branch: master Commit: 1d16d04d6a4956dee46afab2dfe13b6bc633c311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d16d04d6a4956… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 19 20:32:18 2018 +0100 Consolidated log level valuespecs to dedicated type Change-Id: I01447901d11695b00ecbf94dc8008b792f41c2ce --- cmk/gui/plugins/wato/check_mk_configuration.py | 10 ++-------- cmk/gui/valuespec.py | 17 +++++++++++++++++ cmk/gui/wato/mkeventd.py | 19 +++++-------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index f05dfc4..f8fc72e 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -64,6 +64,7 @@ from cmk.gui.valuespec import ( Checkbox, ID, ListOfCAs, + LogLevelChoice, ) from cmk.gui.plugins.wato import ( @@ -114,16 +115,9 @@ def web_log_level_elements(): "details for each executed compilation.")), ]: elements.append((level_id, - DropdownChoice( + LogLevelChoice( title=title, help=help_text, - choices=[ - (logging.CRITICAL, _("Critical")), - (logging.ERROR, _("Error")), - (logging.WARNING, _("Warning")), - (logging.INFO, _("Informational")), - (logging.DEBUG, _("Debug")), - ], default_value=logging.WARNING, ))) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index bdee4a4..2f1bd29 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -60,6 +60,7 @@ from UserDict import DictMixin from enum import Enum import json +import cmk.log import cmk.paths import cmk.defines as defines @@ -4681,3 +4682,19 @@ class SiteChoice(DropdownChoice): def _site_choices(self): import cmk.gui.config as config # FIXME return config.site_attribute_choices() + + +class LogLevelChoice(DropdownChoice): + def __init__(self, **kwargs): + kwargs.setdefault("default_value", cmk.log.INFO) + kwargs.update({ + "choices": [ + (cmk.log.CRITICAL, _("Critical")), + (cmk.log.ERROR, _("Error")), + (cmk.log.WARNING, _("Warning")), + (cmk.log.INFO, _("Informational")), + (cmk.log.VERBOSE, _("Verbose")), + (cmk.log.DEBUG, _("Debug")), + ], + }) + super(LogLevelChoice, self).__init__(**kwargs) diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index 787982d..05b334d 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -81,6 +81,7 @@ from cmk.gui.valuespec import ( IPv4Network, Foldable, DualListChoice, + LogLevelChoice, ) from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -3255,20 +3256,10 @@ if mkeventd_enabled: _("Log level for the SNMP trap processing mechanics. Setting this to debug will enable " "detailed log entries for each received SNMP trap.")), ]: - elements.append((component, - DropdownChoice( - title=title, - help=help_txt, - choices=[ - (cmk.log.CRITICAL, _("Critical")), - (cmk.log.ERROR, _("Error")), - (cmk.log.WARNING, _("Warning")), - (cmk.log.INFO, _("Informational")), - (cmk.log.VERBOSE, _("Verbose")), - (cmk.log.DEBUG, _("Debug")), - ], - default_value=cmk.log.INFO, - ))) + elements.append((component, LogLevelChoice( + title=title, + help=help_txt, + ))) return elements register_configvar(