Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Andreas Umbreit

Module: check_mk Branch: master Commit: bd4cbcf6b498878f51d8bb57556902c3e51eb841 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd4cbcf6b49887… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Feb 18 12:42:41 2019 +0100 CMK-1544: Update Werk 7164 Change-Id: I5cb9c793a149c1ffc2265e91653437090f5e887a --- .werks/7164 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.werks/7164 b/.werks/7164 index c0b2e7c..be88e4c 100644 --- a/.werks/7164 +++ b/.werks/7164 @@ -18,3 +18,8 @@ like <code>copying plugins\cmk-update-agent.exe to temp\cmk-update-agent.exe fai The agent updater now will cancel the connection if there is a connection timeout detected or if the connection freezes. The timeout limit is set to 120 seconds.<br> This timeout handling does not limit the overall connection time. + +Please note: This timeout is only active for connections handled by python-requests.<br> +This fix won't apply if you are running the agent updater using cURL. +(i.e. you are running the Check_MK Agent Updater 1.4 on a Linux/UNIX host and +there is no python-requests module installed.) \ No newline at end of file

5 years, 7 months

mypy helper: Ensure the .venv and mypy commmand exists,

by Lars Michelsen

otherwise report an error Message-ID: <5c6a9c19.cNyhjfxF/HwYiaV9%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 64bdcf6553f04b0be1da923cd94036c96fbff568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64bdcf6553f04b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 22:31:05 2019 +0100 mypy helper: Ensure the .venv and mypy commmand exists, otherwise report an error Change-Id: If67a959c17a6c580b01cca8e35e8b01105440eab --- tests/static/run_mypy | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/static/run_mypy b/tests/static/run_mypy index 42cb3a6..474f9ef 100755 --- a/tests/static/run_mypy +++ b/tests/static/run_mypy @@ -1,5 +1,14 @@ -#! /bin/sh +#!/bin/sh # mypy_path in mypy.ini doesn't support relative paths, so we need this wrapper... :-/ cd $(dirname $0) + +make --silent .venv + +if [ ! -f ./.venv/bin/mypy ]; then + for LAST_ARG; do :; done + echo "$LAST_ARG:1: error: Could not find ./.venv/bin/mypy" + exit 1 +fi + REPO_PATH=$(realpath ../..) MYPYPATH=$REPO_PATH:$REPO_PATH/livestatus/api/python:$REPO_PATH/omd/packages/omd:$REPO_PATH/tests:$(realpath typeshed) exec ./.venv/bin/mypy "$@"

5 years, 7 months

add apache2 as explicit runtime dependency

by Alex Zurhake

Module: check_mk Branch: master Commit: 46d6fe19a9d3bbd99c3ebe0684d33cce062f3de4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46d6fe19a9d3bb… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Feb 18 09:55:28 2019 +0100 add apache2 as explicit runtime dependency Change-Id: Id5371e54c9c819a13974c7ae46e26f7f86e6f8d2 --- omd/distros/DEBIAN_7.mk | 1 + omd/distros/DEBIAN_8.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/omd/distros/DEBIAN_7.mk b/omd/distros/DEBIAN_7.mk index df50e33..4e8893f 100644 --- a/omd/distros/DEBIAN_7.mk +++ b/omd/distros/DEBIAN_7.mk @@ -7,6 +7,7 @@ OS_PACKAGES += curl OS_PACKAGES += dialog OS_PACKAGES += dnsutils OS_PACKAGES += graphviz +OS_PACKAGES += apache2 OS_PACKAGES += libapache2-mod-proxy-html OS_PACKAGES += libdbi1 OS_PACKAGES += libevent-2.0-5 diff --git a/omd/distros/DEBIAN_8.mk b/omd/distros/DEBIAN_8.mk index 9741081..c0c1d43 100644 --- a/omd/distros/DEBIAN_8.mk +++ b/omd/distros/DEBIAN_8.mk @@ -7,6 +7,7 @@ OS_PACKAGES += curl OS_PACKAGES += dialog OS_PACKAGES += dnsutils OS_PACKAGES += graphviz +OS_PACKAGES += apache2 OS_PACKAGES += libapache2-mod-proxy-html OS_PACKAGES += libdbi1 OS_PACKAGES += libevent-2.0-5

5 years, 7 months

agent_jolokia: use code from mk_jolokia plugin

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6512806f3f102fc9306ffe26563b60c7484a574f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6512806f3f102f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Nov 14 07:43:40 2018 +0100 agent_jolokia: use code from mk_jolokia plugin CMK-1265 Change-Id: I3b5b0b010071f6b9418a5061eab018acbdab5ec8 --- agents/special/agent_jolokia | 426 ++++--------------------------------------- 1 file changed, 36 insertions(+), 390 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6512806f3f…

