Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Cleanup all direct config.is_ipv4v6_host calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 26d36811e4f88701ae7912dbad105f22d22f9f3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d36811e4f887… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 22:37:48 2019 +0200 Cleanup all direct config.is_ipv4v6_host calls Change-Id: Ie628fccaa75314c1d37a488d8a177c2e96688155 --- cmk_base/config.py | 5 ----- cmk_base/core_nagios.py | 2 +- cmk_base/dump_host.py | 2 +- tests/unit/cmk_base/test_config.py | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index f0f87ee..259b8b4 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -834,11 +834,6 @@ def parents_of(hostname): # TODO: Replace call sites with HostConfig access and remove this -def is_ipv4v6_host(hostname): - return get_config_cache().get_host_config(hostname).is_ipv4v6_host - - -# TODO: Replace call sites with HostConfig access and remove this def is_ipv6_host(hostname): return get_config_cache().get_host_config(hostname).is_ipv6_host diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index eceecb6..b8cf94b 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -599,7 +599,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): host_attrs["address"], host_config.is_ipv6_primary and 6 or 4, "PING", host_attrs.get("_NODEIPS")) - if config.is_ipv4v6_host(hostname): + if host_config.is_ipv4v6_host: if host_config.is_ipv6_primary: _add_ping_service(cfg, config_cache, hostname, host_attrs["_ADDRESS_4"], 4, "PING IPv4", host_attrs.get("_NODEIPS_4")) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 8a67e68..17ec227 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -56,7 +56,7 @@ def dump_host(hostname): ipaddress = _ip_address_for_dump_host(host_config) addresses = "" - if not config.is_ipv4v6_host(hostname): + if not host_config.is_ipv4v6_host: addresses = ipaddress else: try: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 725e512..9e7a550 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -50,7 +50,6 @@ def test_is_ipv6_host(monkeypatch, hostname, tags, result): ]) def test_is_ipv4v6_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_ipv4v6_host(hostname) == result assert config_cache.get_host_config(hostname).is_ipv4v6_host == result

5 years, 5 months

