Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

7141 FIX mk_docker: Inventorize RepoTags and RepoDigests unprocessed

by Moritz Kiemer

Module: check_mk Branch: master Commit: ed832a750569fa141d87479c42e6fbcc57773201 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed832a750569fa… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Feb 12 14:46:24 2019 +0100 7141 FIX mk_docker: Inventorize RepoTags and RepoDigests unprocessed Previously, the last RepoTag was picked, and inventorized as 'Repository' and 'Tag' separately. This was somewhat arbitrary, so we now inventorize all RepoTags and RepoDigests without any further interpretation. Change-Id: Ia0b7ec6e674b8fa12709d359971aca9e1c592359 --- .werks/7141 | 10 + checks/legacy_docker.include | 50 +- inventory/docker_node_images | 16 +- tests/unit/checks/test_docker_parse_node_images.py | 874 ++------------------- 4 files changed, 108 insertions(+), 842 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ed832a7505…

5 years, 7 months

Fixed code format after YAPF 0.26.0 update

by Lars Michelsen

5 years, 7 months

docker_node_network: bug fix

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8cc56434dcfa5035aa457ecfc3bc763906e92adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cc56434dcfa50… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Feb 12 14:11:06 2019 +0100 docker_node_network: bug fix also fix missing import and add some cosmetic changes along the way Change-Id: I04599bc4f7bd80ad9cda3374b88e821d218ecd5c --- checks/legacy_docker.include | 13 ++++++------ inventory/docker_node_network | 4 ++-- tests/unit/checks/test_docker_parse_node_images.py | 24 +++++++++++++++------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/checks/legacy_docker.include b/checks/legacy_docker.include index 0ee07b6..0273d59 100644 --- a/checks/legacy_docker.include +++ b/checks/legacy_docker.include @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import json import re +import functools class DeprecatedDict(dict): @@ -118,7 +119,7 @@ def _get_repo_tag(string): return string, "latest" -def parse_legacy_docker_node_info(info): +def parse_legacy_docker_node_info(info): # pylint: disable=too-many-branches '''parse output of "docker info"''' parsed = DeprecatedDict() if not info: @@ -199,9 +200,9 @@ def _legacy_docker_parse_table(rows, fields, keys): indices = [] for field in fields: rex = regex(field + r'\ *') - m = rex.search(rows[0][0]) - if m is not None: - start, end = m.start(), m.end() + match = rex.search(rows[0][0]) + if match is not None: + start, end = match.start(), match.end() if end - start == len(field): end = None indices.append((start, end)) @@ -222,8 +223,8 @@ def _legacy_docker_parse_table(rows, fields, keys): def parse_legacy_docker_system_df(info): - def int_or_zero(s): - return int(s.strip() or 0) + def int_or_zero(string): + return int(string.strip() or 0) field_map = ( ('TYPE', 'TOTAL', 'ACTIVE', 'SIZE', 'RECLAIMABLE'), diff --git a/inventory/docker_node_network b/inventory/docker_node_network index bdf19c2..6b076dd 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -64,11 +64,11 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): } try: - network["host_ifname"] = network["Options"]["com.docker.network.bridge.name"] + network_["host_ifname"] = network["Options"]["com.docker.network.bridge.name"] except KeyError: pass - labels = docker_format_labels(network) + labels = docker_format_labels(network) # pylint: disable=undefined-variable if labels: network_["labels"] = labels inventory_networks.update(network_) diff --git a/tests/unit/checks/test_docker_parse_node_images.py b/tests/unit/checks/test_docker_parse_node_images.py index e982749..e208470 100644 --- a/tests/unit/checks/test_docker_parse_node_images.py +++ b/tests/unit/checks/test_docker_parse_node_images.py @@ -1,7 +1,10 @@ # *--encoding: UTF-8--* -import pytest +# pylint: disable=too-many-lines +# pylint: disable=line-too-long +# pylint: disable=invalid-name import os import re +import pytest pytestmark = pytest.mark.checks @@ -11,16 +14,23 @@ execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker. REQUIRED_IMAGE_KEYS = ( - ("ID", (str, unicode)), ("Repository", (str, unicode)), - ("Tag",(str, unicode)), ("CreatedAt", (str, unicode)), - ("VirtualSize", int), ("Labels", dict), ("amount_containers", int), + ("ID", (str, unicode)), + ("Repository", (str, unicode)), + ("Tag", (str, unicode)), + ("CreatedAt", (str, unicode)), + ("VirtualSize", int), + ("Labels", dict), + ("amount_containers", int), ) REQUIRED_CONTAINER_KEYS = ( - ("ID", (str, unicode)), ("Repository", (str, unicode)), - ("Tag", (str, unicode)), ("CreatedAt", (str, unicode)), - ("Labels", dict), ("Names", (str, unicode)), + ("ID", (str, unicode)), + ("Repository", (str, unicode)), + ("Tag", (str, unicode)), + ("CreatedAt", (str, unicode)), + ("Labels", dict), + ("Names", (str, unicode)), ("Status", (str, unicode)), )