5 years, 7 months

7164 FIX cmk-update-agent: Add timeout handling for connection to server

by Andreas Umbreit

Module: check_mk Branch: master Commit: a5a46ad59a30683406a136f1f1460bef36e8c3d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5a46ad59a3068… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Feb 18 09:00:38 2019 +0100 7164 FIX cmk-update-agent: Add timeout handling for connection to server Previously, the connection from the agent updater to the Check_MK Server did not handle timeouts. This could lead to situations where the agent updater would run forever waiting for a response. This was particularly noticeable when running the agent updater under Windows, because the agent updater would fail to start over again, showing an error like <code>copying plugins\cmk-update-agent.exe to temp\cmk-update-agent.exe failed</code>. The agent updater now will cancel the connection if there is a connection timeout detected or if the connection freezes. The timeout limit is set to 120 seconds.<br> This timeout handling does not limit the overall connection time. Change-Id: I7d6d49cf099e6c5f326c4dd8dce2c586957facf1 --- .werks/7164 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/7164 b/.werks/7164 new file mode 100644 index 0000000..c0b2e7c --- /dev/null +++ b/.werks/7164 @@ -0,0 +1,20 @@ +Title: cmk-update-agent: Add timeout handling for connection to server +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1550475651 +Class: fix + +Previously, the connection from the agent updater to the Check_MK Server did +not handle timeouts. This could lead to situations where the agent updater +would run forever waiting for a response. + +This was particularly noticeable when running the agent updater under Windows, +because the agent updater would fail to start over again, showing an error +like <code>copying plugins\cmk-update-agent.exe to temp\cmk-update-agent.exe failed</code>. + +The agent updater now will cancel the connection if there is a connection timeout detected +or if the connection freezes. The timeout limit is set to 120 seconds.<br> +This timeout handling does not limit the overall connection time.

5 years, 7 months

Reserved 10 Werk IDS

by Andreas Umbreit

Module: check_mk Branch: master Commit: 42240ce046208c2a6ada820192e8d0facd5e6a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42240ce046208c… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Feb 18 08:38:23 2019 +0100 Reserved 10 Werk IDS Change-Id: Ief287dca533563ddf213b4f21e977db10b3154b0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6189b3e..190d201 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7164 +7174

5 years, 7 months

test Mon, 18 Feb 2019 03:51:58 +0000

by lm＠mathias-kettner.de

This is a test mailing

5 years, 7 months

Fix new SNMP tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 62973324a8d4bd94da66a3aa71072f7dc6558bf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62973324a8d4bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 18:00:35 2019 +0100 Fix new SNMP tests Change-Id: I38e03c64d696d10b16a45ca5c1c6909edbd4f6ed --- tests/integration/cmk_base/snmp/test_snmp.py | 30 ++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index 2199b19..8efa435 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -1,6 +1,7 @@ import subprocess import logging import os +import copy import pytest # type: ignore from pathlib2 import Path from testlib import cmk_path, wait_until @@ -85,7 +86,17 @@ def snmpsim(site, request, tmp_path_factory, monkeymodule): num_sockets += 1 except OSError: pass - return num_sockets >= 2 + + if num_sockets < 2: + return False + + import netsnmp + var = netsnmp.Varbind("sysDescr.0") + value = netsnmp.snmpget(var, Version=2, DestHost="127.0.0.1:1337", Community="public")[0] + if value is None: + return False + + return True wait_until(is_listening, timeout=20) @@ -106,10 +117,6 @@ def backend(request, monkeypatch): backend_name = request.param source_data_dir = Path(request.fspath.dirname) / "snmp_data" / "cmk-walk" - monkeypatch.setattr(snmp, "_g_single_oid_hostname", None) - monkeypatch.setattr(snmp, "_g_single_oid_ipaddress", None) - monkeypatch.setattr(snmp, "_g_single_oid_cache", {}) - if backend_name == "stored_snmp": monkeypatch.setattr(config, "is_usewalk_host", lambda h: True) monkeypatch.setattr(cmk.utils.paths, "snmpwalks_dir", str(source_data_dir)) @@ -119,6 +126,13 @@ def backend(request, monkeypatch): return backend_name +(a)pytest.fixture(autouse=True) +def clear_cache(monkeypatch): + monkeypatch.setattr(snmp, "_g_single_oid_hostname", None) + monkeypatch.setattr(snmp, "_g_single_oid_ipaddress", None) + monkeypatch.setattr(snmp, "_g_single_oid_cache", {}) + + def test_get_single_oid_ipv6(snmpsim, backend, monkeypatch): if backend == "stored_snmp": pytest.skip("Not relevant") @@ -150,7 +164,7 @@ def test_get_single_oid_wrong_credentials(snmpsim, backend): if backend == "stored_snmp": pytest.skip("Not relevant") - access_data = snmpsim[1] + access_data = copy.deepcopy(snmpsim[1]) access_data["credentials"] = "dingdong" result = snmp.get_single_oid(access_data, ".1.3.6.1.2.1.1.1.0") assert result is None @@ -245,7 +259,7 @@ def test_get_simple_snmp_table_not_resolvable(snmpsim, backend): if backend == "stored_snmp": pytest.skip("Not relevant") - access_data = snmpsim[1] + access_data = copy.deepcopy(snmpsim[1]) access_data["ipaddress"] = "bla.local" # TODO: Unify different error messages @@ -272,7 +286,7 @@ def test_get_simple_snmp_table_wrong_credentials(snmpsim, backend): if backend == "stored_snmp": pytest.skip("Not relevant") - access_data = snmpsim[1] + access_data = copy.deepcopy(snmpsim[1]) access_data["credentials"] = "dingdong" # TODO: Unify different error messages

