Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 717323b1d2ad7fefa530e56dece900280c89b2a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717323b1d2ad7f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 13:57:36 2018 +0100 Unified variable naming a bit. Change-Id: Ifb51eb53f9a23451f8b7d6ae87e3939ad6a81402 --- omd/Makefile.omd | 6 +++--- omd/packages/check_webinject/Makefile | 2 +- omd/packages/jmx4perl/Makefile | 2 +- omd/packages/perl-modules/Makefile | 40 +++++++++++++++++------------------ omd/packages/rrdtool/Makefile | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 8445063..4d04a6d 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -42,9 +42,9 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk # Net result -> all Makefiles have now access to the linux distribution # specific settings -PERL := /usr/bin/perl -P5TMPDIST := $(REPO_PATH)/omd/packages/perl-modules/dist -LOCAL_PERL5LIB := $(P5TMPDIST)/dest/lib/perl5 +PERL := /usr/bin/perl +PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/dist +PACKAGE_PERL_MODULES_PERL5LIB := $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib/perl5 PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/tmp.python27 PACKAGE_PYTHON_PYTHONPATH := $(PACKAGE_PYTHON_DESTDIR)/lib/python2.7 diff --git a/omd/packages/check_webinject/Makefile b/omd/packages/check_webinject/Makefile index 7dd2d2c..92347fc 100644 --- a/omd/packages/check_webinject/Makefile +++ b/omd/packages/check_webinject/Makefile @@ -12,7 +12,7 @@ build: echo "applying $$p..." ; \ patch -p1 -d $(DIR) < $$p ; \ done - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ cd $(DIR) && echo "" | $(PERL) Makefile.PL cd $(DIR) && $(MAKE) check_webinject diff --git a/omd/packages/jmx4perl/Makefile b/omd/packages/jmx4perl/Makefile index b951169..562e91e 100644 --- a/omd/packages/jmx4perl/Makefile +++ b/omd/packages/jmx4perl/Makefile @@ -13,7 +13,7 @@ build: # echo "applying $$p..." ; \ # ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ # done - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ cd $(DIR) && $(PERL) Build.PL < /dev/null >build.log 2>&1 cd $(DIR) && ./Build diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile index c30bccf..5cd07f2 100644 --- a/omd/packages/perl-modules/Makefile +++ b/omd/packages/perl-modules/Makefile @@ -83,23 +83,23 @@ MODULES = \ DateTime-1.18.tar.gz build: - mkdir -p $(P5TMPDIST)/dest - mkdir -p $(P5TMPDIST)/src - rsync -a src/. $(P5TMPDIST)/src/. - rsync -a build_module.pl lib $(P5TMPDIST)/src/. - echo "install --install_base $(P5TMPDIST)/dest" > $(P5TMPDIST)/dest/.modulebuildrc + mkdir -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest + mkdir -p $(PACKAGE_PERL_MODULES_DESTDIR)/src + rsync -a src/. $(PACKAGE_PERL_MODULES_DESTDIR)/src/. + rsync -a build_module.pl lib $(PACKAGE_PERL_MODULES_DESTDIR)/src/. + echo "install --install_base $(PACKAGE_PERL_MODULES_DESTDIR)/dest" > $(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc unset LANG; \ unset PERL5LIB; \ unset PERL_MB_OPT; \ unset PERL_LOCAL_LIB_ROOT; \ unset PERL_MM_OPT; \ - export PATH=$(P5TMPDIST)/dest/bin:$$PATH; \ - export PERL_MM_OPT=INSTALL_BASE=$(P5TMPDIST)/dest; \ - export PERL_MB_OPT=--install_base=$(P5TMPDIST)/dest; \ - export MODULEBUILDRC=$(P5TMPDIST)/dest/.modulebuildrc; \ - export PERL5LIB=$(LOCAL_PERL5LIB):$(P5TMPDIST)/src/lib:$(P5TMPDIST)/src/Crypt-SSLeay-0.72; \ - cd $(P5TMPDIST)/src && \ - FORCE=1 ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest \ + export PATH=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin:$$PATH; \ + export PERL_MM_OPT=INSTALL_BASE=$(PACKAGE_PERL_MODULES_DESTDIR)/dest; \ + export PERL_MB_OPT=--install_base=$(PACKAGE_PERL_MODULES_DESTDIR)/dest; \ + export MODULEBUILDRC=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc; \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB):$(PACKAGE_PERL_MODULES_DESTDIR)/src/lib:$(PACKAGE_PERL_MODULES_DESTDIR)/src/Crypt-SSLeay-0.72; \ + cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ + FORCE=1 ./build_module.pl -d "$(DISTRO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest \ ExtUtils-MakeMaker-*.tar.gz \ parent-*.tar.gz \ version-*.tar.gz \ @@ -108,17 +108,17 @@ build: Types-Serialiser-*.tar.gz \ JSON-*.tar.gz; \ export PERL_JSON_BACKEND='JSON::XS'; \ - cd $(P5TMPDIST)/src && \ - ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest $(MODULES) - cd $(LOCAL_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . - mkdir -p $(LOCAL_PERL5LIB)/CPAN - cp MyConfig.pm $(LOCAL_PERL5LIB)/CPAN/MyConfig.skel + cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ + ./build_module.pl -d "$(DISTRO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES) + cd $(PACKAGE_PERL_MODULES_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . + mkdir -p $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN + cp MyConfig.pm $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN/MyConfig.skel install: if [ -z $(DESTDIR) ]; then echo "cannot install without DESTDIR set!"; exit 1; fi mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin - rsync -a $(P5TMPDIST)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/ - rsync -a $(P5TMPDIST)/dest/bin $(DESTDIR)$(OMD_ROOT)/lib/perl5/ + rsync -a $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/ + rsync -a $(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin $(DESTDIR)$(OMD_ROOT)/lib/perl5/ mkdir -p $(DESTDIR)$(OMD_ROOT)/local/lib/perl5 install -m 755 bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper @@ -126,4 +126,4 @@ skel: echo "install --install_base ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc clean: - rm -rf src/inc $(P5TMPDIST) + rm -rf src/inc $(PACKAGE_PERL_MODULES_DESTDIR) diff --git a/omd/packages/rrdtool/Makefile b/omd/packages/rrdtool/Makefile index f827431..9ff1d6e 100644 --- a/omd/packages/rrdtool/Makefile +++ b/omd/packages/rrdtool/Makefile @@ -30,7 +30,7 @@ build: check-python check-python-modules export PYTHONPATH=$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH) ; \ export LD_LIBRARY_PATH=$(PACKAGE_PYTHON_LD_LIBRARY_PATH) ; \ export PATH="$(PACKAGE_PYTHON_BIN):$$PATH" ; \ - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ export PKG_CONFIG_PATH="../../glib/glib-2.13.7:../../pango/pango-1.17.5:../../cairo/cairo-1.4.6/src"; \ @@ -53,7 +53,7 @@ install: export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ export LD_LIBRARY_PATH=$(PACKAGE_PYTHON_LD_LIBRARY_PATH) ; \ export PATH="$(PACKAGE_PYTHON_BIN):$$PATH" ; \ - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ $(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install # clean up perl man pages which end up in wrong location # clean up systemd init files. Note that on RPM based distros this

