Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: abe606dac9933ee56e7acda445b62643953ec5ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abe606dac9933e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 15:46:44 2019 +0100 Fixed broken popup menu since yesterday Change-Id: I712e938eb15c6b1cf73024e75c77c09787b64c2f --- cmk/gui/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index fd118ea..4febaf2 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -2302,7 +2302,7 @@ def query_action_data(what, host, site, svcdesc): def ajax_popup_action_menu(): site = html.request.var('site') host = html.request.var('host') - svcdesc = html.request.get_unicode_input('service') + svcdesc = html.get_unicode_input('service') what = 'service' if svcdesc else 'host' display_options.load_from_html()

5 years, 6 months

Drop dead code

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fa7071feafd071dfa873da024fbff4b6ae6ee5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa7071feafd07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 14:57:45 2019 +0100 Drop dead code Change-Id: Id2d99a168b762d3699ba1f1ac4eb0a0b8bba49f8 --- cmk_base/ip_lookup.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index a841e4d..513e524 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -206,22 +206,6 @@ def _update_ip_lookup_cache(cache_id, ipa): cmk.utils.store.release_lock(cache_path) -# TODO: remove unused code? -def _write_ip_lookup_cache(): - ip_lookup_cache = cmk_base.config_cache.get_dict("ip_lookup") - - cache_path = cmk.utils.paths.var_dir + '/ipaddresses.cache' - - # Read already known data - data_from_file = cmk.utils.store.load_data_from_file(cache_path, default={}, lock=True) - data_from_file.update(ip_lookup_cache) - # The lock from the previous call is released in the following function - # (I don't like this) - # TODO: this file always grows... there should be a cleanup mechanism - # maybe on "cmk --update-dns-cache" - cmk.utils.store.save_data_to_file(cache_path, data_from_file, pretty=False) - - def update_dns_cache(): # Temporarily disable *use* of cache, we want to force an update # TODO: Cleanup this hacky config override! Better add some global flag

5 years, 6 months

7219 FIX agent_vsphere: Missing data in case of mutliline snapshot description

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3a43c8b18f3c5514de7f7e14e6a33f88af2463d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a43c8b18f3c55… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 20 13:03:17 2019 +0100 7219 FIX agent_vsphere: Missing data in case of mutliline snapshot description In case a description of a VM snapshot consisted of multiple lines, no data about the corresponding VM has been obtained. Change-Id: Ia493747d27a2f368fb3df005bb02acfb06821533 --- .werks/7219 | 12 ++++++++++++ agents/special/agent_vsphere | 5 +---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/7219 b/.werks/7219 new file mode 100644 index 0000000..f6a015f --- /dev/null +++ b/.werks/7219 @@ -0,0 +1,12 @@ +Title: agent_vsphere: Missing data in case of mutliline snapshot description +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553083211 + +In case a description of a VM snapshot consisted of multiple lines, no +data about the corresponding VM has been obtained. diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 68e9e94..81a5c8c 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -906,10 +906,7 @@ def create_search_pattern(tokens): def get_pattern(pattern, line): - if not line: - return [] - p = re.compile(pattern, re.MULTILINE) - return p.findall(line) + return re.findall(pattern, line, re.DOTALL) if line else [] # TODO: Refactor to requests

5 years, 6 months

CMK-CMK-1826: Add sles-12sp4 to new nightly build

by Alex Zurhake

