[checkmk-commits] 7239 FIX Service discovery: Fix creating disabled services rule for services with special characters

Module: check_mk Branch: master Commit: 42b2734ad1e48db0d8939f736818459ae4974ade URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42b2734ad1e48d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 13:48:49 2019 +0200 7239 FIX Service discovery: Fix creating disabled services rule for services with special characters Services with e.g. "[" in their names could not be disabled using the service discovery page. Change-Id: I592ee8757cc194f087a14842ea04548be5066666 --- .werks/7239 | 11 +++++++++++ cmk/gui/wato/pages/services.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7239 b/.werks/7239 new file mode 100644 index 0000000..89070b1 --- /dev/null +++ b/.werks/7239 @@ -0,0 +1,11 @@ +Title: Service discovery: Fix creating disabled services rule for services with special characters +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552549690 + +Services with e.g. "[" in their names could not be disabled using the service discovery page. diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 5d97db7..e376c49 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -32,6 +32,7 @@ import traceback import time import pprint import sys +import re from hashlib import sha256 from typing import NamedTuple, Text, List, Optional # pylint: disable=unused-import @@ -787,7 +788,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): return def _compile_patterns(services): - return ["%s$" % s.replace("\\", "\\\\") for s in services] + return ["%s$" % re.escape(s) for s in services] rulesets = watolib.AllRulesets() rulesets.load()