[checkmk-commits] clarified white-/blacklisting of automatic service activation

Module: check_mk Branch: master Commit: 2ee84f0c660706c9a119ab76549944f62af9c9d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee84f0c660706… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 13 16:19:50 2016 +0200 clarified white-/blacklisting of automatic service activation --- web/plugins/wato/check_mk_configuration.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7f3d1f9..a18ddad 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1887,13 +1887,21 @@ register_rule(group, )), ( "service_whitelist", ListOfStrings( - title = _("Whitelist Services"), + title = _("Activate only services matching"), allow_empty = False, + help = _("Set service names or regular expression patterns here to " + "allow only matching services to be activated automatically. " + "If you set both this and \'Don't activate services matching\', " + "both rules have to apply for a service to be activated."), )), ( "service_blacklist", ListOfStrings( - title = _("Blacklist Services"), + title = _("Don't activate services matching"), allow_empty = False, + help = _("Set service names or regular expression patterns here to " + "prevent matching services from being activated automatically. " + "If you set both this and \'Activate only services matching\', " + "both rules have to apply for a service to be activated."), )), ], optional_keys = ["service_whitelist", "service_blacklist"],