Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

by Alex Zurhake

Module: check_mk Branch: master Commit: 07a11b70c5c075179db4307b1d2ac86cc9f8f7f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07a11b70c5c075… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 08:48:46 2019 +0200 Add Ubuntu 19.04 os node Change-Id: Ia579544da016cd2d56b0d2be46a40e7131a3c671 --- .../os-nodes/ubuntu-19.04/Dockerfile | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/buildscripts/infrastructure/os-nodes/ubuntu-19.04/Dockerfile b/buildscripts/infrastructure/os-nodes/ubuntu-19.04/Dockerfile new file mode 100644 index 0000000..0c7a3c6 --- /dev/null +++ b/buildscripts/infrastructure/os-nodes/ubuntu-19.04/Dockerfile @@ -0,0 +1,39 @@ +FROM ubuntu:19.04 + +SHELL ["/bin/bash", "-c"] +ENV DEBIAN_FRONTEND=noninteractive +ENV LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 + +ARG PACKAGES + +RUN apt-get update \ + && apt-get install -y \ + gdebi \ + git \ + libenchant1c2a \ + libkrb5-dev \ + libldap2-dev \ + libmysqlclient-dev \ + librrd-dev \ + libsasl2-dev \ + libssl-dev \ + make \ + nullmailer \ + python-dev \ + python-dev \ + python3-pip \ + rrdtool \ + strace \ + sudo \ + vim \ + && pip3 install --upgrade setuptools \ + && pip3 install git+https://github.com/pypa/pipenv.git \ + && curl -sL https://deb.nodesource.com/setup_11.x | bash - \ + && apt-get install -y nodejs \ + && apt-get install -y \ + $PACKAGES \ + && rm -rf /var/lib/apt/lists/* + +RUN rm -rf /bin/systemctl \ + && ln -s /bin/true /bin/systemctl

5 years, 2 months

Add Ubuntu 19.04 dependency list

by Alex Zurhake

Module: check_mk Branch: master Commit: bb0443c5a696f694016b312ab5cf18fa2cafdd42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb0443c5a696f6… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 08:50:47 2019 +0200 Add Ubuntu 19.04 dependency list Change-Id: I5c6409cca7500673550cea9adc6427db62721f2b --- omd/distros/UBUNTU_19.04.mk | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/omd/distros/UBUNTU_19.04.mk b/omd/distros/UBUNTU_19.04.mk new file mode 100644 index 0000000..5c3faec --- /dev/null +++ b/omd/distros/UBUNTU_19.04.mk @@ -0,0 +1,68 @@ +DISTRO_CODE = disco +# +# Check_MK build specific packages below +# +OS_PACKAGES = +OS_PACKAGES += cron # needed for sites cron jobs +OS_PACKAGES += time # needed for mk-job +OS_PACKAGES += traceroute # needed for Check_MK parent scan +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += dnsutils +OS_PACKAGES += graphviz +OS_PACKAGES += apache2 +OS_PACKAGES += apache2-utils # contains htpasswd2 +OS_PACKAGES += libdbi1 +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.26 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libuuid1 +OS_PACKAGES += libxml2 +OS_PACKAGES += php-cli +OS_PACKAGES += php-cgi +OS_PACKAGES += php-gd +OS_PACKAGES += php-sqlite3 +OS_PACKAGES += php-json +OS_PACKAGES += php-pear +OS_PACKAGES += pyro +OS_PACKAGES += rsync +OS_PACKAGES += smbclient +OS_PACKAGES += rpcbind # otherwise missing path in util.pm +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += freeradius-utils +# +# Check_MK build specific packages below +# +OS_PACKAGES += libpcap0.8 # needed for cmc +OS_PACKAGES += rpm # needed by msitools/Agent Bakery +OS_PACKAGES += binutils # needed by msitools/Agent Bakery +OS_PACKAGES += lcab # needed for creating MSI packages +OS_PACKAGES += libgsf-1-114 # needed by msitools/Agent Bakery +OS_PACKAGES += libglib2.0-0 # needed by msitools/Agent Bakery +OS_PACKAGES += cpio # needed for Agent bakery (solaris pkgs) +OS_PACKAGES += libfl2 # needed by heirloom-pkgtools +OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting +OS_PACKAGES += libffi6 # needed for pyOpenSSL and dependant +OS_PACKAGES += libpq5 +USERADD_OPTIONS = +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = apt-get -y update ; apt-get -y install +ACTIVATE_INITSCRIPT = update-rc.d %s defaults +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT_NAME = apache2 +APACHE_USER = www-data +APACHE_GROUP = www-data +APACHE_BIN = /usr/sbin/apache2 +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2/modules +APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules +HTPASSWD_BIN = /usr/bin/htpasswd +APACHE_ENMOD = a2enmod %s +PHP_FCGI_BIN = /usr/bin/php-cgi +BECOME_ROOT = sudo su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = +INIT_CMD = /etc/init.d/%(name)s %(action)s

