Module: check_mk Branch: master Commit: fbbf9bce1de920012eaa0b3d3c1cd5eaf4f4781e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbbf9bce1de920… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 7 08:01:12 2017 +0200 4952 FIX Fixed broken alert statistics view (regression since 1.4.0p8) Change-Id: Idc5f09137a37dc493a9b2c039fa72a22ac406b18 --- .werks/4952 | 11 +++++++++++ web/htdocs/views.py | 2 +- web/plugins/views/mkeventd.py | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/4952 b/.werks/4952 new file mode 100644 index 0000000..fbded9a --- /dev/null +++ b/.werks/4952 @@ -0,0 +1,11 @@ +Title: Fixed broken alert statistics view (regression since 1.4.0p8) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499407251 + + diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 282e6a3..d1c0bd6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2245,7 +2245,7 @@ def query_data(datasource, columns, add_columns, add_headers, def do_query_data(query, columns, add_columns, merge_column, add_headers, only_sites, limit, auth_domain): - query += "Columns: %s\n" % " ".join(columns + add_columns) + query += "Columns: %s\n" % " ".join(columns) query += add_headers sites.live().set_prepend_site(True) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index fcef27e..d07365a 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -45,6 +45,10 @@ except: def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, tablename): + for c in [ "event_contact_groups", "host_contact_groups", "event_host" ]: + if c not in columns: + columns.append(c) + rows = query_data(datasource, columns, add_columns, query, only_sites, limit, tablename=tablename) @@ -139,8 +143,6 @@ 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"] = { @@ -151,7 +153,6 @@ 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" ], }