Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

GUI CSS: Refactored wato styles to nested structure meeting sasslint requirements (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 856078b1dc8591246bb56ee3f5c882b769480365 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=856078b1dc8591… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Apr 22 16:09:28 2019 +0200 GUI CSS: Refactored wato styles to nested structure meeting sasslint requirements (CMK-1171) Change-Id: I4cbe596cca50d1a81df0dcc0d74214e82b57ecd2 --- web/htdocs/themes/facelift/scss/_wato.scss | 416 ++++++++++++++--------------- 1 file changed, 207 insertions(+), 209 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=856078b1dc…

5 years, 2 months

GUI CSS: Deployed more wato styles (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: cc5ef55342887a1fc71cfc4f10d8a880ae2bc068 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc5ef55342887a… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Apr 22 15:38:40 2019 +0200 GUI CSS: Deployed more wato styles (CMK-1171) Change-Id: Ideb48e2c7782ecf430d21eca6d1396143a146fb1 --- web/htdocs/themes/facelift/scss/_main.scss | 80 +--- web/htdocs/themes/facelift/scss/_wato.scss | 579 +++++++++++++++-------------- 2 files changed, 306 insertions(+), 353 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cc5ef55342…

5 years, 2 months

postgres_stats: add gen data reg test

by Florian Kromer

Module: check_mk Branch: master Commit: 81017bbfb2427c07714635b6041e73120076ed86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81017bbfb2427c… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Apr 24 10:57:06 2019 +0200 postgres_stats: add gen data reg test Change-Id: Iafc2b70c5e8a287a1f7afce969a41c1f6b1ae14c --- .../checks/generictests/datasets/postgres_stats.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/postgres_stats.py b/tests/unit/checks/generictests/datasets/postgres_stats.py new file mode 100644 index 0000000..5ae2a18 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/postgres_stats.py @@ -0,0 +1,40 @@ +# yapf: disable + + +checkname = 'postgres_stats' + + +freeze_time = '2019-01-12 00:00:00' + + +info = [[u'[databases_start]'], + [u'postgres'], + [u'adwebconnect'], + [u'[databases_end]'], + [u'datname', u'sname', u'tname', u'vtime', u'atime'], + [u'postgres', u'pg_catalog', u'pg_statistic', u'-1', u'-1'], + [u'adwebconnect', u'public', u'serveraktion', u'1488881726', u'1488881726'], + [u'adwebconnect', u'pg_catalog', u'pg_statistic', u'1488882719', u'-1'], + [u'adwebconnect', u'public', u'auftrag', u'1489001316', u'1489001316'], + [u'adwebconnect', u'public', u'anrede', u'-1', u'-1'], + [u'adwebconnect', u'public', u'auftrag_mediadaten', u'-1', u'']] + + +discovery = {'': [(u'ANALYZE adwebconnect', {}), + (u'ANALYZE postgres', {}), + (u'VACUUM adwebconnect', {}), + (u'VACUUM postgres', {})]} + + +checks = {'': [(u'ANALYZE adwebconnect', + {}, + [(0, u'Table: auftrag', []), + (0, 'Time since last vacuum 674 d', []), + (1, u'2 tables were never analyzed: anrede/auftrag_mediadaten', [])]), + (u'ANALYZE postgres', {}, [(0, 'No never checked tables', [])]), + (u'VACUUM adwebconnect', + {}, + [(0, u'Table: auftrag', []), + (0, 'Time since last vacuum 674 d', []), + (1, u'2 tables were never vacuumed: anrede/auftrag_mediadaten', [])]), + (u'VACUUM postgres', {}, [(0, 'No never checked tables', [])])]} \ No newline at end of file

5 years, 2 months

7304 FIX Solaris uptime require across global & local zones

by Óscar Nájera

Module: check_mk Branch: master Commit: 5c157d19ff569c454c315286b0e50217235d6553 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c157d19ff569c… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Apr 16 12:40:16 2019 +0200 7304 FIX Solaris uptime require across global & local zones Solaris uptime check was not correctly working since not all versions of Solaris and within global and local zones return consistent information. This fix reverts Werk 4623, which fixed the problem for some setups but broke it for others. Currently Solaris agent will deliver more system information about uptime. The check performs a cross validation of data, if values are consistent uptime is returned. For inconsistent values, check goes into UNKNOWN state and user is required to fix/patch their Solaris system. Additional information of conflicting data is given to the user. An agent update is needed. CMK-1566 Change-Id: Ia27c852231ccc8bad2f19ae6ae6aaf3f3280fee0 --- .werks/7304 | 23 +++++++ agents/check_mk_agent.solaris | 17 +++-- checks/uptime | 119 ++++++++++++++++++++++++++++++++- tests/unit/checks/test_uptime_check.py | 79 +++++++++++++++++++++- 4 files changed, 227 insertions(+), 11 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c157d19ff…

5 years, 2 months

Fixed site ids in new integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 58d46108add4b8c56b4a03a9d058b8d715ffb190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58d46108add4b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 24 09:10:52 2019 +0200 Fixed site ids in new integration tests Change-Id: Ib3b0d0651b1ef20ff8fdb01633a047952afbdf48 --- tests/integration/cmk/gui/test_webapi.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 0ce98db..28a34dd 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -906,9 +906,7 @@ def test_get_inventory(web): def test_get_user_sites(web, graph_test_config): - assert web.get_user_sites() == [ - [u'heute', u'Der Master'], - ] + assert web.get_user_sites()[0][0] == web.site.id def test_get_host_names(web, graph_test_config): @@ -962,11 +960,11 @@ def test_get_graph_recipes(web, graph_test_config): u'expression': [ u'operator', u'+', [[ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', u'user_time', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'user_time', None, 1.0 ], [ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'children_user_time', None, 1.0 ]] ], @@ -979,11 +977,11 @@ def test_get_graph_recipes(web, graph_test_config): u'expression': [ u'operator', u'+', [[ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'system_time', None, 1.0 ], [ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'children_system_time', None, 1.0 ]] ], @@ -994,7 +992,7 @@ def test_get_graph_recipes(web, graph_test_config): { u'color': u'#00b2ff', u'expression': [ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'cmk_time_agent', None, 1.0 ], u'line_type': u'stack', @@ -1004,7 +1002,7 @@ def test_get_graph_recipes(web, graph_test_config): { u'color': u'#00d1ff', u'expression': [ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'cmk_time_ds', None, 1.0 ], u'line_type': u'stack', @@ -1014,7 +1012,7 @@ def test_get_graph_recipes(web, graph_test_config): { u'color': u'#d080af', u'expression': [ - u'rrd', u'heute', u'test-host-get-graph', u'Check_MK', + u'rrd', web.site.id, u'test-host-get-graph', u'Check_MK', u'execution_time', None, 1.0 ], u'line_type': u'line', @@ -1028,7 +1026,7 @@ def test_get_graph_recipes(web, graph_test_config): u'graph_index': 0, u'host_name': u'test-host-get-graph', u'service_description': u'Check_MK', - u'site': u'heute' + u'site': web.site.id } ], u'title': u'Time usage by phase',

5 years, 2 months

Rename SNMPHostConfig vars to snmp_config

by Lars Michelsen

Module: check_mk Branch: master Commit: ebb2ea072b09c57bc8d377cbe8d7d92b0b46cfc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebb2ea072b09c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 18 21:00:14 2019 +0200 Rename SNMPHostConfig vars to snmp_config Change-Id: If9ad0b6b30943d54683c23868660d36ed5d12740 --- cmk_base/automations/check_mk.py | 4 +- cmk_base/classic_snmp.py | 70 +++++++-------- cmk_base/data_sources/snmp.py | 6 +- cmk_base/snmp.py | 122 +++++++++++++------------- cmk_base/snmp_utils.py | 7 +- tests/integration/cmk_base/snmp/test_snmp.py | 90 +++++++++---------- tests/unit/cmk_base/snmp/test_classic_snmp.py | 24 ++--- 7 files changed, 162 insertions(+), 161 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ebb2ea072b…

5 years, 2 months

Move last SNMP related settings to SNMPHostConfig

by Lars Michelsen

Module: check_mk Branch: master Commit: 35510f2140c7f3889444ad144b10a783c77dc439 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35510f2140c7f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 21 19:37:48 2019 +0200 Move last SNMP related settings to SNMPHostConfig All top level cmk_base.config SNMP related functions have been moved to be wrapped in a single object SNMPHostConfig(). This object is handed over to all SNMP processing code to tell it how to work with a host. Cleaned up SNMP integration tests on the way. Change-Id: I2f8104b7678b2e06788abae8dc3a2aef1a9f6d78 --- cmk_base/automations/check_mk.py | 2 + cmk_base/checking.py | 6 +- cmk_base/config.py | 25 ++-- cmk_base/crash_reporting.py | 6 +- cmk_base/data_sources/snmp.py | 4 +- cmk_base/snmp.py | 7 +- cmk_base/snmp_utils.py | 2 + tests/integration/cmk_base/snmp/test_snmp.py | 196 ++++++++++---------------- tests/unit/cmk_base/snmp/test_classic_snmp.py | 14 ++ 9 files changed, 112 insertions(+), 150 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=35510f2140…

5 years, 2 months

Move SNMPHostConfig instanciation to HostConfig.snmp_config()

by Lars Michelsen

Module: check_mk Branch: master Commit: f1ad452b0166e42d6db4d438fdaf011c2eb7dd3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1ad452b0166e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 19 07:30:23 2019 +0200 Move SNMPHostConfig instanciation to HostConfig.snmp_config() Change-Id: Ie4e05d08cd3e3993ca71bc54b50668616241acae --- cmk_base/config.py | 16 ++++++++++++++++ cmk_base/data_sources/snmp.py | 36 ++++++++---------------------------- cmk_base/snmp.py | 14 +------------- 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 5e4d5b3..167f487 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -56,6 +56,7 @@ import cmk_base.utils import cmk_base.check_api_utils as check_api_utils import cmk_base.cleanup import cmk_base.piggyback as piggyback +import cmk_base.snmp_utils from cmk_base.discovered_labels import DiscoveredHostLabelsStore # TODO: Prefix helper functions with "_". @@ -2688,6 +2689,21 @@ class HostConfig(object): # type: () -> Dict return DiscoveredHostLabelsStore(self.hostname).load() + def snmp_config(self, ipaddress): + # type: (str) -> cmk_base.snmp_utils.SNMPHostConfig + return cmk_base.snmp_utils.SNMPHostConfig( + is_ipv6_primary=self.is_ipv6_primary, + hostname=self.hostname, + ipaddress=ipaddress, + credentials=snmp_credentials_of(self.hostname), + port=snmp_port_of(self.hostname), + is_bulkwalk_host=is_bulkwalk_host(self.hostname), + is_snmpv2or3_without_bulkwalk_host=is_snmpv2or3_without_bulkwalk_host(self.hostname), + bulk_walk_size_of=bulk_walk_size_of(self.hostname), + timing=snmp_timing_of(self.hostname), + oid_range_limits=oid_range_limits_of(self.hostname), + ) + #. # .--Configuration Cache-------------------------------------------------. diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 97c13b5..b360abc 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -61,11 +61,6 @@ class SNMPDataSource(DataSource): self._use_snmpwalk_cache = True 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) - self._is_bulkwalk_host = config.is_bulkwalk_host(self._hostname) - self._is_snmpv2or3_without_bulkwalk_host = config.is_snmpv2or3_without_bulkwalk_host( - self._hostname) def id(self): return "snmp" @@ -76,23 +71,8 @@ class SNMPDataSource(DataSource): def _cpu_tracking_id(self): return "snmp" - # TODO: Replace SNMPHostConfig with HostConfig - def _get_host_config(self): - # type: () -> snmp_utils.SNMPHostConfig - return snmp_utils.SNMPHostConfig( - is_ipv6_primary=self._host_config.is_ipv6_primary, - hostname=self._hostname, - ipaddress=self._ipaddress, - credentials=self._credentials, - port=self._port, - is_bulkwalk_host=self._is_bulkwalk_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), - ) - def describe(self): + snmp_config = self._host_config.snmp_config(self._ipaddress) if config.is_usewalk_host(self._hostname): return "SNMP (use stored walk)" @@ -101,18 +81,18 @@ class SNMPDataSource(DataSource): else: inline = "no" - if snmp_utils.is_snmpv3_host(self._get_host_config()): - credentials_text = "Credentials: '%s'" % ", ".join(self._credentials) + if snmp_utils.is_snmpv3_host(snmp_config): + credentials_text = "Credentials: '%s'" % ", ".join(snmp_config.credentials) else: - credentials_text = "Community: %r" % self._credentials + credentials_text = "Community: %r" % snmp_config.credentials - if snmp_utils.is_snmpv3_host(self._get_host_config()) or self._is_bulkwalk_host: + if snmp_utils.is_snmpv3_host(snmp_config) or snmp_config.is_bulkwalk_host: bulk = "yes" else: bulk = "no" return "%s (%s, Bulk walk: %s, Port: %d, Inline: %s)" % \ - (self.title(), credentials_text, bulk, self._port, inline) + (self.title(), credentials_text, bulk, snmp_config.port, inline) def _from_cache_file(self, raw_data): return ast.literal_eval(raw_data) @@ -164,7 +144,7 @@ class SNMPDataSource(DataSource): return self._check_plugin_names[(self._hostname, self._ipaddress)] except KeyError: check_plugin_names = self._check_plugin_name_filter_func( - self._get_host_config(), + self._host_config.snmp_config(self._ipaddress), on_error=self._on_error, do_snmp_scan=self._do_snmp_scan, for_mgmt_board=self._for_mgmt_board) @@ -178,7 +158,7 @@ class SNMPDataSource(DataSource): check_plugin_names = self.get_check_plugin_names() - host_config = self._get_host_config() + host_config = self._host_config.snmp_config(self._ipaddress) info = {} for check_plugin_name in self._sort_check_plugin_names(check_plugin_names): # Is this an SNMP table check? Then snmp_info specifies the OID to fetch diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index e15644f..78158fc 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -142,7 +142,6 @@ def _clear_other_hosts_oid_cache(hostname): # '----------------------------------------------------------------------' -# TODO: Replace SNMPHostConfig with HostConfig def create_snmp_host_config(hostname): # type: (str) -> cmk_base.snmp_utils.SNMPHostConfig host_config = config.get_config_cache().get_host_config(hostname) @@ -153,18 +152,7 @@ def create_snmp_host_config(hostname): if address is None: raise MKGeneralException("Failed to gather IP address of %s" % hostname) - return cmk_base.snmp_utils.SNMPHostConfig( # type: ignore - is_ipv6_primary=host_config.is_ipv6_primary, - hostname=hostname, - ipaddress=address, - credentials=config.snmp_credentials_of(hostname), - port=config.snmp_port_of(hostname), - is_bulkwalk_host=config.is_bulkwalk_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), - ) + return host_config.snmp_config(address) # TODO: OID_END_OCTET_STRING is not used at all. Drop it.

5 years, 2 months

Extend SNMP integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: c97db07d4d9ccdde812176c977f897be897a0057 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c97db07d4d9ccd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 20 17:58:32 2019 +0200 Extend SNMP integration tests Change-Id: I2a223be0d2ab4a76c8569d140ad9fb969487ebf3 --- tests/integration/cmk_base/snmp/test_snmp.py | 55 ++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index 37fd2e5..db72098 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -484,15 +484,27 @@ def test_get_simple_snmp_table_oid_end_bin(snmpsim, backend): ] -def test_walk_for_export(snmpsim, backend): - if backend == "stored_snmp": - pytest.skip("Not relevant") - +def test_get_simple_snmp_table_with_hex_str(snmpsim, backend): snmp_config = snmpsim[1] - oid = ".1.3.6.1.2.1.11" - table = snmp.walk_for_export(snmp_config, oid) + + table = snmp.get_snmp_table( + snmp_config, + check_plugin_name=None, + oid_info=(".1.3.6.1.2.1.2.2.1", [ + "6", + ]), + use_snmpwalk_cache=False) assert table == [ + [u''], + [ + u'\x00\x12yb\xf9@', + ], + ] + + +(a)pytest.mark.parametrize("oid,expected_table", [ + (".1.3.6.1.2.1.11", [ ('.1.3.6.1.2.1.11.1.0', '4294967295'), ('.1.3.6.1.2.1.11.2.0', '4294967295'), ('.1.3.6.1.2.1.11.3.0', '877474094'), @@ -505,4 +517,33 @@ def test_walk_for_export(snmpsim, backend): ('.1.3.6.1.2.1.11.11.0', '292505902'), ('.1.3.6.1.2.1.11.12.0', '315362353'), ('.1.3.6.1.2.1.11.13.0', '4294967295'), - ] + ]), + (".1.3.6.1.2.1.1.9.1.3", [ + ('.1.3.6.1.2.1.1.9.1.3.1', 'The SNMP Management Architecture MIB.'), + ('.1.3.6.1.2.1.1.9.1.3.2', 'The MIB for Message Processing and Dispatching.'), + ('.1.3.6.1.2.1.1.9.1.3.3', + 'The management information definitions for the SNMP User-based Security Model.'), + ('.1.3.6.1.2.1.1.9.1.3.4', 'The MIB module for SNMPv2 entities'), + ('.1.3.6.1.2.1.1.9.1.3.5', 'The MIB module for managing TCP implementations'), + ('.1.3.6.1.2.1.1.9.1.3.6', 'The MIB module for managing IP and ICMP implementations'), + ('.1.3.6.1.2.1.1.9.1.3.7', 'The MIB module for managing UDP implementations'), + ('.1.3.6.1.2.1.1.9.1.3.8', 'View-based Access Control Model for SNMP.'), + ]), + (".1.3.6.1.2.1.4.21.1.1", [ + ('.1.3.6.1.2.1.4.21.1.1.0.0.0.0', '0.0.0.0'), + ('.1.3.6.1.2.1.4.21.1.1.127.0.0.0', '127.0.0.0'), + ('.1.3.6.1.2.1.4.21.1.1.195.218.254.0', '195.218.254.0'), + ]), + (".1.3.6.1.2.1.2.2.1.6", [ + ('.1.3.6.1.2.1.2.2.1.6.1', ''), + ('.1.3.6.1.2.1.2.2.1.6.2', '"00 12 79 62 F9 40 "'), + ]), +]) +def test_walk_for_export(snmpsim, backend, oid, expected_table): + if backend == "stored_snmp": + pytest.skip("Not relevant") + + snmp_config = snmpsim[1] + table = snmp.walk_for_export(snmp_config, oid) + + assert table == expected_table

5 years, 2 months

Cleanup all direct config.is_bulkwalk_host/

by Lars Michelsen

is_snmpv2or3_without_bulkwalk_host calls Message-ID: <5cc0179a.lrWTRkuL9CjNKIAM%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: 8af1e4d577870ab4496eb040fa7307c39e2181ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8af1e4d577870a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 18 21:15:26 2019 +0200 Cleanup all direct config.is_bulkwalk_host/is_snmpv2or3_without_bulkwalk_host calls Change-Id: I5a314ab298682c9555e7b048180957e4a0dbcd1e --- cmk_base/config.py | 17 +++-------------- tests/unit/cmk_base/snmp/test_snmp_unit.py | 11 +++++++---- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 167f487..f10b0d6 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -912,14 +912,6 @@ def snmp_port_of(hostname): return ports[0] -def is_bulkwalk_host(hostname): - # type: (str) -> bool - if bulkwalk_hosts: - return get_config_cache().in_binary_hostlist(hostname, bulkwalk_hosts) - - return False - - def bulk_walk_size_of(hostname): bulk_sizes = get_config_cache().host_extra_conf(hostname, snmp_bulk_size) if not bulk_sizes: @@ -928,10 +920,6 @@ def bulk_walk_size_of(hostname): return bulk_sizes[0] -def is_snmpv2or3_without_bulkwalk_host(hostname): - return get_config_cache().in_binary_hostlist(hostname, snmpv2c_hosts) - - # TODO: Replace call sites with HostConfig access and remove this def is_usewalk_host(hostname): return get_config_cache().get_host_config(hostname).is_usewalk_host @@ -2697,8 +2685,9 @@ class HostConfig(object): ipaddress=ipaddress, credentials=snmp_credentials_of(self.hostname), port=snmp_port_of(self.hostname), - is_bulkwalk_host=is_bulkwalk_host(self.hostname), - is_snmpv2or3_without_bulkwalk_host=is_snmpv2or3_without_bulkwalk_host(self.hostname), + is_bulkwalk_host=self._config_cache.in_binary_hostlist(self.hostname, bulkwalk_hosts), + is_snmpv2or3_without_bulkwalk_host=self._config_cache.in_binary_hostlist( + self.hostname, snmpv2c_hosts), bulk_walk_size_of=bulk_walk_size_of(self.hostname), timing=snmp_timing_of(self.hostname), oid_range_limits=oid_range_limits_of(self.hostname), diff --git a/tests/unit/cmk_base/snmp/test_snmp_unit.py b/tests/unit/cmk_base/snmp/test_snmp_unit.py index 6f160c8..f0fc37d 100644 --- a/tests/unit/cmk_base/snmp/test_snmp_unit.py +++ b/tests/unit/cmk_base/snmp/test_snmp_unit.py @@ -1,6 +1,8 @@ # encoding: utf-8 -import pytest +import pytest # type: ignore +from testlib.base import Scenario + import cmk_base.config as config import cmk_base.snmp as snmp @@ -22,8 +24,9 @@ def test_sanitize_snmp_encoding(monkeypatch, encoding, columns, expected): def test_is_bulkwalk_host(monkeypatch): - monkeypatch.setattr(config, "bulkwalk_hosts", [ + ts = Scenario().set_ruleset("bulkwalk_hosts", [ ([], ["localhost"], {}), ]) - assert config.is_bulkwalk_host("abc") is False - assert config.is_bulkwalk_host("localhost") is True + config_cache = ts.apply(monkeypatch) + assert config_cache.get_host_config("abc").snmp_config("").is_bulkwalk_host is False + assert config_cache.get_host_config("localhost").snmp_config("").is_bulkwalk_host is True

5 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019