Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: dc495c2a1b822d68c4cfc9326af969dcc8179b74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc495c2a1b822d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 8 14:20:36 2017 +0200 added comment Change-Id: Icd6675d57427f82ab699eb7e2c843b5bb9429816 --- agents/windows/msibuild/msi-update | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 54b68d5..9e95dce 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | @@ -24,6 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +################################################### +# IMPORTANT: THIS FILE EXISTS TWICE +# ANY CHANCES HERE ARE ALSO REQUIRED IN THE COUNTERPART +# check_mk.git ~/share/check_mk/agents/windows/msibuild +# cmk-omd.git ~/packages/msitools +#################################################### + import os, sys, uuid, tempfile, shutil, re def verbose(text):

7 years

Reserved 10 Werk IDS

by “Tom

Module: check_mk Branch: master Commit: 1b77fdfbdcff0908fa741bafe09d9bccf465cbe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b77fdfbdcff09… Author: “Tom <tb(a)mathias-kettner.de> Date: Thu Jun 8 16:43:09 2017 +0200 Reserved 10 Werk IDS Change-Id: Ie2a9b4b67a15b79f00767474a8c56b7aa34e6454 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 758c203..a535f3c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4808 +4818

7 years

4800 FIX zpool: Enable check to handle variant output of zpool list command

by Konstantin Büttner

Module: check_mk Branch: master Commit: ff8f8e5f783e0e05eb73add77042cec74d402506 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff8f8e5f783e0e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 8 15:50:52 2017 +0200 4800 FIX zpool: Enable check to handle variant output of zpool list command Change-Id: Ic6c30af99962ec9aab0a30307c45388324639bb3 --- .werks/4800 | 11 +++++++++++ checks/zpool | 25 +++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.werks/4800 b/.werks/4800 new file mode 100644 index 0000000..35676dd --- /dev/null +++ b/.werks/4800 @@ -0,0 +1,11 @@ +Title: zpool: Enable check to handle variant output of zpool list command +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496929769 + + diff --git a/checks/zpool b/checks/zpool index fc62178..2188f68 100644 --- a/checks/zpool +++ b/checks/zpool @@ -29,13 +29,30 @@ # app02 39.8G 14.1G 25.6G 35% ONLINE - # rpool 39.8G 32.9G 6.81G 82% ONLINE - +# Or also: +# NAME SIZE USED AVAIL CAP HEALTH ALTROOT +# sth_ds 278G 127G 151G 45% ONLINE - + + def parse_zpool(info): + + def canonize_header_entry(entry): + if entry == "used": + return "alloc" + elif entry == "avail": + return "free" + else: + return entry + result = {} - header = [item.lower() for item in info[0]] - for line in info[1:]: - result[line[0]] = dict(zip(header, line)) - return result + if len(info) == 0: + return result + else: + header = [ canonize_header_entry(item.lower()) for item in info[0]] + for line in info[1:]: + result[line[0]] = dict(zip(header, line)) + return result def inventory_zpool(parsed): return df_inventory(parsed.keys())

7 years

4795 FIX netstat: Fixed wrong output if LISTENING connections should be monitored on Ubuntu

by Marcel Arentz

Module: check_mk Branch: master Commit: 9f3bfeff5b4a0edb905bda1c3e7d0709ac3694ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f3bfeff5b4a0e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 8 15:38:00 2017 +0200 4795 FIX netstat: Fixed wrong output if LISTENING connections should be monitored on Ubuntu Ubuntu uses LISTEN instead of LISTENING in netstat. The checkplugin now reflects this exception. Change-Id: I1e8e679daf6f0d651c4955cb6a402952f29d4428 --- .werks/4795 | 11 +++++++++++ checks/netstat | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/4795 b/.werks/4795 new file mode 100644 index 0000000..0dede84 --- /dev/null +++ b/.werks/4795 @@ -0,0 +1,11 @@ +Title: netstat: Fixed wrong output if LISTENING connections should be monitored on Ubuntu +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496928598 +Class: fix + +Ubuntu uses LISTEN instead of LISTENING in netstat. The checkplugin now +reflects this exception. diff --git a/checks/netstat b/checks/netstat index 846bcf0..6176f3f 100644 --- a/checks/netstat +++ b/checks/netstat @@ -60,6 +60,9 @@ def parse_netstat(info): proto = "TCP" elif proto.startswith("udp"): proto = "UDP" + # Ubuntu recently deviced to use "LISTEN" instead of "LISTENING" + if connstate == "LISTEN": + connstate == "LISTENING" if len(line) == 5: # handles UDP listeners proto, recv_q, send_q, local, remote = line