Cleanup all direct config.is_ipv6_host calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e270d6c1324863ab68cffe9412a7bb87f43f8e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e270d6c132486… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 22:47:05 2019 +0200 Cleanup all direct config.is_ipv6_host calls Change-Id: I9f51e9504bfba1cef6a7242db2b9c3f55e134302 --- cmk_base/config.py | 5 ----- cmk_base/core_config.py | 4 ++-- cmk_base/core_nagios.py | 14 +++++++++----- cmk_base/ip_lookup.py | 8 ++++++-- tests/unit/cmk_base/test_config.py | 1 - 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 259b8b4..9766cb5 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -834,11 +834,6 @@ def parents_of(hostname): # TODO: Replace call sites with HostConfig access and remove this -def is_ipv6_host(hostname): - return get_config_cache().get_host_config(hostname).is_ipv6_host - - -# TODO: Replace call sites with HostConfig access and remove this def is_ipv4_host(hostname): return get_config_cache().get_host_config(hostname).is_ipv4_host diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index bbd4d20..69e3968 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -413,7 +413,7 @@ def get_host_attributes(hostname, config_cache): else: attrs["_ADDRESS_4"] = "" - if config.is_ipv6_host(hostname): + if host_config.is_ipv6_host: attrs["_ADDRESS_6"] = _ip_address_of(host_config, 6) if attrs["_ADDRESS_6"] is None: attrs["_ADDRESS_6"] = "" @@ -492,7 +492,7 @@ def get_cluster_attributes(config_cache, host_config, nodes): node_ips_4.append(fallback_ip_for(node_config, 4)) node_ips_6 = [] - if config.is_ipv6_host(host_config.hostname): + if host_config.is_ipv6_host: for h in sorted_nodes: node_config = config_cache.get_host_config(h) addr = _ip_address_of(node_config, 6) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index b8cf94b..b57dfde 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -981,10 +981,12 @@ def precompile_hostchecks(): if not os.path.exists(cmk.utils.paths.precompiled_hostchecks_dir): os.makedirs(cmk.utils.paths.precompiled_hostchecks_dir) + config_cache = config.get_config_cache() + console.verbose("Precompiling host checks...\n") for host in config.all_active_hosts(): try: - _precompile_hostcheck(host) + _precompile_hostcheck(config_cache, host) except Exception as e: if cmk.utils.debug.enabled(): raise @@ -1008,8 +1010,9 @@ def stripped_python_file(filename): return a -def _precompile_hostcheck(hostname): +def _precompile_hostcheck(config_cache, hostname): import cmk_base.check_table as check_table + host_config = config_cache.get_host_config(hostname) console.verbose("%s%s%-16s%s:", tty.bold, tty.blue, hostname, tty.normal, stream=sys.stderr) @@ -1118,10 +1121,11 @@ if '-d' in sys.argv: needed_ipaddresses, needed_ipv6addresses, = {}, {} if config.is_cluster(hostname): for node in config.nodes_of(hostname): + node_config = config_cache.get_host_config(node) if config.is_ipv4_host(node): needed_ipaddresses[node] = ip_lookup.lookup_ipv4_address(node) - if config.is_ipv6_host(node): + if node_config.is_ipv6_host: needed_ipv6addresses[node] = ip_lookup.lookup_ipv6_address(node) try: @@ -1131,7 +1135,7 @@ if '-d' in sys.argv: pass try: - if config.is_ipv6_host(hostname): + if host_config.is_ipv6_host: needed_ipv6addresses[hostname] = ip_lookup.lookup_ipv6_address(hostname) except: pass @@ -1139,7 +1143,7 @@ if '-d' in sys.argv: if config.is_ipv4_host(hostname): needed_ipaddresses[hostname] = ip_lookup.lookup_ipv4_address(hostname) - if config.is_ipv6_host(hostname): + if host_config.is_ipv6_host: needed_ipv6addresses[hostname] = ip_lookup.lookup_ipv6_address(hostname) output.write("config.ipaddresses = %r\n\n" % needed_ipaddresses) diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index 1811e7d..16fa58a 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -226,13 +226,17 @@ def update_dns_cache(): if e.errno != errno.ENOENT: raise + config_cache = config.get_config_cache() + console.verbose("Updating DNS cache...\n") for hostname in config.all_active_hosts(): + host_config = config_cache.get_host_config(hostname) + # Use intelligent logic. This prevents DNS lookups for hosts # with statically configured addresses, etc. for family in [4, 6]: - if (family == 4 and config.is_ipv4_host(hostname)) \ - or (family == 6 and config.is_ipv6_host(hostname)): + if (family == 4 and host_config.is_ipv4_host) \ + or (family == 6 and host_config.is_ipv6_host): console.verbose("%s (IPv%d)..." % (hostname, family)) try: if family == 4: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 9e7a550..d660dd3 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -37,7 +37,6 @@ def test_is_ipv4_host(monkeypatch, hostname, tags, result): ]) def test_is_ipv6_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_ipv6_host(hostname) == result assert config_cache.get_host_config(hostname).is_ipv6_host == result

5 years, 5 months