6 years, 8 months

Unified local DESTDIR paths a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 4b3eb0d931e2171324c7378412dcea22d0d84aa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b3eb0d931e217… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 14:00:17 2018 +0100 Unified local DESTDIR paths a bit. Change-Id: I3307a2e81a65f3b43fecc7757ef6888e6ab0a921 --- omd/Makefile.omd | 4 ++-- omd/packages/perl-modules/.gitignore | 2 +- omd/packages/python/.gitignore | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 4d04a6d..3f36e33 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -43,10 +43,10 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk # specific settings PERL := /usr/bin/perl -PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/dist +PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/destdir PACKAGE_PERL_MODULES_PERL5LIB := $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib/perl5 -PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/tmp.python27 +PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/destdir PACKAGE_PYTHON_PYTHONPATH := $(PACKAGE_PYTHON_DESTDIR)/lib/python2.7 PACKAGE_PYTHON_LDFLAGS := -L$(PACKAGE_PYTHON_DESTDIR)/lib -L$(PACKAGE_PYTHON_PYTHONPATH)/config PACKAGE_PYTHON_LD_LIBRARY_PATH := $(PACKAGE_PYTHON_DESTDIR)/lib diff --git a/omd/packages/perl-modules/.gitignore b/omd/packages/perl-modules/.gitignore index 9f031f5..0d847a6 100644 --- a/omd/packages/perl-modules/.gitignore +++ b/omd/packages/perl-modules/.gitignore @@ -1,2 +1,2 @@ -dist +destdir/ .deps.cache diff --git a/omd/packages/python/.gitignore b/omd/packages/python/.gitignore index 1304f35..b5d449b 100644 --- a/omd/packages/python/.gitignore +++ b/omd/packages/python/.gitignore @@ -1,4 +1,4 @@ Python-2.7.1? bin/ build/ -tmp.python27 +destdir/

