[checkmk-commits] Check_MK Git: check_mk: mkeventd: utf8 encode hostnames for livestatus query

Module: check_mk Branch: master Commit: e682f556e7695eb136a56140e2294c27488c9de7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e682f556e7695e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 17:57:43 2012 +0100 mkeventd: utf8 encode hostnames for livestatus query --- ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24819b3..1336c1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * New builtin syslog server! Please refer to online docu for details. * Icon to events of host links to view that has context button to host * FIX: remove event pipe on program shutdown, prevents syslog freeze + * FIX: hostnames in livestatus query now being utf8 encoded 1.2.1i3: Core: diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 7f36c7e..d277db6 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -42,7 +42,7 @@ def table_events(what, columns, add_headers, only_sites, limit, filters): host_filters = "" for host in required_hosts: host_filters += "Filter: host_name =~ %s\n" \ - "Filter: host_address = %s\n" % (host, host) + "Filter: host_address = %s\n" % (host.encode("utf-8"), host.encode("utf-8")) if len(required_hosts) > 0: host_filters += "Or: %d\n" % (len(required_hosts) * 2)