Cleanup cycle between HostConfig and PiggybackDataSource

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ddfa5dc6448bfb55020c64bbfd75870779e8495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ddfa5dc6448bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 22:33:16 2019 +0200 Cleanup cycle between HostConfig and PiggybackDataSource Change-Id: I196a4c93d76c920c04b091ead0399ae4af4bdc32 --- cmk_base/config.py | 4 ++-- cmk_base/data_sources/abstract.py | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 1b824d3..a0da1b9 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2737,8 +2737,8 @@ class HostConfig(object): if piggyback.has_piggyback_raw_data(piggyback_max_cachefile_age, self.hostname): return True - from cmk_base.data_sources.piggyback import PiggyBackDataSource - return PiggyBackDataSource(self.hostname, None).has_persisted_agent_sections() + from cmk_base.data_sources.abstract import has_persisted_agent_sections + return has_persisted_agent_sections("piggyback", self.hostname) def _primary_ip_address_family_of(self): rules = self._config_cache.host_extra_conf(self.hostname, primary_address_family) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 768a542..b43fa5d 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -270,10 +270,10 @@ class DataSource(object): return os.path.join(cmk.utils.paths.data_source_cache_dir, self.id()) def _persisted_sections_file_path(self): - return os.path.join(self._persisted_sections_dir(), self._hostname) + return _persisted_sections_file_path(self._persisted_sections_dir, self._hostname) def _persisted_sections_dir(self): - return os.path.join(cmk.utils.paths.var_dir, "persisted_sections", self.id()) + return _persisted_sections_dir(self.id()) def get_check_plugin_names(self): if self._enforced_check_plugin_names is not None: @@ -421,9 +421,6 @@ class DataSource(object): # | of sections that are not provided on each query. | # '----------------------------------------------------------------------' - def has_persisted_agent_sections(self): - return os.path.exists(self._persisted_sections_file_path()) - def _store_persisted_sections(self, persisted_sections): if not persisted_sections: return @@ -737,3 +734,15 @@ class ManagementBoardDataSource(DataSource): except socket.error: # no ipv6 address either return False + + +def has_persisted_agent_sections(datasource_id, hostname): + return os.path.exists(_persisted_sections_file_path(datasource_id, hostname)) + + +def _persisted_sections_file_path(datasource_id, hostname): + return os.path.join(_persisted_sections_dir(datasource_id), hostname) + + +def _persisted_sections_dir(datasource_id): + return os.path.join(cmk.utils.paths.var_dir, "persisted_sections", datasource_id)

5 years, 5 months

Cleanup all direct config.is_ipv4_host calls

by Lars Michelsen

Module: check_mk Branch: master Commit: a6ea57cb619bfe36c849eed8b64f1c16ec253d06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6ea57cb619bfe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 22:48:53 2019 +0200 Cleanup all direct config.is_ipv4_host calls Change-Id: I9fec414de54a4b90be974cea7aaa288a80fbb069 --- cmk_base/config.py | 5 ----- cmk_base/core_config.py | 4 ++-- cmk_base/core_nagios.py | 6 +++--- tests/unit/cmk_base/test_config.py | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9766cb5..e46dd33 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -834,11 +834,6 @@ def parents_of(hostname): # TODO: Replace call sites with HostConfig access and remove this -def is_ipv4_host(hostname): - return get_config_cache().get_host_config(hostname).is_ipv4_host - - -# TODO: Replace call sites with HostConfig access and remove this def is_no_ip_host(hostname): return get_config_cache().get_host_config(hostname).is_no_ip_host diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 69e3968..f41f1c9 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -406,7 +406,7 @@ def get_host_attributes(hostname, config_cache): attrs["alias"] = config.alias_of(hostname, hostname) # Now lookup configured IP addresses - if config.is_ipv4_host(hostname): + if host_config.is_ipv4_host: attrs["_ADDRESS_4"] = _ip_address_of(host_config, 4) if attrs["_ADDRESS_4"] is None: attrs["_ADDRESS_4"] = "" @@ -482,7 +482,7 @@ def get_cluster_attributes(config_cache, host_config, nodes): "_NODENAMES": " ".join(sorted_nodes), } node_ips_4 = [] - if config.is_ipv4_host(host_config.hostname): + if host_config.is_ipv4_host: for h in sorted_nodes: node_config = config_cache.get_host_config(h) addr = _ip_address_of(node_config, 4) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index b57dfde..1ca279e 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -1122,14 +1122,14 @@ if '-d' in sys.argv: if config.is_cluster(hostname): for node in config.nodes_of(hostname): node_config = config_cache.get_host_config(node) - if config.is_ipv4_host(node): + if node_config.is_ipv4_host: needed_ipaddresses[node] = ip_lookup.lookup_ipv4_address(node) if node_config.is_ipv6_host: needed_ipv6addresses[node] = ip_lookup.lookup_ipv6_address(node) try: - if config.is_ipv4_host(hostname): + if host_config.is_ipv4_host: needed_ipaddresses[hostname] = ip_lookup.lookup_ipv4_address(hostname) except: pass @@ -1140,7 +1140,7 @@ if '-d' in sys.argv: except: pass else: - if config.is_ipv4_host(hostname): + if host_config.is_ipv4_host: needed_ipaddresses[hostname] = ip_lookup.lookup_ipv4_address(hostname) if host_config.is_ipv6_host: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index d660dd3..9aac531 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -24,7 +24,6 @@ def clear_config_caches(monkeypatch): ]) def test_is_ipv4_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_ipv4_host(hostname) == result assert config_cache.get_host_config(hostname).is_ipv4_host == result

