Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

Add freezegun for comfortable time mocking in tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 01a10e6cfca56d8c301b05abf66c6029f5caf285 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01a10e6cfca56d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 11:54:02 2019 +0100 Add freezegun for comfortable time mocking in tests Change-Id: Ie9667365185f8f86bb443946d2789e2262c6cbe8 --- Pipfile | 1 + Pipfile.lock | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Pipfile b/Pipfile index 42899f7..4ee093d 100644 --- a/Pipfile +++ b/Pipfile @@ -21,6 +21,7 @@ docker = "*" mockldap = "*" isort = "*" pdbpp = "*" +freezegun = "*" [packages] setuptools_scm = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index f4b3102..b7040db 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e4e451366caf430af6048ea42109837b9bc49a9da374e1aa1686914ef220edd8" + "sha256": "4b35e236a3fee27dec1e3686d32f6be30bb1aef4d7a7e0a2ea20fd38b0179c6f" }, "pipfile-spec": 6, "requires": { @@ -996,7 +996,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3.2'", + "markers": "python_version < '3.4'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1120,6 +1120,14 @@ ], "version": "==0.8" }, + "freezegun": { + "hashes": [ + "sha256:6cb82b276f83f2acce67f121dc2656f4df26c71e32238334eb071170b892a278", + "sha256:e839b43bfbe8158b4d62bb97e6313d39f3586daf48e1314fb1083d2ef17700da" + ], + "index": "pypi", + "version": "==0.3.11" + }, "funcparserlib": { "hashes": [ "sha256:b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d" @@ -1131,7 +1139,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1174,11 +1182,11 @@ }, "isort": { "hashes": [ - "sha256:89041186651a9a6159683098f337eed0994d9d94e006f891c6e8cbeb8e65f1c7", - "sha256:ba51a651505242b0b37ad94b281e1154301e221a40c623e62334ed863fc1c98c" + "sha256:38a74a5ccf3a15a7a99f975071164f48d4d10eed4154879009c18e6e8933e5aa", + "sha256:abbb2684aa234d5eb8a67ef36d4aa62ea080d46c2eba36ad09e2990ae52e4305" ], "index": "pypi", - "version": "==4.3.12" + "version": "==4.3.13" }, "lazy-object-proxy": { "hashes": [ @@ -1393,6 +1401,14 @@ "index": "pypi", "version": "==0.4" }, + "python-dateutil": { + "hashes": [ + "sha256:063df5763652e21de43de7d9e00ccf239f953a832941e37be541614732cdfc93", + "sha256:88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02" + ], + "index": "pypi", + "version": "==2.7.5" + }, "python-ldap": { "hashes": [ "sha256:41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5"

5 years, 6 months

fixed broken werk text

by Ronny Bruska