Module: check_mk Branch: master Commit: 49fdfa68b58a0fdc0c4276a9a22f7861cad4d7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49fdfa68b58a0f… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 21 13:26:04 2019 +0100 CMK-CMK-1826: Add sles-12sp4 to new nightly build Change-Id: I6091a5bcda344b27b988a67ce9134c3b4fe038d7 --- .../gnu-toolchain/bw-build-gnu-toolchain.sh | 4 +- .../build-nodes/sles-12sp4/Dockerfile | 8 +- .../infrastructure/os-nodes/sles-12sp4/Dockerfile | 34 ++++++ omd/distros/SLES_12SP4.mk | 116 +++++++++++++++++++++ 4 files changed, 156 insertions(+), 6 deletions(-) diff --git a/buildscripts/infrastructure/build-nodes/gnu-toolchain/bw-build-gnu-toolchain.sh b/buildscripts/infrastructure/build-nodes/gnu-toolchain/bw-build-gnu-toolchain.sh index d4fc51f..16c2c37 100755 --- a/buildscripts/infrastructure/build-nodes/gnu-toolchain/bw-build-gnu-toolchain.sh +++ b/buildscripts/infrastructure/build-nodes/gnu-toolchain/bw-build-gnu-toolchain.sh @@ -12,9 +12,7 @@ PREFIX="/opt/gcc-${GCC_VERSION}" BUILD_DIR=/tmp/build-gcc-toolchain -#NEXUS="http://nexus.lan.tribe29.com/repository/archives/" -NEXUS="http://devrechner.lan.mathias-kettner.de:8081/repository/archives/" -#NEXUS="http://10.9.1.101:8081/repository/archives/" +NEXUS="http://nexus:8081/repository/archives/" function download-sources { # To avoid repeated downloads of the sources + the prerequisites, we diff --git a/buildscripts/infrastructure/build-nodes/sles-12sp4/Dockerfile b/buildscripts/infrastructure/build-nodes/sles-12sp4/Dockerfile index 3f2ece0..cc00e4c 100644 --- a/buildscripts/infrastructure/build-nodes/sles-12sp4/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/sles-12sp4/Dockerfile @@ -1,8 +1,8 @@ -FROM 10.9.1.101:5010/sles-12sp4-base +FROM nexus.lan.tribe29.com:5010/sles-12sp4-base SHELL ["/bin/bash", "-c"] -RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles12sp4 sles12sp4 \ +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp4 sles12sp4 \ && zypper -n in -y --force-resolution \ awk \ && zypper -n in -y --force-resolution \ @@ -63,4 +63,6 @@ RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles12sp4 sles12sp4 \ 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-12sp4/Dockerfile b/buildscripts/infrastructure/os-nodes/sles-12sp4/Dockerfile new file mode 100644 index 0000000..0494ef9 --- /dev/null +++ b/buildscripts/infrastructure/os-nodes/sles-12sp4/Dockerfile @@ -0,0 +1,34 @@ +FROM nexus.lan.tribe29.com:5010/sles-12sp4-base + +SHELL ["/bin/bash", "-c"] + +ARG PACKAGES + +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp4 sles12sp4 \ + && zypper addrepo -G http://nexus:8081/repository/sles12spx-web-scripting web-scripting \ + && zypper -n --no-gpg-checks in --replacefiles \ + gawk \ + && zypper -n --no-gpg-checks in --replacefiles \ + 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 diff --git a/omd/distros/SLES_12SP4.mk b/omd/distros/SLES_12SP4.mk new file mode 100644 index 0000000..84b4c0e --- /dev/null +++ b/omd/distros/SLES_12SP4.mk @@ -0,0 +1,116 @@ +DISTRO_CODE = sles12sp4 +BUILD_PACKAGES = +BUILD_PACKAGES += tar # needed for "make rpm" +BUILD_PACKAGES += rpm-devel # needed for "make rpm" +BUILD_PACKAGES += unzip # unpack src files of packages +BUILD_PACKAGES += groff # needed for building rrdtool +BUILD_PACKAGES += libltdl7 # needed for gearman +BUILD_PACKAGES += libtool # needed for gearman +BUILD_PACKAGES += boost-devel +BUILD_PACKAGES += fping +BUILD_PACKAGES += samba-client # otherwise path to smblient missing in util.pm +BUILD_PACKAGES += rpcbind # otherwise missing path in util.pm +BUILD_PACKAGES += bind-utils # check_dns +BUILD_PACKAGES += freetype2-devel +BUILD_PACKAGES += gcc +BUILD_PACKAGES += gcc-c++ +BUILD_PACKAGES += gd-devel +BUILD_PACKAGES += git +BUILD_PACKAGES += glib2-devel +BUILD_PACKAGES += libcurl-devel # needed by perl modules / thruk +BUILD_PACKAGES += libexpat-devel +BUILD_PACKAGES += libevent-devel +BUILD_PACKAGES += libgnutls-devel +BUILD_PACKAGES += libjpeg62-devel +BUILD_PACKAGES += libmysqlclient-devel +BUILD_PACKAGES += libopenssl-devel +BUILD_PACKAGES += libpng16-devel # Perl::GD +BUILD_PACKAGES += libXpm-devel # Perl::GD +BUILD_PACKAGES += libvpx-devel # Perl::GD +BUILD_PACKAGES += libtiff-devel # Perl::GD +BUILD_PACKAGES += libuuid-devel +BUILD_PACKAGES += libxml2-devel +BUILD_PACKAGES += sqlite3-devel # needed by Python (for sqlite3 module) +BUILD_PACKAGES += tk-devel # needed by Python (for Tkinter module) +BUILD_PACKAGES += make +BUILD_PACKAGES += mysql +BUILD_PACKAGES += net-snmp +BUILD_PACKAGES += openldap2-devel +BUILD_PACKAGES += pango-devel +BUILD_PACKAGES += patch +BUILD_PACKAGES += postgresql-devel +BUILD_PACKAGES += readline-devel +BUILD_PACKAGES += apache2-devel +BUILD_PACKAGES += freeradius-client-devel +BUILD_PACKAGES += libbz2-devel # needed for msitools +BUILD_PACKAGES += libgsf-devel # needed for msitools +BUILD_PACKAGES += libpcap-devel # needed buy CMC +BUILD_PACKAGES += rrdtool-devel # needed for CMC +BUILD_PACKAGES += libffi-devel # needed for pyOpenSSL (and dependant) compilations +BUILD_PACKAGES += krb5-devel # needed for pykerberos / requests-kerberos python modules +BUILD_PACKAGES += flex # needed for heirloom-pkgtools +BUILD_PACKAGES += openssh # needed for check_by_ssh +OS_PACKAGES = +OS_PACKAGES += cronie # needed for sites cron jobs +OS_PACKAGES += net-tools # traceroute is needed for Check_MK parent scan +OS_PACKAGES += apache2 +OS_PACKAGES += bind-utils # check_dns +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += fping +OS_PACKAGES += gd +OS_PACKAGES += graphviz +OS_PACKAGES += libpng12-0 +OS_PACKAGES += libevent-2_0-5 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libreadline6 +OS_PACKAGES += libuuid1 +OS_PACKAGES += net-snmp +OS_PACKAGES += pango +OS_PACKAGES += perl-Net-SNMP +OS_PACKAGES += perl-SNMP +OS_PACKAGES += php-fastcgi +OS_PACKAGES += php-gd +OS_PACKAGES += php-iconv +OS_PACKAGES += php-mbstring +OS_PACKAGES += php-mcrypt +OS_PACKAGES += php-pear +OS_PACKAGES += php-sockets +OS_PACKAGES += php-sqlite +OS_PACKAGES += php-openssl +OS_PACKAGES += rsync +OS_PACKAGES += samba-client +OS_PACKAGES += rpcbind +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += xorg-x11-fonts +OS_PACKAGES += freeradius-client-libs +OS_PACKAGES += binutils # Needed by Check_MK Agent Bakery +OS_PACKAGES += rpm-build # Needed by Check_MK Agent Bakery +OS_PACKAGES += libgio-2_0-0 # needed by msitools/Agent Bakery +OS_PACKAGES += libgsf-1-114 # needed by msitools/Agent Bakery +OS_PACKAGES += cpio # needed for Agent bakery (solaris pkgs) +OS_PACKAGES += poppler-tools # needed for preview of PDF in reporting +OS_PACKAGES += libpcap1 # needed for ICMP of CMC +OS_PACKAGES += libffi4 # needed for pyOpenSSL and dependant +OS_PACKAGES += libjpeg62 # needed by PIL +OS_PACKAGES += libgthread-2_0-0 # Needed by cmc (rrd library) +OS_PACKAGES += libpq5 +USERADD_OPTIONS = -M +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = zypper -n refresh ; zypper -n install +ACTIVATE_INITSCRIPT = chkconfig --add %s +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT_NAME = apache2 +APACHE_USER = wwwrun +APACHE_GROUP = www +APACHE_BIN = /usr/sbin/httpd2-prefork +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2-prefork +APACHE_MODULE_DIR_64 = /usr/lib64/apache2-prefork +HTPASSWD_BIN = /usr/bin/htpasswd2 +PHP_FCGI_BIN = /usr/bin/php-cgi +APACHE_ENMOD = a2enmod %s +BECOME_ROOT = su -c +MOUNT_OPTIONS = +INIT_CMD = /usr/bin/systemctl %(action)s %(name)s.service

