Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

mk_jolokia: improve error handling and deduplicate

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6255bd961a414d91ab6682f579755b34157dc7cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6255bd961a414d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Nov 13 07:32:42 2018 +0100 mk_jolokia: improve error handling and deduplicate Change-Id: I732d5ceac3220e75dd1506475d37e43b824a865c --- agents/plugins/mk_jolokia | 52 +++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 328d64c..3a7ef7d 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -46,7 +46,7 @@ VERBOSE = '--verbose' in sys.argv DEBUG = '--debug' in sys.argv -class SkipInstance(Exception): +class SkipInstance(RuntimeError): pass @@ -111,6 +111,12 @@ class HTTPSAuthHandler(urllib2.HTTPSHandler): host, ca_file=self.__ca_file, key_file=self.__key, cert_file=self.__cert) +def write_section(name, iterable): + sys.stdout.write('<<<%s>>>\n' % name) + for line in iterable: + sys.stdout.write(' '.join(map(str, line)) + '\n') + + def fetch_url_get(base_url, path, function): if path: url = "%s/%s/%s" % (base_url, function, path) @@ -259,7 +265,7 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): for subinstance, value in values: if not subinstance and not title: - sys.stdout.write("INTERNAL ERROR: %s\n" % value) + sys.stderr.write("INTERNAL ERROR: %s\n" % value) continue if "threadStatus" in subinstance or "threadParam" in subinstance: @@ -321,27 +327,18 @@ def query_instance(inst): try: prepare_http_opener(inst) except () if DEBUG else Exception, exc: - if DEBUG: - raise - sys.stdout.write('<<<jolokia_info>>>\n') sys.stderr.write("ERROR: %s\n" % exc) raise SkipInstance() - output_jolokia_info(inst) - # TODO: Untie mbean_search_results / query calculation and jolokia_metrics processing mbean_search_results = {} shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []) custom_vars = inst.get("custom_vars") - sys.stdout.write('<<<jolokia_metrics>>>\n') - for result in generate_values(inst, shipped_vars, mbean_search_results): - sys.stdout.write(' '.join(map(str, result)) + '\n') - - sys.stdout.write('<<<jolokia_generic>>>\n') - for result in generate_values(inst, custom_vars, mbean_search_results): - sys.stdout.write(' '.join(map(str, result)) + '\n') + write_section('jolokia_info', generate_jolokia_info(inst)) + write_section('jolokia_metrics', generate_values(inst, shipped_vars, mbean_search_results)) + write_section('jolokia_generic', generate_values(inst, custom_vars, mbean_search_results)) def prepare_http_opener(inst): @@ -355,7 +352,7 @@ def prepare_http_opener(inst): handlers = [] if inst["protocol"] == "https": if inst["mode"] == 'https' and (inst["client_key"] is None or inst["client_cert"] is None): - raise Exception("HTTPS set up as authentication method but certificate wasn't provided") + raise ValueError("Missing client certificate for HTTPS authentication") handlers.append( HTTPSAuthHandler(inst["cert_path"], inst["client_key"], inst["client_cert"])) if inst["mode"] == 'digest': @@ -370,26 +367,23 @@ def prepare_http_opener(inst): urllib2.install_opener(opener) -def output_jolokia_info(inst): +def generate_jolokia_info(inst): # Determine type of server server_info = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], "", None, None, None) - sys.stdout.write('<<<jolokia_info>>>\n') - if server_info: - info_dict = dict(server_info) - version = info_dict.get(('info', 'version'), "unknown") - product = info_dict.get(('info', 'product'), "unknown") - if inst.get("product"): - product = inst["product"] - agentversion = info_dict.get(('agent',), "unknown") - sys.stdout.write("%s %s %s %s\n" % (inst["instance"], product, version, agentversion)) - else: - sys.stdout.write("%s ERROR\n" % (inst["instance"],)) - sys.stdout.write('<<<jolokia_metrics>>>\n') - sys.stdout.write("%s ERROR\n" % (inst["instance"],)) + if not server_info: + sys.stderr.write("%s ERROR: Empty server info\n" % (inst["instance"],)) raise SkipInstance() + info_dict = dict(server_info) + version = info_dict.get(('info', 'version'), "unknown") + product = info_dict.get(('info', 'product'), "unknown") + if inst.get("product"): + product = inst["product"] + agentversion = info_dict.get(('agent',), "unknown") + yield inst["instance"], product, version, agentversion + def generate_values(inst, var_list, mbean_search_results): for var in var_list:

