[checkmk-commits] Check_MK Git: check_mk: New icon on a service whos host is in downtime

Module: check_mk Branch: master Commit: 1d9cfa0554e2e7b6a3610a822be6f575d57852ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d9cfa0554e2e7… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Nov 15 16:22:49 2011 +0100 New icon on a service whos host is in downtime --- ChangeLog | 1 + web/htdocs/images/icon_hostdowntime.png | Bin 0 -> 2966 bytes web/plugins/icons/builtin.py | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc3866b..f8c8d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * New filter for the (new) state in host/service alerts * New command for sending custom notifications * FIX: Fixed encoding problem when opening dashboard + * New icon on a service whos host is in downtime WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/images/icon_hostdowntime.png b/web/htdocs/images/icon_hostdowntime.png new file mode 100644 index 0000000..03a7ee6 Binary files /dev/null and b/web/htdocs/images/icon_hostdowntime.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 6add96d..88b0b75 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -237,10 +237,20 @@ def paint_downtimes(what, row, tags, custom_vars): # Currently we are in a downtime + link to list of downtimes # for this host / service if row[what + "_scheduled_downtime_depth"] > 0: - return link_to_view('<img class=icon title="%s" src="images/icon_downtime.png">' % - _("Currently in downtime"), row, 'downtimes_of_' + what) + if what == "host": + icon = "hostdowntime" + else: + icon = "downtime" + return link_to_view('<img class=icon title="%s" src="images/icon_%s.png">' % + (_("Currently in downtime"), icon), row, 'downtimes_of_' + what) + elif what == "service" and row["host_scheduled_downtime_depth"] > 0: + return link_to_view('<img class=icon title="%s" src="images/icon_hostdowntime.png">' % + _("The host is currently in downtime"), row, 'downtimes_of_host') + + multisite_icons.append({ + 'host_columns': [ 'scheduled_downtime_depth' ], 'columns': [ 'scheduled_downtime_depth' ], 'paint': paint_downtimes, })