Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

use same compiler for python-modules as for python

by Alex Zurhake

Module: check_mk Branch: master Commit: 1b8342b7c4140a746543fd6def79db00a818290a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b8342b7c4140a… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 10:36:50 2018 +0100 use same compiler for python-modules as for python Change-Id: Iba6b1ad688db0478a1863cabc604d292e4e8731b --- omd/packages/python-modules/python-modules.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 59bf58d..9ca0c33 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -189,6 +189,8 @@ PYTHON_MODULES_LIST += PyYAML-3.13.tar.gz PYTHON_MODULES_LIST += websocket_client-0.54.0.tar.gz PYTHON_MODULES_LIST += kubernetes-8.0.0.tar.gz +# NOTE: Cruel hack below! We need to have a recent GCC visible in the PATH +# because the SSSE3 detection in pycryptodomex is slightly broken. :-/ $(PYTHON_MODULES_BUILD): $(PYTHON_BUILD) $(FREETDS_BUILD) $(PYTHON_MODULES_PATCHING) set -e ; cd $(PYTHON_MODULES_DIR) ; \ $(MKDIR) $(PACKAGE_PYTHON_MODULES_PYTHONPATH) ; \ @@ -197,6 +199,7 @@ $(PYTHON_MODULES_BUILD): $(PYTHON_BUILD) $(FREETDS_BUILD) $(PYTHON_MODULES_PATCH export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ + PATH="$(abspath ./bin):$$PATH" ; \ for M in $(PYTHON_MODULES_LIST); do \ echo "Building $$M..." ; \ PKG=$${M//.tar.gz/} ; \

5 years, 10 months

fix accidential renaming of googletest/Makefile

by Alex Zurhake

