Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 36678c417af612a5e2a4889a66e36735fcb7a715 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36678c417af612… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 27 07:19:34 2019 +0100 Reserved 20 Werk IDS Change-Id: I14d2bf5e5835b8c5cac1ef3807bd5fcad2fd9c98 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c003899..ff6e055 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7384 +7404

5 years, 3 months

CMK-1824: Add sles-12sp2 to the new build mechanism

by Alex Zurhake

Module: check_mk Branch: master Commit: e45eac1de061b6d23a4538a4157feba754b78a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e45eac1de061b6… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:50:38 2019 +0100 CMK-1824: Add sles-12sp2 to the new build mechanism Change-Id: I60609a41e353bdca847fcedc882bf31fa9b07284 --- .../build-nodes/sles-12sp2/Dockerfile | 9 +++--- .../infrastructure/os-nodes/sles-12sp2/Dockerfile | 33 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile b/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile index 6f31c09..e346c96 100644 --- a/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile @@ -1,8 +1,8 @@ -FROM 10.9.1.101:5010/sles-12sp2-base +FROM nexus.lan.tribe29.com:5010/sles-12sp2-base SHELL ["/bin/bash", "-c"] -RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles12sp2 sles12sp2 \ +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp2 sles12sp2 \ && zypper ref -s \ && zypper -n in -y --force-resolution \ apache2-devel \ @@ -62,5 +62,6 @@ RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles12sp2 sles12sp2 \ COPY bw-build-gnu-toolchain.sh /usr/sbin RUN bw-build-gnu-toolchain.sh -b - -RUN rm /usr/bin/gcc /usr/bin/g++ +RUN rm /usr/bin/gcc /usr/bin/g++ \ + && ln -s /opt/gcc-8.2.0/bin/gcc-8 /usr/bin/gcc \ + && ln -s /opt/gcc-8.2.0/bin/g++-8 /usr/bin/g++ diff --git a/buildscripts/infrastructure/os-nodes/sles-12sp2/Dockerfile b/buildscripts/infrastructure/os-nodes/sles-12sp2/Dockerfile new file mode 100644 index 0000000..969ca10 --- /dev/null +++ b/buildscripts/infrastructure/os-nodes/sles-12sp2/Dockerfile @@ -0,0 +1,33 @@ +FROM nexus.lan.tribe29.com:5010/sles-12sp2-base + +SHELL ["/bin/bash", "-c"] + +ARG PACKAGES + +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp2 sles12sp2 \ + && zypper addrepo -G http://nexus:8081/repository/sles12spx-web-scripting web-scripting \ + && zypper -n --no-gpg-checks in --replacefiles --force-resolution \ + curl \ + cyrus-sasl-devel \ + enchant-devel \ + git \ + krb5-devel \ + libmysqlclient-devel \ + make \ + nodejs10 \ + npm10 \ + openldap2-devel \ + python \ + python-devel \ + python-pyOpenSSL \ + python-xml \ + rrdtool-devel \ + sudo \ + && zypper clean -a +RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && python get-pip.py +RUN pip install --upgrade setuptools \ + && pip install git+https://github.com/pypa/pipenv.git \ + && zypper -n --no-gpg-checks in --replacefiles \ + $PACKAGES \ + && zypper clean -a

5 years, 3 months

CMK-1823: Add sles-12sp1 to the new build mechanism

by Alex Zurhake