5 years, 7 months

Add some simple tests

by Lars Michelsen

Module: check_mk Branch: master Commit: d92cdc0775c1969950dec31daa74cddb6f1ae79b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d92cdc0775c196… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 07:48:12 2019 +0100 Add some simple tests Change-Id: I2ca4aaa01d989ec9e7adcb7e2aea6df2f4cb063e --- tests/unit/cmk/ec/test_scrub_and_decode.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/unit/cmk/ec/test_scrub_and_decode.py b/tests/unit/cmk/ec/test_scrub_and_decode.py new file mode 100644 index 0000000..4a59739 --- /dev/null +++ b/tests/unit/cmk/ec/test_scrub_and_decode.py @@ -0,0 +1,13 @@ +# encoding: utf-8 + +import cmk.ec.main as main + + +def test_scrub_and_decode(): + result = main.scrub_and_decode("0123bla\nbla\tbla\0blub\1buh\2boh\3") + assert result == "0123blabla blablubbuhboh\3" + assert isinstance(result, unicode) + + result = main.scrub_and_decode(u"0123bla\nbla\tbla\0blub\1buh\2boh\3") + assert result == u"0123blabla blablubbuhboh\3" + assert isinstance(result, unicode)

5 years, 7 months

Extracted event object construction

by Lars Michelsen

Module: check_mk Branch: master Commit: c3970a40846ed68e42d610ab0330e92a5763e94b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3970a40846ed6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:31:08 2019 +0100 Extracted event object construction Change-Id: Ie5f858e867cb193ad63ae2d80f714ad30b63924e --- cmk/ec/main.py | 712 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 360 insertions(+), 352 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c3970a4084…

5 years, 7 months

Add event creation tests for documented incoming syslog like formats

by Lars Michelsen