5 years, 5 months

Cleanup all direct config.clusters_of calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 3096f54c94303d7c6f0ade327fe4944105138554 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3096f54c94303d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 20:58:45 2019 +0200 Cleanup all direct config.clusters_of calls Change-Id: I8f7de0bbf66a8a4f83c4fce1fd52fb8cf9a80ca6 --- cmk_base/checking.py | 5 +++-- cmk_base/config.py | 9 +-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 08d9a8f..b47d4b1 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -188,13 +188,15 @@ def _check_missing_sections(missing_sections, exit_spec): # Loops over all checks for ANY host (cluster, real host), gets the data, calls the check # function that examines that data and sends the result to the Core. def _do_all_checks_on_host(sources, hostname, ipaddress, only_check_plugin_names=None): + config_cache = config.get_config_cache() + num_success, missing_sections = 0, set() check_api_utils.set_hostname(hostname) filter_mode = None - belongs_to_cluster = len(config.get_config_cache().clusters_of(hostname)) > 0 + belongs_to_cluster = len(config_cache.clusters_of(hostname)) > 0 if belongs_to_cluster: filter_mode = "include_clustered" @@ -214,7 +216,6 @@ def _do_all_checks_on_host(sources, hostname, ipaddress, only_check_plugin_names multi_host_sections = sources.get_host_sections() # Filter out check types which are not used on the node - config_cache = config.get_config_cache() if belongs_to_cluster: pos_match = set() neg_match = set() diff --git a/cmk_base/config.py b/cmk_base/config.py index aac75fd..1b824d3 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -828,13 +828,6 @@ def parents_of(hostname): return used_parents -# If host is node of one or more clusters, return a list of the cluster host names. -# If not, return an empty list. -# TODO: Replace call sites with HostConfig access and remove this -def clusters_of(hostname): - return get_config_cache().get_host_config(hostname).part_of_clusters - - # # IPv4/IPv6 # @@ -3324,8 +3317,8 @@ class ConfigCache(object): self._clusters_of_cache.setdefault(name, []).append(clustername) self._nodes_of_cache[clustername] = hosts - # Return a list of the cluster host names. def clusters_of(self, hostname): + """Returns names of cluster hosts the host is a node of""" return self._clusters_of_cache.get(hostname, []) # TODO: cleanup none

5 years, 5 months

Licenses: Updated the list of licenses and added a PDF containing all license texts

by Kenneth Okoh

Module: check_mk Branch: master Commit: 0d28eea6808564481ee7a6ed34c0a904c71dd83d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d28eea6808564… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Tue Apr 16 15:26:13 2019 +0200 Licenses: Updated the list of licenses and added a PDF containing all license texts Change-Id: Ie0ff75fc63ffa72dfe727eeaa0f5502edbc7c2ba --- omd/License_texts.pdf | 1886 +++++++++++++++++++++++++++++++++++++++++++++++++ omd/Licenses.README | 3 +- omd/Licenses.csv | 43 +- omd/Licenses.ods | Bin 31221 -> 27356 bytes 4 files changed, 1921 insertions(+), 11 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0d28eea680…

5 years, 5 months

7436 fireeye_content: Optional configuration of levels for the age of the last update