5 years, 2 months

Add centos-6 OS Image

by Alex Zurhake

Module: check_mk Branch: master Commit: d5ce06f57b8aae054685350c996947035a337b51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5ce06f57b8aae… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 15:16:31 2019 +0200 Add centos-6 OS Image Change-Id: I1e508986a2a855196d822e99b4524232eef4d788 --- .../infrastructure/os-nodes/centos-6/Dockerfile | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/buildscripts/infrastructure/os-nodes/centos-6/Dockerfile b/buildscripts/infrastructure/os-nodes/centos-6/Dockerfile new file mode 100644 index 0000000..0b80eb9 --- /dev/null +++ b/buildscripts/infrastructure/os-nodes/centos-6/Dockerfile @@ -0,0 +1,44 @@ +FROM centos:6 + +SHELL ["/bin/bash", "-c"] + +ARG PACKAGES + +RUN yum -y --enablerepo=extras install \ + epel-release \ + && yum -y install \ + centos-release-scl-rh \ + && yum -y install \ + curl \ + dpkg \ + enchant \ + gcc \ + git \ + krb5-devel \ + make \ + mysql-devel \ + nodejs \ + npm \ + openldap-devel \ + postfix \ + python27 \ + python27-devel \ + rrdtool-devel \ + strace \ + sudo \ + vim \ + which +RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && scl enable python27 'python get-pip.py' +RUN scl enable python27 'pip install --upgrade setuptools virtualenv' \ + && scl enable python27 'pip install git+https://github.com/pypa/pipenv.git' +RUN yum -y install \ + $PACKAGES \ + && yum clean all + +# Set Environment Variables to activate python27 +ENV PATH=/opt/rh/python27/root/usr/bin${PATH:+:${PATH}} +ENV LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +ENV MANPATH=/opt/rh/python27/root/usr/share/man:${MANPATH} +ENV XDG_DATA_DIRS=/opt/rh/python27/root/usr/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share} +ENV PKG_CONFIG_PATH=/opt/rh/python27/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}

5 years, 2 months

Improve build script for build nodes

by Alex Zurhake