Module: check_mk Branch: master Commit: d003e521be2e9237216d7fcd97ff4e1271d7ecf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d003e521be2e92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:56:35 2019 +0100 Add event creation tests for documented incoming syslog like formats Change-Id: Ic98789a13172b3e524c7f6bcf0f049c50f0b40ec --- tests/unit/cmk/ec/test_event_creator.py | 223 ++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/tests/unit/cmk/ec/test_event_creator.py b/tests/unit/cmk/ec/test_event_creator.py new file mode 100644 index 0000000..a895cce --- /dev/null +++ b/tests/unit/cmk/ec/test_event_creator.py @@ -0,0 +1,223 @@ +import time +import pytest +import cmk.utils.log +import cmk.ec.defaults +import cmk.ec.main as main + + +(a)pytest.fixture +def event_creator(): + logger = cmk.utils.log.get_logger("mkeventd") + + config = cmk.ec.defaults.default_config() + config["debug_rules"] = True + + return main.EventCreator(logger, config) + + +(a)pytest.mark.parametrize( + "line,expected", + [ + ( + # Variant 1: plain syslog message without priority/facility + "May 26 13:45:01 Klapprechner CRON[8046]: message", + { + 'priority': 5, + 'facility': 1, + 'text': 'message', + 'pid': '8046', + 'core_host': '', + 'host_in_downtime': False, + 'application': 'CRON', + 'host': 'Klapprechner', + 'time': 1558874701.0, + 'ipaddress': '127.0.0.1', + }, + ), + ( + # Variant 2: syslog message including facility (RFC 3164) + "<78>May 26 13:45:01 Klapprechner CRON[8046]: message", + { + 'application': 'CRON', + 'core_host': '', + 'facility': 9, + 'host': 'Klapprechner', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': '8046', + 'priority': 6, + 'text': 'message', + 'time': 1558874701.0 + }, + ), + ( + "<134>Jan 24 10:04:57 xygtldc-blaaa-pn02 pfsp: The configuration was changed on leader xygtldc-blaaa-pn02 to version 1111111 by xygtldc-blaaa-pn02/admin at 2019-01-18 11:04:54 CET", + { + 'application': 'pfsp', + 'core_host': '', + 'facility': 16, + 'host': 'xygtldc-blaaa-pn02', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': 0, + 'priority': 6, + 'text': 'The configuration was changed on leader xygtldc-blaaa-pn02 to version 1111111 by xygtldc-blaaa-pn02/admin at 2019-01-18 11:04:54 CET', + 'time': 1548320697.0 + }, + ), + ( + # Variant 3: local Nagios alert posted by mkevent -n + "<154>@1341847712;5;Contact Info; MyHost My Service: CRIT - This che", + { + # TODO: Found a bug? This is not parsed corectly. Check whether or not mkevent + # really sends these messages + 'application': ' MyHost My Service', + 'core_host': '', + 'facility': 19, + 'host': 'Info;', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': 0, + 'priority': 2, + 'sl': 5, + 'text': 'CRIT - This che', + 'time': 1341847712.0 + }, + ), + ( + # Variant 4: remote Nagios alert posted by mkevent -n -> syslog + "<154>Jul 9 17:28:32 Klapprechner @1341847712;5;Contact Info; MyHost My Service: CRIT - This che", + { + 'application': 'My Service', + 'contact': 'Contact Info', + 'core_host': '', + 'facility': 19, + 'host': 'MyHost', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'priority': 2, + 'sl': 5, + 'text': 'CRIT - This che', + 'time': 1341847712.0 + }, + ), + ( + # Variant 5: syslog message + # Timestamp is RFC3339 with additional restrictions: + # - The "T" and "Z" characters in this syntax MUST be upper case. + # - Usage of the "T" character is REQUIRED. + # - Leap seconds MUST NOT be used. + "<166>2013-04-05T13:49:31.685Z esx Vpxa: message....", + { + 'application': 'Vpxa', + 'core_host': '', + 'facility': 20, + 'host': 'esx', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': 0, + 'priority': 6, + 'text': 'message....', + 'time': 1365162571.0 + }, + ), + ( + # Variant 6: syslog message without date / host: + "<5>SYSTEM_INFO: [WLAN-1] Triggering Background Scan", + { + 'application': 'SYSTEM_INFO', + 'core_host': '', + 'facility': 0, + 'host': '127.0.0.1', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': 0, + 'priority': 5, + 'text': '[WLAN-1] Triggering Background Scan', + 'time': 10101010.0 + }, + ), + ( + # Variant 7: logwatch.ec event forwarding + "<78>@1341847712 Klapprechner /var/log/syslog: message....", + { + 'application': '/var/log/syslog', + 'core_host': '', + 'facility': 9, + 'host': 'Klapprechner', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': 0, + 'priority': 6, + 'text': 'message....', + 'time': 1341847712.0 + }, + ), + ( + # Variant 7a: Event simulation + "<78>@1341847712;3 Klapprechner /var/log/syslog: bzong", + { + 'application': '/var/log/syslog', + 'core_host': '', + 'facility': 9, + 'host': 'Klapprechner', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': 0, + 'priority': 6, + 'sl': 3, + 'text': 'bzong', + 'time': 1341847712.0 + }, + ), + ( + # Variant 8: syslog message from sophos firewall + "<84>2015:03:25-12:02:06 gw pluto[7122]: listening for IKE messages", + { + 'application': 'pluto', + 'core_host': '', + 'facility': 10, + 'host': 'gw', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'pid': '7122', + 'priority': 4, + 'text': 'listening for IKE messages', + 'time': 1427281326.0 + }, + ), + ( + # Variant 9: syslog message (RFC 5424) + "<134>1 2016-06-02T12:49:05.181+02:00 chrissw7 ChrisApp - TestID - coming from java code", + { + 'application': 'ChrisApp', + 'core_host': '', + 'facility': 16, + 'host': 'chrissw7', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'priority': 6, + 'text': 'coming from java code', + 'time': 1464864545.0 + }, + ), + ( + # Variant 10: + "2016 May 26 15:41:47 IST XYZ Ebra: %LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.ASAD.Et45), changed state to up year month day hh:mm:ss timezone HOSTNAME KeyAgent:", + { + 'application': 'Ebra', + 'core_host': '', + 'facility': 1, + 'host': 'XYZ', + 'host_in_downtime': False, + 'ipaddress': '127.0.0.1', + 'priority': 5, + 'text': '%LINEPROTO-5-UPDOWN: Line protocol on Interface Ethernet45 (XXX.ASAD.Et45), changed state to up year month day hh:mm:ss timezone HOSTNAME KeyAgent:', + 'time': 1464270107.0 + }, + ), + ]) +def test_create_event_from_line(event_creator, monkeypatch, line, expected): + address = ("127.0.0.1", 1234) + monkeypatch.setattr(time, "time", lambda: 10101010.0) + assert event_creator.create_event_from_line(line, address) == expected

5 years, 7 months

Fix possible hanging tests caused by stale locks

by Lars Michelsen

Module: check_mk Branch: master Commit: 9317ba0b79b9ab919683596f303cbcd95843a227 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9317ba0b79b9ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 16:20:16 2019 +0100 Fix possible hanging tests caused by stale locks The previously used module was using plain file based locks (to be portable). To have a reliable inter process locking, OS support is needed, which we now get by replacing the lockfile module witht fasteners. Change-Id: I5dad7a59cc2da5de384f55a1afb4c9aae3fe547d --- Pipfile | 2 +- Pipfile.lock | 113 +++++++++++++++++---------------- tests/integration/bin/test_mkbackup.py | 4 +- tests/testlib/__init__.py | 8 +-- 4 files changed, 67 insertions(+), 60 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9317ba0b79…

5 years, 7 months

Unbreak builds: Build sles11spFOO with cryptography-1.4 for now.

by Sven Panne

Module: check_mk Branch: master Commit: 65fbd9c07de8a13e7dbe3d1e58071584e8c3f093 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65fbd9c07de8a1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 12 15:36:31 2019 +0100 Unbreak builds: Build sles11spFOO with cryptography-1.4 for now. Change-Id: I887cda0ac9df6df7206d55accc0fdf87deb52709 --- omd/packages/python-modules/python-modules.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 26857ee..a7621fa 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -111,7 +111,7 @@ PYTHON_MODULES_LIST += dnspython-1.15.0.zip # needed for LDAP (nearest DC detect PYTHON_MODULES_LIST += python-ad-0.9.tar.gz # needed for LDAP (nearest DC detection) PYTHON_MODULES_LIST += idna-2.7.tar.gz -ifneq ($(filter $(DISTRO_CODE),el5 sles11sp1 lucid squeeze),) +ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 squeeze),) PYTHON_MODULES_LIST += cryptography-1.4.tar.gz PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0005-NID_ecdsa_with_SHA-fix.patch PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-1.4-disable-version-warning.patch

5 years, 7 months

agent_aws: Do not store cache data if '--no-cache' option is used

by Simon Betz

Module: check_mk Branch: master Commit: 43c4262e95ef3f90bde43f0ca35c772c496620c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43c4262e95ef3f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 12 14:58:09 2019 +0100 agent_aws: Do not store cache data if '--no-cache' option is used Change-Id: I5ed4deaa37c53f632e442ec3cda78ed46ae229f0 --- agents/special/agent_aws | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 7da76ee..9c9053b 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -217,7 +217,8 @@ class AWSSection(object): else: raw_content = self._fetch_raw_content(colleague_contents) # TODO: Write cache only when _compute_section_content succeeded? - self._write_to_cache(raw_content) + if use_cache: + self._write_to_cache(raw_content) cache_timestamp = time.time() return AWSRawContent(raw_content, cache_timestamp) @@ -1355,7 +1356,10 @@ def parse_arguments(argv): action="store_true", help="Log messages from AWS library 'boto3' and 'botocore'.") parser.add_argument( - "--no-cache", action="store_true", help="Execute all sections, do not rely on cached data.") + "--no-cache", + action="store_true", + help="Execute all sections, do not rely on cached data. Cached data will not be overwritten." + ) parser.add_argument( "--access-key-id", required=True, help="The access key for your AWS account.")

5 years, 7 months

aws_ec2.network_io: Fixed performance variable translations

by Simon Betz

Module: check_mk Branch: master Commit: b33b2e87b22d09f170c6810357fab3f0d2f667b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b33b2e87b22d09… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 12 13:34:50 2019 +0100 aws_ec2.network_io: Fixed performance variable translations Change-Id: I4d9625de074abc2bd954af1e170da33cf3ddd6e0 --- cmk/gui/plugins/metrics/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index bc57569..bc186c6 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -5770,6 +5770,7 @@ check_metrics["check_mk-huawei_osn_if"] = if_translation check_metrics["check_mk-if_fortigate"] = if_translation check_metrics["check_mk-aix_if"] = if_translation check_metrics["check_mk-k8s_stats.network"] = if_translation +check_metrics["check_mk-aws_ec2.network_io"] = if_translation check_metrics["check_mk-brocade_fcport"] = { "in": {

5 years, 7 months

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