7 years

4778 FIX lnx_quotas: Adapted plugin output if TABS are used in fstab

by Simon Betz

Module: check_mk Branch: master Commit: e957b91c43d01520d0f256fd7f438ab86bc7fd23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e957b91c43d015… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 15:06:27 2017 +0200 4778 FIX lnx_quotas: Adapted plugin output if TABS are used in fstab Change-Id: Ib7b20bbeb7f563a3c31d7ed5ce37037a7e0bb020 --- .werks/4778 | 11 +++++++++++ agents/plugins/lnx_quota | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4778 b/.werks/4778 new file mode 100644 index 0000000..95a21ad --- /dev/null +++ b/.werks/4778 @@ -0,0 +1,11 @@ +Title: lnx_quotas: Adapted plugin output if TABS are used in fstab +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496927102 + + diff --git a/agents/plugins/lnx_quota b/agents/plugins/lnx_quota index 4f167bd..919417b 100755 --- a/agents/plugins/lnx_quota +++ b/agents/plugins/lnx_quota @@ -27,13 +27,13 @@ if type repquota >/dev/null ; then echo "<<<lnx_quota>>>" # User Quota - for VOL in $(grep -E usr[j]?quota /etc/fstab | cut -d' ' -f2); do + for VOL in $(grep -E usr[j]?quota /etc/fstab | tr -s '\t' ' ' | cut -d' ' -f2); do echo "[[[usr:$VOL]]]" repquota -up $VOL | tail -n +6 | head -n -2 done # Group Quota - for VOL in $(grep -E grp[j]?quota /etc/fstab | cut -d' ' -f2); do + for VOL in $(grep -E grp[j]?quota /etc/fstab | tr -s '\t' ' ' | cut -d' ' -f2); do echo "[[[grp:$VOL]]]" repquota -gp $VOL | tail -n +6 | head -n -2 done

7 years

8656 FIX Button "All Logfiles" in logwatch user interface now works in distributed mode

by Mathias Kettner

