Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

Replaced is_snmpv2c_host with is_snmpv2or3_without_bulkwalk_host

by Lars Michelsen

Module: check_mk Branch: master Commit: 02881844acb11965c846aad8be94adf822458d66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02881844acb119… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 14:03:44 2019 +0100 Replaced is_snmpv2c_host with is_snmpv2or3_without_bulkwalk_host Change-Id: Ieccc32e5a11459d63abd15feecc134351386f5d2 --- cmk_base/automations/check_mk.py | 8 ++++---- cmk_base/classic_snmp.py | 2 +- cmk_base/config.py | 5 ++--- cmk_base/data_sources/snmp.py | 5 +++-- cmk_base/snmp.py | 2 +- cmk_base/snmp_utils.py | 2 +- tests/integration/cmk_base/snmp/test_snmp.py | 8 ++++---- tests/unit/cmk_base/snmp/test_classic_snmp.py | 14 +++++++------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index dada8f0..815514e 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1213,13 +1213,13 @@ class AutomationDiagHost(Automation): # SNMP versions if test in ['snmpv2', 'snmpv3']: is_bulkwalk_host = True - is_snmpv2c_host = False + is_snmpv2or3_without_bulkwalk_host = False elif test == 'snmpv2_nobulk': is_bulkwalk_host = False - is_snmpv2c_host = True + is_snmpv2or3_without_bulkwalk_host = True elif test == 'snmpv1': is_bulkwalk_host = False - is_snmpv2c_host = False + is_snmpv2or3_without_bulkwalk_host = False else: return 1, "SNMP command not implemented" @@ -1232,7 +1232,7 @@ class AutomationDiagHost(Automation): credentials=credentials, port=config.snmp_port_of(hostname), is_bulkwalk_host=is_bulkwalk_host, - is_snmpv2c_host=is_snmpv2c_host, + is_snmpv2or3_without_bulkwalk_host=is_snmpv2or3_without_bulkwalk_host, bulk_walk_size_of=config.bulk_walk_size_of(hostname), timing={ 'timeout': snmp_timeout, diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index 644e1a3..eed8d95 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -231,7 +231,7 @@ def _snmp_base_command(what, host_config, context_name): else: if what == 'walk': command = ['snmpwalk'] - if host_config.is_snmpv2c_host: + if host_config.is_snmpv2or3_without_bulkwalk_host: options.append('-v2c') else: options.append('-v1') diff --git a/cmk_base/config.py b/cmk_base/config.py index 295ba61..1b82a6f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -1064,9 +1064,8 @@ def bulk_walk_size_of(hostname): return bulk_sizes[0] -def is_snmpv2c_host(hostname): - return is_bulkwalk_host(hostname) or \ - in_binary_hostlist(hostname, snmpv2c_hosts) +def is_snmpv2or3_without_bulkwalk_host(hostname): + return in_binary_hostlist(hostname, snmpv2c_hosts) def is_usewalk_host(hostname): diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 4cf84a0..d406c0b 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -64,7 +64,8 @@ class SNMPDataSource(DataSource): self._credentials = config.snmp_credentials_of(self._hostname) self._port = config.snmp_port_of(self._hostname) self._is_bulkwalk_host = config.is_bulkwalk_host(self._hostname) - self._is_snmpv2c_host = config.is_snmpv2c_host(self._hostname) + self._is_snmpv2or3_without_bulkwalk_host = config.is_snmpv2or3_without_bulkwalk_host( + self._hostname) def id(self): return "snmp" @@ -83,7 +84,7 @@ class SNMPDataSource(DataSource): credentials=self._credentials, port=self._port, is_bulkwalk_host=self._is_bulkwalk_host, - is_snmpv2c_host=self._is_snmpv2c_host, + is_snmpv2or3_without_bulkwalk_host=self._is_snmpv2or3_without_bulkwalk_host, bulk_walk_size_of=config.bulk_walk_size_of(self._hostname), timing=config.snmp_timing_of(self._hostname), oid_range_limits=config.oid_range_limits_of(self._hostname), diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index f482791..f0341ee 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -150,7 +150,7 @@ def create_snmp_host_config(hostname): credentials=config.snmp_credentials_of(hostname), port=config.snmp_port_of(hostname), is_bulkwalk_host=config.is_bulkwalk_host(hostname), - is_snmpv2c_host=config.is_snmpv2c_host(hostname), + is_snmpv2or3_without_bulkwalk_host=config.is_snmpv2or3_without_bulkwalk_host(hostname), bulk_walk_size_of=config.bulk_walk_size_of(hostname), timing=config.snmp_timing_of(hostname), oid_range_limits=config.oid_range_limits_of(hostname), diff --git a/cmk_base/snmp_utils.py b/cmk_base/snmp_utils.py index 84bb921..a2a963b 100644 --- a/cmk_base/snmp_utils.py +++ b/cmk_base/snmp_utils.py @@ -84,7 +84,7 @@ SNMPHostConfig = NamedTuple( ("credentials", SNMPCredentials), ("port", int), ("is_bulkwalk_host", bool), - ("is_snmpv2c_host", bool), + ("is_snmpv2or3_without_bulkwalk_host", bool), ("bulk_walk_size_of", int), # TODO: Cleanup to named tuple ("timing", dict), diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index e57e549..54708a4 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -74,7 +74,7 @@ def snmpsim(site, request, tmp_path_factory): port=1337, # TODO: Use SNMPv2 over v1 for the moment is_bulkwalk_host=False, - is_snmpv2c_host=True, + is_snmpv2or3_without_bulkwalk_host=True, bulk_walk_size_of=10, timing={}, oid_range_limits=[], @@ -147,7 +147,7 @@ def test_get_single_oid_ipv6(snmpsim, backend): credentials="public", port=1337, is_bulkwalk_host=False, - is_snmpv2c_host=True, + is_snmpv2or3_without_bulkwalk_host=True, bulk_walk_size_of=10, timing={}, oid_range_limits=[], @@ -167,7 +167,7 @@ def test_get_single_oid_snmpv3(snmpsim, backend): credentials=('authNoPriv', 'md5', 'authOnlyUser', 'authOnlyUser'), port=1337, is_bulkwalk_host=False, - is_snmpv2c_host=True, + is_snmpv2or3_without_bulkwalk_host=True, bulk_walk_size_of=10, timing={}, oid_range_limits=[], @@ -272,7 +272,7 @@ def test_get_single_oid_not_resolvable(snmpsim, backend): credentials="public", port=1337, is_bulkwalk_host=True, - is_snmpv2c_host=True, + is_snmpv2or3_without_bulkwalk_host=True, bulk_walk_size_of=10, timing={}, oid_range_limits=[], diff --git a/tests/unit/cmk_base/snmp/test_classic_snmp.py b/tests/unit/cmk_base/snmp/test_classic_snmp.py index 1df1b91..0b2ee12 100644 --- a/tests/unit/cmk_base/snmp/test_classic_snmp.py +++ b/tests/unit/cmk_base/snmp/test_classic_snmp.py @@ -16,7 +16,7 @@ def test_snmp_port_spec(port, expected): credentials="public", port=port, is_bulkwalk_host=False, - is_snmpv2c_host=False, + is_snmpv2or3_without_bulkwalk_host=False, bulk_walk_size_of=10, timing={}, oid_range_limits=[], @@ -36,7 +36,7 @@ def test_snmp_proto_spec(monkeypatch, is_ipv6, expected): credentials="public", port=161, is_bulkwalk_host=False, - is_snmpv2c_host=False, + is_snmpv2or3_without_bulkwalk_host=False, bulk_walk_size_of=10, timing={}, oid_range_limits=[], @@ -59,7 +59,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ credentials="public", port=161, is_bulkwalk_host=True, - is_snmpv2c_host=True, + is_snmpv2or3_without_bulkwalk_host=True, bulk_walk_size_of=10, timing={ "timeout": 2, @@ -80,7 +80,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ credentials="public", port=161, is_bulkwalk_host=False, - is_snmpv2c_host=False, + is_snmpv2or3_without_bulkwalk_host=False, bulk_walk_size_of=5, timing={ "timeout": 5, @@ -101,7 +101,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ credentials=("authNoPriv", "abc", "md5", "abc"), port=161, is_bulkwalk_host=False, - is_snmpv2c_host=False, + is_snmpv2or3_without_bulkwalk_host=False, bulk_walk_size_of=5, timing={ "timeout": 5, @@ -122,7 +122,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ credentials=('noAuthNoPriv', 'secname'), port=161, is_bulkwalk_host=False, - is_snmpv2c_host=False, + is_snmpv2or3_without_bulkwalk_host=False, bulk_walk_size_of=5, timing={ "timeout": 5, @@ -143,7 +143,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ credentials=('authPriv', 'md5', 'secname', 'auhtpassword', 'DES', 'privacybla'), port=161, is_bulkwalk_host=False, - is_snmpv2c_host=False, + is_snmpv2or3_without_bulkwalk_host=False, bulk_walk_size_of=5, timing={ "timeout": 5,