by Florian Kromer

Module: check_mk Branch: master Commit: 9e2ae9fb6891d0eb4919aa8f28556b6c021c7650 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e2ae9fb6891d0… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Apr 12 11:23:04 2019 +0200 7436 fireeye_content: Optional configuration of levels for the age of the last update Previously the age of the last content update was shown in an informative manner. This werk adds the option to configure the upper levels for the age of the last content update in WATO rule {Fireeye Security Content}. CMK-1938 Change-Id: I0a7cf8f0bc2411a855d76b7e46a087a1e68a5316 --- .werks/7436 | 12 ++++ checkman/fireeye_content | 11 +++- checks/fireeye_content | 56 ++++++++++++------ .../wato/check_parameters/fireeye_content.py | 69 ++++++++++++++++++++++ .../generictests/datasets/fireeye_content.py | 17 ++++++ .../datasets/fireeye_content_assert_update_age.py | 18 ++++++ .../fireeye_content_invalid_update_time.py | 17 ++++++ .../datasets/fireeye_content_update_failed.py | 18 ++++++ 8 files changed, 198 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9e2ae9fb68…

5 years, 5 months

netapp_api_vs_status: regression test

by Florian Kromer

Module: check_mk Branch: master Commit: c0eaae079da4cb89163779596e26c9d84be9bcff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0eaae079da4cb… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Apr 16 12:32:01 2019 +0200 netapp_api_vs_status: regression test Change-Id: I6f76d28dc54f9e1c9291735887ccea994393c484 --- .../checks/generictests/datasets/netapp_api_vs_status.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py b/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py new file mode 100644 index 0000000..e5be4e1 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/netapp_api_vs_status.py @@ -0,0 +1,14 @@ +# yapf: disable + + +checkname = 'netapp_api_vs_status' + + +info = [['kermit1_ng-mc', 'running'], ['bill_vm', 'stopped']] + + +discovery = {'': [('bill_vm', None), ('kermit1_ng-mc', None)]} + + +checks = {'': [('bill_vm', {}, [(2, 'State is stopped', [])]), + ('kermit1_ng-mc', {}, [(0, 'State is running', [])])]} \ No newline at end of file

5 years, 5 months

7400 agent_azure: Report resource group tags

by Moritz Kiemer