Module: check_mk Branch: master Commit: d3d544b9e3a0c4177c285147306a3504d5a69bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3d544b9e3a0c4… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Fri Mar 8 13:42:38 2019 +0100 fixed broken werk text Change-Id: Ie6c7466eec69d5413e81c1c5d62601037361a931 --- .werks/7195 | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.werks/7195 b/.werks/7195 index 1cdec02..1f931d1 100644 --- a/.werks/7195 +++ b/.werks/7195 @@ -10,7 +10,7 @@ Class: feature Check_MK now supports integration with Jira. You can create issues for Host an Service Problems and optional set a resolution on recovery notifications. -In Jira you have to add two custom fields to your project screen as described [https://confluence.atlassian.com/adminjiraserver/adding-a-custom-field-9388… here]. +In Jira you have to add two custom fields to your project screen as described <a href "https://confluence.atlassian.com/adminjiraserver/adding-a-custom-field-9388…">here</a>. In Check_MK, under "WATO - Notifications", create a new notification rule and select Jira. Parameters to set: @@ -30,30 +30,34 @@ Parameters to set: <i>Set optional timeout for connections to JIRA<i>: Timeout in seconds, default is 10 (optional) You need different Jira IDs to open/resolve issues. There are different ways to get this IDs: -LI: [https://confluence.atlassian.com/jirakb/how-to-get-project-id-from-the-jira… Jira_support] +LI: <a href="https://confluence.atlassian.com/jirakb/how-to-get-project-id-from-the-jira…">Jira_support</a> LI: Retrieve with the a script (example: project_id): -F+:#!/usr/bin/env python -F+: -F+:import requests -F+: -F+:USER = "JIRA_USERNAME" -F+:PW = "JIRA_PASSWORD" -F+:PROJECT_KEY = "JIRA_PROJECT_NAME" -F+:JIRA_SERVER = "https://jira.server.your-domain.de" -F+: -F+:sess = requests.Session() -F+:sess.auth = (USER, PW) -F+:resp = sess.get("%s/rest/api/2/project" % JIRA_SERVER, verify=False) -F+: -F+:project_id = [item["id"] for item in resp.json() if item["key"] == PROJECT_KEY][0] -F+:print(project_id) +F+:example_script.py +#!/usr/bin/env python + +import requests + +USER = "JIRA_USERNAME" +PW = "JIRA_PASSWORD" +PROJECT_KEY = "JIRA_PROJECT_NAME" +JIRA_SERVER = "https://jira.server.your-domain.de" + +sess = requests.Session() +sess.auth = (USER, PW) +resp = sess.get("%s/rest/api/2/project" % JIRA_SERVER, verify=False) + +project_id = [item["id"] for item in resp.json() if item["key"] == PROJECT_KEY][0] +print(project_id) +F-: For issuetype and priority ID use: -F+:resp = sess.get("%s/rest/api/2/issuetype" % JIRA_SERVER) -F+:resp = sess.get("%s/rest/api/2/priority" % JIRA_SERVER) +F+:example_script.py +resp = sess.get("%s/rest/api/2/issuetype" % JIRA_SERVER) +resp = sess.get("%s/rest/api/2/priority" % JIRA_SERVER) +F-: -More information about the Jira API can be found [https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0 here]. +More information about the Jira API can be found <a href "https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0">here</a>. CMK-1185

5 years, 7 months

Fix bracket and formating

by Alex Zurhake

Module: check_mk Branch: master Commit: 2d14a8a78870034c3e712618f0d9c571ffb4bf8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d14a8a7887003… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 7 09:12:01 2019 +0100 Fix bracket and formating Change-Id: Ib8b85b35b985edae4df92fd85c75517bf81c1194 --- buildscripts/scripts/os-nodes.jenkins | 43 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/buildscripts/scripts/os-nodes.jenkins b/buildscripts/scripts/os-nodes.jenkins index b04dd90..d2227dd 100644 --- a/buildscripts/scripts/os-nodes.jenkins +++ b/buildscripts/scripts/os-nodes.jenkins @@ -17,11 +17,12 @@ node { IMAGE = 'ubuntu-18.04-common' docker.image(IMAGE).pull() docker.image(IMAGE).inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { - stage('checkout sources') { - cleanWs() - checkout(scm) - stash name: 'distroinfos', includes: 'omd/distros/*.mk' - stash name: 'dockerfiles', includes: 'buildscripts/infrastructure/os-nodes/*/Dockerfile' + stage('checkout sources') { + cleanWs() + checkout(scm) + stash name: 'distroinfos', includes: 'omd/distros/*.mk' + stash name: 'dockerfiles', includes: 'buildscripts/infrastructure/os-nodes/*/Dockerfile' + } } } } @@ -29,24 +30,24 @@ node { DISTRO_LIST.each { DISTRO -> DOCKER_BUILDS[DISTRO] = { node { - docker.withRegistry(DOCKER_REGISTRY, 'nexus') { - IMAGE = 'ubuntu-18.04-common' - docker.image(IMAGE).inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { - stage('build ' + DISTRO + ' os-image') { - unstash name: 'dockerfiles' - unstash name: 'distroinfos' - def DISTRO_INFO = 'omd/distros/' + sh(script: "echo \'$DISTRO\' | tr 'a-z' 'A-Z' | tr '-' '_'", returnStdout: true).trim() + '.mk' - def OS_PACKAGES = sh(script: """ - cat \'$DISTRO_INFO\' | sed 's/OS_PACKAGES\\s\\++=\\s\\+\$.*\$/\\1/;t;d' | sed 's/#.*\$//' | tr '\\n' ' ' - """, - returnStdout: true).trim() - dir('buildscripts/infrastructure/os-nodes/' + DISTRO) { - docker.withRegistry(DOCKER_REGISTRY, 'nexus') { - sh "docker build -t $DOCKER_REGISTRY/$DISTRO-os-image --build-arg PACKAGES='$OS_PACKAGES' --network ci_local-infra ." - sh "docker push $DOCKER_REGISTRY/$DISTRO-os-image" + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + IMAGE = 'ubuntu-18.04-common' + docker.image(IMAGE).inside('-u 0:0 -v /var/run/docker.sock:/var/run/docker.sock --cap-add=SYS_ADMIN --network ci_local-infra') { + stage('build ' + DISTRO + ' os-image') { + unstash name: 'dockerfiles' + unstash name: 'distroinfos' + def DISTRO_INFO = 'omd/distros/' + sh(script: "echo \'$DISTRO\' | tr 'a-z' 'A-Z' | tr '-' '_'", returnStdout: true).trim() + '.mk' + def OS_PACKAGES = sh(script: """ + cat \'$DISTRO_INFO\' | sed 's/OS_PACKAGES\\s\\++=\\s\\+\$.*\$/\\1/;t;d' | sed 's/#.*\$//' | tr '\\n' ' ' + """, + returnStdout: true).trim() + dir('buildscripts/infrastructure/os-nodes/' + DISTRO) { + def DOCKER_REGISTRY_NOHTTP = DOCKER_REGISTRY.split('//')[1] + sh "docker build -t $DOCKER_REGISTRY_NOHTTP/$DISTRO-os-image --build-arg PACKAGES='$OS_PACKAGES' --network ci_local-infra ." + sh "docker push $DOCKER_REGISTRY_NOHTTP/$DISTRO-os-image" } } - } + } } } }

5 years, 7 months

Archive the test results

by Alex Zurhake

Module: check_mk Branch: master Commit: 35e5299c776e480350dc90b4ea6a46fc705c1fd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35e5299c776e48… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 7 10:50:20 2019 +0100 Archive the test results - create junit.xml - sore logfile and junit.xml on Jenkins Change-Id: I98c94f63b396505e6348992b56936311f1c8bc6a --- buildscripts/scripts/integration-daily-master.jenkins | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index c769244..4d2b10e 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -28,7 +28,8 @@ node { stage('checkout sources') { cleanWs() dir(TEST_DATA + '/git') { - checkout(scm) + git branch: 'master', changelog: false, credentialsId: '058f09c4-21c9-49ae-b72b-0b9d2f465da6', poll: false, url: 'ssh://jenkins@review.lan.mathias-kettner.de:29418/check_mk.git' + //checkout(scm) } } } @@ -119,9 +120,14 @@ DISTRO_LIST.each { DISTRO -> sh "mount -t overlay overlay -o lowerdir=${TEST_DATA}/git,upperdir=${WORKSPACE}/$DISTRO-dest,workdir=${WORKSPACE}/$DISTRO-work ${WORKSPACE}/$DISTRO-dest" sh 'ls -lah' dir (DISTRO + '-dest') { - sh 'rm -rf .venv' - sh 'PYTEST_ADDOPTS="--maxfail 300" make -C tests test-integration' + sh 'PYTEST_ADDOPTS="--junitxml=/omd/sites/int_master/junit.xml --maxfail 300" make -C tests test-integration' } + sh """ + mkdir -p /$DISRTO + cp /omd/sites/int_master/junit.xml /$DISTRO/ + cp -r /omd/sites/int_master/var/log /$DISRTO/ + """ + archiveArtifacts '/$DISTRO' sh "until umount $DISTRO-dest; do sleep 1; done" } }

5 years, 7 months

Use the systemctl workaround for all distros

by Alex Zurhake

Module: check_mk Branch: master Commit: 7071fe11182a3ef702133ecc7487a8391c518236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7071fe11182a3e… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Mar 8 14:16:31 2019 +0100 Use the systemctl workaround for all distros Change-Id: I8e4e00e25ed3884e5a1aca95fa6595cc4dbe9432 --- buildscripts/scripts/integration-daily-master.jenkins | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index d1f24a7..112e3f8 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -86,6 +86,12 @@ DISTRO_LIST.each { DISTRO -> ).trim() def PACKAGE = '/bauwelt/download/' + CMK_VERSION + '/check-mk-enterprise-' + CMK_VERSION + DISTRO_CODE sh """ + # Workaround: systemctl in docker leads to: Failed to connect to bus: No such file or directory + if SYSCTL=\$(which systemctl); then + rm -rf \$SYSCTL + ln -s \$(which true) \$SYSCTL + fi + case $DISTRO in centos*|rh*) yum -y install $PACKAGE @@ -95,10 +101,6 @@ DISTRO_LIST.each { DISTRO -> ;; *) apt-get update - if test -e /bin/systemctl; then - mv /bin/systemctl /bin/systemctl-real - ln -s /bin/true /bin/systemctl - fi gdebi -n $PACKAGE ;; esac @@ -116,7 +118,6 @@ DISTRO_LIST.each { DISTRO -> // } try { stage('integration test ' + DISTRO + ' omd') { - sh 'rm -rf /bin/systemctl; ln -s /bin/true /bin/systemctl' sh "mkdir -p $DISTRO-work $DISTRO-dest" sh "mount -t overlay overlay -o lowerdir=${TEST_DATA}/git,upperdir=${WORKSPACE}/$DISTRO-dest,workdir=${WORKSPACE}/$DISTRO-work ${WORKSPACE}/$DISTRO-dest" sh 'ls -lah'

5 years, 7 months

Install newer Python in centos-7 test container

by Alex Zurhake

Module: check_mk Branch: master Commit: bb6e5649ea3689316085db6db0cb1f9ad88022b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb6e5649ea3689… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 7 09:24:33 2019 +0100 Install newer Python in centos-7 test container - Pipenv doesn't work with python before 2.7.9 - python needs to be activated via scl - dpkg for deb bakery test - postfix (mail and mta) for notifications - strace and vim for debuging Change-Id: Ibf0ed63739e0382ec4c4a5375d46ea4beb159fc1 --- .../infrastructure/os-nodes/centos-7/Dockerfile | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile b/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile index c34f575..a52c063 100644 --- a/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile +++ b/buildscripts/infrastructure/os-nodes/centos-7/Dockerfile @@ -7,7 +7,10 @@ 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 \ @@ -17,15 +20,25 @@ RUN yum -y --enablerepo=extras install \ nodejs \ npm \ openldap-devel \ - python \ - python-devel \ + postfix \ + python27 \ + python27-devel \ rrdtool-devel \ + strace \ sudo \ + vim \ which 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 + && 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, 7 months

Do not stop integration test after single failure

by Alex Zurhake

Module: check_mk Branch: master Commit: 2d8d90578a5a07a187b981f934c31ac903a09f00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d8d90578a5a07… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 7 09:27:24 2019 +0100 Do not stop integration test after single failure in order to get a history of which test failed in which distro, how often, when, etc. This will help us to improve code and test quality Change-Id: Ida38302bd81bf2907bf5b293c47ae1ecf9103251 --- 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 e112038..c769244 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -120,7 +120,7 @@ DISTRO_LIST.each { DISTRO -> sh 'ls -lah' dir (DISTRO + '-dest') { sh 'rm -rf .venv' - sh 'make -C tests test-integration' + sh 'PYTEST_ADDOPTS="--maxfail 300" make -C tests test-integration' } sh "until umount $DISTRO-dest; do sleep 1; done" }

5 years, 7 months

Correct the docker network

by Alex Zurhake

Module: check_mk Branch: master Commit: 9e958ec202927d1dd00bcf68fb742d8ad4eceb23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e958ec202927d… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Mar 8 14:05:34 2019 +0100 Correct the docker network - nexus is in network ci_local-infra - this network supports ipv6 - no need for connecting to the brige anymore Change-Id: If341cfb2ab2819b34284639135c085ebc40fc7ff --- buildscripts/scripts/integration-daily-master.jenkins | 2 +- buildscripts/scripts/os-nodes.jenkins | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index 4d2b10e..f1cac67 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -41,7 +41,7 @@ DISTRO_LIST.each { DISTRO -> node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { docker.image(DISTRO + '-os-image').pull() - docker.image(DISTRO + '-os-image').inside("-u 0:0 -v /bauwelt/download/$CMK_VERSION:/bauwelt/download/$CMK_VERSION:ro -v $TEST_DATA:$TEST_DATA --init --privileged --network ci_local-infra --network bridge") { + docker.image(DISTRO + '-os-image').inside("-u 0:0 -v /bauwelt/download/$CMK_VERSION:/bauwelt/download/$CMK_VERSION:ro -v $TEST_DATA:$TEST_DATA --init --privileged --network ci_local-infra") { stage('install ' + DISTRO + ' omd') { DISTRO_CODE = sh ( script: """ case $DISTRO in diff --git a/buildscripts/scripts/os-nodes.jenkins b/buildscripts/scripts/os-nodes.jenkins index d2227dd..7a52baf 100644 --- a/buildscripts/scripts/os-nodes.jenkins +++ b/buildscripts/scripts/os-nodes.jenkins @@ -16,7 +16,7 @@ node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { IMAGE = 'ubuntu-18.04-common' docker.image(IMAGE).pull() - docker.image(IMAGE).inside('-u 0:0 --cap-add=SYS_ADMIN --network infrastructure_local-infra') { + docker.image(IMAGE).inside('-u 0:0 --cap-add=SYS_ADMIN --network ci_local-infra') { stage('checkout sources') { cleanWs() checkout(scm)

5 years, 7 months

Save artifacts, whether the test fails or not

by Alex Zurhake

Module: check_mk Branch: master Commit: b67e96a9cd6bfc587a95c03fc740ee75e7f9cc11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b67e96a9cd6bfc… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Mar 8 14:15:54 2019 +0100 Save artifacts, whether the test fails or not Change-Id: Id1fe995366f814a561132f89aaba8660b8d429e2 --- .../scripts/integration-daily-master.jenkins | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index f1cac67..d1f24a7 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -114,20 +114,27 @@ DISTRO_LIST.each { DISTRO -> // sh 'su -c \"python -c \'import azure.mgmt.resource\'\" - test' // sh 'su -c \"python -c \'import azure.mgmt.compute\'\" - test' // } - stage('integration test ' + DISTRO + ' omd') { - sh 'rm -rf /bin/systemctl; ln -s /bin/true /bin/systemctl' - sh "mkdir -p $DISTRO-work $DISTRO-dest" - sh "mount -t overlay overlay -o lowerdir=${TEST_DATA}/git,upperdir=${WORKSPACE}/$DISTRO-dest,workdir=${WORKSPACE}/$DISTRO-work ${WORKSPACE}/$DISTRO-dest" - sh 'ls -lah' - dir (DISTRO + '-dest') { - sh 'PYTEST_ADDOPTS="--junitxml=/omd/sites/int_master/junit.xml --maxfail 300" make -C tests test-integration' + try { + stage('integration test ' + DISTRO + ' omd') { + sh 'rm -rf /bin/systemctl; ln -s /bin/true /bin/systemctl' + sh "mkdir -p $DISTRO-work $DISTRO-dest" + sh "mount -t overlay overlay -o lowerdir=${TEST_DATA}/git,upperdir=${WORKSPACE}/$DISTRO-dest,workdir=${WORKSPACE}/$DISTRO-work ${WORKSPACE}/$DISTRO-dest" + sh 'ls -lah' + dir (DISTRO + '-dest') { + sh 'PYTEST_ADDOPTS="--junitxml=/omd/sites/int_master/junit.xml --maxfail 300" make -C tests test-integration' + } } + } + finally { sh """ - mkdir -p /$DISRTO - cp /omd/sites/int_master/junit.xml /$DISTRO/ - cp -r /omd/sites/int_master/var/log /$DISRTO/ + rm -rf $DISTRO + mkdir -p $DISTRO + cp /omd/sites/int_master/junit.xml $DISTRO/ + cp -r /omd/sites/int_master/var/log $DISTRO/ + chown -R 112:120 $DISTRO """ - archiveArtifacts '/$DISTRO' + archiveArtifacts "$DISTRO/**/*" + xunit([Custom(customXSL: "$JENKINS_HOME/userContent/xunit/JUnit/0.1/pytest-xunit.xsl", deleteOutputFiles: true, failIfNotNew: true, pattern: "$DISTRO/junit.xml", skipNoTestFiles: false, stopProcessingIfError: true)]) sh "until umount $DISTRO-dest; do sleep 1; done" } }

5 years, 7 months

7024 BI aggregation list now shows icons for the aggregation config options

by Lars Michelsen

Module: check_mk Branch: master Commit: ae66188f84bafd2f9d36910bda88e450d4219512 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae66188f84bafd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 15:38:36 2019 +0100 7024 BI aggregation list now shows icons for the aggregation config options The aggregation list of WATO now shows icons for the aggregation option flags (enabled/disabled, single/multiple hosts, hard/all states, downtime aggregate WARN/CRIT). Change-Id: I49844b0892caf16141cd3512cb916e63f59682fb --- .werks/7024 | 11 +++++++++++ cmk/gui/plugins/wato/bi.py | 17 ++++++++++++++++- web/htdocs/themes/classic/images/icon_all_states.png | Bin 0 -> 4436 bytes web/htdocs/themes/classic/images/icon_critical.png | Bin 0 -> 4477 bytes web/htdocs/themes/classic/images/icon_hard_states.png | Bin 0 -> 2935 bytes web/htdocs/themes/facelift/images/icon_all_states.png | Bin 0 -> 21429 bytes web/htdocs/themes/facelift/images/icon_critical.png | Bin 0 -> 698 bytes web/htdocs/themes/facelift/images/icon_hard_states.png | Bin 0 -> 12090 bytes 8 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/7024 b/.werks/7024 new file mode 100644 index 0000000..1358663 --- /dev/null +++ b/.werks/7024 @@ -0,0 +1,11 @@ +Title: BI aggregation list now shows icons for the aggregation config options +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1546958239 +Class: feature + +The aggregation list of WATO now shows icons for the aggregation option flags +(enabled/disabled, single/multiple hosts, hard/all states, downtime aggregate WARN/CRIT). diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index c5af8a4..9a2035d 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -1314,12 +1314,27 @@ class ModeBIAggregations(ModeBI): if "customer" in aggregation: html.write_text(managed.get_customer_name(aggregation)) - table.text_cell("", css="buttons") + table.text_cell(_("Options"), css="buttons") if aggregation["disabled"]: html.icon(_("This aggregation is currently disabled."), "disabled") + else: + html.icon(_("This aggregation is currently enabled."), "enabled") + if aggregation["single_host"]: html.icon(_("This aggregation covers only data from a single host."), "host") + else: + html.icon(_("This aggregation works with data of multiple hosts."), "aggr") + + if aggregation["hard_states"]: + html.icon(_("Base state computation on hard states"), "hard_states") + else: + html.icon(_("Base state computation on soft and hard states"), "all_states") + + if aggregation["downtime_aggr_warn"]: + html.icon(_("Escalate downtimes based on aggregated WARN state"), "warning") + else: + html.icon(_("Escalate downtimes based on aggregated CRIT state"), "critical") table.text_cell(_("Groups"), ", ".join(aggregation["groups"])) diff --git a/web/htdocs/themes/classic/images/icon_all_states.png b/web/htdocs/themes/classic/images/icon_all_states.png new file mode 100644 index 0000000..6c20127 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_all_states.png differ diff --git a/web/htdocs/themes/classic/images/icon_critical.png b/web/htdocs/themes/classic/images/icon_critical.png new file mode 100644 index 0000000..e1841e4 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_critical.png differ diff --git a/web/htdocs/themes/classic/images/icon_hard_states.png b/web/htdocs/themes/classic/images/icon_hard_states.png new file mode 100644 index 0000000..8b87561 Binary files /dev/null and b/web/htdocs/themes/classic/images/icon_hard_states.png differ diff --git a/web/htdocs/themes/facelift/images/icon_all_states.png b/web/htdocs/themes/facelift/images/icon_all_states.png new file mode 100644 index 0000000..77e24cf Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_all_states.png differ diff --git a/web/htdocs/themes/facelift/images/icon_critical.png b/web/htdocs/themes/facelift/images/icon_critical.png new file mode 100644 index 0000000..53c8559 Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_critical.png differ diff --git a/web/htdocs/themes/facelift/images/icon_hard_states.png b/web/htdocs/themes/facelift/images/icon_hard_states.png new file mode 100644 index 0000000..ebf622d Binary files /dev/null and b/web/htdocs/themes/facelift/images/icon_hard_states.png differ

5 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
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