[checkmk-commits] Check_MK Git: check_mk: New versions of all alert icons

Module: check_mk Branch: master Commit: ab22b20bf12029774bb10e761a837dc3240be351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab22b20bf12029… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Nov 19 18:05:01 2014 +0100 New versions of all alert icons These should also fix ugly transparency errors in PDF versions of the views. --- web/htdocs/images/alert_command.png | Bin 1244 -> 5083 bytes web/htdocs/images/alert_crit.png | Bin 1166 -> 2953 bytes web/htdocs/images/alert_down.png | Bin 1166 -> 2953 bytes web/htdocs/images/alert_downtime.png | Bin 1014 -> 4052 bytes web/htdocs/images/alert_downtimestop.png | Bin 865 -> 2816 bytes web/htdocs/images/alert_ok.png | Bin 1367 -> 3485 bytes web/htdocs/images/alert_restart.png | Bin 1052 -> 3375 bytes web/htdocs/images/alert_start.png | Bin 971 -> 2558 bytes web/htdocs/images/alert_stop.png | Bin 1185 -> 796 bytes web/htdocs/images/alert_unknown.png | Bin 1278 -> 3205 bytes web/htdocs/images/alert_unreach.png | Bin 1278 -> 3205 bytes web/htdocs/images/alert_up.png | Bin 1367 -> 3485 bytes web/htdocs/images/alert_warn.png | Bin 1153 -> 2804 bytes web/plugins/views/painters.py | 6 +++--- 14 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/images/alert_command.png b/web/htdocs/images/alert_command.png index 077a566..0c17cd9 100644 Binary files a/web/htdocs/images/alert_command.png and b/web/htdocs/images/alert_command.png differ diff --git a/web/htdocs/images/alert_crit.png b/web/htdocs/images/alert_crit.png index f04113c..2d0f217 100644 Binary files a/web/htdocs/images/alert_crit.png and b/web/htdocs/images/alert_crit.png differ diff --git a/web/htdocs/images/alert_down.png b/web/htdocs/images/alert_down.png index f04113c..2d0f217 100644 Binary files a/web/htdocs/images/alert_down.png and b/web/htdocs/images/alert_down.png differ diff --git a/web/htdocs/images/alert_downtime.png b/web/htdocs/images/alert_downtime.png index ff0e4e3..20f55b5 100644 Binary files a/web/htdocs/images/alert_downtime.png and b/web/htdocs/images/alert_downtime.png differ diff --git a/web/htdocs/images/alert_downtimestop.png b/web/htdocs/images/alert_downtimestop.png index 76160c3..b85e57a 100644 Binary files a/web/htdocs/images/alert_downtimestop.png and b/web/htdocs/images/alert_downtimestop.png differ diff --git a/web/htdocs/images/alert_ok.png b/web/htdocs/images/alert_ok.png index 738a10e..df67814 100644 Binary files a/web/htdocs/images/alert_ok.png and b/web/htdocs/images/alert_ok.png differ diff --git a/web/htdocs/images/alert_restart.png b/web/htdocs/images/alert_restart.png index d8b951a..389efac 100644 Binary files a/web/htdocs/images/alert_restart.png and b/web/htdocs/images/alert_restart.png differ diff --git a/web/htdocs/images/alert_start.png b/web/htdocs/images/alert_start.png index a8bede9..b2da347 100644 Binary files a/web/htdocs/images/alert_start.png and b/web/htdocs/images/alert_start.png differ diff --git a/web/htdocs/images/alert_stop.png b/web/htdocs/images/alert_stop.png index fd1bbe6..646acf9 100644 Binary files a/web/htdocs/images/alert_stop.png and b/web/htdocs/images/alert_stop.png differ diff --git a/web/htdocs/images/alert_unknown.png b/web/htdocs/images/alert_unknown.png index 803d56d..36671a0 100644 Binary files a/web/htdocs/images/alert_unknown.png and b/web/htdocs/images/alert_unknown.png differ diff --git a/web/htdocs/images/alert_unreach.png b/web/htdocs/images/alert_unreach.png index 803d56d..36671a0 100644 Binary files a/web/htdocs/images/alert_unreach.png and b/web/htdocs/images/alert_unreach.png differ diff --git a/web/htdocs/images/alert_up.png b/web/htdocs/images/alert_up.png index 738a10e..df67814 100644 Binary files a/web/htdocs/images/alert_up.png and b/web/htdocs/images/alert_up.png differ diff --git a/web/htdocs/images/alert_warn.png b/web/htdocs/images/alert_warn.png index d895f86..39d297e 100644 Binary files a/web/htdocs/images/alert_warn.png and b/web/htdocs/images/alert_warn.png differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0cf409b..172bbcf 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1764,7 +1764,7 @@ def paint_log_icon(row): elif log_type == "HOST ALERT": img = { 0: "up", 1: "down", 2:"unreach" }.get(row["log_state"]) elif "DOWNTIME" in log_type: - if row["log_state_type"] == "STOPPED": + if row["log_state_type"] in [ "END", "STOPPED" ]: img = "downtimestop" else: img = "downtime" @@ -1776,13 +1776,13 @@ def paint_log_icon(row): img = "restart" elif "starting..." in log_type: img = "start" - elif "shutdown..." in log_type: + elif "shutdown..." in log_type or "shutting down" in log_type: img = "stop" elif " FLAPPING " in log_type: img = "flapping" if img: - return "icon", '<img src="images/alert_%s.png">' % img + return "icon", '<img class=icon src="images/alert_%s.png">' % img else: return "icon", ""