Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5137 FIX Fix error when spaces are present in custom agent files

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c3cc205e1c96e9b692e6a014ac5ea2ed3f8d7ec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3cc205e1c96e9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Sep 25 19:29:49 2017 +0200 5137 FIX Fix error when spaces are present in custom agent files Resolves an error while baking agents when custom agent files that contain spaces exist. Change-Id: I2d2ab237070bec11a4d5875a190a00c41e0aef27 --- .werks/5137 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5137 b/.werks/5137 new file mode 100644 index 0000000..0f280e4 --- /dev/null +++ b/.werks/5137 @@ -0,0 +1,11 @@ +Title: Fix error when spaces are present in custom agent files +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1506359902 +Class: fix + +Resolves an error while baking agents when custom agent files that +contain spaces exist.

6 years, 9 months

Fixed merge issue in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: e555bfd2a2dcaba50ab7bba77d1793792b185644 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e555bfd2a2dcab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 25 20:47:52 2017 +0200 Fixed merge issue in last commit Change-Id: Id8599668c13d79e1f7168a9ebae75cd52aa43402 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index eb7ca66..95af272 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3212,7 +3212,7 @@ class StatusServer(object): addr_info and addr_info[0] or "") duration = time.time() - before - verbose("Answered request in %0.2f ms" % (duration*1000)) + self.logger.verbose("Answered request in %0.2f ms" % (duration*1000)) g_perfcounters.count_time("request", duration) except Exception as e:

