Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

aws_ec2.network_io: Adapted service description

by Simon Betz

Module: check_mk Branch: master Commit: 3428cd05c8f2f906a60ad884cd52940e414aafbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3428cd05c8f2f9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 15 11:18:34 2019 +0100 aws_ec2.network_io: Adapted service description Change-Id: I27fd04f5a0303d96ca76519f5feefae73c536b7e --- checks/aws_ec2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/aws_ec2 b/checks/aws_ec2 index 6c405ee..584b2e3 100644 --- a/checks/aws_ec2 +++ b/checks/aws_ec2 @@ -235,14 +235,14 @@ def check_aws_ec2_network_io(item, params, metrics): EC2DefaultItemName, "", ]] - return check_if_common_single("", params, interfaces) + return check_if_common_single(EC2DefaultItemName, params, interfaces) check_info['aws_ec2.network_io'] = { 'inventory_function': discover(), 'check_function': check_aws_ec2_network_io, - 'service_description': 'AWS/EC2 Interface %s', - 'includes': ["if.include", 'aws.include'], + 'service_description': 'AWS/EC2 Network IO %s', + 'includes': ['if.include'], 'default_levels_variable': "if_default_levels", 'group': 'if', 'has_perfdata': True,

5 years, 7 months

mk_docker.py: handle docker-py version below 3.0.0

by Moritz Kiemer

Module: check_mk Branch: master Commit: f0e5f94ac41b00b84a5a0ddab0a00c7ffdbb133d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0e5f94ac41b00… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 14 15:24:55 2019 +0100 mk_docker.py: handle docker-py version below 3.0.0 Also: be nice and allow empty config file CMK-1662 Change-Id: Ibdbecf0ce0fee616de896cbd608669b520cbb958 --- agents/plugins/mk_docker.py | 42 +++++++++++++++++++++++++----------- tests/unit/plugins/test_mk_docker.py | 2 +- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index a9b6fa1..c8ccdc3 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -119,7 +119,8 @@ def get_config(cfg_file): LOGGER.debug("trying to read %r", cfg_file) files_read = config.read(cfg_file) LOGGER.info("read configration file(s): %r", files_read) - return dict(config.items("DOCKER")) + section_name = "DOCKER" if config.sections() else "DEFAULT" + return dict(config.items(section_name)) class Section(list): @@ -176,17 +177,29 @@ class AgentDispatcher(object): ''' @staticmethod - def iter_socket(sock): + def iter_socket(sock, descriptor): header = sock.recv(8) while header: - _descriptor, length = struct.unpack('>BxxxL', header) + actual_descriptor, length = struct.unpack('>BxxxL', header) while length: data = sock.recv(length) length -= len(data) LOGGER.debug("Received data: %r", data) - yield data + if actual_descriptor == descriptor: + yield data header = sock.recv(8) + def get_stdout(self, exec_return_val): + if isinstance(exec_return_val, tuple): + # it's a tuple since version 3.0.0 + exit_code, sock = exec_return_val + if exit_code not in (0, None): + return '' + else: + sock = exec_return_val + + return ''.join(self.iter_socket(sock, 1)) + def __init__(self): remote = os.getenv("REMOTE", "") self.env = {"REMOTE": remote} @@ -214,26 +227,31 @@ class AgentDispatcher(object): '''run check_mk agent in container or container context''' LOGGER.debug("trying to run containers check_mk_agent") - result = container.exec_run('check_mk_agent', environment=self.env, demux=True) - if result.exit_code == 0: + result = container.exec_run('check_mk_agent', environment=self.env, socket=True) + output = self.get_stdout(result) + if output: LOGGER.info("successfully ran containers check_mk_agent") - return result.output[0] + return output LOGGER.info("container has no agent or executing agent failed") # check for agent code and bash: if not self.agent_code: LOGGER.info("failed to load agent code: %s", self.agent_code_exc) return None - result = container.exec_run('bash') - if result.exit_code != 0: + result = container.exec_run('bash', socket=True) + if not self.get_stdout(result): LOGGER.info("failed to run bash in container: %s", container.short_id) return None - _exit_code, dock_sock = container.exec_run( + result = container.exec_run( 'bash', environment=self.env_from_node, socket=True, stdin=True, stderr=False) - nbytes = dock_sock.sendall(self.agent_code) + try: + nbytes = result.sendall(self.agent_code) + except AttributeError: + # it's a tuple since version 3.0.0 + nbytes = result[1].sendall(self.agent_code) LOGGER.debug("sent agent to container (%d bytes)", nbytes) - agent_ouput = ''.join(self.iter_socket(dock_sock)) + agent_ouput = self.get_stdout(result) LOGGER.info("successfully ran check_mk_agent that was sent to container") return agent_ouput diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index 63c3497..b62d429 100644 --- a/tests/unit/plugins/test_mk_docker.py +++ b/tests/unit/plugins/test_mk_docker.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(cmk_path(), 'agents', 'plugins')) import mk_docker # pylint: disable=import-error,wrong-import-position PLUGIN_CHECKSUMS = { - '0.1': '2296ae916366d26d54ea449b2c2552bb', + '0.1': '2e03d077fbefb3b10a51600aa23d2154', }

5 years, 7 months

logwatch: Fix missing logfile handling

by Florian Kromer

Module: check_mk Branch: master Commit: fd82c31bdd3c65dde66033f226bf915c1f1d723d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd82c31bdd3c65… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Feb 13 17:19:32 2019 +0100 logwatch: Fix missing logfile handling Previously configured but not existing logfiles raised an exception during agent execution. This werk fixes the handling of missing logfiles. CMK-1692 Change-Id: Ie0b7b8a0497a592fde12ca206811f1506f7156ba --- agents/plugins/mk_logwatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 7a0b3b5..0f32af3 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -837,7 +837,7 @@ def main(): sys.stdout.write('[[[%s:cannotopen]]]' % logfile) else: LOGGER.debug("Invalid logfile processing result %s", process_result) - elif isinstance(meta_data, None): + elif meta_data is None: sys.stdout.write('[[[%s:missing]]]\n' % logfile) else: LOGGER.debug("Invalid parse metadata %s", meta_data)

5 years, 7 months

Revert "Revert "Add some integration tests for SNMP modules""

by Lars Michelsen

Module: check_mk Branch: master Commit: e625c838ba460602d5fdf64f6ee5b04f36037d8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e625c838ba4606… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 23:34:43 2019 +0100 Revert "Revert "Add some integration tests for SNMP modules"" This reverts commit e6ae3d3ec11b0154778569f2c22b3be28d48fbcf. --- Pipfile | 1 + cmk_base/snmp.py | 1 + omd/packages/python-modules/python-modules.make | 1 + .../python-modules/src/snmpsim-0.4.6.tar.gz | Bin 0 -> 414473 bytes .../snmp/snmp_data/1.3.6.1.6.1.1.0.snmprec | 1 + .../snmp_data/1.3.6.1.6.1.1.0/127.0.0.1.snmprec | 1 + .../cmk_base/snmp/snmp_data/cmk-walk/localhost | 555 +++++++++++++++++++ .../cmk_base/snmp/snmp_data/public.snmprec | 614 +++++++++++++++++++++ tests/integration/cmk_base/snmp/test_snmp.py | 420 ++++++++++++++ 9 files changed, 1594 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e625c838ba…

5 years, 7 months

Bumped snmpsim, pysmi, pysnmp versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 0f6e148ca080ba44f7944b2e06300d0d6f3e1ccb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f6e148ca080ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 19:47:02 2019 +0100 Bumped snmpsim, pysmi, pysnmp versions Change-Id: I98c51d9f20fb1e5dbba5de8541fb33bb598f5364 --- Pipfile | 6 +++--- Pipfile.lock | 31 ++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Pipfile b/Pipfile index 9a2d7af..f42590d 100644 --- a/Pipfile +++ b/Pipfile @@ -31,9 +31,9 @@ pyasn1-modules = "==0.2.2" pycryptodomex = "==3.6.6" ordereddict = "==1.1" ply = "==3.11" -pysmi = "==0.3.2" -pysnmp = "==4.4.4" -snmpsim = "==0.4.6" +pysmi = "==0.3.3" +pysnmp = "==4.4.9" +snmpsim = "==0.4.7" setuptools-git = "==1.2" pymssql = "==2.1.3" python-ldap = "==3.1.0" diff --git a/Pipfile.lock b/Pipfile.lock index ad6d5bf..0819fb8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "5763860c70293c943ade86d158aecb5eb57a12e3595b35b1796d59d2411f8526" + "sha256": "b3a4890adcd5b45115a01aeb6618f0e157e3d22d5686af61af417573ee604828" }, "pipfile-spec": 6, "requires": { @@ -682,19 +682,19 @@ }, "pysmi": { "hashes": [ - "sha256:0cb6b28ea22bdb82d2f01646154b73ee86046c7451663dab471bd918dd90f154", - "sha256:309039ab9bd458cc721692ffff10b4ad2c4a8e731e6507c34866ca2727323353" + "sha256:25ec5cbc97b8c01981224b8900f113842316064059bbf35ec6121c3f73adce6d", + "sha256:4e35c2b935ba5a68e086d7781dae1b508c228a960279620d182e876448acf02f" ], "index": "pypi", - "version": "==0.3.2" + "version": "==0.3.3" }, "pysnmp": { "hashes": [ - "sha256:2f363106ad1518d9ef81c1f04b3764a77f9e5fac0303e3148ceb4261c9c6fcca", - "sha256:9c80a84fe67f0696da23da021d1237536ebd108ac9a816c41ad6ea8d40f021b1" + "sha256:128a4832ce170213a59b82e7eeb886fc07d4b2e6eb638db8049af03f1014b0f8", + "sha256:d5d1e59780126e963dd92e25993b783295734e71bef181f602e51f7393260441" ], "index": "pypi", - "version": "==4.4.4" + "version": "==4.4.9" }, "pysphere": { "hashes": [ @@ -893,6 +893,14 @@ "index": "pypi", "version": "==1.11.0" }, + "snmpsim": { + "hashes": [ + "sha256:2c94acec6f8e7b5278137f9c5d3b1510ea902d8023842f96408f39f5d9859b14", + "sha256:a00b053e7e8f1ad27c381d009eb52fb55ae3bcd02b92ad2c6eae3e6b077da02b" + ], + "index": "pypi", + "version": "==0.4.7" + }, "tinkerforge": { "hashes": [ "sha256:4a4edd1c745dce05572ae0f2e27375fb2eb8b0ca64a894153c680357427c13f5" @@ -1104,7 +1112,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1256,6 +1264,7 @@ "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc", "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9" ], + "markers": "python_version <= '2.7'", "version": "==5.0.0" }, "pathlib2": { @@ -1343,11 +1352,11 @@ }, "pytest": { "hashes": [ - "sha256:65aeaa77ae87c7fc95de56285282546cfa9c886dc8e5dc78313db1c25e21bc07", - "sha256:6ac6d467d9f053e95aaacd79f831dbecfe730f419c6c7022cb316b365cd9199d" + "sha256:80cfd9c8b9e93f419abcc0400e9f595974a98e44b6863a77d3e1039961bfc9c4", + "sha256:c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c" ], "index": "pypi", - "version": "==4.2.0" + "version": "==4.2.1" }, "pytest-cov": { "hashes": [

5 years, 7 months

Fix new SNMP integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d5aabffc91da8f9ee680b5c71e2af6600ab1659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d5aabffc91da8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 20:15:12 2019 +0100 Fix new SNMP integration tests * Use SNMPv2 for the moment instead of v1 * Start one snmpsim instance for all tests * Wait until snmpsim is ready before starting the tests Change-Id: I88661114b6b7054536e9c6d64f24135f5376d701 --- .../cmk_base/snmp/snmp_data/cmk-walk/localhost | 5 +-- tests/integration/cmk_base/snmp/test_snmp.py | 42 ++++++++++++++++++---- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/tests/integration/cmk_base/snmp/snmp_data/cmk-walk/localhost b/tests/integration/cmk_base/snmp/snmp_data/cmk-walk/localhost index 154d0e8..22f13cc 100644 --- a/tests/integration/cmk_base/snmp/snmp_data/cmk-walk/localhost +++ b/tests/integration/cmk_base/snmp/snmp_data/cmk-walk/localhost @@ -1,6 +1,6 @@ .1.3.6.1.2.1.1.1.0 Linux zeus 4.8.6.5-smp #2 SMP Sun Nov 13 14:58:11 CDT 2016 i686 .1.3.6.1.2.1.1.2.0 .1.3.6.1.4.1.8072.3.2.10 -.1.3.6.1.2.1.1.3.0 452596856 +.1.3.6.1.2.1.1.3.0 449613886 .1.3.6.1.2.1.1.4.0 SNMP Laboratories, info(a)snmplabs.com .1.3.6.1.2.1.1.5.0 new system name .1.3.6.1.2.1.1.6.0 San Francisco, California, United States @@ -268,6 +268,7 @@ .1.3.6.1.2.1.4.31.1.1.18.2 0 .1.3.6.1.2.1.4.31.1.1.20.1 15833452 .1.3.6.1.2.1.4.31.1.1.20.2 6 +.1.3.6.1.2.1.4.31.1.1.21.1 15833452 .1.3.6.1.2.1.4.31.1.1.22.1 0 .1.3.6.1.2.1.4.31.1.1.22.2 0 .1.3.6.1.2.1.4.31.1.1.25.1 0 @@ -552,4 +553,4 @@ .1.3.6.1.2.1.7.5.1.1.195.218.254.105.53 195.218.254.105 .1.3.6.1.2.1.7.5.1.1.195.218.254.105.123 195.218.254.105 .1.3.6.1.2.1.7.5.1.2.0.0.0.0.37 37 -.1.3.6.1.2.1.7.5.1.2.0.0.0. \ No newline at end of file +.1.3.6.1.2.1.7.5.1.2.0.0.0. diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index b057a14..2199b19 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -3,7 +3,7 @@ import logging import os import pytest # type: ignore from pathlib2 import Path -from testlib import cmk_path +from testlib import cmk_path, wait_until from cmk.utils.exceptions import MKGeneralException import cmk.utils.paths @@ -24,15 +24,30 @@ logger = logging.getLogger(__name__) # SNMP device and back. -(a)pytest.fixture() -def snmpsim(site, request, tmp_path, monkeypatch): +# Found no other way to archieve this +# https://github.com/pytest-dev/pytest/issues/363 +(a)pytest.fixture(scope="module") +def monkeymodule(request): + from _pytest.monkeypatch import MonkeyPatch + mpatch = MonkeyPatch() + yield mpatch + mpatch.undo() + + +(a)pytest.fixture(scope="module") +def snmpsim(site, request, tmp_path_factory, monkeymodule): + tmp_path = tmp_path_factory.getbasetemp() + cmd = "%s/.venv/bin/snmpsimd.py" % cmk_path() source_data_dir = Path(request.fspath.dirname) / "snmp_data" - monkeypatch.setattr(config, "snmp_port_of", lambda h: 1337) + monkeymodule.setattr(config, "snmp_port_of", lambda h: 1337) log.set_verbosity(2) debug.enable() + # TODO: Use SNMPv2 over v1 for the moment + monkeymodule.setattr(config, "is_snmpv2c_host", lambda h: True) + p = subprocess.Popen( [ cmd, @@ -51,8 +66,8 @@ def snmpsim(site, request, tmp_path, monkeypatch): ], close_fds=True, # Silence the very noisy output. May be useful to enable this for debugging tests - stdout=open(os.devnull, "w"), - stderr=subprocess.STDOUT, + #stdout=open(os.devnull, "w"), + #stderr=subprocess.STDOUT, ) access_data = { @@ -61,6 +76,19 @@ def snmpsim(site, request, tmp_path, monkeypatch): "credentials": "public", } + # Ensure that snmpsim is ready for clients before starting with the tests + def is_listening(): + num_sockets = 0 + for e in os.listdir("/proc/%d/fd" % p.pid): + try: + if os.readlink("/proc/%d/fd/%s" % (p.pid, e)).startswith("socket:"): + num_sockets += 1 + except OSError: + pass + return num_sockets >= 2 + + wait_until(is_listening, timeout=20) + yield p, access_data log.set_verbosity(0) @@ -74,7 +102,7 @@ def snmpsim(site, request, tmp_path, monkeypatch): # Execute all tests for all SNMP backends @pytest.fixture(params=["inline_snmp", "classic_snmp", "stored_snmp"], autouse=True) -def backend(request, monkeypatch, tmp_path): +def backend(request, monkeypatch): backend_name = request.param source_data_dir = Path(request.fspath.dirname) / "snmp_data" / "cmk-walk"

5 years, 7 months

docker deprecation: quick fix

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6f48926edbb8eae9a746f8727cf9d9cf2236cad7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f48926edbb8ea… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 15 07:41:49 2019 +0100 docker deprecation: quick fix Change-Id: Idc68724e5e669759f4a2709319727cbab23418ce --- checks/docker_container_status | 36 ++++++++++++++++++++++++++++++++++++ checks/docker_node_disk_usage | 36 ++++++++++++++++++++++++++++++++++++ checks/docker_node_info | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+) diff --git a/checks/docker_container_status b/checks/docker_container_status index 69649fa..13e7b3a 100644 --- a/checks/docker_container_status +++ b/checks/docker_container_status @@ -25,6 +25,42 @@ # Boston, MA 02110-1301 USA. +# TODO: see why it's not enough to have it in legacy_docker.include +def append_deprecation_warning(check_function): + '''A wrapper to WARN if legacy code is used + + If the parse result is of one of the legacy Types the decorated + check function will yield an additional WARNING state. + + These legacy parse results correspond to agents/plugins from version + 1.5.0b1 to 1.5.0p12 + ''' + + @functools.wraps(check_function) + def wrapper(item, params, parsed): + + is_deprecated = isinstance(parsed, (DeprecatedDict, DeprecatedList)) + catch_these = Exception if is_deprecated else () + + try: + results = check_function(item, params, parsed) + if isinstance(results, tuple): + yield results + else: + for result in results: + yield result + except catch_these: + yield 3, "Could not handle data" + finally: + if is_deprecated: + yield 1, ("Deprecated plugin/agent (see long output)(!)\n" + "You are using legacy code, which may lead to crashes and/or" + " incomplete information. Please upgrade the monitored host to" + " use the plugin 'mk_docker.py'.") + + return wrapper + + def parse_docker_container_status(info): '''process the first line to a JSON object diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage index d5355e2..a4be887 100644 --- a/checks/docker_node_disk_usage +++ b/checks/docker_node_disk_usage @@ -25,6 +25,42 @@ # Boston, MA 02110-1301 USA. +# TODO: see why it's not enough to have it in legacy_docker.include +def append_deprecation_warning(check_function): + '''A wrapper to WARN if legacy code is used + + If the parse result is of one of the legacy Types the decorated + check function will yield an additional WARNING state. + + These legacy parse results correspond to agents/plugins from version + 1.5.0b1 to 1.5.0p12 + ''' + + @functools.wraps(check_function) + def wrapper(item, params, parsed): + + is_deprecated = isinstance(parsed, (DeprecatedDict, DeprecatedList)) + catch_these = Exception if is_deprecated else () + + try: + results = check_function(item, params, parsed) + if isinstance(results, tuple): + yield results + else: + for result in results: + yield result + except catch_these: + yield 3, "Could not handle data" + finally: + if is_deprecated: + yield 1, ("Deprecated plugin/agent (see long output)(!)\n" + "You are using legacy code, which may lead to crashes and/or" + " incomplete information. Please upgrade the monitored host to" + " use the plugin 'mk_docker.py'.") + + return wrapper + + def parse_docker_node_disk_usage(info): version = docker_get_version(info) # pylint: disable=undefined-variable diff --git a/checks/docker_node_info b/checks/docker_node_info index 3d193d1..f560f9e 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -25,6 +25,42 @@ # Boston, MA 02110-1301 USA. +# TODO: see why it's not enough to have it in legacy_docker.include +def append_deprecation_warning(check_function): + '''A wrapper to WARN if legacy code is used + + If the parse result is of one of the legacy Types the decorated + check function will yield an additional WARNING state. + + These legacy parse results correspond to agents/plugins from version + 1.5.0b1 to 1.5.0p12 + ''' + + @functools.wraps(check_function) + def wrapper(item, params, parsed): + + is_deprecated = isinstance(parsed, (DeprecatedDict, DeprecatedList)) + catch_these = Exception if is_deprecated else () + + try: + results = check_function(item, params, parsed) + if isinstance(results, tuple): + yield results + else: + for result in results: + yield result + except catch_these: + yield 3, "Could not handle data" + finally: + if is_deprecated: + yield 1, ("Deprecated plugin/agent (see long output)(!)\n" + "You are using legacy code, which may lead to crashes and/or" + " incomplete information. Please upgrade the monitored host to" + " use the plugin 'mk_docker.py'.") + + return wrapper + + def parse_docker_node_info(info): version = docker_get_version(info) # pylint: disable=undefined-variable

5 years, 7 months

Revert "Add some integration tests for SNMP modules"

by Lars Michelsen

Module: check_mk Branch: master Commit: e6ae3d3ec11b0154778569f2c22b3be28d48fbcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ae3d3ec11b01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 21:11:31 2019 +0100 Revert "Add some integration tests for SNMP modules" This reverts commit c7575232f3cb97e522057f81a75dc8a99dc44506. --- Pipfile | 1 - cmk_base/snmp.py | 1 - omd/packages/python-modules/python-modules.make | 1 - .../python-modules/src/snmpsim-0.4.6.tar.gz | Bin 414473 -> 0 bytes .../snmp/snmp_data/1.3.6.1.6.1.1.0.snmprec | 1 - .../snmp_data/1.3.6.1.6.1.1.0/127.0.0.1.snmprec | 1 - .../cmk_base/snmp/snmp_data/cmk-walk/localhost | 555 ------------------- .../cmk_base/snmp/snmp_data/public.snmprec | 614 --------------------- tests/integration/cmk_base/snmp/test_snmp.py | 420 -------------- 9 files changed, 1594 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e6ae3d3ec1…

5 years, 7 months

Add some SNMP unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bd62c63ef5436f3b009551c8f65ef4b38b2ee22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bd62c63ef5436… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Feb 10 13:41:39 2019 +0100 Add some SNMP unit tests Change-Id: Iacb549fe59a7814f7bbb4deb7051b24d644ba586 --- tests/unit/cmk_base/snmp/test_classic_snmp.py | 133 ++++++++++++++++++++++++++ tests/unit/cmk_base/snmp/test_snmp_unit.py | 21 ++++ 2 files changed, 154 insertions(+) diff --git a/tests/unit/cmk_base/snmp/test_classic_snmp.py b/tests/unit/cmk_base/snmp/test_classic_snmp.py new file mode 100644 index 0000000..98cd254 --- /dev/null +++ b/tests/unit/cmk_base/snmp/test_classic_snmp.py @@ -0,0 +1,133 @@ +import collections +import pytest +import cmk_base.config as config +import cmk_base.classic_snmp as classic_snmp + + +(a)pytest.mark.parametrize("port,expected", [ + (None, ""), + (1234, ":1234"), +]) +def test_snmp_port_spec(monkeypatch, port, expected): + monkeypatch.setattr(config, "snmp_port_of", lambda h: port) + assert classic_snmp._snmp_port_spec("localhost") == expected + + +(a)pytest.mark.parametrize("is_ipv6,expected", [ + (True, "udp6:"), + (False, ""), +]) +def test_snmp_proto_spec(monkeypatch, is_ipv6, expected): + monkeypatch.setattr(config, "is_ipv6_primary", lambda h: is_ipv6) + assert classic_snmp._snmp_proto_spec("localhost") == expected + + +SNMPSettings = collections.namedtuple("SNMPSettings", [ + "access_data", + "is_bulkwalk_host", + "bulk_walk_size_of", + "is_snmpv2c_host", + "snmp_timing_of", + "context_name", +]) + + +(a)pytest.mark.parametrize("settings,expected", [ + (SNMPSettings( + access_data={ + "hostname": "localhost", + "ipaddress": "127.0.0.1", + "credentials": "public", + }, + is_bulkwalk_host=True, + bulk_walk_size_of=10, + is_snmpv2c_host=True, + snmp_timing_of={ + "timeout": 2, + "retries": 3 + }, + context_name=None, + ), [ + 'snmpbulkwalk', '-Cr10', '-v2c', '-c', 'public', '-m', '', '-M', '', '-t', '2.00', '-r', + '3', '-Cc' + ]), + (SNMPSettings( + access_data={ + "hostname": "lohost", + "ipaddress": "127.0.0.1", + "credentials": "public", + }, + is_bulkwalk_host=False, + bulk_walk_size_of=5, + is_snmpv2c_host=False, + snmp_timing_of={ + "timeout": 5, + "retries": 1 + }, + context_name="blabla", + ), [ + 'snmpwalk', '-v1', '-c', 'public', '-m', '', '-M', '', '-t', '5.00', '-r', '1', '-n', + 'blabla', '-Cc' + ]), + (SNMPSettings( + access_data={ + "hostname": "lohost", + "ipaddress": "public", + "credentials": ("authNoPriv", "abc", "md5", "abc"), + }, + is_bulkwalk_host=False, + bulk_walk_size_of=5, + is_snmpv2c_host=False, + snmp_timing_of={ + "timeout": 5, + "retries": 1 + }, + context_name="blabla", + ), [ + 'snmpwalk', '-v3', '-l', 'authNoPriv', '-a', 'abc', '-u', 'md5', '-A', 'abc', '-m', '', + '-M', '', '-t', '5.00', '-r', '1', '-n', 'blabla', '-Cc' + ]), + (SNMPSettings( + access_data={ + "hostname": "lohost", + "ipaddress": "public", + "credentials": ('noAuthNoPriv', 'secname'), + }, + is_bulkwalk_host=False, + bulk_walk_size_of=5, + is_snmpv2c_host=False, + snmp_timing_of={ + "timeout": 5, + "retries": 1 + }, + context_name=None, + ), [ + 'snmpwalk', '-v3', '-l', 'noAuthNoPriv', '-u', 'secname', '-m', '', '-M', '', '-t', '5.00', + '-r', '1', '-Cc' + ]), + (SNMPSettings( + access_data={ + "hostname": "lohost", + "ipaddress": "127.0.0.1", + "credentials": ('authPriv', 'md5', 'secname', 'auhtpassword', 'DES', 'privacybla'), + }, + is_bulkwalk_host=False, + bulk_walk_size_of=5, + is_snmpv2c_host=False, + snmp_timing_of={ + "timeout": 5, + "retries": 1 + }, + context_name=None, + ), [ + 'snmpwalk', '-v3', '-l', 'authPriv', '-a', 'md5', '-u', 'secname', '-A', 'auhtpassword', + '-x', 'DES', '-X', 'privacybla', '-m', '', '-M', '', '-t', '5.00', '-r', '1', '-Cc' + ]), +]) +def test_snmp_walk_command(monkeypatch, settings, expected): + monkeypatch.setattr(config, "is_bulkwalk_host", lambda h: settings.is_bulkwalk_host) + monkeypatch.setattr(config, "bulk_walk_size_of", lambda h: settings.bulk_walk_size_of) + monkeypatch.setattr(config, "is_snmpv2c_host", lambda h: settings.is_snmpv2c_host) + monkeypatch.setattr(config, "snmp_timing_of", lambda h: settings.snmp_timing_of) + monkeypatch.setattr(config, "snmp_timing_of", lambda h: settings.snmp_timing_of) + assert classic_snmp._snmp_walk_command(settings.access_data, settings.context_name) == expected diff --git a/tests/unit/cmk_base/snmp/test_snmp_unit.py b/tests/unit/cmk_base/snmp/test_snmp_unit.py new file mode 100644 index 0000000..297eafb --- /dev/null +++ b/tests/unit/cmk_base/snmp/test_snmp_unit.py @@ -0,0 +1,21 @@ +# encoding: utf-8 + +import pytest +import cmk_base.config as config +import cmk_base.snmp as snmp + + +(a)pytest.mark.parametrize( + "encoding,columns,expected", + [ + (None, [(['\xc3\xbc'], "string")], [[u"ü"]]), # utf-8 + (None, [('\xc3\xbc', "binary")], [[[195], [188]]]), # utf-8 + (None, [(["\xfc"], "string")], [[u"ü"]]), # latin-1 + (None, [('\xfc', "binary")], [[[252]]]), # latin-1 + ("utf-8", [(['\xc3\xbc'], "string")], [[u"ü"]]), + ("latin1", [(['\xfc'], "string")], [[u"ü"]]), + ("cp437", [(['\x81'], "string")], [[u"ü"]]), + ]) +def test_sanitize_snmp_encoding(monkeypatch, encoding, columns, expected): + monkeypatch.setattr(config, "snmp_character_encoding_of", lambda h: encoding) + assert snmp._sanitize_snmp_encoding("localhost", columns) == expected

5 years, 7 months

Add some integration tests for SNMP modules

by Lars Michelsen

Module: check_mk Branch: master Commit: c7575232f3cb97e522057f81a75dc8a99dc44506 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7575232f3cb97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Feb 10 09:56:25 2019 +0100 Add some integration tests for SNMP modules We really want to test the SNMP implementations communicating against a SNMP agent and the "netsnmp" python module (used for inline SNMP) and snmp commands (used for classic SNMP) are not available in the git environment. For the moment it does not make sense to build these tests as unit tests because we want to tests the whole chain from single SNMP actions in our modules to the faked SNMP device and back. We use the snmpsimd (thanks Ilya! :-)) for simulating SNMP agents providing different sets of SNMP information. The tests invoke various calls using our different SNMP backends: SNMP classic (based on snmp commands subprocesses), Inline SNMP (based on netsnmp python bindings) and also get data from Check_MKs stored SNMP walks. For internal and more detailed testing we'll use unit tests instead. Change-Id: I61e98d748220374b341f838c30617ca6043f1487 --- Pipfile | 1 + cmk_base/snmp.py | 1 + omd/packages/python-modules/python-modules.make | 1 + .../python-modules/src/snmpsim-0.4.6.tar.gz | Bin 0 -> 414473 bytes .../snmp/snmp_data/1.3.6.1.6.1.1.0.snmprec | 1 + .../snmp_data/1.3.6.1.6.1.1.0/127.0.0.1.snmprec | 1 + .../cmk_base/snmp/snmp_data/cmk-walk/localhost | 555 +++++++++++++++++++ .../cmk_base/snmp/snmp_data/public.snmprec | 614 +++++++++++++++++++++ tests/integration/cmk_base/snmp/test_snmp.py | 420 ++++++++++++++ 9 files changed, 1594 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7575232f3…

5 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
...
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