5 years, 4 months

aws_s3_limits: Check AWS/S3 limits

by Simon Betz

Module: check_mk Branch: master Commit: 812c419f3cafc78a8cd1a4ba2a62ea41ecd85f52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=812c419f3cafc7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 21 11:56:52 2019 +0100 aws_s3_limits: Check AWS/S3 limits Change-Id: I81778de145da833754e66e6a86239949033b9dc1 --- .werks/7101 | 11 ++ agents/special/agent_aws | 183 +++++++++++++++++++++------ checkman/aws_s3_limits | 19 +++ checks/agent_aws | 13 +- checks/aws.include | 15 +++ checks/aws_s3_limits | 44 +++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 60 +++++++++ cmk/gui/plugins/wato/datasource_programs.py | 15 ++- 8 files changed, 316 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=812c419f3c…

5 years, 4 months

Centralized some standard SNMPHostConfig() construction

by Lars Michelsen

Module: check_mk Branch: master Commit: ec5e9e3cc40db893ffa5f37a16c21f959037381b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec5e9e3cc40db8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 19:07:07 2019 +0100 Centralized some standard SNMPHostConfig() construction Change-Id: I2be22309a606da95237d16b0d0c1495625363246 --- cmk_base/automations/check_mk.py | 6 +----- cmk_base/snmp.py | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 348ddd1..dd56735 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1392,11 +1392,7 @@ class AutomationGetAgentOutput(Automation): success = False output += "[%s] %s\n" % (source.id(), source_output) else: - host_config = snmp_utils.SNMPHostConfig( - hostname=hostname, - ipaddress=ip_lookup.lookup_ipv4_address(hostname), - credentials=config.snmp_credentials_of(hostname), - ) + host_config = snmp.create_snmp_host_config(hostname) lines = [] for walk_oid in snmp.oids_to_walk(): diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index e7128b6..f9decdd 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -141,6 +141,15 @@ def _clear_other_hosts_oid_cache(hostname): # '----------------------------------------------------------------------' +def create_snmp_host_config(hostname): + # type: (str) -> cmk_base.snmp_utils.SNMPHostConfig + return cmk_base.snmp_utils.SNMPHostConfig( + hostname=hostname, + ipaddress=ip_lookup.lookup_ipv4_address(hostname), + credentials=config.snmp_credentials_of(hostname), + ) + + # TODO: OID_END_OCTET_STRING is not used at all. Drop it. def get_snmp_table(host_config, check_plugin_name, oid_info, use_snmpwalk_cache): # oid_info is either ( oid, columns ) or @@ -738,11 +747,7 @@ def do_snmpwalk(options, hostnames): for hostname in hostnames: #TODO: What about SNMP management boards? - host_config = cmk_base.snmp_utils.SNMPHostConfig( - hostname=hostname, - ipaddress=ip_lookup.lookup_ipv4_address(hostname), - credentials=config.snmp_credentials_of(hostname), - ) + host_config = create_snmp_host_config(hostname) try: _do_snmpwalk_on(host_config, options, cmk.utils.paths.snmpwalks_dir + "/" + hostname) @@ -810,11 +815,7 @@ def do_snmpget(*args): for hostname in hostnames: #TODO what about SNMP management boards? - host_config = cmk_base.snmp_utils.SNMPHostConfig( - hostname=hostname, - ipaddress=ip_lookup.lookup_ipv4_address(hostname), - credentials=config.snmp_credentials_of(hostname), - ) + host_config = create_snmp_host_config(hostname) value = get_single_oid(host_config, oid) console.output("%s (%s): %r\n" % (hostname, host_config.ipaddress, value))

