[checkmk-commits] 7024 BI aggregation list now shows icons for the aggregation config options

Module: check_mk Branch: master Commit: ae66188f84bafd2f9d36910bda88e450d4219512 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae66188f84bafd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 15:38:36 2019 +0100 7024 BI aggregation list now shows icons for the aggregation config options The aggregation list of WATO now shows icons for the aggregation option flags (enabled/disabled, single/multiple hosts, hard/all states, downtime aggregate WARN/CRIT). Change-Id: I49844b0892caf16141cd3512cb916e63f59682fb --- .werks/7024 | 11 +++++++++++ cmk/gui/plugins/wato/bi.py | 17 ++++++++++++++++- web/htdocs/themes/classic/images/icon_all_states.png | Bin 0 -> 4436 bytes web/htdocs/themes/classic/images/icon_critical.png | Bin 0 -> 4477 bytes web/htdocs/themes/classic/images/icon_hard_states.png | Bin 0 -> 2935 bytes web/htdocs/themes/facelift/images/icon_all_states.png | Bin 0 -> 21429 bytes web/htdocs/themes/facelift/images/icon_critical.png | Bin 0 -> 698 bytes web/htdocs/themes/facelift/images/icon_hard_states.png | Bin 0 -> 12090 bytes 8 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/7024 b/.werks/7024 new file mode 100644 index 0000000..1358663 --- /dev/null +++ b/.werks/7024 @@ -0,0 +1,11 @@ +Title: BI aggregation list now shows icons for the aggregation config options +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1546958239 +Class: feature + +The aggregation list of WATO now shows icons for the aggregation option flags +(enabled/disabled, single/multiple hosts, hard/all states, downtime aggregate WARN/CRIT). diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index c5af8a4..9a2035d 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -1314,12 +1314,27 @@ class ModeBIAggregations(ModeBI): if "customer" in aggregation: html.write_text(managed.get_customer_name(aggregation)) - table.text_cell("", css="buttons") + table.text_cell(_("Options"), css="buttons") if aggregation["disabled"]: html.icon(_("This aggregation is currently disabled."), "disabled") + else: + html.icon(_("This aggregation is currently enabled."), "enabled") + if aggregation["single_host"]: html.icon(_("This aggregation covers only data from a single host."), "host") + else: + html.icon(_("This aggregation works with data of multiple hosts."), "aggr") + + if aggregation["hard_states"]: + html.icon(_("Base state computation on hard states"), "hard_states") + else: + html.icon(_("Base state computation on soft and hard states"), "all_states") + + if aggregation["downtime_aggr_warn"]: + html.icon(_("Escalate downtimes based on aggregated WARN state"), "warning") + else: + html.icon(_("Escalate downtimes based on aggregated CRIT state"), "critical") table.text_cell(_("Groups"), ", ".join(aggregation["groups"])) diff --git a/web/htdocs/themes/classic/images/icon_all_states.png b/web/htdocs/themes/classic/images/icon_all_states.png new file mode 100644 index 0000000..6c20127 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_all_states.png differ diff --git a/web/htdocs/themes/classic/images/icon_critical.png b/web/htdocs/themes/classic/images/icon_critical.png new file mode 100644 index 0000000..e1841e4 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_critical.png differ diff --git a/web/htdocs/themes/classic/images/icon_hard_states.png b/web/htdocs/themes/classic/images/icon_hard_states.png new file mode 100644 index 0000000..8b87561 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_hard_states.png differ diff --git a/web/htdocs/themes/facelift/images/icon_all_states.png b/web/htdocs/themes/facelift/images/icon_all_states.png new file mode 100644 index 0000000..77e24cf Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_all_states.png differ diff --git a/web/htdocs/themes/facelift/images/icon_critical.png b/web/htdocs/themes/facelift/images/icon_critical.png new file mode 100644 index 0000000..53c8559 Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_critical.png differ diff --git a/web/htdocs/themes/facelift/images/icon_hard_states.png b/web/htdocs/themes/facelift/images/icon_hard_states.png new file mode 100644 index 0000000..ebf622d Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_hard_states.png differ