Module: check_mk Branch: master Commit: 4fb2eb5e15477b19fa169034ab8e8fc25bb81bd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb2eb5e15477b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 26 13:06:26 2018 +0100 5659 FIX Master control snapin: Improved handling of half configured sites Change-Id: I023c6ea92b177b71e5025d375112d13d3a5d01bb --- .werks/5659 | 11 +++++++++++ web/plugins/sidebar/shipped.py | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5659 b/.werks/5659 new file mode 100644 index 0000000..06b3c2d --- /dev/null +++ b/.werks/5659 @@ -0,0 +1,11 @@ +Title: Master control snapin: Improved handling of half configured sites +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516968363 + + diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 828e96c..dff3f4c 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1335,6 +1335,12 @@ def render_master_control(): elif site_state["state"] == "disabled": html.show_info(_("Site is disabled")) + elif site_state["state"] == "unknown": + if site_state.get("exception"): + html.show_error(site_state["exception"]) + else: + html.show_error(_("Site state is unknown")) + else: is_cmc = site_state["program_version"].startswith("Check_MK ")