Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: Recompiled windows agent (for new version number)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83c8921d57980105dfa01f202067d108a870fb9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83c8921d579801… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 18:00:02 2010 +0100 Recompiled windows agent (for new version number) --- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4a6d506..e2681b1 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index f409d1c..cdc4516 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

13 years, 9 months

Check_MK Git: check_mk: Switched version to 1.1.9i3

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95122c69f2e9ebe1518e6266d63bd4cf7422c20a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95122c69f2e9eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 17:59:19 2010 +0100 Switched version to 1.1.9i3 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d31bc7f..09931eb 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i2 +VERSION = 1.1.9i3 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index e251549..5bd4c2a 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i2 +echo Version: 1.1.9i3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 78695b1..28b3d82 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i2 +echo Version: 1.1.9i3 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e7ec806..0bac8f5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i2 +echo Version: 1.1.9i3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index e548c4b..ccfb6bc 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i2 +echo Version: 1.1.9i3 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 09caa88..ad723b7 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i2" +#define CHECK_MK_VERSION "1.1.9i3" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/livestatus/configure.ac b/livestatus/configure.ac index dd796ae..59c466a 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index 451c403..bdebe80 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.2 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.3 -CHECK_MK_VERSION=1.1.9i2 +CHECK_MK_VERSION=1.1.9i3 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.1 diff --git a/scripts/setup.sh b/scripts/setup.sh index 95a5741..8c8cfcd 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i2 +VERSION=1.1.9i3 NAME=check_mk LANG= LC_ALL=

13 years, 9 months

Check_MK Git: check_mk: Multisite+Livestatus: new automatic PNP icon

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f7300085c47b8157043c01785c0c7627234d4bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f7300085c47b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 17:58:45 2010 +0100 Multisite+Livestatus: new automatic PNP icon --- ChangeLog | 12 +- LIESMICH.zutun | 7 +- livestatus/src/.f12 | 2 + livestatus/src/HostSpecialIntColumn.cc | 3 + livestatus/src/HostSpecialIntColumn.h | 3 +- livestatus/src/Makefile.am | 4 +- livestatus/src/ServiceSpecialIntColumn.cc | 40 ++ livestatus/src/ServiceSpecialIntColumn.h | 44 +++ livestatus/src/TableHosts.cc | 2 + livestatus/src/TableServices.cc | 3 + livestatus/src/module.c | 27 ++- livestatus/src/pnp4nagios.cc | 66 ++++ livestatus/src/pnp4nagios.h | 31 ++ web/htdocs/htmllib.py | 11 +- web/htdocs/images/icon_pnp.png | Bin 0 -> 6115 bytes web/htdocs/{ => js}/check_mk.js | 0 web/htdocs/js/jquery-min.js | 154 ++++++++ web/htdocs/js/jquery.cluetip.js | 558 +++++++++++++++++++++++++++++ web/htdocs/{ => js}/search.js | 0 web/htdocs/{ => js}/sidebar.js | 0 web/htdocs/sidebar.py | 4 +- web/plugins/views/builtin.py | 2 +- web/plugins/views/painters.py | 70 ++-- 23 files changed, 993 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9f7300085c…

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fff597047b74b0a7d7d7d684579e02e2d3ea3965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fff597047b74b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 14:36:04 2010 +0100 Updated internal doku --- LIESMICH.zutun | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index e8c921f..bed6b03 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,21 +1,22 @@ +DOKU: +-------------------------------------------------------------------------------- Hostnamen in ipaddresses eintragen: Das sollte man dokumentieren (wegen dynamischen Hosts.) Man-Pages zu df_netapp und df_netapp32 fehlen (df_netapp geht nur mit bulkwalk_hosts!!) +Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie +-------------------------------------------------------------------------------- + Livestatus: is_contact_member_of_contactgroup selbst programmieren, da diese Funktion in Nagios rausfliegen wird. -Doku: Check_MK und OMD: Installieren von MKPs, local-Hierarchie - Multisite: Kontextknöpfe Services: OK, Services: Crit usw. unsichtbar machen. Dazu einen neue View-Option einbauen (hide context button). -Multisite: Bei jedem aktiven Service soll ein Knopf angezeigt werden -zum Reschedulen. Dieser soll dann per WaitCondition: so lange warten, -bis der Check auch wirklich ausgeführt wurde! - Inventurcheck: retry_interval evt. anders (kuerzer) einstellbar machen. +Das geht aber auch mit extra_service_conf. Evtl. reicht hier die Doku. +Ein sinnvoller Default-Wert wäre aber schon gut. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 @@ -153,6 +154,8 @@ Multisite: Zeitanzeige der Downtimes (ende) zu ungenau. "in 6 hrs" ist blöd. Auch bei Start "19 sec" ist dumm, hier wäre besser (vor 19 sec). Oder bei Downtimes immer absolute Zeiten angeben? Evtl. Zusatzspalte der Duration. + + -------------------------------------------------------------------------------- IDEEN & VERBESSERUNGEN --------------------------------------------------------------------------------

