Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: liveproxyd: avoid busy wait loop when no site is configured

by Mathias Kettner

Module: check_mk Branch: master Commit: f32559fa3537ff33c1cac61bcddbd9a821f1d87d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f32559fa3537ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 15 14:04:22 2014 +0200 liveproxyd: avoid busy wait loop when no site is configured --- doc/treasures/liveproxy/liveproxyd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 7d80797..946cc96 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -252,7 +252,7 @@ def do_select(timeout): p.register(channel["socket"], select.POLLIN) try: - readylist = p.poll(timeout) + readylist = p.poll(timeout * 1000) r_able = [] w_able = [] for fd, event in readylist:

10 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2155

by Mathias Kettner

Module: check_mk Branch: master Commit: de1d432a47af82de1ded802058537ed10456a927 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1d432a47af82… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 14 14:00:20 2014 +0200 Updated bug entries #2155 --- .bugs/2155 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.bugs/2155 b/.bugs/2155 new file mode 100644 index 0000000..c34b3bc --- /dev/null +++ b/.bugs/2155 @@ -0,0 +1,18 @@ +Title: Host named like a Python module will break precompiled checks +Component: core +State: open +Date: 2014-05-14 13:57:30 +Targetversion: 1.2.5i1 +Class: bug + +Operating System: Debian 7 + +We created a host named 'random' while using Nagios as Core. That leads to +the files random.py and random in var/check_mk/precompiled. The bug: the +other precompiled host checks import 'tempfile' and that in turn imports +'random'. Now somehow the precompiled directory seems to be part of the +import path in that situation and the Check_MK host files is being imported +instead of the real random module. + +This only seems to affect that indrectly imported module. A test with creating a +host with the name 'os' did not show any abnormalities.

10 years, 4 months