Module: check_mk Branch: master Commit: a9626992b28a94e5e4f9aaea5685bd69afc2eb73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9626992b28a94… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 15 11:09:57 2019 +0200 7400 agent_azure: Report resource group tags The agent now produces the new generic "<<<labels>>>" section. This makes Check_MK automatically create host labels from the tags configured in Azure. You can now use them to filter your views, dashboards and in the future also create rules in WATO based on them. Change-Id: Ia75586e0d2315ccebbc0e3ab95284dcb8fb76e01 --- .werks/7400 | 11 +++++++++ agents/special/agent_azure | 56 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/.werks/7400 b/.werks/7400 new file mode 100644 index 0000000..936b277 --- /dev/null +++ b/.werks/7400 @@ -0,0 +1,11 @@ +Title: agent_azure: Report resource group tags +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555320415 +Class: feature + +The agent now produces the new generic "<<<labels>>>" section. +This makes Check_MK automatically create host labels from the tags configured in Azure. You can now use them to filter your views, dashboards and in the future also create rules in WATO based on them. diff --git a/agents/special/agent_azure b/agents/special/agent_azure index c503791..a2f97ed 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -344,22 +344,21 @@ class Selector(object): class Section(object): - SEP = 124 LOCK = Lock() - def __init__(self, name, piggytarget=''): + def __init__(self, name, piggytarget, separator): super(Section, self).__init__() + self._sep = chr(separator) self._head = [] self._cont = [] self._foot = [] - if piggytarget != '': + if piggytarget: self._head.append('<<<<%s>>>>\n' % piggytarget) self._foot.append('<<<<>>>>\n') - self._head.append('<<<azure_%s:sep(%s)>>>\n' % (name, Section.SEP)) + self._head.append('<<<%s:sep(%d)>>>\n' % (name, separator)) - @staticmethod - def formatline(tokens): - return chr(Section.SEP).join(map(str, tokens)) + '\n' + def formatline(self, tokens): + return self._sep.join(map(str, tokens)) + '\n' def add(self, info): if not info: @@ -379,6 +378,16 @@ class Section(object): self.LOCK.release() +class AzureSection(Section): + def __init__(self, name, piggytarget=None): + super(AzureSection, self).__init__('azure_%s' % name, piggytarget, separator=124) + + +class LabelsSection(Section): + def __init__(self, piggytarget): + super(LabelsSection, self).__init__("labels", piggytarget, separator=0) + + class IssueCollecter(object): def __init__(self): super(IssueCollecter, self).__init__() @@ -538,6 +547,12 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes return client.process(resource, self.args) + def list_groups(self): + if "groups" not in self._cache: + # azure-api-call + self._cache["groups"] = list(self._resource_client.resource_groups.list()) + return self._cache["groups"] + def list_resources(self): if "resources" not in self._cache: # azure-api-call @@ -614,28 +629,35 @@ def process_resource(args): for metric in client.get_metrics(resource, err): resource.metrics.append(metric) - agent_info_section = Section('agent_info') + agent_info_section = AzureSection('agent_info') agent_info_section.add(('remaining-reads', client.remaining_reads)) agent_info_section.add(err.dumpinfo()) sections = [agent_info_section] for piggytarget in resource.piggytargets: - section = Section(resource.section, piggytarget) + section = AzureSection(resource.section, piggytarget) section.add(resource.dumpinfo()) sections.append(section) return sections -def write_group_info(resources): - groups = sorted(set(r.info['group'] for r in resources)) - section = Section('agent_info') - section.add(('monitored-groups', json.dumps(groups))) +def write_group_info(client, resources): + monitored_groups = sorted(set(r.info['group'] for r in resources)) + + for group in client.list_groups(): + if group.name in monitored_groups and group.tags: + labels_section = LabelsSection(group.name) + labels_section.add((json.dumps(group.tags),)) + labels_section.write() + + section = AzureSection('agent_info') + section.add(('monitored-groups', json.dumps(monitored_groups))) section.write() # create empty agent_info section for all groups, otherwise # the service will only be discovered if something goes wrong - for group in groups: - Section('agent_info', group).write() + for group in monitored_groups: + AzureSection('agent_info', group).write() def write_exception_to_agent_info_section(exception): @@ -647,7 +669,7 @@ def write_exception_to_agent_info_section(exception): msg += "HINT: Make sure you have a proper role asigned to your client!" value = json.dumps((2, msg)) - section = Section('agent_info') + section = AzureSection('agent_info') section.add(('agent-bailout', value)) section.write() @@ -666,7 +688,7 @@ def main(argv=None): resources = [r for r in client.list_resources() if selector.do_monitor(r)] client.init_specific(resources) - write_group_info(resources) + write_group_info(client, resources) func_args = ((resource, client) for resource in resources) map_ = map if args.sequential else AsyncMapper(args.timeout, args.debug)

5 years, 5 months

agent_azure: use Lock context

by Moritz Kiemer

Module: check_mk Branch: master Commit: 87ba26e0ca0a2d699bcdc4cc4c46183b2d289422 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ba26e0ca0a2d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 15 14:14:58 2019 +0200 agent_azure: use Lock context Change-Id: Ie8c2f076c626f45814c325a5d937b282a05dba5b --- agents/special/agent_azure | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index a2f97ed..0a1d2c9 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -372,10 +372,9 @@ class Section(object): def write(self): if not self._cont: return - self.LOCK.acquire() - sys.stdout.writelines(self._head + self._cont + self._foot) - sys.stdout.flush() - self.LOCK.release() + with self.LOCK: + sys.stdout.writelines(self._head + self._cont + self._foot) + sys.stdout.flush() class AzureSection(Section):

5 years, 5 months

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