6 years, 8 months

Cleaned up freetds build.

by Sven Panne

Module: check_mk Branch: master Commit: 2463a04e812a18d5197cff1294ddabc2eea87a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2463a04e812a18… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 14:06:36 2018 +0100 Cleaned up freetds build. Change-Id: Id181a8899bb396962f0136d42384d15d7fdcecc9 --- omd/Makefile.omd | 9 +++++++++ omd/packages/freetds/.gitignore | 3 ++- omd/packages/freetds/Makefile | 15 ++++++++------- omd/packages/python-modules/Makefile | 17 +++++------------ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 3f36e33..14cd4d7 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -58,3 +58,12 @@ check-python: echo "ERROR: You need to build the \"python\" package first" ; \ exit 1 ; \ fi + +PACKAGE_FREETDS_DESTDIR := $(REPO_PATH)/omd/packages/freetds/destdir +PACKAGE_FREETDS_LDFLAGS := -L$(PACKAGE_FREETDS_DESTDIR)/lib + +check-freetds: + @if [ ! -d $(PACKAGE_FREETDS_DESTDIR) ]; then \ + echo "ERROR: You need to build the \"freetds\" package first" ; \ + exit 1 ; \ + fi diff --git a/omd/packages/freetds/.gitignore b/omd/packages/freetds/.gitignore index 5a41c94..7abc2c3 100644 --- a/omd/packages/freetds/.gitignore +++ b/omd/packages/freetds/.gitignore @@ -1 +1,2 @@ -freetds-0.95.95 +destdir/ +freetds-[0-9].[0-9][0-9].[0-9][0-9]/ diff --git a/omd/packages/freetds/Makefile b/omd/packages/freetds/Makefile index fdb5d99..4b03a50 100644 --- a/omd/packages/freetds/Makefile +++ b/omd/packages/freetds/Makefile @@ -11,20 +11,21 @@ build: cd $(DIR) && \ ./configure \ --enable-msdblib \ - --prefix=/usr \ + --prefix=$(OMD_ROOT) \ --sysconfdir=/etc/freetds \ --with-tdsver=7.1 \ --disable-apps \ --disable-server \ --disable-pool \ - --disable-odbc \ - && \ - $(MAKE) -j4 + --disable-odbc + $(MAKE) -C $(DIR) -j4 +# Package python-modules needs some stuff during the build. + $(MAKE) -C $(DIR)/include prefix=$(PACKAGE_FREETDS_DESTDIR) install + $(MAKE) -C $(DIR)/src/dblib prefix=$(PACKAGE_FREETDS_DESTDIR) install install: - mkdir -p $(DESTDIR)$(OMD_ROOT)/lib - install -m 644 $(DIR)/src/ctlib/.libs/libct.so $(DESTDIR)$(OMD_ROOT)/lib/ - install -m 644 $(DIR)/src/dblib/.libs/libsybdb.so $(DESTDIR)$(OMD_ROOT)/lib/ +# At runtime we need only the libraries. + $(MAKE) -C $(DIR)/src/dblib DESTDIR=$(DESTDIR) install skel: diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 51478a3..98718d1 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -121,8 +121,8 @@ build: check-python check-freetds unpack mkdir -p $(TMP_INSTALL_PATH)/lib || true; \ export PYTHONPATH="$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib" ; \ export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ - export CPATH="$(shell pwd)/../freetds/freetds-0.95.95/include" ; \ - export LDFLAGS="-$(PACKAGE_PYTHON_LDFLAGS) -L$(shell pwd)/../freetds/freetds-0.95.95/src/dblib/.libs" ; \ + export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ + export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ for M in $(MODULES); do \ echo "Building $$M..." ; \ @@ -157,20 +157,13 @@ unpack: patch -p1 -b -d dest < $$p ; \ done - -check-freetds: - @if [ ! -d ../freetds/freetds-0.95.95 ]; then \ - echo "ERROR: You need to build the \"freetds\" package first" ; \ - exit 1 ; \ - fi - install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python set -e ; cd dest && \ export PYTHONPATH=$$PYTHONPATH:"$(TMP_INSTALL_PATH)/lib" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_PYTHONPATH)" ; \ - export CPATH="$(shell pwd)/../freetds/freetds-0.95.95/include" ; \ - export LDFLAGS="-$(PACKAGE_PYTHON_LDFLAGS) -L$(shell pwd)/../freetds/freetds-0.95.95/src/dblib/.libs" ; \ + export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ + export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ for M in $$(ls); do \ echo "Installing $$M..." ; \ @@ -198,4 +191,4 @@ install: skel: clean: - rm -rf dest tmp.python + rm -rf dest $(TMP_INSTALL_PATH)

