Module: check_mk
Branch: master
Commit: 961b749f44f72a24538e5db882ddd6586be325ee
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=961b749f44f72a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 15 11:04:41 2010 +0100
Multisite: finally support icon images
---
ChangeLog | 6 ++++++
LIESMICH.zutun | 2 --
web/.f12 | 2 +-
web/htdocs/images/icons/README | 9 +++++++++
web/htdocs/images/icons/cactus.png | Bin 0 -> 6388 bytes
web/htdocs/images/icons/earth.png | Bin 0 -> 8319 bytes
web/htdocs/images/icons/home.png | Bin 0 -> 7482 bytes
web/htdocs/images/icons/missing.png | Bin 0 -> 7279 bytes
web/htdocs/images/icons/networkdevice.png | Bin 0 -> 4068 bytes
web/htdocs/images/icons/printer.png | Bin 0 -> 5656 bytes
web/htdocs/images/icons/processor.png | Bin 0 -> 6593 bytes
web/htdocs/images/icons/security.png | Bin 0 -> 8453 bytes
web/htdocs/images/icons/shed.png | Bin 0 -> 4516 bytes
web/htdocs/images/icons/terminal.png | Bin 0 -> 4321 bytes
web/plugins/views/painters.py | 7 ++++++-
15 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c4facbc..9581a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1.1.9i3:
+ Multisite:
+ * Finally show host/services icons from the nagios value "icon_image".
+ Put your icon files in /usr/share/check_mk/web/htdocs/images/icons.
+ OMD users put the icons into ~/local/share/check_mk/web/htdocs/images/icons.
+
1.1.9i2:
Checks & Agents:
* ibm_imm_health: fix inventory function
diff --git a/LIESMICH.zutun b/LIESMICH.zutun
index c7c6af7..591d665 100644
--- a/LIESMICH.zutun
+++ b/LIESMICH.zutun
@@ -116,8 +116,6 @@ kann man eben kein SNMP machen.
PNP4Nagios-Popups automatisch einbauen, mit eigenen intelligenten
Icons.
-Host- und Serviceicons (icon_image) anzeigen.
-
Aliasse einbauen (Wrappen in bin/):
cmk = check_mk
mkp = check_mk -P
diff --git a/web/.f12 b/web/.f12
index 27c68e1..037e052 100644
--- a/web/.f12
+++ b/web/.f12
@@ -1,2 +1,2 @@
sudo cp -prv * /omd/versions/default/share/check_mk/web/
-
+sudo omd restart wato apache
diff --git a/web/htdocs/images/icons/README b/web/htdocs/images/icons/README
new file mode 100644
index 0000000..be44c48
--- /dev/null
+++ b/web/htdocs/images/icons/README
@@ -0,0 +1,9 @@
+The icons in this directory and also some of the icons in web/htdocs/images are
+from the "NUVOLA" icon set, copyright by David Vignoni. They are contributed
+under the terms of the LGPL Version 2.1. Please visit the home page of NUVOLA
+for details:
+
+http://www.icon-king.com/projects/nuvola/
+
+We wish to thank David for his nice artwork and for him making this open
+source!
diff --git a/web/htdocs/images/icons/cactus.png b/web/htdocs/images/icons/cactus.png
new file mode 100644
index 0000000..07454be
Binary files /dev/null and b/web/htdocs/images/icons/cactus.png differ
diff --git a/web/htdocs/images/icons/earth.png b/web/htdocs/images/icons/earth.png
new file mode 100644
index 0000000..2d0fdf9
Binary files /dev/null and b/web/htdocs/images/icons/earth.png differ
diff --git a/web/htdocs/images/icons/home.png b/web/htdocs/images/icons/home.png
new file mode 100644
index 0000000..7b20e56
Binary files /dev/null and b/web/htdocs/images/icons/home.png differ
diff --git a/web/htdocs/images/icons/missing.png b/web/htdocs/images/icons/missing.png
new file mode 100644
index 0000000..07d9337
Binary files /dev/null and b/web/htdocs/images/icons/missing.png differ
diff --git a/web/htdocs/images/icons/networkdevice.png
b/web/htdocs/images/icons/networkdevice.png
new file mode 100644
index 0000000..4e402f6
Binary files /dev/null and b/web/htdocs/images/icons/networkdevice.png differ
diff --git a/web/htdocs/images/icons/printer.png b/web/htdocs/images/icons/printer.png
new file mode 100644
index 0000000..0291e3f
Binary files /dev/null and b/web/htdocs/images/icons/printer.png differ
diff --git a/web/htdocs/images/icons/processor.png
b/web/htdocs/images/icons/processor.png
new file mode 100644
index 0000000..4fe3373
Binary files /dev/null and b/web/htdocs/images/icons/processor.png differ
diff --git a/web/htdocs/images/icons/security.png b/web/htdocs/images/icons/security.png
new file mode 100644
index 0000000..61ac0aa
Binary files /dev/null and b/web/htdocs/images/icons/security.png differ
diff --git a/web/htdocs/images/icons/shed.png b/web/htdocs/images/icons/shed.png
new file mode 100644
index 0000000..f4b83c9
Binary files /dev/null and b/web/htdocs/images/icons/shed.png differ
diff --git a/web/htdocs/images/icons/terminal.png b/web/htdocs/images/icons/terminal.png
new file mode 100644
index 0000000..5e93201
Binary files /dev/null and b/web/htdocs/images/icons/terminal.png differ
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index bfb6c7f..50f7a5b 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -75,7 +75,7 @@
icon_columns = [ "acknowledged", "scheduled_downtime_depth",
"downtimes_with_info", "comments_with_info",
"notifications_enabled", "is_flapping",
"modified_attributes_list", "active_checks_enabled",
"accept_passive_checks", "action_url_expanded",
"notes_url_expanded", "in_notification_period",
- "custom_variable_names", "custom_variable_values" ]
+ "custom_variable_names", "custom_variable_values",
"icon_image" ]
# Additional columns only to fetch for services
icon_service_columns = [ "service_description" ]
@@ -100,6 +100,11 @@ def paint_icons(what, row): # what is "host" or
"service"
prefix = "service_"
custom_vars = dict(zip(row[prefix + "custom_variable_names"], row[prefix +
"custom_variable_values"]))
+ # Icons configured in Nagios via icon_image
+ if row[prefix + "icon_image"]:
+ image = row[prefix + "icon_image"]
+ output += '<img class=icon src="images/icons/%s">' %
image
+
# Link to detail host if this is a summary host
if "_REALNAME" in custom_vars:
newrow = row.copy()