13 years, 9 months

Check_MK Git: check_mk: cups_queues: fixed plugin error due to invalid import of datetime

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 597f25384312e7a9550d46e05964adb520930265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=597f25384312e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 14:34:18 2010 +0100 cups_queues: fixed plugin error due to invalid import of datetime --- ChangeLog | 2 ++ checks/ad_replication | 7 +++---- checks/cups_queues | 11 +++++------ checks/smbios_sel | 11 +++++------ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2adf2c..b5c4d51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) + * cups_queues: fixed plugin error due to invalid import of datetime, + converted other checks from 'from datetime import...' to 'import datetime'. 1.1.9i2: Checks & Agents: diff --git a/checks/ad_replication b/checks/ad_replication index 0f0e542..90f45f5 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -32,8 +32,7 @@ # showrepl_INFO,Standardname-des-ersten-Standorts,WIN2003,"CN=Configuration,DC=corp,DC=de",Standardname-des-ersten-Standorts,WIN2003-DC2,RPC,0,0,2010-07-02 12:54:08,0 # showrepl_INFO,Standardname-des-ersten-Standorts,WIN2003,"CN=Schema,CN=Configuration,DC=corp,DC=de",Standardname-des-ersten-Standorts,WIN2003-DC2,RPC,0,0,2010-07-02 12:46:28,0 -from datetime import datetime, timedelta -import time +import datetime, time ad_replication_default_params = (20,) @@ -41,7 +40,7 @@ def parse_ad_replication_dates(s): if s == '0' or s == '(never)': return None else: - return datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[0:5]) + return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[0:5]) def parse_ad_replication_info(info): lines = [] @@ -60,7 +59,7 @@ def inventory_ad_replication(checktype, info): def check_ad_replication(item, params, info): status = 0 output = '' - now = datetime.now() + now = datetime.datetime.now() foundLine = False for l in parse_ad_replication_info(info): diff --git a/checks/cups_queues b/checks/cups_queues index 2a8fda7..733efe3 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -45,8 +45,7 @@ #lpr2-2 root 1024 Tue Jun 29 09:02:35 2010 #lpr2-3 root 1024 Tue Jun 29 09:05:54 2010 -from datetime import datetime, timedelta -import time +import time, datetime # Default thresholds # ("<Warning max entries>", "<Critical num entries>", "<Warning entry age in seconds>", "<Critical entry age>") @@ -60,7 +59,7 @@ def check_cups_queues(item, params, info): state = 3 output = "UNKNOWN - Queue not found" numJobs = 0 - now = datetime.now() + now = datetime.datetime.now() oldest = now for num, line in enumerate(info): if line[0] == 'printer' and line[1] == item: @@ -83,15 +82,15 @@ def check_cups_queues(item, params, info): elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 - dt = datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[0:5]) + dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[0:5]) if dt < oldest: oldest = dt jobOutput = 'Jobs: %d' % numJobs if numJobs > 0: - if oldest < now - timedelta(seconds=critAge) or numJobs > critNum: + if oldest < now - datetime.timedelta(seconds=critAge) or numJobs > critNum: state = 2 - elif oldest < now - timedelta(seconds=warnAge) or numJobs > warnNum: + elif oldest < now - datetime.timedelta(seconds=warnAge) or numJobs > warnNum: state = 1 jobOutput += ', Oldest job is from %s' % oldest diff --git a/checks/smbios_sel b/checks/smbios_sel index 0623024..d05b489 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -66,8 +66,7 @@ # 0xFF End-of-Log #}; -from datetime import datetime -import time +import datetime, time smbios_sel_msg_types = { #Type: (Number-of-Entries Threshold, Status-Code, Current Count, Last Entry, Alias) @@ -118,14 +117,14 @@ def check_smbios_sel(_no_item, _no_params, info): if type == "E": sum_status = 2 num_errors += 1; - smbios_sel_msg_types["E%d"%num_errors] = [1, 2, 1, datetime.now(), msg] + smbios_sel_msg_types["E%d"%num_errors] = [1, 2, 1, datetime.datetime.now(), msg] continue # Informational messages are explicit created by our binary when the # sel is empty. This is needed to create the smbios_sel service in Nagios. if type == "I": sum_status = 0 - smbios_sel_msg_types["I%d"%num_errors] = [1, 0, 1, datetime.now(), msg] + smbios_sel_msg_types["I%d"%num_errors] = [1, 0, 1, datetime.datetime.now(), msg] continue type = int(type) @@ -144,14 +143,14 @@ def check_smbios_sel(_no_item, _no_params, info): sum_status = smbios_sel_msg_types[type][1] # Save the date when the current entry is newer - dt = datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[0:5]) + dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[0:5]) if smbios_sel_msg_types[type][3] == None or smbios_sel_msg_types[type][3] < dt: smbios_sel_msg_types[type][3] = dt; else: # Unknown types will result in UNKNOWN state sum_status = 3 smbios_sel_msg_types[type] = [1, 3, 1, - datetime.now(), + datetime.datetime.now(), "Unknown log type (%s)" % type] sum_output = ""

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c9683ea517c3b5a9e0666367f391db9d41794a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c9683ea517c3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 14:20:24 2010 +0100 Updated internal doku --- LIESMICH.zutun | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 9ddff78..e8c921f 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -546,3 +546,7 @@ rendern. Also geht das nicht... if-Check: Die Bandbreiten-Erkennung klappt manchmal nicht, z.B. weil der Provider die Bandbreite runterregelt. In den Check-Params sollte man die tatsächliche Bandbreite angeben können. + +SNMP: Hier könnte man weiter Parameter konfigurierbar machen, +z.B. snmp_parameters = []. Auf die Art kann man auch z.B. eine +alternative Portnummer angeben.