Module: check_mk Branch: master Commit: 5d034dd5a8263e1da1cc3ea3146504fc02773bf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d034dd5a8263e… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:51:06 2019 +0100 CMK-1823: Add sles-12sp1 to the new build mechanism Change-Id: I591ae08078a2c55a75bb8bbbdad50053d9e74527 --- .../build-nodes/sles-12sp1/Dockerfile | 8 +++-- .../infrastructure/os-nodes/sles-12sp1/Dockerfile | 34 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/buildscripts/infrastructure/build-nodes/sles-12sp1/Dockerfile b/buildscripts/infrastructure/build-nodes/sles-12sp1/Dockerfile index 9decab9..528e202 100644 --- a/buildscripts/infrastructure/build-nodes/sles-12sp1/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/sles-12sp1/Dockerfile @@ -1,8 +1,8 @@ -FROM 10.9.1.101:5010/sles-12sp1-base +FROM nexus.lan.tribe29.com:5010/sles-12sp1-base SHELL ["/bin/bash", "-c"] -RUN zypper addrepo http://10.9.1.101:8081/repository/sles12sp1 sles12sp1 \ +RUN zypper addrepo http://nexus:8081/repository/sles12sp1 sles12sp1 \ && zypper ref -s \ && zypper -n in -y --force-resolution \ apache2-devel \ @@ -62,4 +62,6 @@ RUN zypper addrepo http://10.9.1.101:8081/repository/sles12sp1 sles12sp1 \ COPY bw-build-gnu-toolchain.sh /usr/sbin RUN bw-build-gnu-toolchain.sh -b -RUN rm /usr/bin/gcc /usr/bin/g++ +RUN rm /usr/bin/gcc /usr/bin/g++ \ + && ln -s /opt/gcc-8.2.0/bin/gcc-8 /usr/bin/gcc \ + && ln -s /opt/gcc-8.2.0/bin/g++-8 /usr/bin/g++ diff --git a/buildscripts/infrastructure/os-nodes/sles-12sp1/Dockerfile b/buildscripts/infrastructure/os-nodes/sles-12sp1/Dockerfile new file mode 100644 index 0000000..1705790 --- /dev/null +++ b/buildscripts/infrastructure/os-nodes/sles-12sp1/Dockerfile @@ -0,0 +1,34 @@ +FROM nexus.lan.tribe29.com:5010/sles-12sp1-base + +SHELL ["/bin/bash", "-c"] + +ARG PACKAGES + +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp1 sles12sp1 \ + && zypper addrepo -G http://nexus:8081/repository/sles12spx-web-scripting web-scripting \ + && zypper -n --no-gpg-checks in --replacefiles --force-resolution \ + gawk \ + && zypper -n --no-gpg-checks in --replacefiles --force-resolution \ + curl \ + cyrus-sasl-devel \ + enchant-devel \ + git \ + krb5-devel \ + libmysqlclient-devel \ + make \ + nodejs10 \ + npm10 \ + openldap2-devel \ + python \ + python-devel \ + python-pyOpenSSL \ + python-xml \ + rrdtool-devel \ + sudo +RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && python get-pip.py +RUN pip install --upgrade setuptools \ + && pip install git+https://github.com/pypa/pipenv.git \ + && zypper -n --no-gpg-checks in --replacefiles \ + $PACKAGES \ + && zypper clean -a

5 years, 3 months

trigger integration test after new master

by Alex Zurhake

Module: check_mk Branch: master Commit: 519736f3a72811284bf154503f9ff6ab04e1af38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=519736f3a72811… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 16:10:13 2019 +0100 trigger integration test after new master Change-Id: I995885f305ac0dc7d744a9de04d002d52e1aec19 --- buildscripts/scripts/integration-daily-master.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index dfc956c..5c8eacd 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -5,7 +5,7 @@ properties([ string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ) ]), pipelineTriggers([ - upstream(upstreamProjects: 'cmk_master/nightly_build', threshold: hudson.model.Result.SUCCESS) + upstream(upstreamProjects: 'cmk_master/nightly_build_containerized', threshold: hudson.model.Result.SUCCESS) ]) ])

5 years, 3 months

CMK-1870: Fix cma build command

by Alex Zurhake

Module: check_mk Branch: master Commit: 422361d7e196628868ceee988a67217b2eb3b12e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=422361d7e19662… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 15:21:37 2019 +0100 CMK-1870: Fix cma build command Change-Id: Icdab046cfa568498bd5eae105a73bb3d6226e4d2 --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 831aace..55f0445 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -183,7 +183,7 @@ DISTRO_LIST.each { DISTRO -> make -C omd rpm ;; cma*) - make -C cma + make -C omd cma ;; *) DEBFULLNAME='Check_MK Team' DEBEMAIL='feedback(a)check-mk.org' make -C omd deb

5 years, 3 months