Module: check_mk Branch: master Commit: aca03d362b5bf93721cbe155d8677ff4037680aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aca03d362b5bf9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 8 14:55:41 2017 +0200 8656 FIX Button "All Logfiles" in logwatch user interface now works in distributed mode The problem was that this button would only show the log files that are on the same monitoring site as the currently shown log file or host. This problem only appeared in a distributed environment. Change-Id: I1a47413d15098458228a28c06cde9f12553f9896 --- .werks/8656 | 13 +++++++++++++ web/htdocs/logwatch.py | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/8656 b/.werks/8656 new file mode 100644 index 0000000..c653a30 --- /dev/null +++ b/.werks/8656 @@ -0,0 +1,13 @@ +Title: Button "All Logfiles" in logwatch user interface now works in distributed mode +Level: 2 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496926447 + +The problem was that this button would only show the log files that are on +the same monitoring site as the currently shown log file or host. This problem +only appeared in a distributed environment. diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 6139054..f6bf93b 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -70,6 +70,10 @@ def page_show(): show_host_log_list(site, host_name) +def button_all_logfiles(): + html.context_button(_("All Logfiles"), html.makeuri([('site', ''), ('host', ''), ('file', '')])) + + # Shows a list of all problematic logfiles grouped by host def show_log_list(): html.header(_("All Problematic Logfiles"), stylesheets = stylesheets) @@ -106,7 +110,7 @@ def show_host_log_list(site, host_name): html.begin_context_buttons() html.context_button(_("Services"), services_url(site, host_name), 'services') - html.context_button(_("All Logfiles"), html.makeuri([('site', ''), ('host', ''), ('file', '')])) + button_all_logfiles() html.context_button(_("Analyze host patterns"), analyse_url(site, host_name), 'analyze') ack_button(site, host_name) html.end_context_buttons() @@ -163,7 +167,7 @@ def show_file(site, host_name, file_name): html.begin_context_buttons() html.context_button(_("Services"), services_url(site, host_name), 'services') html.context_button(_("All Logfiles of Host"), html.makeuri([('file', '')])) - html.context_button(_("All Logfiles"), html.makeuri([('host', ''), ('file', '')])) + button_all_logfiles() html.context_button(_("Analyze patterns"), analyse_url(site, host_name, file_name), 'analyze') if html.var('_hidecontext', 'no') == 'yes': @@ -284,7 +288,7 @@ def do_log_ack(site, host_name, file_name): html.header(_("Acknowledge %s") % ack_msg, stylesheets = stylesheets) html.begin_context_buttons() - html.context_button(_("All Logfiles"), html.makeuri([('host', ''), ('file', '')])) + button_all_logfiles() if host_name: html.context_button(_("All Logfiles of Host"), html.makeuri([('file', '')])) if host_name and file_name:

7 years

4793 FIX chrony: Changed to raw IP address without dns name to avoid empty output

by Marcel Arentz

Module: check_mk Branch: master Commit: 8404a15514ccfb8abddc38be0524a628c7904f86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8404a15514ccfb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 8 13:59:47 2017 +0200 4793 FIX chrony: Changed to raw IP address without dns name to avoid empty output The output has been empty if the timeout was reached. This fix speeds up the computation time since the reverse DNS lookup for the IP address is skipped. Change-Id: Ie181ba88ce685800ce0d4b7c291a08e6461e563a --- .werks/4793 | 11 +++++++++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4793 b/.werks/4793 new file mode 100644 index 0000000..5e09387 --- /dev/null +++ b/.werks/4793 @@ -0,0 +1,11 @@ +Title: chrony: Changed to raw IP address without dns name to avoid empty output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496922905 +Class: fix + +The output has been empty if the timeout was reached. This fix speeds up the +computation time since the reverse DNS lookup for the IP address is skipped. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9617379..00b4d00 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -560,7 +560,7 @@ fi # Time synchronization with Chrony if type chronyc > /dev/null 2>&1 ; then # Force successful exit code. Otherwise section will be missing if daemon not running - run_cached -s chrony 30 "waitmax 5 chronyc tracking || true" + run_cached -s chrony 30 "waitmax 5 chronyc -n tracking || true" fi if type nvidia-settings >/dev/null && [ -S /tmp/.X11-unix/X0 ]

7 years

4794 FIX check_mk_agent.solaris: Now considers top in /usr/bin/ and /usr/ local/bin/

by Marcel Arentz

Module: check_mk Branch: master Commit: b7239b8a4eca0c52e4843ae68c1295963d721dfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7239b8a4eca0c… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 8 14:40:57 2017 +0200 4794 FIX check_mk_agent.solaris: Now considers top in /usr/bin/ and /usr/local/bin/ Change-Id: Ia111c6ec112a547a77340899a96612170940f367 --- .werks/4794 | 10 ++++++++++ agents/check_mk_agent.solaris | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4794 b/.werks/4794 new file mode 100644 index 0000000..1a62785 --- /dev/null +++ b/.werks/4794 @@ -0,0 +1,10 @@ +Title: check_mk_agent.solaris: Now considers top in /usr/bin/ and /usr/local/bin/ +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496925621 +Class: fix + + diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c10e3b1..a801c3f 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -266,7 +266,7 @@ then # the <<<statgrab_mem>>> info is already provided by <<<solaris_mem>>> # However, we make an exception if /usr/bin/top is missing (required by solaris_mem) - if [ ! -x /usr/bin/top ] + if [ ! -x /usr/bin/top ] && [ ! -x /usr/local/bin/top ] then echo '<<<statgrab_mem>>>' egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' @@ -311,10 +311,11 @@ fi # Memory -if [ -x /usr/bin/top ] +if [ -x /usr/bin/top ] || [ -x /usr/local/top ] then echo "<<<solaris_mem>>>" - /usr/bin/top | grep '^Memory:' + if [ -x /usr/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi + if [ -x /usr/local/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi fi if type prtdiag >/dev/null 2>&1