6 years, 9 months

Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: e281b103377972fed041e49933489538f39ee35e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e281b103377972… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 25 20:48:11 2017 +0200 Fixed typo Change-Id: Ic202edd656dbcc5e21cae58ee7e6cf3bc9515f35 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 95af272..baca9bc 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3202,7 +3202,7 @@ class StatusServer(object): self._tcp_access_list: client_socket.close() client_socket = None - self.logger.info("Denying access to status socket from %s (allowed ist only %s)" % + self.logger.info("Denying access to status socket from %s (allowed is only %s)" % (addr_info[0], ", ".join(self._tcp_access_list))) continue else:

6 years, 9 months

EC: Only suppress broken pipe socket exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: a82ebe58cc9e66846352c8215d706772e21fba5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a82ebe58cc9e66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 25 20:53:13 2017 +0200 EC: Only suppress broken pipe socket exceptions Change-Id: Iddbce915486dd888ca405ac85dd817f8aac2022e --- bin/mkeventd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index baca9bc..763c969 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3265,6 +3265,8 @@ class StatusServer(object): except socket.error as e: if e.errno == 32: # Broken pipe -> ignore this pass + else: + raise client_socket.close()

6 years, 9 months

EC: Log processing time of status queries in verbose mode

by Lars Michelsen

Module: check_mk Branch: master Commit: c6e700930fde9b66b203b6943e228dce19a2a807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6e700930fde9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 25 16:57:50 2017 +0200 EC: Log processing time of status queries in verbose mode Change-Id: I840f279532e9f83275587a23db7cf490eb8d4757 --- bin/mkeventd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index e753e84..eb7ca66 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3210,7 +3210,10 @@ class StatusServer(object): self.handle_client(client_socket, allow_commands, addr_info and addr_info[0] or "") - g_perfcounters.count_time("request", time.time() - before) + + duration = time.time() - before + verbose("Answered request in %0.2f ms" % (duration*1000)) + g_perfcounters.count_time("request", duration) except Exception as e: self.logger.exception("Error handling client %s: %s" % (addr_info, e))

6 years, 9 months

updated werk catalog entry

by Marcel Arentz

Module: check_mk Branch: master Commit: 19b73168dcee9645ffe1bfa9ebe5206afa540e36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19b73168dcee96… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Sep 25 14:29:05 2017 +0200 updated werk catalog entry Change-Id: I2efaad889a879bab7f713a674c7675149e94ef1d --- checkman/scaleio_mdm | 2 +- checkman/scaleio_pd | 2 +- checkman/scaleio_pd.status | 2 +- checkman/scaleio_sds | 2 +- checkman/scaleio_sds.status | 2 +- checkman/scaleio_storage_pool | 2 +- checkman/scaleio_storage_pool.rebalancerw | 2 +- checkman/scaleio_storage_pool.totalrw | 2 +- checkman/scaleio_system | 2 +- checkman/scaleio_volume | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/checkman/scaleio_mdm b/checkman/scaleio_mdm index 95ce45b..3e4e884 100644 --- a/checkman/scaleio_mdm +++ b/checkman/scaleio_mdm @@ -1,6 +1,6 @@ title: EMC ScaleIO: Cluster status agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_pd b/checkman/scaleio_pd index abcfc20..30df217 100644 --- a/checkman/scaleio_pd +++ b/checkman/scaleio_pd @@ -1,6 +1,6 @@ title: EMC ScaleIO: Protection Domain Capacity agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_pd.status b/checkman/scaleio_pd.status index 983680f..afc8027 100644 --- a/checkman/scaleio_pd.status +++ b/checkman/scaleio_pd.status @@ -1,6 +1,6 @@ title: EMC ScaleIO: Protection Domain Status agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_sds b/checkman/scaleio_sds index b4a950d..caca0d5 100644 --- a/checkman/scaleio_sds +++ b/checkman/scaleio_sds @@ -1,6 +1,6 @@ title: EMC ScaleIO: Data Server Capacity agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_sds.status b/checkman/scaleio_sds.status index d6f6cb7..a6da91b 100644 --- a/checkman/scaleio_sds.status +++ b/checkman/scaleio_sds.status @@ -1,6 +1,6 @@ title: EMC ScaleIO: Data Server Status agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_storage_pool b/checkman/scaleio_storage_pool index aa001b2..e41e0e6 100644 --- a/checkman/scaleio_storage_pool +++ b/checkman/scaleio_storage_pool @@ -1,6 +1,6 @@ title: EMC ScaleIO: Storage Pool Capacity agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_storage_pool.rebalancerw b/checkman/scaleio_storage_pool.rebalancerw index 3573a86..ba4c1b1 100644 --- a/checkman/scaleio_storage_pool.rebalancerw +++ b/checkman/scaleio_storage_pool.rebalancerw @@ -1,6 +1,6 @@ title: EMC ScaleIO: Storage Pool Rebalance read/write agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_storage_pool.totalrw b/checkman/scaleio_storage_pool.totalrw index 21e23cd..def9fed 100644 --- a/checkman/scaleio_storage_pool.totalrw +++ b/checkman/scaleio_storage_pool.totalrw @@ -1,6 +1,6 @@ title: EMC ScaleIO: Storage Pool Total read/write agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_system b/checkman/scaleio_system index 5de7a47..39544f8 100644 --- a/checkman/scaleio_system +++ b/checkman/scaleio_system @@ -1,6 +1,6 @@ title: EMC ScaleIO: System Capacity agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description: diff --git a/checkman/scaleio_volume b/checkman/scaleio_volume index 1ac29ae..b2518c8 100644 --- a/checkman/scaleio_volume +++ b/checkman/scaleio_volume @@ -1,6 +1,6 @@ title: EMC ScaleIO: Volume size and throughput agents: linux -catalog: os/storage/emc +catalog: os/storage license: GPL distribution: check_mk description:

6 years, 9 months

5017 FIX check_mk_agent: Fixed false positive error messages while installing rpm from bakery

by Marcel Arentz

Module: check_mk Branch: master Commit: f9740335400ce767154f190d4b5388c62707a0fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9740335400ce7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Sep 20 11:42:23 2017 +0200 5017 FIX check_mk_agent: Fixed false positive error messages while installing rpm from bakery Previously a rpm package of the linux agent assumed sysvinit while checking for xinetd to be installed. The check failed if systemd was the init system. This affects only rpm packages built by agent bakery. Now the rpm packages verifies the presence of xinetd by looking for the presence of the binary (/usr/sbin/xinetd) which seems to be less error-prone. Change-Id: I03b2ed41d5da7d1e6c49e9c501a3d5971a263a59 --- .werks/5017 | 15 +++++++++++++++ agents/check-mk-agent.spec | 10 ++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.werks/5017 b/.werks/5017 new file mode 100644 index 0000000..2062999 --- /dev/null +++ b/.werks/5017 @@ -0,0 +1,15 @@ +Title: check_mk_agent: Fixed false positive error messages while installing rpm from bakery +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1505899691 +Class: fix + +Previously a rpm package of the linux agent assumed sysvinit while checking for +xinetd to be installed. The check failed if systemd was the init system. This +affects only rpm packages built by agent bakery. + +Now the rpm packages verifies the presence of xinetd by looking for the +presence of the binary (/usr/sbin/xinetd) which seems to be less error-prone. diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 6c3d1b1..a73f911 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -81,17 +81,16 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/check_mk_agent /var/lib/check_mk_agent -%define reload_xinetd if [ -x /etc/init.d/xinetd ] ; then if pgrep -x xinetd >/dev/null ; then echo "Reloading xinetd..." ; /etc/init.d/xinetd reload ; else echo "Starting xinetd..." ; /etc/init.d/xinetd start ; fi ; fi +%define reload_xinetd if which xinetd >/dev/null 2>&1 ; then if pgrep -x xinetd >/dev/null ; then echo "Reloading xinetd..." ; service xinetd reload ; else echo "Starting xinetd..." ; service xinetd start ; fi ; fi -%define reload_xinetd_systemd if [ ! -x /etc/init.d/xinetd ] && [ -x /usr/sbin/xinetd ]; then if pgrep -x xinetd >/dev/null ; then echo "Reloading xinetd..." ; service xinetd reload ; else echo "Starting xinetd..." ; service init.d/xinetd start ; fi ; fi +%define activate_xinetd if which xinetd >/dev/null 2>&1 && which chkconfig >/dev/null 2>&1 ; then echo "Activating startscript of xinetd" ; chkconfig xinetd on ; fi -%define activate_xinetd if [ -x /usr/bin/xinetd ] && [ which chkconfig >/dev/null 2>&1 ] ; then echo "Activating startscript of xinetd" ; chkconfig xinetd on ; fi %define cleanup_rpmnew if [ -f /etc/xinetd.d/check_mk.rpmnew ] ; then rm /etc/xinetd.d/check_mk.rpmnew ; fi -%define systemd_enable if [ -x /usr/bin/systemctl ] && [ ! -x /usr/sbin/xinetd ] ; then echo "Enable Check_MK_Agent in systemd..." ; systemctl enable check_mk.socket ; systemctl restart sockets.target ; fi +%define systemd_enable if which systemctl >/dev/null 2>&1 && ! which xinetd >/dev/null 2>&1 ; then echo "Enable Check_MK_Agent in systemd..." ; systemctl enable check_mk.socket ; systemctl restart sockets.target ; fi %pre -if [ ! -x /usr/sbin/xinetd ] && [ ! -x /usr/bin/systemctl ] ; then +if ! which xinetd >/dev/null 2>&1 && ! which systemctl >/dev/null 2>&1 ; then echo echo "---------------------------------------------" echo "WARNING" @@ -111,7 +110,6 @@ fi %cleanup_rpmnew %activate_xinetd %reload_xinetd -%reload_xinetd_systemd %systemd_enable %postun

6 years, 9 months

Update the description of Werk 5034

by Jukka Aro

Module: check_mk Branch: master Commit: 6013f3fb8f741d1044b107f9b7cd8aed565ec76b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6013f3fb8f741d… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 25 13:08:29 2017 +0200 Update the description of Werk 5034 Change-Id: I613dee74935ae3450f9fc5afc907b54c1b31ecd2 --- .werks/5034 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5034 b/.werks/5034 index 8d5a454..15fe5f7 100644 --- a/.werks/5034 +++ b/.werks/5034 @@ -7,6 +7,6 @@ Version: 1.5.0i1 Date: 1506332777 Class: fix -Under certain circumstances, the first entry in Windows eventlog was skipped after starting the Windows agent. Now the first entry is always processed as expected. +The first entry in Windows eventlog was skipped after starting the Windows agent in standard configuration, that is, without vista_api=yes. With a certain pace of new events, also following eventlog entries might go missed. The bug was introduced through the fix in Werk 3134. All releases on branches 1.4.0 and master contained the bug. Now the first entry is always processed as expected.

6 years, 9 months

5209 FIX Python: Updated to 2.7.14

by Lars Michelsen

Module: check_mk Branch: master Commit: 338fd0198cf68042ce45b2f95431deb05915929e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=338fd0198cf680… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 25 12:34:31 2017 +0200 5209 FIX Python: Updated to 2.7.14 Change-Id: I6128ceee482ad049617837d834c7166ece15f2d7 --- .werks/5209 | 10 ++++++++++ omd/packages/python/Makefile | 2 +- tests/omd/test_python.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/5209 b/.werks/5209 new file mode 100644 index 0000000..5afee36 --- /dev/null +++ b/.werks/5209 @@ -0,0 +1,10 @@ +Title: Python: Updated to 2.7.14 +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506335653 +Class: fix + + diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index 8ad4e2d..46dafa6 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Python -VERSION = 2.7.13 +VERSION = 2.7.14 DIR = $(NAME)-$(VERSION) .PHONY: build install skel clean diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index d691512..88ccf9d 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -20,7 +20,7 @@ def test_03_python_interpreter_version(site): p = site.execute(["python", "-V"], stderr=subprocess.PIPE) version = p.stderr.read() - assert version.startswith("Python 2.7.13") + assert version.startswith("Python 2.7.14") def test_03_python_path(site):

6 years, 9 months

Fix Werk 5034

by Jukka Aro

Module: check_mk Branch: master Commit: 01127692fec8e78eed6e975cb43fda5624c83585 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01127692fec8e7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 25 12:12:30 2017 +0200 Fix Werk 5034 Empty line is expected by our scripts. Change-Id: I553e87d86ea83e9e799618cc31044ddd5271ec9a --- .werks/5034 | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/5034 b/.werks/5034 index 4aec9a5..8d5a454 100644 --- a/.werks/5034 +++ b/.werks/5034 @@ -6,6 +6,7 @@ Edition: cre Version: 1.5.0i1 Date: 1506332777 Class: fix + Under certain circumstances, the first entry in Windows eventlog was skipped after starting the Windows agent. Now the first entry is always processed as expected.

6 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017