6 years, 8 months

Disable incorrect fix for site.py.

by Sven Panne

Module: check_mk Branch: master Commit: 5ef51e2a2d67bc57e602d8854b6eff09be80e1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef51e2a2d67bc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 15:14:21 2018 +0100 Disable incorrect fix for site.py. Change-Id: I0567ac247a7b2133ae31a987467a91103f5595af --- omd/packages/net-snmp/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/omd/packages/net-snmp/Makefile b/omd/packages/net-snmp/Makefile index 72dab3a..5ef4ac0 100644 --- a/omd/packages/net-snmp/Makefile +++ b/omd/packages/net-snmp/Makefile @@ -43,7 +43,9 @@ install: # creation of a lib/python/site.py, a copy of site-patch.py from setuptools. # Having this in the PYTHONPATH makes it impossible to run python3-based SW as a # site user, including gdb! So let's simply nuke it here... - $(RM) $(DESTDIR)$(OMD_ROOT)/lib/python/site.py* +# TODO(sp): Disabled for now, otherwise the netsnmp module is not found. Figure +# out what's really going on here! +# $(RM) $(DESTDIR)$(OMD_ROOT)/lib/python/site.py* skel:

6 years, 8 months

Cleaned up Python modules build a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 52be1ca13168ad0d773ef591608740244245b981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52be1ca13168ad… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 15:24:06 2018 +0100 Cleaned up Python modules build a bit. Change-Id: I9caf8beefc187bc8abeda16905bceeac1d1476b2 --- omd/Makefile.omd | 9 +++++++++ omd/packages/python-modules/Makefile | 11 +++++------ omd/packages/rrdtool/Makefile | 8 ++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 14cd4d7..b6d5fa1 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -67,3 +67,12 @@ check-freetds: echo "ERROR: You need to build the \"freetds\" package first" ; \ exit 1 ; \ fi + +PACKAGE_PYTHON_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/python-modules/destdir +PACKAGE_PYTHON_MODULES_PYTHONPATH := $(PACKAGE_PYTHON_MODULES_DESTDIR)/lib + +check-python-modules: + @if [ ! -d $(PACKAGE_PYTHON_MODULES_DESTDIR) ]; then \ + echo "ERROR: You need to build the \"python-modules\" package first" ; \ + exit 1 ; \ + fi diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 98718d1..d1e74f7 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -4,7 +4,6 @@ NAME = python-modules SHELL = /bin/bash VERSION = $(OMD_VERSION) DISTRO = $(shell ../../distro) -TMP_INSTALL_PATH = $(shell pwd)/tmp.python PATCHES := $(wildcard patches/*.dif) @@ -118,8 +117,8 @@ MODULES+=paramiko-2.1.2.tar.gz build: check-python check-freetds unpack set -e ; cd dest && \ - mkdir -p $(TMP_INSTALL_PATH)/lib || true; \ - export PYTHONPATH="$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib" ; \ + mkdir -p $(PACKAGE_PYTHON_MODULES_PYTHONPATH) || true; \ + export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_MODULES_PYTHONPATH)" ; \ export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ @@ -134,7 +133,7 @@ build: check-python check-freetds unpack cd $$PKG ; \ $(PACKAGE_PYTHON_EXECUTABLE) setup.py build ; \ $(PACKAGE_PYTHON_EXECUTABLE) setup.py install \ - --root=$(TMP_INSTALL_PATH) \ + --root=$(PACKAGE_PYTHON_MODULES_DESTDIR) \ --prefix='' \ --install-platlib=/lib \ --install-purelib=/lib ; \ @@ -160,7 +159,7 @@ unpack: install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python set -e ; cd dest && \ - export PYTHONPATH=$$PYTHONPATH:"$(TMP_INSTALL_PATH)/lib" ; \ + export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_MODULES_PYTHONPATH)" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_PYTHONPATH)" ; \ export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ @@ -191,4 +190,4 @@ install: skel: clean: - rm -rf dest $(TMP_INSTALL_PATH) + rm -rf dest $(PACKAGE_PYTHON_MODULES_DESTDIR) diff --git a/omd/packages/rrdtool/Makefile b/omd/packages/rrdtool/Makefile index 9ff1d6e..d248e93 100644 --- a/omd/packages/rrdtool/Makefile +++ b/omd/packages/rrdtool/Makefile @@ -27,6 +27,7 @@ build: check-python check-python-modules CentOS\ 5.*) MS_ASYNC=broken ;; \ *) MS_ASYNC=ok ;; \ esac ; \ + export PYTHONPATH=$$PYTHONPATH:$(PACKAGE_PYTHON_MODULES_PYTHONPATH) ; \ export PYTHONPATH=$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH) ; \ export LD_LIBRARY_PATH=$(PACKAGE_PYTHON_LD_LIBRARY_PATH) ; \ export PATH="$(PACKAGE_PYTHON_BIN):$$PATH" ; \ @@ -42,13 +43,8 @@ build: check-python check-python-modules ./configure $(CONFIGUREOPTS) && \ $(MAKE) all -check-python-modules: - @if [ ! -d $(PACKAGE_PYTHON_DESTDIR) ]; then \ - echo "ERROR: You need to build the \"python-modules\" package first" ; \ - exit 1 ; \ - fi - install: + export PYTHONPATH=$$PYTHONPATH:$(PACKAGE_PYTHON_MODULES_PYTHONPATH) ; \ export PYTHONPATH=$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH) ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ export LD_LIBRARY_PATH=$(PACKAGE_PYTHON_LD_LIBRARY_PATH) ; \

6 years, 8 months

Extracted Perl 5 library search path during building.

by Sven Panne

Module: check_mk Branch: master Commit: 189d8a859f720500f1804b97dc9f73e719ce06a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=189d8a859f7205… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 11:26:35 2018 +0100 Extracted Perl 5 library search path during building. Change-Id: I2412c1b1fd59d95d3bc193dc3e593190c0715b6d --- omd/Makefile.omd | 1 + omd/packages/check_webinject/Makefile | 2 +- omd/packages/jmx4perl/Makefile | 2 +- omd/packages/perl-modules/Makefile | 8 ++++---- omd/packages/rrdtool/Makefile | 14 +++++++------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 8d3c43c..e15f4a4 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -44,6 +44,7 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk PERL := /usr/bin/perl P5TMPDIST := $(REPO_PATH)/omd/packages/perl-modules/dist +LOCAL_PERL5LIB := $(P5TMPDIST)/dest/lib/perl5 TMP_PYTHON_PATH := $(REPO_PATH)/omd/packages/python/tmp.python27 PYTHON_LIB := $(TMP_PYTHON_PATH)/lib/python2.7 diff --git a/omd/packages/check_webinject/Makefile b/omd/packages/check_webinject/Makefile index 380bf4e..7dd2d2c 100644 --- a/omd/packages/check_webinject/Makefile +++ b/omd/packages/check_webinject/Makefile @@ -12,7 +12,7 @@ build: echo "applying $$p..." ; \ patch -p1 -d $(DIR) < $$p ; \ done - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ cd $(DIR) && echo "" | $(PERL) Makefile.PL cd $(DIR) && $(MAKE) check_webinject diff --git a/omd/packages/jmx4perl/Makefile b/omd/packages/jmx4perl/Makefile index 37db0ae..b951169 100644 --- a/omd/packages/jmx4perl/Makefile +++ b/omd/packages/jmx4perl/Makefile @@ -13,7 +13,7 @@ build: # echo "applying $$p..." ; \ # ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ # done - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ cd $(DIR) && $(PERL) Build.PL < /dev/null >build.log 2>&1 cd $(DIR) && ./Build diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile index c57b44f..c30bccf 100644 --- a/omd/packages/perl-modules/Makefile +++ b/omd/packages/perl-modules/Makefile @@ -97,7 +97,7 @@ build: export PERL_MM_OPT=INSTALL_BASE=$(P5TMPDIST)/dest; \ export PERL_MB_OPT=--install_base=$(P5TMPDIST)/dest; \ export MODULEBUILDRC=$(P5TMPDIST)/dest/.modulebuildrc; \ - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5:$(P5TMPDIST)/src/lib:$(P5TMPDIST)/src/Crypt-SSLeay-0.72; \ + export PERL5LIB=$(LOCAL_PERL5LIB):$(P5TMPDIST)/src/lib:$(P5TMPDIST)/src/Crypt-SSLeay-0.72; \ cd $(P5TMPDIST)/src && \ FORCE=1 ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest \ ExtUtils-MakeMaker-*.tar.gz \ @@ -110,9 +110,9 @@ build: export PERL_JSON_BACKEND='JSON::XS'; \ cd $(P5TMPDIST)/src && \ ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest $(MODULES) - cd $(P5TMPDIST)/dest/lib/perl5/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . - mkdir -p $(P5TMPDIST)/dest/lib/perl5/CPAN - cp MyConfig.pm $(P5TMPDIST)/dest/lib/perl5/CPAN/MyConfig.skel + cd $(LOCAL_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . + mkdir -p $(LOCAL_PERL5LIB)/CPAN + cp MyConfig.pm $(LOCAL_PERL5LIB)/CPAN/MyConfig.skel install: if [ -z $(DESTDIR) ]; then echo "cannot install without DESTDIR set!"; exit 1; fi diff --git a/omd/packages/rrdtool/Makefile b/omd/packages/rrdtool/Makefile index f9bb3be..55641b3 100644 --- a/omd/packages/rrdtool/Makefile +++ b/omd/packages/rrdtool/Makefile @@ -33,13 +33,13 @@ build: check-python check-python-modules export PYTHONPATH=$$PYTHONPATH:$(TMP_PYTHON_PATH)/lib/python2.7 ; \ export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \ export PYTHONPATH=$$PYTHONPATH:$(TMP_SETUPTOOLS) ; \ - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5:$$(pwd)/../perl-modules/dist/lib/perl5:$$(pwd)/../perl-modules/dist/lib/perl5/$(PERLARCH); \ - export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ - export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ - export PKG_CONFIG_PATH="../../glib/glib-2.13.7:../../pango/pango-1.17.5:../../cairo/cairo-1.4.6/src"; \ - export top_builddir="."; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ + export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ + export PKG_CONFIG_PATH="../../glib/glib-2.13.7:../../pango/pango-1.17.5:../../cairo/cairo-1.4.6/src"; \ + export top_builddir="."; \ export LDFLAGS="$(shell pkg-config --libs gthread-2.0) -lglib-2.0 -L$$(pwd)/../../cairo/cairo-1.4.6/src/.libs -L$$(pwd)/../../glib/glib-2.13.7/glib/.libs -L$$(pwd)/../../pango/pango-1.17.5/pango/.libs -L$$(pwd)/../../pango/pango-1.17.5/pango -L$(TMP_PYTHON_PATH)/lib -L$(TMP_PYTHON_PATH)/lib/python2.7/config" ; \ - export CPPFLAGS="$(shell pkg-config --cflags gthread-2.0) -I$$(pwd)/../../glib/glib-2.13.7 -I$$(pwd)/../../glib/glib-2.13.7/glib -I$$(pwd)/../../pango/pango-1.17.5 -I$$(pwd)/../../pango/pango-1.17.5/pango -I$$(pwd)/../../cairo/cairo-1.4.6/src" ; \ + export CPPFLAGS="$(shell pkg-config --cflags gthread-2.0) -I$$(pwd)/../../glib/glib-2.13.7 -I$$(pwd)/../../glib/glib-2.13.7/glib -I$$(pwd)/../../pango/pango-1.17.5 -I$$(pwd)/../../pango/pango-1.17.5/pango -I$$(pwd)/../../cairo/cairo-1.4.6/src" ; \ export rd_cv_ms_async="$$MS_ASYNC" ; \ cd $(DIR) && \ ./configure $(CONFIGUREOPTS) && \ @@ -59,7 +59,7 @@ install: export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \ export PYTHONPATH=$$PYTHONPATH:$(TMP_SETUPTOOLS) ; \ export LDFLAGS="-L$(TMP_PYTHON_PATH)/lib -L$(TMP_PYTHON_PATH)/lib/python2.7/config" ; \ - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ $(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install # clean up perl man pages which end up in wrong location # clean up systemd init files. Note that on RPM based distros this

6 years, 8 months

Simplified path detection logic a tiny bit.

by Sven Panne

Module: check_mk Branch: master Commit: a0e104015c4677af537f2db897367a1a01347b15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0e104015c4677… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 10:59:23 2018 +0100 Simplified path detection logic a tiny bit. Change-Id: Ib40d0028756ce702804ea091ced8b150aac8cf5b --- omd/Makefile.omd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 0a44778..8d3c43c 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -1,8 +1,5 @@ # General settings included by all packages -PERL := /usr/bin/perl -P5TMPDIST := $(shell pwd)/../perl-modules/dist - # Makefile is loaded either from omd/packages/*/Makefile or omd/Makefile ifneq (,$(wildcard ../../../omd/distro)) REPO_PATH := $(abspath ../../..) @@ -45,6 +42,8 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk # Net result -> all Makefiles have now access to the linux distribution # specific settings +PERL := /usr/bin/perl +P5TMPDIST := $(REPO_PATH)/omd/packages/perl-modules/dist TMP_PYTHON_PATH := $(REPO_PATH)/omd/packages/python/tmp.python27 PYTHON_LIB := $(TMP_PYTHON_PATH)/lib/python2.7

6 years, 8 months

Extracted Python temporary paths during building.

by Sven Panne

Module: check_mk Branch: master Commit: ff2320324ef695e2050a5ad75b4ce2e5004020ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff2320324ef695… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 12:59:24 2018 +0100 Extracted Python temporary paths during building. Change-Id: I0be920fac89a4f6769f80c6cc2e9bb91d7e7b7a0 --- omd/Makefile.omd | 12 +++++++----- omd/packages/boost/Makefile | 10 ++++------ omd/packages/mod_python/Makefile | 23 ++++++++++++----------- omd/packages/net-snmp/Makefile | 8 ++++---- omd/packages/python-modules/Makefile | 23 ++++++++++++----------- omd/packages/python/Makefile | 4 ++-- omd/packages/rrdtool/Makefile | 24 +++++++++--------------- omd/packages/snap7/Makefile | 15 ++++++++------- 8 files changed, 58 insertions(+), 61 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ff2320324e…

6 years, 8 months

5649 FIX Fixed performance issue caused by too many parse function calls

by Lars Michelsen

Module: check_mk Branch: master Commit: ebd1d1ef16ba701bccfcead24ba59dea31672d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd1d1ef16ba70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 16 14:32:29 2018 +0100 5649 FIX Fixed performance issue caused by too many parse function calls Fixed a regression that was introduced with 1.5.0i2. The parse functions were called not only once per Check_MK check, as it is intended. Each service of a Check_MK check lead to a new call of the parse function logic. For example in case you have 100 services of a single check type on one host, the parse logic was called a hundred times instead of a single time. Change-Id: I66cb6c08393bab567f017c6e20f0cbf134b37173 --- .werks/5649 | 15 +++++++++++++++ cmk_base/data_sources/host_sections.py | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/.werks/5649 b/.werks/5649 new file mode 100644 index 0000000..e2bb6b9 --- /dev/null +++ b/.werks/5649 @@ -0,0 +1,15 @@ +Title: Fixed performance issue caused by too many parse function calls +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516109439 +Class: fix + +Fixed a regression that was introduced with 1.5.0i2. The parse functions +were called not only once per Check_MK check, as it is intended. Each +service of a Check_MK check lead to a new call of the parse function logic. + +For example in case you have 100 services of a single check type on one host, +the parse logic was called a hundred times instead of a single time. diff --git a/cmk_base/data_sources/host_sections.py b/cmk_base/data_sources/host_sections.py index 68742fe..2432384 100644 --- a/cmk_base/data_sources/host_sections.py +++ b/cmk_base/data_sources/host_sections.py @@ -32,6 +32,7 @@ import cmk.debug import cmk_base.console as console import cmk_base.config as config import cmk_base.checks as checks +import cmk_base.caching as caching import cmk_base.ip_lookup as ip_lookup import cmk_base.item_state as item_state @@ -93,6 +94,7 @@ class MultiHostSections(object): def __init__(self): super(MultiHostSections, self).__init__() self._multi_host_sections = {} + self._section_content_cache = caching.DictCache() def add_or_get_host_sections(self, host_name, ipaddress, deflt=None): @@ -125,6 +127,15 @@ class MultiHostSections(object): It can return an section_content construct or None when there is no section content for this check available. """ + try: + return self._section_content_cache[(hostname, ipaddress, check_plugin_name, for_discovery)] + except KeyError: + section_content = self._get_section_content(hostname, ipaddress, check_plugin_name, for_discovery) + self._section_content_cache[(hostname, ipaddress, check_plugin_name, for_discovery)] = section_content + return section_content + + + def _get_section_content(self, hostname, ipaddress, check_plugin_name, for_discovery): section_name = checks.section_name_of(check_plugin_name) # First abstract cluster / non cluster hosts

6 years, 8 months

Cleanup notify.py and mknotifyd and remove unused imports

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e1b752f20c240e274f2f80a84816bad741545074 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1b752f20c240e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jan 16 14:36:39 2018 +0100 Cleanup notify.py and mknotifyd and remove unused imports Change-Id: Ie8291e32515749957dcb9bcf624f2ac3f868e271 --- cmk_base/notify.py | 281 +++++++++++++++++++++++++++++------------------------ 1 file changed, 154 insertions(+), 127 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e1b752f20c…

6 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018