[checkmk-commits] Check_MK Git: check_mk: #2644 FIX Fix exception in executing actions or notifications when match groups contain non-ASCII characters

Module: check_mk Branch: master Commit: e45c54cc06ea284d4c18c5e8cb168d92d30ac278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e45c54cc06ea28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 25 14:15:37 2015 +0200 #2644 FIX Fix exception in executing actions or notifications when match groups contain non-ASCII characters --- .werks/2644 | 10 ++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 12 +++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/2644 b/.werks/2644 new file mode 100644 index 0000000..3cf9553 --- /dev/null +++ b/.werks/2644 @@ -0,0 +1,10 @@ +Title: Fix exception in executing actions or notifications when match groups contain non-ASCII characters +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1443183271 + + diff --git a/ChangeLog b/ChangeLog index fef64b8..65b45c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -315,6 +315,7 @@ * 2460 FIX: Slightly more robust SNMP trap translation... * 2534 FIX: Fixed implementation of skipping rule packs * 2614 FIX: Fixed exception when processing events with umlaut in names from history + * 2644 FIX: Fix exception in executing actions or notifications when match groups contain non-ASCII characters Livestatus: * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 615ab2e..611862b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3360,11 +3360,17 @@ def substitute_event_tags(text, event): varname = key[6:] substs.append((varname, event.get(varname, defaultvalue))) + def to_string(v): + if type(v) in [ str, unicode ]: + return v + else: + return str(v) + for key, value in substs: if type(value) == tuple: - value = " ".join(map(str,value)) - elif type(value) not in [ str, unicode ]: - value = str(value) + value = " ".join(map(to_string, value)) + else: + value = to_string(value) text = text.replace('$%s$' % key.upper(), value) return text