Module: check_mk
Branch: master
Commit: 25bc1b3c9f9065fdcef86a7e7ac98b12cc71c656
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25bc1b3c9f9065…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 11 10:55:13 2016 +0100
Added help texts to log event icons
---
.bugs/1001 | 7 +++++--
.bugs/2185 | 14 ++++++++++++--
.bugs/2411 | 6 ++++--
web/plugins/views/painters.py | 28 +++++++++++++++++++++++++++-
4 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/.bugs/1001 b/.bugs/1001
index 6c57b12..83b5e33 100644
--- a/.bugs/1001
+++ b/.bugs/1001
@@ -1,12 +1,15 @@
Title: check ups_power uses the group 'hw_temperature' which settings levels in
degree celcius'
Component: checks
-State: open
+Class: nastiness
+State: done
Date: 2013-08-22 13:43:24
Targetversion: future
-Class: nastiness
Levels for the electric power of ups devices are in watt, however the check uses the
group
hw_temperature to set the values with the corresponding wato check in degrees celcius.
This will nevertheless work and may be in active use since the values are integers.
However it
may be confusing. A new group hw_power with corresponding wato rule should be added.
Customers
need to be aware that this fix may break their existing checks.
+
+2016-02-11 10:37:06: changed state open -> done
+has already been fixed.
diff --git a/.bugs/2185 b/.bugs/2185
index 74270aa..b257b0c 100644
--- a/.bugs/2185
+++ b/.bugs/2185
@@ -1,10 +1,20 @@
Title: Page reload with click on page title loads *.css files new
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2014-09-25 16:31:49
Targetversion: future
-Class: nastiness
If you initiate a page reload on a view by clicking on the page title,
then all static web files are being reloaded. This is not neccessary
and create extensive page requests.
+
+2016-02-11 10:45:29: changed state open -> done
+This seems to be the standard behaviour for different situations in most browsers:
+
+a) Entering a new URL in the address bar
+b) reloading the page (e.g. F5, ctrl + r)
+
+In case of following a link this the css files are not loaded.
+
+Seems to be ok.
diff --git a/.bugs/2411 b/.bugs/2411
index 1b0cab8..823db7d 100644
--- a/.bugs/2411
+++ b/.bugs/2411
@@ -1,11 +1,13 @@
Title: Events of the last four hours: mouse hover help for icons
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2015-11-16 14:08:07
Targetversion: future
-Class: nastiness
All event icons should have a hover help that explain what type
of event that is. For example light grey loud speaker means a
core notification (and not one to the end user). This need
explanation!
+
+2016-02-11 10:54:13: changed state open -> done
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index 67664c4..7320eaf 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -2181,43 +2181,69 @@ multisite_painters["log_command"] = {
"columns" : ["log_command_name"],
"paint" : lambda row: ("nowrap",
row["log_command_name"]),
}
+
+
def paint_log_icon(row):
img = None
log_type = row["log_type"]
if log_type == "SERVICE ALERT":
img = { 0: "ok", 1: "warn", 2:"crit",
3:"unknown" }.get(row["log_state"])
+ title = _("Service Alert")
+
elif log_type == "HOST ALERT":
img = { 0: "up", 1: "down", 2:"unreach"
}.get(row["log_state"])
+ title = _("Host Alert")
+
elif "DOWNTIME" in log_type:
if row["log_state_type"] in [ "END", "STOPPED" ]:
img = "downtimestop"
+ title = _("Downtime stopped")
else:
img = "downtime"
+ title = _("Downtime")
+
elif log_type.endswith("NOTIFICATION"):
if row["log_command_name"] == "check-mk-notify":
img = "cmk_notify"
+ title = _("Core produced a notification")
else:
img = "notify"
+ title = _("User notification")
+
elif log_type == "EXTERNAL COMMAND":
img = "command"
+ title = _("External command")
+
elif "restarting..." in log_type:
img = "restart"
+ title = _("Core restarted")
+
elif "Reloading configuration" in log_type:
img = "reload"
+ title = _("Core configuration reloaded")
+
elif "starting..." in log_type:
img = "start"
+ title = _("Core started")
+
elif "shutdown..." in log_type or "shutting down" in log_type:
img = "stop"
+ title = _("Core stopped")
+
elif " FLAPPING " in log_type:
img = "flapping"
+ title = _("Flapping")
+
elif "ACKNOWLEDGE ALERT" in log_type:
if row["log_state_type"] == "STARTED":
img = "ack"
+ title = _("Acknowledged")
else:
img = "ackstop"
+ title = _("Stopped acknowledgement")
if img:
- return "icon", '<img class=icon
src="images/alert_%s.png">' % img
+ return "icon", '<img class=icon
src="images/alert_%s.png" title="%s">' % (img, title)
else:
return "icon", ""