5 years, 4 months

Refactored SNMP access_data to SNMPHostConfig named tuple

by Lars Michelsen

Module: check_mk Branch: master Commit: 46986b6dc8688772f2ae7a9f6870ae140fcd3e01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46986b6dc86887… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 10:51:38 2019 +0100 Refactored SNMP access_data to SNMPHostConfig named tuple Change-Id: I7d990d57f99dde0ddac95360ce6c7c8b84aa2a01 --- cmk_base/automations/check_mk.py | 25 ++--- cmk_base/classic_snmp.py | 76 +++++++------- cmk_base/data_sources/snmp.py | 21 ++-- cmk_base/inventory.py | 4 +- cmk_base/snmp.py | 141 ++++++++++++-------------- cmk_base/snmp_scan.py | 26 +++-- cmk_base/snmp_utils.py | 22 ++++ tests/integration/cmk_base/snmp/test_snmp.py | 132 ++++++++++++------------ tests/unit/cmk_base/snmp/test_classic_snmp.py | 55 +++++----- 9 files changed, 260 insertions(+), 242 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=46986b6dc8…

5 years, 4 months

Moved SNMP port attribute to SNMPHostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 53baf34b5b56bfeb010412f4c5e28fa9676118b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53baf34b5b56bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 19:21:37 2019 +0100 Moved SNMP port attribute to SNMPHostConfig Change-Id: Ie2cf927a99f680c9f454f24ac6e2ce94a67704ea --- cmk_base/automations/check_mk.py | 1 + cmk_base/classic_snmp.py | 6 ++---- cmk_base/config.py | 3 ++- cmk_base/data_sources/snmp.py | 10 ++++------ cmk_base/snmp.py | 1 + cmk_base/snmp_utils.py | 1 + tests/integration/cmk_base/snmp/test_snmp.py | 6 ++++-- tests/unit/cmk_base/snmp/test_classic_snmp.py | 17 ++++++++++++++--- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index dd56735..beec622 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1233,6 +1233,7 @@ class AutomationDiagHost(Automation): hostname=hostname, ipaddress=ipaddress, credentials=config.snmp_credentials_of(hostname), + port=config.snmp_port_of(hostname), ) data = snmp.get_snmp_table( host_config, diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index d06ee45..78b07fe 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -184,11 +184,9 @@ def get(host_config, oid, context_name=None): def _snmp_port_spec(host_config): - port = config.snmp_port_of(host_config.hostname) - if port is None: + if host_config.port == 161: return "" - - return ":%d" % port + return ":%d" % host_config.port def _snmp_proto_spec(host_config): diff --git a/cmk_base/config.py b/cmk_base/config.py index b76b69c..f9f6480 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -1041,9 +1041,10 @@ def oid_range_limits_of(hostname): def snmp_port_of(hostname): + # type: (str) -> int ports = host_extra_conf(hostname, snmp_ports) if len(ports) == 0: - return None # do not specify a port, use default + return 161 return ports[0] diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index e9fddfb..2bd6f9c 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -64,6 +64,7 @@ class SNMPDataSource(DataSource): self._ignore_check_interval = False self._fetched_check_plugin_names = [] self._credentials = config.snmp_credentials_of(self._hostname) + self._port = config.snmp_port_of(self._hostname) def id(self): return "snmp" @@ -79,6 +80,7 @@ class SNMPDataSource(DataSource): hostname=self._hostname, ipaddress=self._ipaddress, credentials=self._credentials, + port=self._port, ) def describe(self): @@ -100,12 +102,8 @@ class SNMPDataSource(DataSource): else: bulk = "no" - portinfo = config.snmp_port_of(self._hostname) - if portinfo is None: - portinfo = 'default' - - return "%s (%s, Bulk walk: %s, Port: %s, Inline: %s)" % \ - (self.title(), credentials_text, bulk, portinfo, inline) + return "%s (%s, Bulk walk: %s, Port: %d, Inline: %s)" % \ + (self.title(), credentials_text, bulk, self._port, inline) def _from_cache_file(self, raw_data): return ast.literal_eval(raw_data) diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index f9decdd..b2fadf3 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -147,6 +147,7 @@ def create_snmp_host_config(hostname): hostname=hostname, ipaddress=ip_lookup.lookup_ipv4_address(hostname), credentials=config.snmp_credentials_of(hostname), + port=config.snmp_port_of(hostname), ) diff --git a/cmk_base/snmp_utils.py b/cmk_base/snmp_utils.py index 0f80127..7885152 100644 --- a/cmk_base/snmp_utils.py +++ b/cmk_base/snmp_utils.py @@ -75,4 +75,5 @@ SNMPHostConfig = NamedTuple("SNMPHostConfig", [ ("hostname", str), ("ipaddress", str), ("credentials", SNMPCredentials), + ("port", int), ]) diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index 3ccadb9..81705a8 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -1,7 +1,6 @@ import subprocess import logging import os -import copy import pytest # type: ignore from pathlib2 import Path from testlib import cmk_path, wait_until @@ -42,7 +41,6 @@ def snmpsim(site, request, tmp_path_factory, monkeymodule): cmd = "%s/.venv/bin/snmpsimd.py" % cmk_path() source_data_dir = Path(request.fspath.dirname) / "snmp_data" - monkeymodule.setattr(config, "snmp_port_of", lambda h: 1337) log.set_verbosity(2) debug.enable() @@ -75,6 +73,7 @@ def snmpsim(site, request, tmp_path_factory, monkeymodule): ipaddress="127.0.0.1", hostname="localhost", credentials="public", + port=1337, ) # Ensure that snmpsim is ready for clients before starting with the tests @@ -141,6 +140,7 @@ def test_get_single_oid_ipv6(snmpsim, backend, monkeypatch): ipaddress="::1", hostname="localhost", credentials="public", + port=1337, ) monkeypatch.setattr(config, "is_ipv6_primary", lambda h: True) result = snmp.get_single_oid(host_config, ".1.3.6.1.2.1.1.1.0") @@ -155,6 +155,7 @@ def test_get_single_oid_snmpv3(snmpsim, backend, monkeypatch): ipaddress="127.0.0.1", hostname="localhost", credentials=('authNoPriv', 'md5', 'authOnlyUser', 'authOnlyUser'), + port=1337, ) result = snmp.get_single_oid(host_config, ".1.3.6.1.2.1.1.1.0") assert result == "Linux zeus 4.8.6.5-smp #2 SMP Sun Nov 13 14:58:11 CDT 2016 i686" @@ -253,6 +254,7 @@ def test_get_single_oid_not_resolvable(snmpsim, backend): ipaddress="bla.local", hostname="localhost", credentials="public", + port=1337, ) assert snmp.get_single_oid(host_config, ".1.3.6.1.2.1.1.7.0") is None diff --git a/tests/unit/cmk_base/snmp/test_classic_snmp.py b/tests/unit/cmk_base/snmp/test_classic_snmp.py index 4fda7fd..870e1a8 100644 --- a/tests/unit/cmk_base/snmp/test_classic_snmp.py +++ b/tests/unit/cmk_base/snmp/test_classic_snmp.py @@ -11,15 +11,21 @@ def host_config(): hostname="localhost", ipaddress="127.0.0.1", credentials="public", + port=161, ) @pytest.mark.parametrize("port,expected", [ - (None, ""), + (161, ""), (1234, ":1234"), ]) -def test_snmp_port_spec(monkeypatch, port, expected, host_config): - monkeypatch.setattr(config, "snmp_port_of", lambda h: port) +def test_snmp_port_spec(port, expected): + host_config = snmp_utils.SNMPHostConfig( + hostname="localhost", + ipaddress="127.0.0.1", + credentials="public", + port=port, + ) assert classic_snmp._snmp_port_spec(host_config) == expected @@ -48,6 +54,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ hostname="localhost", ipaddress="127.0.0.1", credentials="public", + port=161, ), is_bulkwalk_host=True, bulk_walk_size_of=10, @@ -66,6 +73,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ hostname="lohost", ipaddress="127.0.0.1", credentials="public", + port=161, ), is_bulkwalk_host=False, bulk_walk_size_of=5, @@ -84,6 +92,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ hostname="lohost", ipaddress="public", credentials=("authNoPriv", "abc", "md5", "abc"), + port=161, ), is_bulkwalk_host=False, bulk_walk_size_of=5, @@ -102,6 +111,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ hostname="lohost", ipaddress="public", credentials=('noAuthNoPriv', 'secname'), + port=161, ), is_bulkwalk_host=False, bulk_walk_size_of=5, @@ -120,6 +130,7 @@ SNMPSettings = collections.namedtuple("SNMPSettings", [ hostname="lohost", ipaddress="127.0.0.1", credentials=('authPriv', 'md5', 'secname', 'auhtpassword', 'DES', 'privacybla'), + port=161, ), is_bulkwalk_host=False, bulk_walk_size_of=5,

5 years, 4 months

Inline SNMP now also uses host_config data structures

by Lars Michelsen

Module: check_mk Branch: master Commit: 0aa7adf337ab1025c6a1d6b39c0242e5fe8d316a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aa7adf337ab10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 18:57:47 2019 +0100 Inline SNMP now also uses host_config data structures Made some classic SNMP methods also use host_config instead of single host attributes. Change-Id: I80f71743447c5c51f9eda63c0a5c08447c3aeeed --- cmk_base/classic_snmp.py | 16 ++++++------- cmk_base/snmp.py | 34 +++++++-------------------- cmk_base/snmp_scan.py | 4 ++-- tests/unit/cmk_base/snmp/test_classic_snmp.py | 17 ++++++++++---- 4 files changed, 32 insertions(+), 39 deletions(-) diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index 277e08f..d06ee45 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -51,8 +51,8 @@ from cmk_base.exceptions import MKSNMPError def walk(host_config, oid, hex_plain=False, context_name=None): - protospec = _snmp_proto_spec(host_config.hostname) - portspec = _snmp_port_spec(host_config.hostname) + protospec = _snmp_proto_spec(host_config) + portspec = _snmp_port_spec(host_config) command = _snmp_walk_command(host_config, context_name) command += [ "-OQ", "-OU", "-On", "-Ot", @@ -144,8 +144,8 @@ def get(host_config, oid, context_name=None): oid_prefix = oid commandtype = "get" - protospec = _snmp_proto_spec(host_config.hostname) - portspec = _snmp_port_spec(host_config.hostname) + protospec = _snmp_proto_spec(host_config) + portspec = _snmp_port_spec(host_config) command = _snmp_base_command(commandtype, host_config, context_name) + \ [ "-On", "-OQ", "-Oe", "-Ot", "%s%s%s" % (protospec, host_config.ipaddress, portspec), @@ -183,16 +183,16 @@ def get(host_config, oid, context_name=None): return value -def _snmp_port_spec(hostname): - port = config.snmp_port_of(hostname) +def _snmp_port_spec(host_config): + port = config.snmp_port_of(host_config.hostname) if port is None: return "" return ":%d" % port -def _snmp_proto_spec(hostname): - if config.is_ipv6_primary(hostname): +def _snmp_proto_spec(host_config): + if config.is_ipv6_primary(host_config.hostname): return "udp6:" return "" diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 891ee7c..e7128b6 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -94,15 +94,15 @@ def write_single_oid_cache(host_config): store.save_data_to_file(cache_path, _g_single_oid_cache, pretty=False) -def set_single_oid_cache(hostname, oid, value): +def set_single_oid_cache(host_config, oid, value): _g_single_oid_cache[oid] = value -def _is_in_single_oid_cache(hostname, oid): +def _is_in_single_oid_cache(host_config, oid): return oid in _g_single_oid_cache -def _get_oid_from_single_oid_cache(hostname, oid): +def _get_oid_from_single_oid_cache(host_config, oid): return _g_single_oid_cache.get(oid) @@ -258,9 +258,9 @@ def get_single_oid(host_config, oid, check_plugin_name=None, do_snmp_scan=True): oid = '.' + oid # TODO: Use generic cache mechanism - if _is_in_single_oid_cache(host_config.hostname, oid): + if _is_in_single_oid_cache(host_config, oid): console.vverbose(" Using cached OID %s: " % oid) - value = _get_oid_from_single_oid_cache(host_config.hostname, oid) + value = _get_oid_from_single_oid_cache(host_config, oid) console.vverbose("%s%s%s%s\n" % (tty.bold, tty.green, value, tty.normal)) return value @@ -287,12 +287,7 @@ def get_single_oid(host_config, oid, check_plugin_name=None, do_snmp_scan=True): for context_name in snmp_contexts: try: if config.is_inline_snmp_host(host_config.hostname): - value = inline_snmp.get( - host_config.hostname, - oid, - ipaddress=host_config.ipaddress, - context_name=context_name, - credentials=host_config.credentials) + value = inline_snmp.get(host_config, oid, context_name=context_name) else: value = classic_snmp.get(host_config, oid, context_name=context_name) @@ -308,18 +303,13 @@ def get_single_oid(host_config, oid, check_plugin_name=None, do_snmp_scan=True): else: console.vverbose("failed.\n") - set_single_oid_cache(host_config.hostname, oid, value) + set_single_oid_cache(host_config, oid, value) return value def walk_for_export(host_config, oid): if config.is_inline_snmp_host(host_config.hostname): - rows = inline_snmp.walk( - host_config.hostname, - None, - oid, - ipaddress=host_config.ipaddress, - credentials=host_config.credentials) + rows = inline_snmp.walk(host_config, None, oid) return inline_snmp.convert_rows_for_stored_walk(rows) return classic_snmp.walk(host_config, oid, hex_plain=True) @@ -404,13 +394,7 @@ def _perform_snmpwalk(host_config, check_plugin_name, base_oid, fetchoid): for context_name in snmp_contexts: if config.is_inline_snmp_host(host_config.hostname): rows = inline_snmp.walk( - host_config.hostname, - check_plugin_name, - fetchoid, - base_oid, - context_name=context_name, - ipaddress=host_config.ipaddress, - credentials=host_config.credentials) + host_config, check_plugin_name, fetchoid, base_oid, context_name=context_name) else: rows = classic_snmp.walk(host_config, fetchoid, context_name=context_name) diff --git a/cmk_base/snmp_scan.py b/cmk_base/snmp_scan.py index 048c25e..6a2495e 100644 --- a/cmk_base/snmp_scan.py +++ b/cmk_base/snmp_scan.py @@ -88,8 +88,8 @@ def _snmp_scan(host_config, # Fake OID values to prevent issues with a lot of scan functions console.vverbose(" Skipping system description OID " "(Set .1.3.6.1.2.1.1.1.0 and .1.3.6.1.2.1.1.2.0 to \"\")\n") - snmp.set_single_oid_cache(host_config.hostname, ".1.3.6.1.2.1.1.1.0", "") - snmp.set_single_oid_cache(host_config.hostname, ".1.3.6.1.2.1.1.2.0", "") + snmp.set_single_oid_cache(host_config, ".1.3.6.1.2.1.1.1.0", "") + snmp.set_single_oid_cache(host_config, ".1.3.6.1.2.1.1.2.0", "") found_check_plugin_names = [] if for_inv: diff --git a/tests/unit/cmk_base/snmp/test_classic_snmp.py b/tests/unit/cmk_base/snmp/test_classic_snmp.py index 6068c13..4fda7fd 100644 --- a/tests/unit/cmk_base/snmp/test_classic_snmp.py +++ b/tests/unit/cmk_base/snmp/test_classic_snmp.py @@ -5,22 +5,31 @@ import cmk_base.classic_snmp as classic_snmp import cmk_base.snmp_utils as snmp_utils +(a)pytest.fixture +def host_config(): + return snmp_utils.SNMPHostConfig( + hostname="localhost", + ipaddress="127.0.0.1", + credentials="public", + ) + + @pytest.mark.parametrize("port,expected", [ (None, ""), (1234, ":1234"), ]) -def test_snmp_port_spec(monkeypatch, port, expected): +def test_snmp_port_spec(monkeypatch, port, expected, host_config): monkeypatch.setattr(config, "snmp_port_of", lambda h: port) - assert classic_snmp._snmp_port_spec("localhost") == expected + assert classic_snmp._snmp_port_spec(host_config) == expected @pytest.mark.parametrize("is_ipv6,expected", [ (True, "udp6:"), (False, ""), ]) -def test_snmp_proto_spec(monkeypatch, is_ipv6, expected): +def test_snmp_proto_spec(monkeypatch, is_ipv6, expected, host_config): monkeypatch.setattr(config, "is_ipv6_primary", lambda h: is_ipv6) - assert classic_snmp._snmp_proto_spec("localhost") == expected + assert classic_snmp._snmp_proto_spec(host_config) == expected SNMPSettings = collections.namedtuple("SNMPSettings", [

5 years, 4 months

Moved SNMP is_bulkwalk_Host attribute to SNMPHostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e999e4f2f34039d04ecf8f3e1397e96a68a4bd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e999e4f2f3403… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 19:58:29 2019 +0100 Moved SNMP is_bulkwalk_Host attribute to SNMPHostConfig Change-Id: I549fa28a245d3e67f588be91ff80afa82e8bb8ac --- cmk_base/automations/check_mk.py | 7 ++++--- cmk_base/classic_snmp.py | 4 ++-- cmk_base/config.py | 1 + cmk_base/data_sources/snmp.py | 4 +++- cmk_base/snmp.py | 1 + cmk_base/snmp_utils.py | 1 + tests/integration/cmk_base/snmp/test_snmp.py | 10 +++++++--- tests/unit/cmk_base/snmp/test_classic_snmp.py | 14 +++++++------- tests/unit/cmk_base/snmp/test_snmp_unit.py | 8 ++++++++ 9 files changed, 34 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4e999e4f2f…

5 years, 4 months

Add Windows alert handler example to doc/treasures

by Alexander Wilms

Module: check_mk Branch: master Commit: 8c991b98ecc54dc8f87c8a4897cc2c4603fc546e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c991b98ecc54d… Author: Alexander Wilms <aw(a)mathias-kettner.de> Date: Thu Dec 13 13:34:55 2018 +0100 Add Windows alert handler example to doc/treasures Change-Id: I1b2254953aa786bf4859059958c668520ea4c0fa --- doc/treasures/alert_handler/windows/README | 52 ++++++++++++++++++ doc/treasures/alert_handler/windows/windows_remote | 51 ++++++++++++++++++ .../windows/windows_remote_alert_handler.py | 63 ++++++++++++++++++++++ 3 files changed, 166 insertions(+) diff --git a/doc/treasures/alert_handler/windows/README b/doc/treasures/alert_handler/windows/README new file mode 100644 index 0000000..076654b --- /dev/null +++ b/doc/treasures/alert_handler/windows/README @@ -0,0 +1,52 @@ +#. +# .--Security Warning----------------------------------------------------. +# | ____ _ _ | +# | / ___| ___ ___ _ _ _ __(_) |_ _ _ | +# | \___ \ / _ \/ __| | | | '__| | __| | | | | +# | ___) | __/ (__| |_| | | | | |_| |_| | | +# | |____/ \___|\___|\__,_|_| |_|\__|\__, | | +# | |___/ | +# | __ __ _ | +# | \ \ / /_ _ _ __ _ __ (_)_ __ __ _ | +# | \ \ /\ / / _` | '__| '_ \| | '_ \ / _` | | +# | \ V V / (_| | | | | | | | | | | (_| | | +# | \_/\_/ \__,_|_| |_| |_|_|_| |_|\__, | | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Use this alert handler at your own risk! | +# | It can execute arbritrary code with permissions | +# | of the configured windows user! | +# '----------------------------------------------------------------------' + + + +#. +# .--Installation--------------------------------------------------------. +# | ___ _ _ _ _ _ | +# | |_ _|_ __ ___| |_ __ _| | | __ _| |_(_) ___ _ __ | +# | | || '_ \/ __| __/ _` | | |/ _` | __| |/ _ \| '_ \ | +# | | || | | \__ \ || (_| | | | (_| | |_| | (_) | | | | | +# | |___|_| |_|___/\__\__,_|_|_|\__,_|\__|_|\___/|_| |_| | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' +Check_MK +1. Copy windows_remote to /opt/omd/sites/<mysite>/local/share/check_mk/alert_handlers +2. Copy windows_remote_alert_handler.py to /opt/omd/sites/<mysite>/local/share/check_mk/web/plugins/wato/ +3. Install pypsrp into <mysite>: su - mystite; pip install pypsrp +4. Configure the alert handler rule in WATO/Alert Handlers, supply User, Password and command to execute + +Windows +As user credentials are transferred via network, this alert handler is designed to use HTTPS as transport mode. +Therefore you have to enable the WinRM HTTPS listener on windows, at least with a self signed certificate. +For simplicity the certificate validation is set to false. To increase security you may enable validation and use +valid public certificate chains instead + +1. Create a self-signed certificate using administrative powershell: + New-SelfSignedCertificate -DnsName <myhostname> -CertStoreLocation Cert:\LocalMachine\My +2. Create HTTPS listener and bind certificate to it using administrative cmd: + winrm create winrm/config/Listener?Address=*+Transport=HTTPS @{Hostname="<myhostname>"; CertificateThumbprint="<thumbprint from step 1>"} +3. You may need to open the firewall. Also this will work in the NLA profiles "Domain" and "Private" only! + + diff --git a/doc/treasures/alert_handler/windows/windows_remote b/doc/treasures/alert_handler/windows/windows_remote new file mode 100755 index 0000000..c283b85 --- /dev/null +++ b/doc/treasures/alert_handler/windows/windows_remote @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# PowerShell Remoting Protocol Client + +import os +import sys + +from pypsrp.client import Client + +import cmk.password_store + + +def from_environment(env): + user = os.environ.get("PARAMETER_RUNAS") + password = os.environ.get("PARAMETER_PASSWORD") + command = os.environ.get("PARAMETER_COMMAND") + address = os.environ.get("ALERT_HOSTADDRESS") + + if not user or not command or not password: + sys.stdout.write("Need user, password and command as arguments") + sys.exit(3) + + if not address: + sys.stdout.write("Environment ALERT_HOSTADDRESS is missing\n") + sys.exit(3) + + return user, password, command, address + + +def main(argv=None): + if argv is None: + argv = sys.argv + + user, password, command, address = from_environment(os.environ) + + if password.startswith("store\t"): + password_id = password.split("\t", 1)[1] + try: + password = cmk.password_store.load().get(password_id) + except KeyError: + raise Exception("pwstore: Password '%s' does not exist" % password_id) + elif password.startswith("password\t"): + password = password.split("\t", 1)[1] + + client = Client(address, username=user, password=password, cert_validation=False) + stdout, stderr, rc = client.execute_cmd(command) + + return rc + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/doc/treasures/alert_handler/windows/windows_remote_alert_handler.py b/doc/treasures/alert_handler/windows/windows_remote_alert_handler.py new file mode 100644 index 0000000..45adc69 --- /dev/null +++ b/doc/treasures/alert_handler/windows/windows_remote_alert_handler.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# .------------------------------------------------------------------------. +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | |_____| | +# | _____ _ _ | +# | | ____|_ __ | |_ ___ _ __ _ __ _ __(_)___ ___ | +# | | _| | '_ \| __/ _ \ '__| '_ \| '__| / __|/ _ \ | +# | | |___| | | | || __/ | | |_) | | | \__ \ __/ | +# | |_____|_| |_|\__\___|_| | .__/|_| |_|___/\___| | +# | |_| | +# | _____ _ _ _ _ | +# | | ____|__| (_) |_(_) ___ _ __ | +# | | _| / _` | | __| |/ _ \| '_ \ | +# | | |__| (_| | | |_| | (_) | | | | | +# | |_____\__,_|_|\__|_|\___/|_| |_| | +# | | +# | mathias-kettner.com mathias-kettner.de | +# '------------------------------------------------------------------------' +# This file is part of the Check_MK Enterprise Edition (CEE). +# Copyright by Mathias Kettner and Mathias Kettner GmbH. All rights reserved. +# +# Distributed under the Check_MK Enterprise License. +# +# You should have received a copy of the Check_MK Enterprise License +# along with Check_MK. If not, email to mk(a)mathias-kettner.de +# or write to the postal address provided at www.mathias-kettner.de + + +register_alert_handler_parameters( + "windows_remote", + Dictionary( + title = _("Remote execution on Windows via WMI"), + help = _("This alert handler allows the remote execution of scripts and programs " + "on Windows systems via WMI. Please note that this configuration is saved " + "in clear text (including the password!). We have not made any influence on " + "the security settings of the target Window hosts. If you don't secure the " + "WMI access, the credentials might be used to execute arbitrary commands on " + "the remote system. Use with caution!"), + elements = [ + ("runas", TextAscii( + title = _("User to run handler as"), + allow_empty = False, + regex = re.compile('^[a-zA-Z_][-/a-zA-Z0-9_\\\\]*$'), + regex_error = _("Your input does not match the required format.") \ + + " " + _("Expected syntax: [domain/]username") + )), + ("password", PasswordFromStore( + title = _("Password of the user"), + allow_empty = False, + )), + ("command", TextAscii( + title = _("Command to execute"), + allow_empty = False, + )), + ], + optional_keys = False, + ) +)

5 years, 4 months

7100 mk_sap_hana: Refactored plugin; Deprecated old checks; Add new checks

by Simon Betz

Module: check_mk Branch: master Commit: 30fb2e58171213d9d196ced26f3406f12c6c4e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30fb2e58171213… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sun Feb 24 16:58:22 2019 +0100 7100 mk_sap_hana: Refactored plugin; Deprecated old checks; Add new checks Deprecated checks are: sap_hana_filesystem, sap_hana_full_backup, sap_hana_mem, sap_hana_process_list, sap_hana_version, New checks are: sap_hana_backup, sap_hana_data_volume, sap_hana_diskusage, sap_hana_ess, sap_hana_events, sap_hana_license, sap_hana_memrate, sap_hana_proc, sap_hana_replication_status, sap_hana_status, In order to make the SAP HANA checks work you have to install the agent plugin {{mk_sap_hana}} on your clients. If you have installed the old agent plugin then you have to perform a rediscovery on these hosts. Thanks to Robert S. and Werner F. Change-Id: Ifec16db32f8b83d8712d95f0c37438415e390760 --- .werks/7100 | 38 ++ agents/plugins/mk_sap_hana | 514 ++++++++++++++++++---- checkman/sap_hana_backup | 25 ++ checkman/sap_hana_data_volume | 21 + checkman/sap_hana_diskusage | 24 + checkman/sap_hana_ess | 23 + checkman/sap_hana_events | 21 + checkman/sap_hana_license | 28 ++ checkman/sap_hana_memrate | 20 + checkman/sap_hana_proc | 23 + checkman/sap_hana_replication_status | 24 + checkman/sap_hana_status | 20 + checks/sap_hana.include | 38 ++ checks/sap_hana_backup | 103 +++++ checks/sap_hana_data_volume | 96 ++++ checks/sap_hana_diskusage | 94 ++++ checks/sap_hana_ess | 87 ++++ checks/sap_hana_events | 83 ++++ checks/sap_hana_filesystem | 25 +- checks/sap_hana_full_backup | 36 +- checks/sap_hana_license | 138 ++++++ checks/sap_hana_mem | 76 +--- checks/sap_hana_memrate | 74 ++++ checks/sap_hana_proc | 86 ++++ checks/sap_hana_process_list | 42 +- checks/sap_hana_replication_status | 82 ++++ checks/sap_hana_status | 74 ++++ checks/sap_hana_version | 32 +- cmk/gui/plugins/metrics/check_mk.py | 24 + cmk/gui/plugins/wato/check_parameters/sap_hana.py | 209 +++++++++ 30 files changed, 1908 insertions(+), 272 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=30fb2e5817…

5 years, 4 months

7183 FIX Metrics: Do not auto graph metrics that are part of a graph but have no metric_info

by Lars Michelsen

Module: check_mk Branch: master Commit: 848eef61f8a58dd8f74e4c6f455ccdcc39c1c953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=848eef61f8a58d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 12:42:21 2019 +0100 7183 FIX Metrics: Do not auto graph metrics that are part of a graph but have no metric_info When adding a new metric to a service, the metric system automatically renders this metric as single graph until a graph definition is added that renders this metric. In this moment the automatically rendered metric is hidden. This logic only worked for metrics that already have a metric_info definition. Now, if you add a new metric without specifying a metric_info for it, but add it to a graph_info, the automatically created single metric graph will now also be hidden. Change-Id: I28d7d5356ce3948ea430a03882356010052483c0 --- .werks/7183 | 16 ++++++++++++++++ cmk/gui/plugins/metrics/utils.py | 6 ++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/7183 b/.werks/7183 new file mode 100644 index 0000000..5f9c4e8 --- /dev/null +++ b/.werks/7183 @@ -0,0 +1,16 @@ +Title: Metrics: Do not auto graph metrics that are part of a graph but have no metric_info +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551094759 +Class: fix + +When adding a new metric to a service, the metric system automatically renders this metric +as single graph until a graph definition is added that renders this metric. In this moment +the automatically rendered metric is hidden. + +This logic only worked for metrics that already have a metric_info definition. Now, if +you add a new metric without specifying a metric_info for it, but add it to a graph_info, +the automatically created single metric graph will now also be hidden. diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py index 5c55289..71a4f58 100644 --- a/cmk/gui/plugins/metrics/utils.py +++ b/cmk/gui/plugins/metrics/utils.py @@ -598,8 +598,10 @@ def _metrics_used_in_definition(metric_definition): parts = without_color.split(",") for part in parts: metric_name = part.split(".")[0] # drop .min, .max, .average - if metric_name in metric_info: - yield metric_name + if metric_name in rpn_operators: + continue + + yield metric_name def _graph_possible(graph_template, translated_metrics):

5 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
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