[checkmk-commits] Check_MK Git: check_mk: #2614 FIX Fixed exception when processing events with umlaut in names from history

Module: check_mk Branch: master Commit: 58cb8ece2d72094f4dccb1cd4824f578996e3fa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58cb8ece2d7209… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 18 12:42:52 2015 +0200 #2614 FIX Fixed exception when processing events with umlaut in names from history --- .werks/2614 | 10 ++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2614 b/.werks/2614 new file mode 100644 index 0000000..2c3a62c --- /dev/null +++ b/.werks/2614 @@ -0,0 +1,10 @@ +Title: Fixed exception when processing events with umlaut in names from history +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1442572943 + + diff --git a/ChangeLog b/ChangeLog index 92b5031..601b674 100644 --- a/ChangeLog +++ b/ChangeLog @@ -296,6 +296,7 @@ * 2322 FIX: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated... * 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 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 3794562..615ab2e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -858,7 +858,7 @@ def parse_history_file(path, headers, filters, greptexts, limit): break try: - parts = line.rstrip('\n').split('\t') + parts = line.decode('utf-8').rstrip('\n').split('\t') convert_history_line(parts) values = [line_no] + parts if g_status_server.filter_row(headers, filters, values):