5 years, 7 months

Fix aggregated Kubernetes cluster metrics

by Óscar Nájera

Module: check_mk Branch: master Commit: 9750c48626e939738eabbe1f0e0eb8280159e9cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9750c48626e939… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Feb 15 13:48:09 2019 +0100 Fix aggregated Kubernetes cluster metrics Change-Id: Ie5cfc9c1af5230439eda3d52300885d64c5c3c62 --- checks/k8s_stats | 33 ++++---- .../unit/checks/generictests/datasets/k8s_stats.py | 98 ++++++++++++++++++++++ 2 files changed, 116 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9750c48626…

5 years, 7 months

Cleanup perf_data parser

by Óscar Nájera

Module: check_mk Branch: master Commit: b3e5113bb711032667d10ca6bc0d7463c3157264 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3e5113bb71103… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Feb 14 17:21:38 2019 +0100 Cleanup perf_data parser Add tests Change-Id: I2fa26235d35a33f497dad191754a1794db525df4 --- cmk/gui/plugins/metrics/utils.py | 129 ++++++++++++----------- tests/unit/cmk/gui/plugins/test_metrics_utils.py | 40 +++++++ 2 files changed, 107 insertions(+), 62 deletions(-) diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py index 7a18358..eab13ad 100644 --- a/cmk/gui/plugins/metrics/utils.py +++ b/cmk/gui/plugins/metrics/utils.py @@ -109,24 +109,52 @@ scale_symbols = { } -# Convert perf_data_string into perf_data, extract check_command -# This methods must not return None or anything else. It mustr strictly -# return a tuple of perf_data list and the check_command. In case of -# errors during parsing it returns an empty list for the perf_data. +def parse_perf_values(data_str): + "convert perf str into a tuple with values" + varname, values = data_str.split("=", 1) + varname = cmk.utils.pnp_cleanup(varname.replace("\"", "").replace("\'", "")) + + value_parts = values.split(";") + while len(value_parts) < 5: + value_parts.append(None) + + return varname, value_parts[0], value_parts[1:] + + +def split_unit(value_text): + "separate value from unit" + + if not value_text.strip(): + return None, None + + def digit_unit_split(value_text): + for i, char in enumerate(value_text): + if char not in '0123456789.,-': + return i + return len(value_text) + + cut_unit = digit_unit_split(value_text) + + unit_name = value_text[cut_unit:] + if value_text[:cut_unit]: + return _float_or_int(value_text[:cut_unit]), unit_name + + return None, unit_name + + def parse_perf_data(perf_data_string, check_command=None): - # Strip away arguments like in "check_http!-H mathias-kettner.de" - # FIXME: check_command=None? Fails here! - check_command = check_command.split("!")[0] + """ Convert perf_data_string into perf_data, extract check_command - if not perf_data_string: - return [], check_command +This methods must not return None or anything else. It must strictly +return a tuple of perf_data list and the check_command. In case of +errors during parsing it returns an empty list for the perf_data. +""" + # Strip away arguments like in "check_http!-H mathias-kettner.de" + if hasattr(check_command, 'split'): + check_command = check_command.split("!")[0] # Split the perf data string into parts. Preserve quoted strings! - try: - parts = _split_perf_data(perf_data_string) - except ValueError: - logger.exception("Failed to parse perfdata string: %s", perf_data_string) - return [], check_command + parts = _split_perf_data(perf_data_string) if not parts: return [], check_command @@ -137,72 +165,49 @@ def parse_perf_data(perf_data_string, check_command=None): check_command = parts[-1][1:-1] del parts[-1] - # Python's isdigit() works only on str. We deal with unicode since - # we deal with data coming from Livestatus - def isdigit(x): - return x in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] - # Parse performance data, at least try perf_data = [] + for part in parts: try: - varname, values = part.split("=", 1) - varname = cmk.utils.pnp_cleanup(varname.replace("\"", "").replace("\'", "")) - - # Enforce varname to be a byte string for the moment. The plugins currently register - # the plugins with byte string varnames. In the long term this needs to be cleaned up - # to be unicode strings just like all internal strings. But for the moment the mixup - # would confuse e.g. dict lookups etc. - varname = varname.encode("utf-8") - - value_parts = values.split(";") - while len(value_parts) < 5: - value_parts.append(None) - value_text, warn, crit, min_, max_ = value_parts[0:5] - if value_text.strip() == "": - continue # ignore useless empty variable + varname, value_text, value_parts = parse_perf_values(part) - # separate value from unit - i = 0 - while i < len(value_text) and (isdigit(value_text[i]) or - value_text[i] in ['.', ',', '-']): - i += 1 - - unit_name = value_text[i:] - if value_text[:i] == "": - continue - value = _float_or_int(value_text[:i]) - - perf_data_tuple = (varname, value, unit_name) - for val in [warn, crit, min_, max_]: - if val is not None: - try: - val = _float_or_int(val) - except ValueError: - val = None - perf_data_tuple += (val,) + value, unit_name = split_unit(value_text) + if value is None: + continue # ignore useless empty variable + perf_data_tuple = (varname, value, unit_name) + tuple(map(_float_or_int, value_parts)) perf_data.append(perf_data_tuple) - except: + except Exception as exc: logger.exception("Failed to parse perfdata '%s'", perf_data_string) if config.debug: - raise + raise exc return perf_data, check_command -def _float_or_int(v): +def _float_or_int(val): """"45.0" -> 45.0, "45" -> 45""" + if val is None: + return None + try: - return int(v) - except: - return float(v) + return int(val) + except ValueError: + try: + return float(val) + except ValueError: + return None def _split_perf_data(perf_data_string): - # In python < 2.5 shlex.split can not deal with unicode strings. But we always - # have unicode strings. So encode and decode again. - return [s.decode('utf-8') for s in shlex.split(perf_data_string.encode('utf-8'))] + "Split the perf data string into parts. Preserve quoted strings!" + try: # python3 + return shlex.split(perf_data_string) + except UnicodeEncodeError: + # In python 2 shlex.split can not deal with unicode strings. But we always + # have unicode strings. So encode and decode again. + return [s.decode('utf-8') for s in shlex.split(perf_data_string.encode('utf-8'))] def perfvar_translation(perfvar_nr, perfvar_name, check_command): diff --git a/tests/unit/cmk/gui/plugins/test_metrics_utils.py b/tests/unit/cmk/gui/plugins/test_metrics_utils.py new file mode 100644 index 0000000..4fe7ac1 --- /dev/null +++ b/tests/unit/cmk/gui/plugins/test_metrics_utils.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +import pytest +import cmk.gui.config +from cmk.gui.plugins.metrics import utils + + +(a)pytest.mark.parametrize( + "data_string, result", + [ + ("he lo", ["he", "lo"]), + ("'há li'", ["há li"]), + (u"hé ßß", [u"hé", u"ßß"]), + ], +) +def test_split_perf_data(data_string, result): + assert utils._split_perf_data(data_string) == result + + +(a)pytest.mark.parametrize("perf_str, check_command, result", [ + ('', None, ([], None)), + ('hi ho', None, ([], None)), + ('hi=6 [ihe]', 'ter', ([('hi', 6, '', None, None, None, None)], 'ihe')), + (u'hi=l6 [ihe]', 'ter', ([], 'ihe')), + (u'hi=6 [ihe]', 'ter', ([('hi', 6, '', None, None, None, None)], 'ihe')), + ('hi=5 no=6', 'test', ([('hi', 5, u'', None, None, None, None), + ('no', 6, u'', None, None, None, None)], 'test')), + ('hi=5;6;7;8;9 \'not here\'=6;5.6;;;', 'test', + ([('hi', 5, u'', 6, 7, 8, 9), ('not_here', 6, u'', 5.6, None, None, None)], 'test')), + ('hi=5G;;;; \'not here\'=6M;5.6;;;', 'test', + ([('hi', 5, u'G', None, None, None, None), + ('not_here', 6, u'M', 5.6, None, None, None)], 'test')), +]) +def test_parse_perf_data(perf_str, check_command, result): + assert utils.parse_perf_data(perf_str, check_command) == result + + +def test_parse_perf_data2(monkeypatch): + with pytest.raises(ValueError): + monkeypatch.setattr(cmk.gui.config, "debug", True) + utils.parse_perf_data('hi ho', None)

5 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019