13 years, 9 months

Check_MK Git: check_mk: Linux agent: fixed problem with OnlyFrom and section <<<df>>>

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4ed0bd2e5d9edb3987409d56f0727cb4f4d9e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ed0bd2e5d9ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 14:12:04 2010 +0100 Linux agent: fixed problem with OnlyFrom and section <<<df>>> --- ChangeLog | 3 +++ agents/check_mk_agent.linux | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88eafe9..d2adf2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ OMD users put the icons into ~/local/share/check_mk/web/htdocs/images/icons. * fix problem with PNP-links with services containing a ':' (thanks to Dirk Mayer) + Checks & Agents: + * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) + 1.1.9i2: Checks & Agents: * ibm_imm_health: fix inventory function diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 297d751..e7ec806 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -63,7 +63,7 @@ echo AgentDirectory: $MK_CONFDIR if [ -n "$REMOTE_HOST" ] then echo -n 'OnlyFrom: ' - sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1 + echo $(sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) fi # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten)

13 years, 9 months

Check_MK Git: check_mk: Multisite: fix colons in PNP links

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27975cadf290f2ef806a0634061f399d6fa7f980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27975cadf290f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 12:25:59 2010 +0100 Multisite: fix colons in PNP links thanks to Dirk Mayer --- ChangeLog | 1 + web/plugins/views/painters.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a54422f..88eafe9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 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. + * fix problem with PNP-links with services containing a ':' (thanks to Dirk Mayer) 1.1.9i2: Checks & Agents: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 50f7a5b..ff1197d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1105,7 +1105,7 @@ def pnp_icon_link(row): if config.site_is_local(row["site"]): # Where is our RRD? basedir = defaults.rrd_path + "/" + row["host_name"] - xmlpath = basedir + "/" + row["service_description"].replace("/", "_").replace(" ", "_") + ".xml" + xmlpath = basedir + "/" + row["service_description"].replace("/", "_").replace(" ", "_").replace(":", "_") + ".xml" if os.path.exists(xmlpath): return a else:

13 years, 9 months

Check_MK Git: check_mk: Multisite: finally support icon images

by mk＠mathias-kettner.de

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()

13 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53e3851d037297fd5aa34c52cadd885a896b401d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53e3851d037297… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 11:05:14 2010 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010