5 years, 10 months

remove duplicate code

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8fd7c6dfcf8b3d35899971a5beda73cb1e51b070 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fd7c6dfcf8b3d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Nov 13 08:05:27 2018 +0100 remove duplicate code Change-Id: I3708d0d48242f8cf1010b6d774372b4f15aa6fe9 --- tests/unit/checks/test_docker_parse_node_images.py | 887 +-------------------- tests/unit/checks/test_veritas_vcs_check.py | 51 +- 2 files changed, 2 insertions(+), 936 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8fd7c6dfcf…

5 years, 10 months

6635 FIX printer_alerts: Fix handling for Sleep state

by Konstantin Büttner

Module: check_mk Branch: master Commit: b566b32c54dc864a9828f69dac8bd7dd74b6d84d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b566b32c54dc86… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 12 17:24:52 2018 +0100 6635 FIX printer_alerts: Fix handling for Sleep state Some printers report states not defined in the MIB. A reasonably common case appears to be the printer going to sleep, which should be treated as OK instead of UNKNOWN. Change-Id: I40d7f84557db9f386b4fd66c9818ceb772fe6ca7 --- .werks/6635 | 14 ++++++++++++++ checks/printer_alerts | 1 + 2 files changed, 15 insertions(+) diff --git a/.werks/6635 b/.werks/6635 new file mode 100644 index 0000000..0be137a --- /dev/null +++ b/.werks/6635 @@ -0,0 +1,14 @@ +Title: printer_alerts: Fix handling for Sleep state +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542039777 + +Some printers report states not defined in the MIB. A +reasonably common case appears to be the printer going +to sleep, which should be treated as OK instead +of UNKNOWN. diff --git a/checks/printer_alerts b/checks/printer_alerts index b9988b6..5062a2e 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -175,6 +175,7 @@ printer_code_map = { printer_alerts_text_map = { 'Energiesparen' : 0, + 'Sleep' : 0, } def inventory_printer_alerts(info):

5 years, 10 months

Synched Pipfile.lock with reality. Bumped some version.

by Sven Panne

Module: check_mk Branch: master Commit: 57bf5b7d4c2748522a1ccdfecf37bb70f190c20e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57bf5b7d4c2748… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 13 08:40:04 2018 +0100 Synched Pipfile.lock with reality. Bumped some version. Change-Id: I3025bf9304b8b82c03f269630919e962c48653d3 --- Pipfile.lock | 122 ++++++++++++++------- omd/packages/python-modules/Makefile | 6 +- .../python-modules/src/botocore-1.12.42.tar.gz | Bin 4928041 -> 0 bytes .../python-modules/src/botocore-1.12.43.tar.gz | Bin 0 -> 4899169 bytes .../src/python-dateutil-2.7.3.tar.gz | Bin 302871 -> 0 bytes .../src/python-dateutil-2.7.5.tar.gz | Bin 0 -> 316043 bytes .../python-modules/src/urllib3-1.24.1.tar.gz | Bin 0 -> 229688 bytes .../python-modules/src/urllib3-1.24.tar.gz | Bin 229200 -> 0 bytes 8 files changed, 86 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=57bf5b7d4c…

5 years, 10 months

Increased expected package size (added new python dependencies)

by Lars Michelsen

Module: check_mk Branch: master Commit: bc380995af37be8c4e3437326a16e095a3293639 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc380995af37be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 08:37:32 2018 +0100 Increased expected package size (added new python dependencies) Change-Id: I624fd72b188c093a572c9750732af338566d9784 --- tests/packaging/test_files.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 261e9e1..0a6cbe8 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -22,10 +22,10 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 220*1024*1024), - ("deb", 94*1024*1024, 200*1024*1024), - ("cma", 169*1024*1024, 225*1024*1024), - ("tar.gz", 320*1024*1024, 405*1024*1024), + ("rpm", 119*1024*1024, 230*1024*1024), + ("deb", 94*1024*1024, 210*1024*1024), + ("cma", 169*1024*1024, 235*1024*1024), + ("tar.gz", 320*1024*1024, 415*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

5 years, 10 months

Add boto3 package and dependencies

by Lars Michelsen

Module: check_mk Branch: master Commit: 093382b9432ebfde6104ee14b0f1d00cace171c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=093382b9432ebf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 19:21:41 2018 +0100 Add boto3 package and dependencies Change-Id: I26383a07fc5bfc500f97a3c2a74c1cf6c13dabdc --- omd/packages/python-modules/Makefile | 5 +++++ omd/packages/python-modules/src/boto3-1.9.42.tar.gz | Bin 0 -> 93153 bytes .../python-modules/src/botocore-1.12.42.tar.gz | Bin 0 -> 4928041 bytes omd/packages/python-modules/src/docutils-0.14.tar.gz | Bin 0 -> 1727105 bytes omd/packages/python-modules/src/futures-3.2.0.tar.gz | Bin 0 -> 27320 bytes omd/packages/python-modules/src/jmespath-0.9.3.tar.gz | Bin 0 -> 22967 bytes .../python-modules/src/s3transfer-0.1.13.tar.gz | Bin 0 -> 103335 bytes 7 files changed, 5 insertions(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 584c843..128a4c3 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -158,6 +158,11 @@ MODULES += urllib3-1.24.tar.gz MODULES += Werkzeug-0.14.1.tar.gz MODULES += passlib-1.7.1.tar.gz # Added for AWS special agent +MODULES += docutils-0.14.tar.gz +MODULES += futures-3.2.0.tar.gz +MODULES += jmespath-0.9.3.tar.gz +MODULES += s3transfer-0.1.13.tar.gz +MODULES += botocore-1.12.42.tar.gz MODULES += boto3-1.9.42.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/boto3-1.9.42.tar.gz b/omd/packages/python-modules/src/boto3-1.9.42.tar.gz new file mode 100644 index 0000000..cf628cf Binary files /dev/null and b/omd/packages/python-modules/src/boto3-1.9.42.tar.gz differ diff --git a/omd/packages/python-modules/src/botocore-1.12.42.tar.gz b/omd/packages/python-modules/src/botocore-1.12.42.tar.gz new file mode 100644 index 0000000..d9fa3e0 Binary files /dev/null and b/omd/packages/python-modules/src/botocore-1.12.42.tar.gz differ diff --git a/omd/packages/python-modules/src/docutils-0.14.tar.gz b/omd/packages/python-modules/src/docutils-0.14.tar.gz new file mode 100644 index 0000000..e064115 Binary files /dev/null and b/omd/packages/python-modules/src/docutils-0.14.tar.gz differ diff --git a/omd/packages/python-modules/src/futures-3.2.0.tar.gz b/omd/packages/python-modules/src/futures-3.2.0.tar.gz new file mode 100644 index 0000000..5e896bf Binary files /dev/null and b/omd/packages/python-modules/src/futures-3.2.0.tar.gz differ diff --git a/omd/packages/python-modules/src/jmespath-0.9.3.tar.gz b/omd/packages/python-modules/src/jmespath-0.9.3.tar.gz new file mode 100644 index 0000000..0964193 Binary files /dev/null and b/omd/packages/python-modules/src/jmespath-0.9.3.tar.gz differ diff --git a/omd/packages/python-modules/src/s3transfer-0.1.13.tar.gz b/omd/packages/python-modules/src/s3transfer-0.1.13.tar.gz new file mode 100644 index 0000000..6324d60 Binary files /dev/null and b/omd/packages/python-modules/src/s3transfer-0.1.13.tar.gz differ

5 years, 10 months

Extracted python file finding from bandit test target

by Lars Michelsen

Module: check_mk Branch: master Commit: da14fb485f9069a452cf15e48bdec535c51006a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da14fb485f9069… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 13:56:38 2018 +0100 Extracted python file finding from bandit test target * Moved python file searching to separate tests/find-python-files script * Exclude .venv files from tests/static/.venv * Moved bandit.ini creation to separate phony target Change-Id: Ie4e02f22ee76b63c83c2a4abbf421774a7d598bf --- tests/Makefile | 33 +++++---------------------------- tests/find-python-files | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index af85575..0ba7f03 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -23,7 +23,7 @@ help: # This target needs to be phony so it is run every time because only the other # makefile can determine that there's nothing to be done. # TODO: Move everything to top level makefile? -.PHONY: ../.venv +.PHONY: ../.venv bandit.ini ../.venv: $(MAKE) -C .. .venv @@ -53,33 +53,10 @@ test-docker: ../.venv $(MAKE) -C ../docker test-lint-dockerfile test-lint-entrypoint $(PYTEST) -T docker -test-bandit: ../.venv -# Finding all the Python stuff in our project is a bit tricky/ugly... - ( cd .. ; \ - echo '[bandit]'; \ - echo -n 'targets: '; \ - for i in $$(find $$(realpath active_checks \ - agents \ - bin \ - checks \ - cmk \ - cmk_base \ - doc \ - enterprise \ - inventory \ - livestatus \ - managed \ - notifications \ - omd/packages/cma \ - omd/packages/maintenance \ - omd/packages/omd \ - scripts \ - tests \ - web/app \ - werk ) \ - -type f | sort ); do \ - { [[ "$$i" == *.py ]] || { head -n 1 "$$i" | grep -q '^#!.*python$$'; } ; } && echo -n "$$i,"; \ - done ) | sed 's/,$$//' > bandit.ini +bandit.ini: + echo -e "[bandit]\ntargets: $$(./find-python-files | tr '\n' ',' | sed 's/,$$//')" > bandit.ini + +test-bandit: ../.venv bandit.ini # Currently only care about high severity reported issues. Once this is reached, # go and enable the medium/low checks. $(BANDIT) -c ../bandit.yaml -r -lll --ini bandit.ini $(BANDIT_OUTPUT_ARGS) diff --git a/tests/find-python-files b/tests/find-python-files new file mode 100755 index 0000000..19d0056 --- /dev/null +++ b/tests/find-python-files @@ -0,0 +1,39 @@ +#!/bin/bash +# Find and print the absolute paths of all python source code files +set -e + +REPO_PATH=$(dirname $(dirname $(realpath "$0"))) +cd "$REPO_PATH" + +SEARCH= +SEARCH+=" active_checks" +SEARCH+=" agents" +SEARCH+=" bin" +SEARCH+=" checks" +SEARCH+=" cmk" +SEARCH+=" cmk_base" +SEARCH+=" doc" +SEARCH+=" enterprise" +SEARCH+=" inventory" +SEARCH+=" livestatus" +SEARCH+=" managed" +SEARCH+=" notifications" +# Do not search whole omd/ because it may contain unpacked sub-packages +SEARCH+=" omd/packages/cma" +SEARCH+=" omd/packages/maintenance" +SEARCH+=" omd/packages/omd" + +SEARCH+=" scripts" +SEARCH+=" tests" +SEARCH+=" web/app" +SEARCH+=" werk" + +# Resolve search paths to real paths before the search for performance reasons +REAL_SEARCH=$(realpath $SEARCH) + +# while read F is used to deal with files containing whitespaces +find $REAL_SEARCH -name .venv -prune -o -type f -print | while read F; do + if [[ "$F" == *.py ]] || head -n 1 "$F" | grep -q '^#!.*python$' >/dev/null 2>&1; then + echo "$F" + fi +done

5 years, 10 months

Increased docker image size threshold and added a little more friendly failiure message

by Lars Michelsen

Module: check_mk Branch: master Commit: bc481c543230fabd836ba793f75468bbf4da13b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc481c543230fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 19:15:25 2018 +0100 Increased docker image size threshold and added a little more friendly failiure message Change-Id: I858f832bf076038dfca5288cb30364ad5286e986 --- tests/docker/test_docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 5e445a5..6377d1b 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -105,7 +105,8 @@ def _build(request, client, edition, version, add_args=None): u'6557/tcp': {}, } - assert attrs["Size"] < 900000000 + assert attrs["Size"] < 900 * 1024 * 1024, \ + "Docker image size increased: Please verify that this is intended" assert len(attrs["RootFS"]["Layers"]) == 6

5 years, 10 months

6860 FIX Fixed random backup issues: "Connection reset by peer"

by Lars Michelsen

Module: check_mk Branch: master Commit: 6eb322101d95deb45396e3c81a556e5dd940f08c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eb322101d95de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 12:32:01 2018 +0100 6860 FIX Fixed random backup issues: "Connection reset by peer" The "mkbackup" and "omd backup" commands could fail while backing up a site when the rrdcached process was reloaded, restarted or stopped during the backup. This could also be triggered by an "Activate changes" action in the GUI. The backup was then aborted with an error like this: "Failed to perform backup: [Errno 104] Connection reset by peer". This issue did not affect backups performed for not running sites. FEED-2982 FEED-3045 CMK-943 Change-Id: I020700f4a9d347a14a79f5440ac2024d8b45e042 --- .werks/6860 | 17 +++++++++++++++++ omd/packages/omd/omd | 7 +++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/6860 b/.werks/6860 new file mode 100644 index 0000000..f17812e --- /dev/null +++ b/.werks/6860 @@ -0,0 +1,17 @@ +Title: Fixed random backup issues: "Connection reset by peer" +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542022142 + +The "mkbackup" and "omd backup" commands could fail while backing up a site when +the rrdcached process was reloaded, restarted or stopped during the backup. This +could also be triggered by an "Activate changes" action in the GUI. + +The backup was then aborted with an error like this: "Failed to perform backup: [Errno 104] Connection reset by peer". + +This issue did not affect backups performed for not running sites. diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 81cfccb..21926d0 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -3631,10 +3631,13 @@ class BackupTarFile(tarfile.TarFile): while not answer.endswith("\n"): answer += self._sock.recv(1024) except socket.error, e: - if e.errno == 32: # Broken pipe + # ECONNRESET: Broken pipe + # EPIPE: Connection reset by peer + # Happens, for example, when the rrdcached is reloaded/restarted during backup + if e.errno in (errno.ECONNRESET, errno.EPIPE): self._sock = None if opt_verbose: - sys.stdout.write("skipping rrdcached command (broken pipe)\n") + sys.stdout.write("skipping rrdcached command (%s)\n" % e) return else: raise

5 years, 10 months

Fixed typo in manpage

by Marcel Arentz

Module: check_mk Branch: master Commit: af31c62683074d57d1693403015a85acd5039329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af31c62683074d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Nov 12 17:01:14 2018 +0100 Fixed typo in manpage Change-Id: I6282a758c1e8798c7895d722a99c772480ef6208 --- checkman/esx_vsphere_hostsystem.maintenance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/esx_vsphere_hostsystem.maintenance b/checkman/esx_vsphere_hostsystem.maintenance index 26976ec..8cefa05 100644 --- a/checkman/esx_vsphere_hostsystem.maintenance +++ b/checkman/esx_vsphere_hostsystem.maintenance @@ -7,7 +7,7 @@ description: This check queries the maintenance State of an ESX host system via the vsphere agent and returns: - {OK} if the ESX host has the same sate since the last service detection + {OK} if the ESX host has the same state since the last service detection. {CRIT} if the state has changed.

5 years, 10 months

← Newer
1
...
30
31
32
33
34
35
36
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018