Add info to the docstring of check_levels

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 55e8fae40c68654afba2d2b8bd3a63dde3787408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55e8fae40c6865… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Mar 26 14:00:05 2019 +0100 Add info to the docstring of check_levels Change-Id: I3303248aacb6884cf207e6ee99286f530dbd4cca --- cmk_base/check_api.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 647fec0..1083d5c 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -377,6 +377,8 @@ def check_levels(value, Tuple[warn_upper, crit_upper] -> upper level checking only. Tuple[warn_upper, crit_upper, warn_lower, crit_lower] -> upper and lower level checking. + If a Dict is passed to check_levels, predictive levels are used + automatically. The following constellations are possible: Dict containing "lower" as key -> lower level checking. Dict containing "upper" or "levels_upper_min" as key -> upper level checking. Dict containing "lower" and "upper"/"levels_upper_min" as key ->

5 years, 3 months

CMK-1870: No integration test for CMA

by Alex Zurhake

Module: check_mk Branch: master Commit: add81c42a943fef293e2f41ff2e688d9071b10cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=add81c42a943fe… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:37:47 2019 +0100 CMK-1870: No integration test for CMA Change-Id: I91fd9d3bd2550125b668c5211c7a6dd82d768182 --- buildscripts/scripts/integration-daily-master.jenkins | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index 2c558ac..dfc956c 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -14,6 +14,9 @@ DISTRO_LIST = DISTROS.split(' '); // CMK-1705: SLES-15 is missing xinitd and should therefore not be tested DISTRO_LIST = DISTRO_LIST - ['sles-15'] +// Testing CMA is not needed +DISTRO_LIST = DISTRO_LIST - ['cma'] + println("Building for the following Distros:") println(DISTRO_LIST) currentBuild.description = '\nBuilding for the following Distros:\n' + DISTRO_LIST

5 years, 3 months

CMK-1870: Copy cma artifacts

by Alex Zurhake

Module: check_mk Branch: master Commit: 7023350b11f3fa875b71089ec73ffa4e980eb7f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7023350b11f3fa… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:47:15 2019 +0100 CMK-1870: Copy cma artifacts Change-Id: Ie312fe18b496750d1a168a20db5738220e0bdbcf --- buildscripts/scripts/nightly-build.jenkins | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 82593b0..a211941 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -217,6 +217,8 @@ node { cd /bauwelt/download/${CMK_VERS} cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true + cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.cma . || true + cp ${DAILY_DATA}/git/check-mk-enterprise-${CMK_VERS}.cee.tar.gz . || true """ withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { sh """ @@ -231,6 +233,8 @@ node { dir("${DAILY_DATA}/download") { sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" + sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.cma . || true" + sh "cp ${DAILY_DATA}/git/check-mk-enterprise-${CMK_VERS}.cee.tar.gz . || true" withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS}" }

5 years, 3 months

Event console: Fix bug introduced by extraction of RuleMatcher from EventServer

by Konstantin Büttner

Module: check_mk Branch: master Commit: 26927ad9d520c07eb94d0eded166cc2adc9d361b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26927ad9d520c0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 26 12:35:17 2019 +0100 Event console: Fix bug introduced by extraction of RuleMatcher from EventServer CMK-1841 Change-Id: I3d563bfb4b491dc4be32ea87af2eb380b0bc3526 --- cmk/ec/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index d2a5761..0fa5135 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1206,7 +1206,7 @@ class EventServer(ECServerThread): for rule in self._rules: if "expect" in rule: - if not self.event_rule_matches_site(rule, event=None): + if not self._rule_matcher.event_rule_matches_site(rule, event=None): continue # Interval is either a number of seconds, or pair of a number of seconds

5 years, 3 months

CMK-1705: SLES-15 is missing xinitd and should therefore not be tested

by Alex Zurhake

Module: check_mk Branch: master Commit: 221e73e7fe0b528a54ac9adba18ac56bef1924b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=221e73e7fe0b52… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:33:45 2019 +0100 CMK-1705: SLES-15 is missing xinitd and should therefore not be tested Change-Id: Iea3e3eaf211ada65c458f873c3fd1aedf20c9bab --- buildscripts/scripts/integration-daily-master.jenkins | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index 505f234..2c558ac 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -11,6 +11,9 @@ properties([ DISTRO_LIST = DISTROS.split(' '); +// CMK-1705: SLES-15 is missing xinitd and should therefore not be tested +DISTRO_LIST = DISTRO_LIST - ['sles-15'] + println("Building for the following Distros:") println(DISTRO_LIST) currentBuild.description = '\nBuilding for the following Distros:\n' + DISTRO_LIST

5 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019