Module: check_mk Branch: master Commit: 372e2ebbca5c9b3db2a5dca0e665a3fec2eeb92f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=372e2ebbca5c9b… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 08:39:08 2019 +0200 Improve build script for build nodes - Add parameters to node build script - Fix network - Improve pull mechanism Change-Id: I838523e6e357836d181a681ca45ae375aed6d11b --- buildscripts/scripts/build-nodes.jenkins | 43 +++++++++++++++++++------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/buildscripts/scripts/build-nodes.jenkins b/buildscripts/scripts/build-nodes.jenkins index 2138018..b413452 100644 --- a/buildscripts/scripts/build-nodes.jenkins +++ b/buildscripts/scripts/build-nodes.jenkins @@ -1,17 +1,26 @@ -def DISTRO_LIST = ["sles-11sp4", "sles-12", "sles-12sp1", "sles-12sp2", "sles-12sp3", "sles-12sp4", "sles-15", "debian-8", "debian-9", "ubuntu-14.04", "ubuntu-16.04", "ubuntu-17.10", "ubuntu-18.04", "ubuntu-18.10", "centos-6", "centos-7"] +properties([ + parameters([ + string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ) + ]) +]) +def DISTRO_LIST = DISTROS.split(' ') def DOCKER_BUILDS = [:] +currentBuild.description = 'Building for the following Distros:\n' + DISTRO_LIST node { - docker.image('devrechner:5010/ubuntu-18.04-common').inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { - stage('checkout sources') { - checkout(scm) - dir('buildscripts/infrastructure/build-nodes/gnu-toolchain/') { - stash name: 'bw-build-gnu-toolchain', includes: 'bw-build-gnu-toolchain.sh' - withCredentials([usernamePassword(credentialsId: 'nexus', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh './bw-build-gnu-toolchain.sh -d' + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + docker.image('ubuntu-18.04-common').pull() + docker.image('ubuntu-18.04-common').inside('-u 0:0 --cap-add=SYS_ADMIN --network ci_local-infra') { + stage('checkout sources') { + checkout(scm) + dir('buildscripts/infrastructure/build-nodes/gnu-toolchain/') { + stash name: 'bw-build-gnu-toolchain', includes: 'bw-build-gnu-toolchain.sh' + withCredentials([usernamePassword(credentialsId: 'nexus', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { + sh './bw-build-gnu-toolchain.sh -d' + } } + stash name: 'dockerfiles', includes: 'buildscripts/infrastructure/build-nodes/*/Dockerfile' } - stash name: 'dockerfiles', includes: 'buildscripts/infrastructure/build-nodes/*/Dockerfile' } } } @@ -19,14 +28,14 @@ node { DISTRO_LIST.each { DISTRO -> DOCKER_BUILDS[DISTRO] = { node { - docker.image('devrechner:5010/ubuntu-18.04-common').inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network infrastructure_local-infra') { - stage('build' + DISTRO + ' image') { - unstash name: 'dockerfiles' - dir('buildscripts/infrastructure/build-nodes/' + DISTRO) { - unstash name: 'bw-build-gnu-toolchain' - docker.withRegistry('http://10.9.1.101:5010', 'nexus') { - sh "echo 'nameserver 10.1.1.10' > /etc/resolv.conf" - def Image = docker.build(DISTRO, "--network infrastructure_local-infra .") + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + docker.image('ubuntu-18.04-common').pull() + docker.image('ubuntu-18.04-common').inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { + stage('build' + DISTRO + ' image') { + unstash name: 'dockerfiles' + dir('buildscripts/infrastructure/build-nodes/' + DISTRO) { + unstash name: 'bw-build-gnu-toolchain' + def Image = docker.build(DISTRO, "--network ci_local-infra .") Image.push() } }

5 years, 2 months

Drop libcloog-ppl1 as it is not needed

by Alex Zurhake

Module: check_mk Branch: master Commit: aa45af689ba75c3fa1f8e077d5cf29540ac9b9aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa45af689ba75c… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 14:08:21 2019 +0200 Drop libcloog-ppl1 as it is not needed Change-Id: Id26b31dd3bcd5d73f81080c358eed70b0ec38402 --- buildscripts/infrastructure/build-nodes/common/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/debian-8/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/debian-9/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/ubuntu-14.04/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/ubuntu-16.04/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/ubuntu-17.10/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/ubuntu-18.04/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/ubuntu-18.10/Dockerfile | 1 - buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile | 1 - 9 files changed, 9 deletions(-) diff --git a/buildscripts/infrastructure/build-nodes/common/Dockerfile b/buildscripts/infrastructure/build-nodes/common/Dockerfile index 98d3290..cfa0e86 100644 --- a/buildscripts/infrastructure/build-nodes/common/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/common/Dockerfile @@ -33,7 +33,6 @@ RUN apt-get update \ libboost-dev \ libboost-system-dev \ libclang-7-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \ diff --git a/buildscripts/infrastructure/build-nodes/debian-8/Dockerfile b/buildscripts/infrastructure/build-nodes/debian-8/Dockerfile index 4495110..c0cd0e2 100644 --- a/buildscripts/infrastructure/build-nodes/debian-8/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/debian-8/Dockerfile @@ -15,7 +15,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libdbi-dev \ libevent-dev \ diff --git a/buildscripts/infrastructure/build-nodes/debian-9/Dockerfile b/buildscripts/infrastructure/build-nodes/debian-9/Dockerfile index 03d8af6..fe90a90 100644 --- a/buildscripts/infrastructure/build-nodes/debian-9/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/debian-9/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libdbi-dev \ libevent-dev \ diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-14.04/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-14.04/Dockerfile index fd388ea..290ca2c 100644 --- a/buildscripts/infrastructure/build-nodes/ubuntu-14.04/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/ubuntu-14.04/Dockerfile @@ -15,7 +15,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \ diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-16.04/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-16.04/Dockerfile index 9df9c77..9603ebc 100644 --- a/buildscripts/infrastructure/build-nodes/ubuntu-16.04/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/ubuntu-16.04/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \ diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-17.10/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-17.10/Dockerfile index 53ba775..e4bcba5 100644 --- a/buildscripts/infrastructure/build-nodes/ubuntu-17.10/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/ubuntu-17.10/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \ diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-18.04/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-18.04/Dockerfile index 937f33a..de59c0c 100644 --- a/buildscripts/infrastructure/build-nodes/ubuntu-18.04/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/ubuntu-18.04/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \ diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-18.10/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-18.10/Dockerfile index 3897b56..21fc9c6 100644 --- a/buildscripts/infrastructure/build-nodes/ubuntu-18.10/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/ubuntu-18.10/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \ diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile index dac1d99..2eae7dd 100644 --- a/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update \ gettext \ git-buildpackage \ libboost-all-dev \ - libcloog-ppl1 \ libcurl4-openssl-dev \ libevent-dev \ libffi-dev \

5 years, 2 months

Add Ubuntu 19.04 build node

by Alex Zurhake

Module: check_mk Branch: master Commit: 20762c03b63efc373676106540aa39ca96aecafe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20762c03b63efc… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon May 6 08:31:24 2019 +0200 Add Ubuntu 19.04 build node Change-Id: I497f7dbedd014b582a990b8bd803fdbbf7d230e9 --- .../build-nodes/ubuntu-19.04/Dockerfile | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile b/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile new file mode 100644 index 0000000..dac1d99 --- /dev/null +++ b/buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile @@ -0,0 +1,58 @@ +FROM ubuntu:19.04 + +SHELL ["/bin/bash", "-c"] +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y \ + apache2 \ + apache2-dev \ + autoconf \ + build-essential \ + devscripts \ + dnsutils \ + dpatch \ + flex \ + gettext \ + git-buildpackage \ + libboost-all-dev \ + libcloog-ppl1 \ + libcurl4-openssl-dev \ + libevent-dev \ + libffi-dev \ + libfreeradius-dev \ + libgd-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libgsf-1-dev \ + libkrb5-dev \ + libldap2-dev \ + libltdl-dev \ + libmcrypt-dev \ + libmysqlclient-dev \ + libncurses5-dev \ + libpango1.0-dev \ + libpcap-dev \ + libperl-dev \ + libpq-dev \ + libreadline-dev \ + librrd-dev \ + libsqlite3-dev \ + libssl-dev \ + libtool \ + libxml2-dev \ + openssh-client \ + patch \ + rpcbind \ + rsync \ + smbclient \ + texinfo \ + tk-dev \ + uuid-dev \ + && rm -rf /var/lib/apt/lists/* + +COPY bw-build-gnu-toolchain.sh /usr/sbin +RUN bw-build-gnu-toolchain.sh -b +RUN mv /usr/bin/gcc /usr/bin/gcc-old \ + && ln -s /usr/local/bin/gcc-8 /usr/local/bin/gcc \ + && ln -s /usr/local/bin/gcc-8 /usr/local/bin/cc

5 years, 2 months

Bumped compiledb snapshot version.

by Sven Panne

Module: check_mk Branch: master Commit: ced3c1f160ce0ff26523c2afeaefe533174835aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ced3c1f160ce0f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 6 15:36:16 2019 +0200 Bumped compiledb snapshot version. Change-Id: Ic0ed67f5c16521eb192a3b5944567df81a5d2cb6 --- Pipfile | 2 +- Pipfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Pipfile b/Pipfile index e660f5e..6aa4912 100644 --- a/Pipfile +++ b/Pipfile @@ -24,7 +24,7 @@ pdbpp = "*" freezegun = "*" # We have to use a snapshot, a version which works for us has not been released yet. :-/ # Workaround: We need to upload the Archive and cannot use it from our Git due to a Pipenv bug -compiledb = {file = "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz"} +compiledb = {file = "http://nexus:8081/repository/archives/compiledb-10a1da2.tar.gz"} [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index 0096c14..12c3201 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9f48473f7896536f450eb385c041745c6028ebadb0ae29b516b1b678d4e0fc7b" + "sha256": "cf2db0742979e1e3530150d7cc4572ce18251fb3eb98740531d21c6ff5cfe9eb" }, "pipfile-spec": 6, "requires": { @@ -1010,7 +1010,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version == '2.7'", + "markers": "python_version < '3.2'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1054,7 +1054,7 @@ "version": "==3.0.4" }, "compiledb": { - "file": "http://nexus:8081/repository/archives/compiledb-1604e14.tar.gz" + "file": "http://nexus:8081/repository/archives/compiledb-10a1da2.tar.gz" }, "configparser": { "hashes": [ @@ -1280,11 +1280,11 @@ }, "mock": { "hashes": [ - "sha256:5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe", - "sha256:d659f8ef8810ff4c3f8f973d113a05d291a08ab0f7ed17bd60887983b93a0f9a" + "sha256:21a2c07af3bbc4a77f9d14ac18fcc1782e8e7ea363df718740cdeaf61995b5e7", + "sha256:7868db2825a1563578869d4a011a036503a2f1d60f9ff9dd1e3205cd6e25fcec" ], "markers": "python_version < '3.0'", - "version": "==3.0.3" + "version": "==3.0.4" }, "mockldap": { "hashes": [

5 years, 2 months

Call make via compiledb itself.

by Sven Panne

Module: check_mk Branch: master Commit: 3830c18551c7630cf99a193e7c35a17618202468 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3830c18551c763… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 6 15:51:59 2019 +0200 Call make via compiledb itself. Change-Id: I4024034af68ba470ff0f9bdb8c347cd23e3fd7c5 --- livestatus/src/Makefile.am | 2 +- livestatus/src/test/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 759e63e..6470419 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -178,7 +178,7 @@ livestatus.o: $(liblivestatus_a_OBJECTS) compile_commands.json: Makefile $(wildcard *.cc *.h) $(MAKE) -C $(top_srcdir) .venv - LANG=C $(MAKE) -Bnwk | pipenv run compiledb + LANG=C pipenv run compiledb --no-build make tidy: compile_commands.json $(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK) diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am index 1b13e39..c0886c9 100644 --- a/livestatus/src/test/Makefile.am +++ b/livestatus/src/test/Makefile.am @@ -79,7 +79,7 @@ build_googletest: compile_commands.json: Makefile $(wildcard *.cc *.h) $(MAKE) -C $(top_srcdir) .venv $(MAKE) -j4 -C .. - LANG=C $(MAKE) -Bnwk | PIPENV_MAX_DEPTH=4 pipenv run compiledb + LANG=C PIPENV_MAX_DEPTH=4 pipenv run compiledb --no-build make tidy: compile_commands.json $(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK)

5 years, 2 months

7475 ceph_status: Adapt to new health field name 'status'

by Moritz Kiemer

Module: check_mk Branch: master Commit: b151b324fc945e488905c72ac9440d67383db21a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b151b324fc945e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon May 6 10:07:31 2019 +0200 7475 ceph_status: Adapt to new health field name 'status' Ceph health' JSON format has changed in luminous, which lead to a false {WARN} state for affected devices. Change-Id: I56646cfa19107ba286b3413ca462d9b438d6e0ec --- .werks/7475 | 11 +++++++++++ checks/ceph_status | 14 +++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/7475 b/.werks/7475 new file mode 100644 index 0000000..8535ed4 --- /dev/null +++ b/.werks/7475 @@ -0,0 +1,11 @@ +Title: ceph_status: Adapt to new health field name 'status' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1557129950 +Class: feature + +Ceph health' JSON format has changed in luminous, which lead to a false {WARN} state +for affected devices. diff --git a/checks/ceph_status b/checks/ceph_status index 84a3918..9c6a000 100644 --- a/checks/ceph_status +++ b/checks/ceph_status @@ -28,10 +28,14 @@ def parse_ceph_status(info): import json - parsed = "" - for line in info: - parsed += " ".join(line) - return json.loads(parsed) + joined_lines = [" ".join(line) for line in info] + parsed = json.loads(''.join(joined_lines)) + + # ceph health' JSON format has changed in luminous + if "health" in parsed and "status" not in parsed["health"]: + parsed["health"]["status"] = parsed["health"].get("overall_status") + + return parsed def ceph_check_epoch(_id, epoch, params): @@ -80,7 +84,7 @@ def check_ceph_status(_no_item, params, parsed): "HEALTH_ERR": (2, "error"), } - overall_status = parsed["health"]["overall_status"] + overall_status = parsed["health"]["status"] state, state_readable = map_health_states.get(overall_status, (3, "unknown[%s]" % overall_status)) yield state, 'Status: %s' % state_readable

5 years, 2 months

update for WK7259

by Andreas Boesl

Module: check_mk Branch: master Commit: b5d3f3d0fea40924fe1504b5b07819f679044f12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5d3f3d0fea409… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 6 15:33:06 2019 +0200 update for WK7259 Change-Id: Ifb051a3542dc2ff7acb7a66afdd04e51831a0ab4 --- cmk_base/discovery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index d32aae2..3c3c13c 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -29,7 +29,7 @@ import socket import time import signal from typing import Callable, List, Text, Optional, Dict, Tuple # pylint: disable=unused-import -import pathlib2 as pathlib +from pathlib2 import Path from cmk.utils.regex import regex import cmk.utils.tty as tty @@ -1338,7 +1338,7 @@ def _save_autochecks_file(hostname, items): if not os.path.exists(cmk.utils.paths.autochecks_dir): os.makedirs(cmk.utils.paths.autochecks_dir) - filepath = pathlib.Path() / cmk.utils.paths.autochecks_dir / ("%s.mk" % hostname) + filepath = Path(cmk.utils.paths.autochecks_dir) / ("%s.mk" % hostname) content = [] content.append("[") for check_plugin_name, item, paramstring in items:

5 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019