Module: check_mk Branch: master Commit: 6063d6d5fcc177ed95b0d0baa6527a63e599b375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6063d6d5fcc177… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 07:54:03 2018 +0100 fix accidential renaming of googletest/Makefile Change-Id: I079d7875f1fd795498361ce042a0168256095610 --- omd/packages/googletest/{googletest.make => Makefile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/googletest/googletest.make b/omd/packages/googletest/Makefile similarity index 100% rename from omd/packages/googletest/googletest.make rename to omd/packages/googletest/Makefile

5 years, 10 months

only unpack libgsf on sles15, use unpack function in package.make

by Alex Zurhake

Module: check_mk Branch: master Commit: 01a77d26afb8db088c2e35d949e06f9e5b95691d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01a77d26afb8db… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 08:24:09 2018 +0100 only unpack libgsf on sles15, use unpack function in package.make Change-Id: I25d85158913b03846065b54df1c3fcc61becaa59 --- omd/packages/libgsf/libgsf.make | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/omd/packages/libgsf/libgsf.make b/omd/packages/libgsf/libgsf.make index 395c6dd..3d54070 100644 --- a/omd/packages/libgsf/libgsf.make +++ b/omd/packages/libgsf/libgsf.make @@ -12,11 +12,15 @@ $(LIBGSF): $(LIBGSF_BUILD) $(LIBGSF)-install: $(LIBGSF_INSTALL) -$(LIBGSF_BUILD): $(LIBGSF_UNPACK) + ifneq ($(filter $(DISTRO_CODE),sles15),) - tar xJf $(LIBGSF_DIR).tar.xz +$(LIBGSF_BUILD): $(LIBGSF_UNPACK) cd $(LIBGSF_DIR) && ./configure --prefix=$(OMD_ROOT) $(MAKE) -C $(LIBGSF_DIR) + $(TOUCH) $@ +else +$(LIBGSF_BUILD): + $(TOUCH) $@ endif $(LIBGSF_INSTALL): $(LIBGSF_BUILD)

5 years, 10 months

fix cma recursive call

by Alex Zurhake

Module: check_mk Branch: master Commit: 02ed31e66200ac5e6388bf32a27d4303ec3e34fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02ed31e66200ac… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 09:40:04 2018 +0100 fix cma recursive call Change-Id: I9bebfafdc10f69790f5f029874eb0c028539b2f0 --- omd/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 9afeaeb..f6eb28e 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -310,14 +310,17 @@ setversion: test: t/test_all.sh -cma: check-edition +cma-pre: check-edition # make the cmc the default core sed -i 's/default)/default) echo "cmc"; exit;/g' packages/omd/CORE.hook # enable the event console by default sed -i 's/default)/default) echo "on"; exit;/g' packages/check_mk/MKEVENTD.hook - - make PACKAGES="$(PACKAGES) cma" build pack - + +cma-install: + make -C packages/cma install + +cma: cma-pre $(PACKAGES) cma-install pack + # Create info file to mark minimal cma firmware version requirement @if [ "$(DISTRO_CODE)" = "stretch" ]; then \ MIN_VERSION=1.4.0 ; \

5 years, 10 months

add correct path to patches in python-modules

by Alex Zurhake

Module: check_mk Branch: master Commit: 0eab2d2e91da01837241e213c8ba0e5c69841fe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eab2d2e91da01… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 08:49:19 2018 +0100 add correct path to patches in python-modules Change-Id: Ia05f1dc31a8fa04bfa22104ed9e6042e3e59bcd3 --- omd/packages/python-modules/python-modules.make | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 2536cef..59bf58d 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -39,8 +39,8 @@ PYTHON_MODULES_LIST += pymssql-2.1.3.tar.gz # needed for check_sql (together wit LEGACY_LDAP=0 ifeq ($(DISTRO_CODE),el5) LEGACY_LDAP=1 - PYTHON_MODULES_PATCHES += patches/0018-mysqlclient-fortify-source.patch - PYTHON_MODULES_PATCHES += patches/0019-PyNaCl-fortify-source.patch + PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0018-mysqlclient-fortify-source.patch + PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0019-PyNaCl-fortify-source.patch endif ifeq ($(LEGACY_LDAP), 1) @@ -120,8 +120,8 @@ else ifneq ($(filter $(DISTRO_CODE),el6),) # (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst), # so we stick with 1.5.3. PYTHON_MODULES_LIST += cryptography-1.5.3.tar.gz - PYTHON_MODULES_PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch - PYTHON_MODULES_PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch + PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0004-CMS_DEBUG_DECRYPT-fix.patch + PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-1.5.3-disable-version-warning.patch else PYTHON_MODULES_LIST += asn1crypto-0.24.0.tar.gz PYTHON_MODULES_LIST += cryptography-2.4.1.tar.gz

5 years, 10 months

fix recursive definitions of openhardwaremonitor targets

by Alex Zurhake

Module: check_mk Branch: master Commit: c16df4bef7b5e29ff14ca01f1c7b908db1d60ce2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c16df4bef7b5e2… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 09:18:58 2018 +0100 fix recursive definitions of openhardwaremonitor targets Change-Id: If9c6ffd333c69b37924da34b21699b78ae546961 --- Makefile | 3 --- omd/packages/openhardwaremonitor/openhardwaremonitor.make | 10 ++++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a852dd..154b09c 100644 --- a/Makefile +++ b/Makefile @@ -257,9 +257,6 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo " FINISHED. " @echo "==============================================================================" -omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll: - make -C omd openhardwaremonitor-dist - .werks/werks: $(WERKS) PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/werks cre diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor.make b/omd/packages/openhardwaremonitor/openhardwaremonitor.make index 8edc39b..efefbf5 100644 --- a/omd/packages/openhardwaremonitor/openhardwaremonitor.make +++ b/omd/packages/openhardwaremonitor/openhardwaremonitor.make @@ -4,6 +4,7 @@ OPENHARDWAREMONITOR_DIR := $(OPENHARDWAREMONITOR)-$(OPENHARDWAREMONITOR_VERS) OPENHARDWAREMONITOR_INSTALL := $(BUILD_HELPER_DIR)/$(OPENHARDWAREMONITOR_DIR)-install OPENHARDWAREMONITOR_UNPACK := $(BUILD_HELPER_DIR)/$(OPENHARDWAREMONITOR_DIR)-unpack +OPENHARDWAREMONITOR_DIST := $(BUILD_HELPER_DIR)/$(OPENHARDWAREMONITOR_DIR)-dist .PHONY: $(OPENHARDWAREMONITOR) $(OPENHARDWAREMONITOR)-setup $(OPENHARDWAREMONITOR)-clean-ohm $(OPENHARDWAREMONITOR)-dist $(OPENHARDWAREMONITOR)-build $(OPENHARDWAREMONITOR)-install $(OPENHARDWAREMONITOR)-skel $(OPENHARDWAREMONITOR)-clean @@ -15,13 +16,15 @@ $(OPENHARDWAREMONITOR): $(OPENHARDWAREMONITOR)-install: $(OPENHARDWAREMONITOR_INSTALL) +$(OPENHARDWAREMONITOR)-dist: $(OPENHARDWAREMONITOR_DIST) + # OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll # cp -p $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe \ # $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll \ # . #$(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln -OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln +$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln # The strange "cat" below is necessary because the extremely ancient Mono # versions coming with even the latest Ubuntus still contain the rather severe # bug https://github.com/mono/mono/issues/6752. ("...System.Exception: Magic @@ -30,6 +33,8 @@ OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UN /p:TargetFrameworkVersion="v4.5" \ $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln \ /target:OpenHardwareMonitorCLI | cat + cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) + cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI cp -r $< $(OPENHARDWAREMONITOR_DIR)/ @@ -50,7 +55,8 @@ $(OPENHARDWAREMONITOR)-setup: mono-complete \ mono-xbuild -$(OPENHARDWAREMONITOR)-dist: OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll +$(OPENHARDWAREMONITOR_DIST): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll + $(TOUCH) $@ $(OPENHARDWAREMONITOR)-clean-ohm: clean rm -f OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll

5 years, 10 months

6908 FIX jolokia_metrics.tp: Fix percentage of tomcat threadpool info

by Moritz Kiemer

Module: check_mk Branch: master Commit: 95e4ba21d3ac10b6b8bfa158d27f558dd4e83918 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95e4ba21d3ac10… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 19 09:34:34 2018 +0100 6908 FIX jolokia_metrics.tp: Fix percentage of tomcat threadpool info Previously the value shown as percentage was too small by a factor of 100 and rounded to 1 decimal digit. Change-Id: Ia7c8b7d33e6b69cc51bb9435c74a0b89ccd72cfb --- .werks/6908 | 11 +++++++++++ checks/jolokia_metrics | 11 ++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/6908 b/.werks/6908 new file mode 100644 index 0000000..8d66461 --- /dev/null +++ b/.werks/6908 @@ -0,0 +1,11 @@ +Title: jolokia_metrics.tp: Fix percentage of tomcat threadpool info +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542615887 +Class: fix + +Previously the value shown as percentage was too small by a factor of 100 +and rounded to 1 decimal digit. diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index ce0fc69..b0e1a8e 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -473,18 +473,19 @@ def check_jolokia_metrics_tp(item, params, info): def check_thread_levels(what): threads_abs = int(threadpool_info[what]) - threads_rel = threads_abs / max_threads - infotext = "%s: %d (%.1f%%)" % (what, threads_abs, threads_rel) + threads_perc = threads_abs * 100. / max_threads + infotext = "%s: %d (%s)" % (what, threads_abs, get_percent_human_readable(threads_perc)) status = 0 _params = params.get(what) if _params and _params[0] != None and _params[1] != None: warn, crit = params[what] - levelstext = " (warn/crit at %d/%d%%)" % (warn, crit) - if threads_rel >= crit: + levelstext = " (warn/crit at %s/%s)" % (get_percent_human_readable(warn), + get_percent_human_readable(crit)) + if threads_perc >= crit: status = 2 infotext += levelstext - elif threads_rel >= warn: + elif threads_perc >= warn: status = 1 infotext += levelstext else:

5 years, 10 months

mk_jolokia: move constants to top

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5c981916b65a1100002429dde6e73bcddc37a10e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c981916b65a11… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 16 15:49:54 2018 +0100 mk_jolokia: move constants to top Change-Id: I9a67ad9ec33aa128ef335c3596fa0f4bafec23ab --- agents/plugins/mk_jolokia | 191 +++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c981916b6…

5 years, 10 months

jolokia_generic: adjust tests to improved discovery

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3619136dfa9d051a064978824752ed4faaaba03d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3619136dfa9d05… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 19 08:29:33 2018 +0100 jolokia_generic: adjust tests to improved discovery Change-Id: I57337b41b9235537cba10ad9c68b24cea667dec3 --- tests/unit/checks/generictests/datasets/jolokia_generic.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/checks/generictests/datasets/jolokia_generic.py b/tests/unit/checks/generictests/datasets/jolokia_generic.py index 9777b60..f956776 100644 --- a/tests/unit/checks/generictests/datasets/jolokia_generic.py +++ b/tests/unit/checks/generictests/datasets/jolokia_generic.py @@ -17,7 +17,6 @@ discovery = { '': [ ('Instance1 MBean Mitglieder_Anzahl', {}), ('Instance2 MBean Mitglieder Anzahl', {}), - ('JIRA,com.atlassian.jira:type=web.requests,invocation.count MBean jira.name', {}), ('JIRA,com.atlassian.jira:type=web.requests,invocation.count MBean jira.value', {}), ], 'rate': [],

5 years, 10 months

Refactored automation_commands to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: c8c2a2575e73853d365254c04975cffc5f468242 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8c2a2575e7385… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 16 12:17:33 2018 +0100 Refactored automation_commands to plugin registry Change-Id: I98cde040f90db71605e5a605e3cfcfe9c1308cfe --- cmk/gui/wato/pages/activate_changes.py | 27 ++-- cmk/gui/wato/pages/analyze_configuration.py | 2 +- cmk/gui/wato/pages/automation.py | 16 +- cmk/gui/watolib.py | 241 +++++++++++++++++----------- tests/unit/cmk/gui/test_watolib.py | 22 ++- 5 files changed, 192 insertions(+), 116 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c8c2a2575e…

5 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018