[checkmk-commits] 4933 FIX Fixed possible KeyError event_host in EC views since 1.4.0p6

Module: check_mk Branch: master Commit: 3013e7c70e1fd7da5ff1631cf84367b337f9c7af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3013e7c70e1fd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 3 15:26:22 2017 +0200 4933 FIX Fixed possible KeyError event_host in EC views since 1.4.0p6 This issue could occure when using customized EC views which did not render or filtr the origin event host name. Change-Id: I0318ac93b9187bde2e7632347a84e0cfea5285a9 --- .werks/4933 | 12 ++++++++++++ web/plugins/views/mkeventd.py | 8 +++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/4933 b/.werks/4933 new file mode 100644 index 0000000..83c5047 --- /dev/null +++ b/.werks/4933 @@ -0,0 +1,12 @@ +Title: Fixed possible KeyError event_host in EC views since 1.4.0p6 +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499088288 + +This issue could occure when using customized EC views which did not render or filtr the origin +event host name. diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index b5ea5c9..fcef27e 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -45,11 +45,6 @@ except: def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, tablename): - if "event_contact_groups" not in columns: - columns.append("event_contact_groups") - if "host_contact_groups" not in columns: - columns.append("host_contact_groups") - rows = query_data(datasource, columns, add_columns, query, only_sites, limit, tablename=tablename) @@ -144,6 +139,8 @@ if mkeventd_enabled: "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id' ], "time_filters" : [ "event_first" ], + "add_columns" :[ "event_contact_groups", "host_contact_groups", "event_host" ], + } multisite_datasources["mkeventd_history"] = { @@ -154,6 +151,7 @@ if mkeventd_enabled: "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id', 'history_line' ], "time_filters" : [ "history_time" ], + "add_columns" :[ "event_contact_groups", "host_contact_groups", "event_host" ], }