[checkmk-commits] 4330 FIX Tactical overview: Show data of core even when Event Console is currently not reachable

Module: check_mk Branch: master Commit: d194fe547a5ab8bc32f733bb7cb00255fc9365bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d194fe547a5ab8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 09:00:07 2017 +0100 4330 FIX Tactical overview: Show data of core even when Event Console is currently not reachable The data of the core and failed notifications are shown even when the Event Console is not running Change-Id: I81373836a8fa57c9f920114f31597d8406f5c5cc --- .werks/4330 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4330 b/.werks/4330 new file mode 100644 index 0000000..4aadfc6 --- /dev/null +++ b/.werks/4330 @@ -0,0 +1,10 @@ +Title: Tactical overview: Show data of core even when Event Console is currently not reachable +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486713568 +Class: fix + +The data of the core and failed notifications are shown even when the Event Console +is not running diff --git a/ChangeLog b/ChangeLog index 2d7095e..7d7cea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again * 4049 FIX: Fixed cut-off of bulk options when row-limit is reached. * 4025 FIX: BI Aggregations: No longer suppressing error messages for invalid configured BI rules... + * 4330 FIX: Tactical overview: Show data of core even when Event Console is currently not reachable... WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 03a012d..d325b8b 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -637,7 +637,10 @@ def get_tactical_overview_data(extra_filter_headers): if notdata is None: notdata = [0] - event_data = sites.live().query_summed_stats(event_query) + try: + event_data = sites.live().query_summed_stats(event_query) + except livestatus.MKLivestatusNotFoundError: + event_data = [0, 0, 0] except livestatus.MKLivestatusNotFoundError: return None, None, None, None