Check_MK Git: check_mk: Updated werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 14f2778502791022137536905ed03a0de6f4ad7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14f27785027910… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 14 10:53:04 2014 +0200 Updated werk description --- .werks/970 | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.werks/970 b/.werks/970 index 0dd6b6f..a6d68c6 100644 --- a/.werks/970 +++ b/.werks/970 @@ -9,17 +9,18 @@ When you are using the Livestatus Proxy Daemon for connecting lots of sites and you have lots of concurrent users then two things could happen: -1. You might run out of files. The reason is that per default on most -Linux systems the number of files a process is allowed to keep open -is limited to 1024. The can be increased by using <tt>/etc/security/limits.conf</tt>. -The script launching the <tt>liveproxyd</tt> need to issue a <tt>ulimit -S -n unlimited</tt> -before starting. In the OMD builds of the Check_MK Monitoring System this -has been added for recent development builds. The <tt>liveproxyd</tt> now handles -this situation better and does not long run into a busy CPU loop. It waits for -5 seconds and restarts itself instead. +1. You might run out of allowed open files. The reason is that +per default on most Linux systems the number of files a process is +allowed to keep open is limited to 1024. The can be increased by changing +<tt>/etc/security/limits.conf</tt> and issue a <tt>ulimit -S -n unlimited</tt> +before starting <tt>liveproxyd</tt>. That latter one has now ben implemented +in the recent development OMD builds of the Check_MK Monitoring System. The +<tt>liveproxyd</tt> now also handles the out-of-files error situation +better and does not long run into a busy CPU loop. It waits for 5 seconds +and restarts itself instead. -2. Even if you increased the number of allowed open files the <tt>liveproxyd</tt> -could never open more than 1024 files on most Python versions (due to a limit of -the system call <tt>select()</tt>. This has been fixed by using the <tt>poll()</tt> -system call. +2. Even if you increased the number of allowed open files, the +<tt>liveproxyd</tt> could never handle more than 1024 open files on most +Python versions (due to a limit of the system call <tt>select()</tt>. This +has been fixed by using the <tt>poll()</tt> system call.

10 years, 4 months

Check_MK Git: check_mk: FIX liveproxyd: handle situations with more then 1024 open files

by Mathias Kettner

Module: check_mk Branch: master Commit: f6235fb501f8a6b4988c86b302e5958b00affd79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6235fb501f8a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 14 10:44:34 2014 +0200 FIX liveproxyd: handle situations with more then 1024 open files When you are using the Livestatus Proxy Daemon for connecting lots of sites and you have lots of concurrent users then two things could happen: 1. You might run out of files. The reason is that per default on most Linux systems the number of files a process is allowed to keep open is limited to 1024. The can be increased by using <tt>/etc/security/limits.conf</tt>. The script launching the <tt>liveproxyd</tt> need to issue a <tt>ulimit -S -n unlimited</tt> before starting. In the OMD builds of the Check_MK Monitoring System this has been added for recent development builds. The <tt>liveproxyd</tt> now handles this situation better and does not long run into a busy CPU loop. It waits for 5 seconds and restarts itself instead. 2. Even if you increased the number of allowed open files the <tt>liveproxyd</tt> could never open more than 1024 files on most Python versions (due to a limit of the system call <tt>select()</tt>. This has been fixed by using the <tt>poll()</tt> system call. --- .werks/970 | 25 +++++++++++++++ ChangeLog | 3 ++ doc/treasures/liveproxy/liveproxyd | 60 +++++++++++++++++++++++++----------- 3 files changed, 70 insertions(+), 18 deletions(-) diff --git a/.werks/970 b/.werks/970 new file mode 100644 index 0000000..0dd6b6f --- /dev/null +++ b/.werks/970 @@ -0,0 +1,25 @@ +Title: liveproxyd: handle situations with more then 1024 open files +Level: 2 +Component: liveproxy +Version: 1.2.5i3 +Date: 1400056696 +Class: fix + +When you are using the Livestatus Proxy Daemon for connecting lots +of sites and you have lots of concurrent users then two things could +happen: + +1. You might run out of files. The reason is that per default on most +Linux systems the number of files a process is allowed to keep open +is limited to 1024. The can be increased by using <tt>/etc/security/limits.conf</tt>. +The script launching the <tt>liveproxyd</tt> need to issue a <tt>ulimit -S -n unlimited</tt> +before starting. In the OMD builds of the Check_MK Monitoring System this +has been added for recent development builds. The <tt>liveproxyd</tt> now handles +this situation better and does not long run into a busy CPU loop. It waits for +5 seconds and restarts itself instead. + +2. Even if you increased the number of allowed open files the <tt>liveproxyd</tt> +could never open more than 1024 files on most Python versions (due to a limit of +the system call <tt>select()</tt>. This has been fixed by using the <tt>poll()</tt> +system call. + diff --git a/ChangeLog b/ChangeLog index e3b0ec6..ee78c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,9 @@ * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... * 0831 FIX: table statehist: no longer crashes on TIMEPERIOD TRANSITION entries with an invalid syntax... + Livestatus-Proxy: + * 0970 FIX: liveproxyd: handle situations with more then 1024 open files... + HW/SW-Inventory: * 0913 lnx_distro: Now able to detect SuSE distributions... * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 162ebe2..7d80797 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -96,7 +96,15 @@ def liveproxyd_run(): if opt_debug: raise + if "Too many open files" in str(e): + log("Too many open files! Please increase the ulimit for 'nofiles'!") + log("Waiting for 5 seconds...") + time.sleep(5) + log("Restarting, in the hope that files will the again be enough for a while.") + do_restart() + log("Ignoring exception: %s: %s" % (e, traceback.format_exc())) + time.sleep(1) # Avoid CPU loop in case of permanent error def initiate_connections(): # Create new channels to target sites. Nonblocking! @@ -198,7 +206,7 @@ def disconnect_from_site(sitename): def complete_connections(writable): for sitename, sitestate in g_sites.items(): for channel in sitestate["channels"]: - if channel["state"] == "connecting" and channel["socket"] in writable: + if channel["state"] == "connecting" and channel["socket"].fileno() in writable: try: channel["socket"].send("") channel["socket"].setblocking(1) # avoid signals from interrupting us @@ -209,44 +217,60 @@ def complete_connections(writable): channel["state"] = "error" sitestate["last_failed_connect"] = time.time() -# Master/Mega/Central select(). We are going to be the select() master. Harhar. +# Master/Mega/Central poll(). We though we are the select() master. But select() +# is limited to 1024 filedescriptors in most Python versions. So we rather use +# poll(). If you have many sites and many users you will easily get more +# filedescriptors... def do_select(timeout): - read_fds = [] - write_fds = [] + p = select.poll() for sitename, sitestate in g_sites.items(): # outgoing connections currently building up for channel in sitestate["channels"]: + sock = channel["socket"] if channel["state"] == "connecting": - write_fds.append(channel["socket"]) + p.register(sock, select.POLLOUT) # new client connections - read_fds.append(sitestate["socket"]) + sock = sitestate["socket"] + p.register(sock, select.POLLIN) for client in sitestate["clients"]: + sock = client["socket"] + # new requests from existing clients if client["state"] == "idle": - read_fds.append(client["socket"]) + p.register(sock, select.POLLIN) # clients ready to receive a response - if client["state"] == "response": - write_fds.append(client["socket"]) + elif client["state"] == "response": + p.register(sock, select.POLLOUT) # Responses from channels, also heartbeat responses for channel in sitestate["channels"]: if channel["state"] in [ "busy", "heartbeat" ]: - read_fds.append(channel["socket"]) + p.register(channel["socket"], select.POLLIN) try: - r_able, w_able, x_able = select.select(read_fds, write_fds, [], timeout) - except select.error: + readylist = p.poll(timeout) + r_able = [] + w_able = [] + for fd, event in readylist: + if event & select.POLLIN: + r_able.append(fd) + if event & select.POLLOUT: + w_able.append(fd) + return r_able, w_able + + except select.error, e: + log("Error during poll(): %s" % e) return [], [] - return r_able, w_able + def accept_new_clients(readable): for sitename, sitestate in g_sites.items(): - if sitestate["socket"] in readable: + if sitestate["socket"].fileno() in readable: try: s, addrinfo = sitestate["socket"].accept() s.setblocking(1) @@ -261,7 +285,7 @@ def get_new_requests(readable): for sitename, sitestate in g_sites.items(): for client in sitestate["clients"]: if client["state"] == "idle" and \ - (client["socket"] in readable or client.get("nextrequest")): + (client["socket"].fileno() in readable or client.get("nextrequest")): try: request = receive_request(sitename, client) if not request: @@ -419,7 +443,7 @@ def receive_request(sitename, client): def get_responses(readable): for sitename, sitestate in g_sites.items(): for channel in sitestate["channels"]: - if channel["socket"] in readable: + if channel["socket"].fileno() in readable: if channel["state"] == "busy": receive_response(sitename, channel) else: @@ -498,7 +522,7 @@ def receive_response(sitename, channel): def send_responses(writable): for sitename, sitestatus in g_sites.items(): for client in sitestatus["clients"]: - if client["state"] == "response" and client["socket"] in writable: + if client["state"] == "response" and client["socket"].fileno() in writable: try: # ACHTUNG: Beim senden an den Client können wir blockieren, wenn @@ -822,7 +846,7 @@ def read_configuration(): def do_restart(): log("Restarting myself") - for fd in range(3, 256): + for fd in range(3, 8192): try: os.close(fd) except:

10 years, 4 months

Check_MK Git: check_mk: if: now able to configure minimum bandwidth limits

by Andreas Boesl

Module: check_mk Branch: master Commit: 4a707a1c1f7ea8ce2e38ac985b5df15522ea3566 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a707a1c1f7ea8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 13 13:45:45 2014 +0200 if: now able to configure minimum bandwidth limits --- .werks/916 | 8 ++++++ ChangeLog | 1 + checkman/if | 9 +++++++ checks/if.include | 46 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 25 +++++++++++++++++- 5 files changed, 82 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a707a1c1f…

10 years, 4 months

Check_MK Git: check_mk: FIX brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 27ff879dad863abd7ee736105c72e04c9c1904d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27ff879dad863a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon May 12 14:12:40 2014 +0200 FIX brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP --- .werks/953 | 8 ++++++++ ChangeLog | 1 + checks/brocade_mlx_temp | 11 ++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/953 b/.werks/953 new file mode 100644 index 0000000..f78dcaf --- /dev/null +++ b/.werks/953 @@ -0,0 +1,8 @@ +Title: brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1399896720 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c1fb9a9..ef24dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 0161 FIX: cisco_fru_power: Exluded not existing devices from the inventory * 0969 FIX: blade_health: correctly output error message in non-OK state * 0611 FIX: nfsexports.solaris: fix in determination of path prefix + * 0953 FIX: brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp index 406f6c4..f346f6c 100644 --- a/checks/brocade_mlx_temp +++ b/checks/brocade_mlx_temp @@ -54,14 +54,19 @@ def check_brocade_mlx_temp(item, params, info): for temp_descr, temp_id, temp_value in info: current_item = compose_item(temp_id, temp_descr) if current_item == item: - # Info from the MIB: "Each unit is 0.5 degrees Celcius." - temp_value = int(temp_value) / 2 - # OID_END needs to be used for sensor id because especially # Active management modules may have more temperature sensors # with the same description temp_id = re.sub("[0-9]+\.", "", temp_id) + # some devices do not deliver values on one single check in + # between - setting to unknown in this case + if temp_value == "": + return 3, "No temperature value delivered by SNMP for sensor " + temp_id + + # Info from the MIB: "Each unit is 0.5 degrees Celcius." + temp_value = int(temp_value) / 2 + txt = "Sensor %s: %s°C" % (temp_id, temp_value) if temp_value > crit: status = max(status, 2)

10 years, 4 months

Check_MK Git: check_mk: FIX nfsexports.solaris: fix in determination of path prefix

by Goetz Golla

Module: check_mk Branch: master Commit: d83f76c394d7dd924d4ccf4d892c2b92c598d59d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d83f76c394d7dd… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu May 8 17:54:09 2014 +0200 FIX nfsexports.solaris: fix in determination of path prefix --- .werks/611 | 8 ++++++++ ChangeLog | 1 + agents/solaris/nfsexports.solaris | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/611 b/.werks/611 new file mode 100644 index 0000000..d046b8e --- /dev/null +++ b/.werks/611 @@ -0,0 +1,8 @@ +Title: nfsexports.solaris: fix in determination of path prefix +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1399564395 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1e56f2d..c1fb9a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 0158 FIX: dell_om_disks: Handle hotspares more correctly * 0161 FIX: cisco_fru_power: Exluded not existing devices from the inventory * 0969 FIX: blade_health: correctly output error message in non-OK state + * 0611 FIX: nfsexports.solaris: fix in determination of path prefix Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/solaris/nfsexports.solaris b/agents/solaris/nfsexports.solaris index 39c6443..c953a08 100644 --- a/agents/solaris/nfsexports.solaris +++ b/agents/solaris/nfsexports.solaris @@ -31,7 +31,7 @@ if [ -r $clusterconfigdir ]; then # is a clustered nfs server nfsconfig=/etc/cluster/ccr/global/`grep rgm $clusterconfigdir | grep nfs | grep rg_` if [ -r $nsconfig ]; then - Pathprefix=`grep Path $nfsconfig | awk {'print $2'}`/SUNW.nfs + Pathprefix=`grep Pathprefix $nfsconfig | awk {'print $2'}`/SUNW.nfs dfstabfile=$Pathprefix/dfstab.`grep -v FilesystemMountPoints $nfsconfig | grep SUNW.nfs | \ awk {'print $1'} | sed -e 's/RS_//'` if [ -r $dfstabfile ]; then

10 years, 4 months

Check_MK Git: check_mk: mk_inventory: windows inventory check now included, install date added to data

by Goetz Golla

Module: check_mk Branch: master Commit: cb6f008ebb8b1f19aae208d6aecfb863b199eee1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb6f008ebb8b1f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu May 8 16:18:58 2014 +0200 mk_inventory: windows inventory check now included, install date added to data --- .werks/610 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 29 +++++++++++++++++++++++++++++ inventory/win_wmi_software | 3 ++- web/plugins/views/inventory.py | 3 ++- 5 files changed, 42 insertions(+), 2 deletions(-) diff --git a/.werks/610 b/.werks/610 new file mode 100644 index 0000000..1f7757d --- /dev/null +++ b/.werks/610 @@ -0,0 +1,8 @@ +Title: mk_inventory: windows inventory check now included, install date added to data +Level: 2 +Component: inv +Version: 1.2.5i3 +Date: 1399558285 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f6d99a3..f2e6bd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ HW/SW-Inventory: * 0913 lnx_distro: Now able to detect SuSE distributions... + * 0610 mk_inventory: windows inventory check now included, install date added to data * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 new file mode 100644 index 0000000..b4ec784 --- /dev/null +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -0,0 +1,29 @@ +$name = (Get-Item env:\Computername).Value +$separator = "|" + +# Processor +write-host "<<<win_cpuinfo:sep(58)>>>" +Get-WmiObject Win32_Processor -ComputerName $name | Select Name,Manufacturer,Caption,DeviceID,MaxClockSpeed,DataWidth,L2CacheSize,L3CacheSize,NumberOfCores,NumberOfLogicalProcessors,Status + +# OS Version +write-host "<<<win_os:sep(58)>>>" +Get-WmiObject Win32_OperatingSystem -ComputerName $name -Recurse | foreach-object { write-host -separator $separator $_.csname, $_.caption, $_.version, $_.servicepackmajorversion, $_.ServicePackMinorVersion } + +# Installed Software +write-host "<<<win_wmi_software:sep(124)>>>" +Get-WmiObject Win32_Product -ComputerName $name | foreach-object { write-host -separator $separator $_.Name, $_.Vendor, $_.Version, $_.InstallDate } + +## Search Registry +write-host "<<<win_reg_uninstall:sep(124)>>>" +Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall" -Recurse | foreach-object { write-host -separator $separator $_.PSChildName } + +## Search exes +write-host "<<<win_exefiles:sep(124)>>>" +$paths = @("d:\", "c:\Program Files", "c:\Program Files (x86)", "c:\Progs") +foreach ($item in $paths) +{ + if ((Test-Path $item -pathType container)) + { + Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.Length } + } +} diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index 01eb091..68872ff 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -36,11 +36,12 @@ def inv_win_wmi_software(info): paclist = inv_tree("software.packages:") - for pacname, vendor, version in info: + for pacname, vendor, version, install_date in info: entry = { "name" : pacname, "version" : version, "vendor" : vendor, + "install_date" : install_date, "package_type" : "wmi", } paclist.append(entry) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 48c65e9..7764ae8 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -579,6 +579,7 @@ inventory_displayhints.update({ ".software.packages:*.summary" : { "title" : _("Description"), }, ".software.packages:*.version" : { "title" : _("Version"), }, ".software.packages:*.package_version" : { "title" : _("Package Version"), }, + ".software.packages:*.install_date" : { "title" : _("Install Date"), }, ".software.packages:*.size" : { "title" : _("Size"), "paint" : "count" }, }) @@ -812,7 +813,7 @@ for name, title, sortfunc in [ ( "arch", _("CPU Architecture"), cmp ), ( "package_type", _("Type"), cmp ), ( "version", _("Version"), cmp_version ), - ( "package_version", _("Package Version"), cmp_version ), + ( "install_date", _("Install Date"), cmp ), ]: declare_swpacs_columns(name, title, sortfunc)

10 years, 4 months

Check_MK Git: check_mk: FIX blade_health: correctly output error message in non-OK state

by Mathias Kettner

Module: check_mk Branch: master Commit: 4595668d1edf7da2a014f9a266f8f04472935e0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4595668d1edf7d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 8 12:37:30 2014 +0200 FIX blade_health: correctly output error message in non-OK state --- .werks/969 | 8 ++++++++ ChangeLog | 1 + checks/blade_health | 6 +----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.werks/969 b/.werks/969 new file mode 100644 index 0000000..a06924d --- /dev/null +++ b/.werks/969 @@ -0,0 +1,8 @@ +Title: blade_health: correctly output error message in non-OK state +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1399545417 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 17f4122..e3b0ec6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 0910 FIX: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure... * 0158 FIX: dell_om_disks: Handle hotspares more correctly * 0161 FIX: cisco_fru_power: Exluded not existing devices from the inventory + * 0969 FIX: blade_health: correctly output error message in non-OK state Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/blade_health b/checks/blade_health index cc631f4..de27f9c 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -38,9 +38,7 @@ def inventory_blade_health(info): def check_blade_health(_no_item, _no_params, info): state = info[0][0] - descr = '' - if len(info[0]) > 1: - descr = ': %s' % info[0][1] + descr = ": " + ", ".join([ line[1] for line in info if len(line) > 1 ]) if state == "255": return (0, "State is good") @@ -55,8 +53,6 @@ def check_blade_health(_no_item, _no_params, info): - - check_info["blade_health"] = { 'check_function': check_blade_health, 'inventory_function': inventory_blade_health,

10 years, 4 months

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 1675a869cd0b79018f09a38e076af58ff2bdb66c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1675a869cd0b79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 8 12:19:18 2014 +0200 Updated Werk description --- .werks/968 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/968 b/.werks/968 index 73ba143..a31304b 100644 --- a/.werks/968 +++ b/.werks/968 @@ -30,13 +30,13 @@ in different notification rules. If a configuration key appears both in <i>Host & Service Parameters</i> and in a notification rule then the latter one has precedence. -Within that effort the HTML email script is now far more configurable. You +Within that effort the HTML email script has been made far more configurable. You can now configure: <ul> <li>The From- and Reply-To Address</li> <li>The subjects for host and service notifications</li> <li>An URL-Prefix for your Multisite interface (this makes hosts and services -in the notifications clickable<li> +in the notifications clickable</li> <li>A choice of optional information to be displayed in the emails</li> </ul>

10 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014