7 years

4799 FIX printer_input: Make check work with newer revisions of the Printer-MIB

by Konstantin Büttner

Module: check_mk Branch: master Commit: b0488c4cf3fe133af79c559290e90b42a846078f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0488c4cf3fe13… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 8 14:14:15 2017 +0200 4799 FIX printer_input: Make check work with newer revisions of the Printer-MIB An extension of the syntax for the capacity unit was previously not handled by the check. This has been fixed. Change-Id: I2051c5847c2abb1fb81f4e22a3cbaf86fa267add --- .werks/4799 | 13 +++++++++++++ checks/printer_io.include | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/4799 b/.werks/4799 new file mode 100644 index 0000000..726b2be --- /dev/null +++ b/.werks/4799 @@ -0,0 +1,13 @@ +Title: printer_input: Make check work with newer revisions of the Printer-MIB +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496923932 + +An extension of the syntax for the capacity unit was previously not handled +by the check. This has been fixed. + diff --git a/checks/printer_io.include b/checks/printer_io.include index dc8c487..7762b91 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -27,6 +27,7 @@ printer_io_units = { '-1' : 'unknown', '0' : 'unknown', + '2' : 'unknown', # defined by PrtCapacityUnitTC used in newer revs. '3' : '1/10000 in', '4' : 'micrometers', '8' : 'sheets',

7 years

4777 FIX esx_vsphere_sensors: Fixed wrong interpretation of ESX sensor health state 'UNKNOWN'

by Simon Betz

Module: check_mk Branch: master Commit: c1660acabb4fd1e6bfe078338c020c9e65f9f302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1660acabb4fd1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 13:50:21 2017 +0200 4777 FIX esx_vsphere_sensors: Fixed wrong interpretation of ESX sensor health state 'UNKNOWN' Change-Id: I4cc350341dfa6cbb86736e271288bb2a6a07dcfe --- .werks/4777 | 11 +++++++++++ checks/esx_vsphere_sensors | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4777 b/.werks/4777 new file mode 100644 index 0000000..82ae709 --- /dev/null +++ b/.werks/4777 @@ -0,0 +1,11 @@ +Title: esx_vsphere_sensors: Fixed wrong interpretation of ESX sensor health state 'UNKNOWN' +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496922381 + + diff --git a/checks/esx_vsphere_sensors b/checks/esx_vsphere_sensors index 45a5be8..a071d8f 100644 --- a/checks/esx_vsphere_sensors +++ b/checks/esx_vsphere_sensors @@ -48,13 +48,13 @@ def check_esx_vsphere_sensors(_no_item, params, info): health_key = health_key.lower() if health_key == "green": continue # usually not output by agent anyway - infos.append("%s: %s (%s)" % (name, health_label, health_summary)) + infos.append("%s: %s (%s)" % (name, health_label, health_summary)) sensor_state = 0 if health_key == "yellow": sensor_state = 1 elif health_key == "unknown": - sensor_state = 1 + sensor_state = 3 else: sensor_state = 2 @@ -69,7 +69,7 @@ def check_esx_vsphere_sensors(_no_item, params, info): sensor_state_modified = True state = max(state, sensor_state) - infos[-1] += ["", "(!)", "(!!)", "(!)"][state] + infos[-1] += ["", "(!)", "(!!)", "(?)"][state] infos[-1] += extra_info if state > 0 or sensor_state_modified:

7 years

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017