5 years, 6 months

Unbreak integration test

by Lars Michelsen

Module: check_mk Branch: master Commit: 87c3a5255b691a76b190b539368c14e635c70c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87c3a5255b691a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 13:27:17 2019 +0100 Unbreak integration test Change-Id: I229757a22dcef8007d20edaa28ddc4d2199c6b84 --- tests/integration/core/test_active_checks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/core/test_active_checks.py b/tests/integration/core/test_active_checks.py index abb4e7d..9d372a1 100644 --- a/tests/integration/core/test_active_checks.py +++ b/tests/integration/core/test_active_checks.py @@ -85,7 +85,8 @@ def test_active_check_macros(test_cfg, site, web): "$HOSTNAME$": "test-host", "$_HOSTTAGS$": " ".join( sorted([ - "/wato/", "ip-v4", "ip-v4-only", "lan", "no-agent", "no-snmp", "ping", "prod", + "/wato/", "auto-piggyback", "ip-v4", "ip-v4-only", "lan", "no-agent", "no-snmp", + "ping", "prod", "site:%s" % site.id, "wato" ])), "$_HOSTADDRESS_4$": "127.0.0.1",

5 years, 6 months

upload master builds

by Alex Zurhake

Module: check_mk Branch: master Commit: 2d02000972bc2527c1362ab6a26244e70c024403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d02000972bc25… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 21 11:17:48 2019 +0100 upload master builds Change-Id: I9fabb3f1a49e10241527d029254980547b1bf6d5 --- buildscripts/scripts/nightly-build.jenkins | 33 ++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 7be0b11..321190d 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -25,6 +25,10 @@ def date = new Date() def CMK_VERS = dateFormat.format(date) def DAILY_DATA = '/var/jenkins_home/daily-data/' + BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERS +def PACKAGE_DIR = '/bauwelt/download' +def GPG_KEY_DIR = '/bauwelt/etc/.gnupg' +def RELEASE_KEY_DIR = '/bauwelt/git/release/release.key' + node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { IMAGE = 'ubuntu-18.04-common' @@ -186,15 +190,32 @@ node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { IMAGE = 'ubuntu-18.04-common' docker.image(IMAGE).pull() - docker.image(IMAGE).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA} -v /bauwelt/etc/.gnupg:/bauwelt/etc/.gnupg --network ci_local-infra") { + docker.image(IMAGE).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA} -v ${PACKAGE_DIR}:${PACKAGE_DIR} -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro --network ci_local-infra") { stage('Archive artifacts') { - dir("${DAILY_DATA}/downloads") { - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" - withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { - sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh" + // Only master builds should end up on the Website + if ${BRANCH} == 'master' { + dir("/bauwelt/downloads/${CMK_VERS}") { + sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" + sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" + withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { + sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh" + sh """ + rsync -av -e "ssh -i ${RELEASE_KEY_DIR}" \ + ${PACKAGE_DIR}/${CMK_VERSION} \ + bauwelt@mathias-kettner.de:${PACKAGE_DIR} + """ + } } archiveArtifacts "*" + } else { + dir("${DAILY_DATA}/downloads") { + sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" + sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" + withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { + sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh" + } + archiveArtifacts "*" + } } } }

5 years, 6 months

check_http: simplify 'virthost' evaluation

by Moritz Kiemer

Module: check_mk Branch: master Commit: 13471b856a6aebac5841c7a1bb161063eed19a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13471b856a6aeb… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 21 09:20:30 2019 +0100 check_http: simplify 'virthost' evaluation Change-Id: I4c25aa67ac9c2919724c57ee502e4fb65f451676 --- checks/check_http | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/checks/check_http b/checks/check_http index ef4bd93..3f5e9fe 100644 --- a/checks/check_http +++ b/checks/check_http @@ -85,23 +85,19 @@ def _certificate_args(address_family, address, settings): def _url_args(address_family, address, settings): - def _omit_ip(settings): - if "virthost" in settings: - return settings["virthost"][1] - return False + + # get virthost settings: + # TODO: when did 'vhost' dissapear from WATO? + vhost, omit_ip = settings.get("virthost", (settings.get("vhost"), False)) args = [] - if (not _omit_ip(settings)) and ("proxy" not in settings): + if (not omit_ip) and ("proxy" not in settings): args += ["-I", address] elif "proxy" in settings: args += ["-I", settings["proxy"]] - if "vhost" in settings: - args += ["-H", settings["vhost"]] - - if "virthost" in settings: - vhost = settings["virthost"][0] + if vhost: args += ["-H", vhost] if address_family == 'ipv6':

5 years, 6 months

Cleanup naming a bit and prevent mypy type errors

by Lars Michelsen

Module: check_mk Branch: master Commit: c8f30644932b9426368816cf8db5e3ed997d779f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8f30644932b94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 12:31:46 2019 +0100 Cleanup naming a bit and prevent mypy type errors Change-Id: Ib80bf90d2e7bcd0747b299dc18903ef49582d61c --- active_checks/check_bi_aggr | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/active_checks/check_bi_aggr b/active_checks/check_bi_aggr index c16337f..dbc2517 100755 --- a/active_checks/check_bi_aggr +++ b/active_checks/check_bi_aggr @@ -32,7 +32,7 @@ import traceback import urllib import requests -import urllib3 +import urllib3 # type: ignore import cmk.utils.password_store @@ -150,7 +150,7 @@ def init_auth(): auth_obj = None if username and password: if auth_mode == 'kerberos': - from requests_kerberos import HTTPKerberosAuth + from requests_kerberos import HTTPKerberosAuth # type: ignore from subprocess import Popen, PIPE kinit = Popen(["kinit", username], stdin=PIPE, stdout=PIPE, stderr=PIPE) @@ -187,7 +187,7 @@ if debug: try: r = requests.get(url, timeout=timeout, auth=auth, proxies=proxies) r.raise_for_status() - json = r.text + raw_response = r.text except requests.Timeout: sys.stdout.write('ERROR: Socket timeout while opening URL: %s\n' % (url)) sys.exit(3) @@ -199,14 +199,14 @@ except Exception, e: 'ERROR: Exception while opening URL: %s - %s\n%s' % (url, e, traceback.format_exc())) sys.exit(3) -if json.startswith("ERROR:"): - sys.stdout.write(json.rstrip() + "\n") +if raw_response.startswith("ERROR:"): + sys.stdout.write(raw_response.rstrip() + "\n") sys.exit(3) try: - obj = eval(json) + obj = eval(raw_response) except Exception, e: - sys.stdout.write('ERROR: Invalid json response (%s): %s\n' % (e, json)) + sys.stdout.write('ERROR: Invalid response (%s): %s\n' % (e, raw_response)) sys.exit(3) if len(obj) == 1: @@ -215,7 +215,7 @@ if len(obj) == 1: sys.exit(3) if not isinstance(obj, list): - sys.stdout.write('ERROR: Invalid response: %s\n' % (json.replace("\n", ""))) + sys.stdout.write('ERROR: Invalid response: %s\n' % (raw_response.replace("\n", ""))) sys.exit(3) headers = obj[0]

5 years, 6 months

Replace insecure eval call with more secure ast.literal_eval()

by Lars Michelsen

Module: check_mk Branch: master Commit: 300ddeb627d46c789648b9d0958206439105cfe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=300ddeb627d46c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 12:32:15 2019 +0100 Replace insecure eval call with more secure ast.literal_eval() Change-Id: I32edf0ddb1772ba26b8834062f273d09af31bce2 --- active_checks/check_bi_aggr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/active_checks/check_bi_aggr b/active_checks/check_bi_aggr index dbc2517..13f14e5 100755 --- a/active_checks/check_bi_aggr +++ b/active_checks/check_bi_aggr @@ -30,6 +30,7 @@ import sys import time import traceback import urllib +import ast import requests import urllib3 # type: ignore @@ -204,7 +205,7 @@ if raw_response.startswith("ERROR:"): sys.exit(3) try: - obj = eval(raw_response) + obj = ast.literal_eval(raw_response) except Exception, e: sys.stdout.write('ERROR: Invalid response (%s): %s\n' % (e, raw_response)) sys.exit(3)

5 years, 6 months

7325 FIX check_bi_aggr: Improve GUI application error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: e62bd36bec6447f6d931e490311f122fa486e74d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e62bd36bec6447… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 21 12:34:29 2019 +0100 7325 FIX check_bi_aggr: Improve GUI application error handling When the webservice detects an error -- such as an authentication problem -- it does not output the expected data structure, but a string starting with "ERROR:". This is now correctly being detected and the error is output as check output, rather than a nasty parsing exception. Change-Id: I123e3391afb768a2a9ba1f58d261f612d9d34546 --- .werks/7325 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/7325 b/.werks/7325 new file mode 100644 index 0000000..1daff11 --- /dev/null +++ b/.werks/7325 @@ -0,0 +1,14 @@ +Title: check_bi_aggr: Improve GUI application error handling +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553167995 +Class: fix + +When the webservice detects an error -- such as an authentication problem -- it +does not output the expected data structure, but a string starting with +"ERROR:". This is now correctly being detected and the error is output as check +output, rather than a nasty parsing exception. +

5 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
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