[checkmk-commits] 5214 FIX Events in tactical overview can now be disabled

Module: check_mk Branch: master Commit: 759c15bf0547abf5eb0eaa3df91ff8fb1d7ff6b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=759c15bf0547ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 09:57:54 2017 +0200 5214 FIX Events in tactical overview can now be disabled A new permission "See events in tactical overview snapin" has been added that can be used to disable the "Events" row in the tactical overview snapin. Change-Id: Idd469a51bbbc69047a123206fa8868ad05c4f238 --- .werks/5214 | 12 ++++++++++++ web/plugins/sidebar/shipped.py | 28 +++++++++++++++++----------- web/plugins/views/mkeventd.py | 6 ++++++ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.werks/5214 b/.werks/5214 new file mode 100644 index 0000000..e5d4122 --- /dev/null +++ b/.werks/5214 @@ -0,0 +1,12 @@ +Title: Events in tactical overview can now be disabled +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506585388 +Class: fix + +A new permission "See events in tactical overview snapin" has been added +that can be used to disable the "Events" row in the tactical overview +snapin. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7b80057..03a8467 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -649,13 +649,17 @@ def get_tactical_overview_data(extra_filter_headers): stat_only=True, extra_headers=extra_filter_headers) - try: - sites.live().set_auth_domain("ec") - event_data = sites.live().query_summed_stats(event_query) - except livestatus.MKLivestatusNotFoundError: - event_data = [0, 0, 0] - finally: - sites.live().set_auth_domain("read") + + if config.user.may("mkeventd.see_in_tactical_overview"): + try: + sites.live().set_auth_domain("ec") + event_data = sites.live().query_summed_stats(event_query) + except livestatus.MKLivestatusNotFoundError: + event_data = [0, 0, 0] + finally: + sites.live().set_auth_domain("read") + else: + event_data = [0, 0, 0] except livestatus.MKLivestatusNotFoundError: return None, None, None, None @@ -717,8 +721,11 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): ("view_name", "uncheckedsvc"), ], }, - }, - { + } + ] + + if config.user.may("mkeventd.see_in_tactical_overview"): + rows.append({ "what" : "event", "title" : _("Events"), "data" : event_data, @@ -743,8 +750,7 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): ], "stale" : None, }, - }, - ] + }) html.open_table(class_=["content_center", "tacticaloverview"], cellspacing=2, cellpadding=0, border=0) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index e16e0a5..b2cb4f0 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -135,6 +135,12 @@ if mkeventd_enabled: "and that do not have been assigned specific contact groups to via the event rule."), [ "user", "admin", "guest" ]) + config.declare_permission("mkeventd.see_in_tactical_overview", + _("See events in tactical overview snapin"), + _("Whether or not the user is permitted to see the number of open events in the " + "tactical overview snapin."), + [ "user", "admin", "guest" ]) + multisite_datasources["mkeventd_events"] = { "title" : _("Event Console: Current Events"), "table" : (query_ec_table, ["eventconsoleevents"]),