Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

Use sites trusted CAs for verifying remote livestatus server certificates

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d54072c67b98dec51fae01b71f3fa0f3c72f41a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d54072c67b98d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 20:22:38 2019 +0100 Use sites trusted CAs for verifying remote livestatus server certificates Change-Id: I10df80bc6323a42fe0b6648c621c8ccd97e6647a --- livestatus/api/python/livestatus.py | 2 +- tests/unit/livestatus/test_livestatus_unit.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 1448388..a1d8d42 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -106,7 +106,7 @@ def site_local_ca_path(): if not omd_root: raise MKLivestatusConfigError("OMD_ROOT is not set. You are not running in OMD context.") - return os.path.join(omd_root, "etc/ssl/ca.pem") + return os.path.join(omd_root, "var/ssl/ca-certificates.crt") def create_client_socket(family, tls, verify, ca_file_path): diff --git a/tests/unit/livestatus/test_livestatus_unit.py b/tests/unit/livestatus/test_livestatus_unit.py index 22fcb18..c28002f 100644 --- a/tests/unit/livestatus/test_livestatus_unit.py +++ b/tests/unit/livestatus/test_livestatus_unit.py @@ -1,6 +1,5 @@ import socket import ssl -import os from contextlib import closing from pathlib2 import Path import pytest # type: ignore @@ -125,6 +124,11 @@ def test_single_site_connection_socketurl(socket_url, result, monkeypatch): def test_create_socket(tls, verify, ca, ca_file_path, monkeypatch, tmpdir): ca.initialize() + ssl_dir = Path("%s/var/ssl" % tmpdir) + ssl_dir.mkdir(parents=True) + with ssl_dir.joinpath("ca-certificates.crt").open(mode="w", encoding="utf-8") as f: # pylint: disable=no-member + f.write(ca.ca_path.joinpath("ca.pem").open(encoding="utf-8").read()) + monkeypatch.setenv("OMD_ROOT", "%s" % tmpdir) if ca_file_path is not None: @@ -134,7 +138,7 @@ def test_create_socket(tls, verify, ca, ca_file_path, monkeypatch, tmpdir): "unix:/tmp/xyz", tls=tls, verify=verify, ca_file_path=ca_file_path) if ca_file_path is None: - ca_file_path = "%s/ca.pem" % ca.ca_path + ca_file_path = "%s/var/ssl/ca-certificates.crt" % tmpdir sock = live._create_socket(socket.AF_INET)

5 years, 4 months

Increase internal certificate age used for encrypted Livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: 781490f52f356c6504569c2892587fcaddbc1fd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=781490f52f356c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 12:20:18 2019 +0100 Increase internal certificate age used for encrypted Livestatus We decided to set the age of the internally used certificates to a very long period of 999 years for convenience. The benefit of a certificate expiration is not really worth the trouble in our scenario. In case you have specific security requirements that don't allow such a long period, you will likely use your own certificates, signed by your company or some other trusted CA which has a more strict validity period. CMK-1535 Change-Id: I2838ba706cf98fb4d9fd836d3bb0b5465a74b064 --- omd/packages/omd/omdlib/certs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omd/packages/omd/omdlib/certs.py b/omd/packages/omd/omdlib/certs.py index 98ebfd8..e321f2b 100644 --- a/omd/packages/omd/omdlib/certs.py +++ b/omd/packages/omd/omdlib/certs.py @@ -31,7 +31,8 @@ from pathlib2 import Path # pylint: disable=unused-import from OpenSSL import crypto from OpenSSL.SSL import FILETYPE_PEM # type: ignore -CERT_NOT_AFTER = 3 * 365 * 24 * 60 * 60 # 3 years by default +CERT_NOT_AFTER = 999 * 365 * 24 * 60 * 60 # 999 years by default +CA_CERT_NOT_AFTER = CERT_NOT_AFTER class CertificateAuthority(object): @@ -66,7 +67,7 @@ class CertificateAuthority(object): # type: () -> Tuple[str, str] key = self._make_private_key() - cert = self._make_cert(self._ca_name, 10 * 365 * 24 * 60 * 60) # 10 years + cert = self._make_cert(self._ca_name, CA_CERT_NOT_AFTER) cert.set_issuer(cert.get_subject()) cert.set_pubkey(key) cert.add_extensions([

5 years, 4 months

7081 Reworked "Distributed Monitoring" page

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f156f4666acdfcd156924dcd87425b8d8cdfb70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f156f4666acdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Feb 3 12:06:59 2019 +0100 7081 Reworked "Distributed Monitoring" page The "Distributed Monitoring" pages have been reworked to make it easier to manage multiple Check_MK site connections. The list page is now showing less site configuration details. Instead of these columns status columns have been added to visualize whether or not your site connections can currently be used. One column shows the current status of the Livestatus connection, which is needed by the GUI to gather the monitoring status from the site. In case your livestatus connection is not configured properly, you may have a look at the status and hover the icon for more information about the reason. One possible reason for a non functional Livestatus connection may be a TLS connection issue (if you use encrypted Livestatus). You can use this site to inspect the remote site certificate and establish a trust with this certificate to allow the GUI to connect with that site. The replication status column tells you whether or not the configuration replication connection is working. CMK-1535 Change-Id: I6939183412f0af033c95f889e1a111bc6be8b546 --- .werks/7081 | 29 +++ cmk/gui/plugins/wato/utils/__init__.py | 14 +- cmk/gui/wato/__init__.py | 1 - cmk/gui/wato/pages/sites.py | 297 ++++++++++++++++++++++------- cmk/gui/watolib/automation_commands.py | 18 +- tests/unit/cmk/gui/watolib/test_watolib.py | 1 + web/htdocs/js/index.js | 2 + web/htdocs/js/modules/sites.js | 66 +++++++ 8 files changed, 350 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8f156f4666…

5 years, 4 months

Disentangled Livestatus Proxy and socket connection settings

by Lars Michelsen

Module: check_mk Branch: master Commit: 70eb920fe5dae6e2121d73feea728e9c150caadd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70eb920fe5dae6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 19:51:47 2019 +0100 Disentangled Livestatus Proxy and socket connection settings The Livestatus socket connection settings (address and port) were part of the Livestatus Proxy settings in previous versions. This resulted in several problems. >From the user view: It was not possible to toggle Livestatus Proxy on and of without having to remember the connection settings to re-enter it after enabling or disabling the proxy. >From the internal view: There were several places in the code that had to deal with both kind of socket setting structures in order to get the destination address. CMK-1535 Change-Id: If1ec2306b14aff6d5c54822d688c2997ca4cfa30 --- cmk/gui/config.py | 40 +++++++++++------ cmk/gui/plugins/wato/ac_tests.py | 3 +- cmk/gui/sites.py | 23 +++++++--- cmk/gui/wato/pages/sites.py | 1 + cmk/gui/watolib/sites.py | 84 +++++++++++++++++------------------ tests/unit/cmk/gui/test_gui_config.py | 41 ++++++++++++----- tests/unit/cmk/gui/test_sites.py | 49 +++++++++++++------- 7 files changed, 150 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70eb920fe5…

5 years, 4 months

agent_aws: Be stricter in section API

by Simon Betz

Module: check_mk Branch: master Commit: 048707ba2b1d9d56ec934d1d8cdaf98267d01329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=048707ba2b1d9d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 11 10:44:15 2019 +0100 agent_aws: Be stricter in section API Change-Id: I3ddda6e5fd61ca2be2c484971d8e95f97f4f2b98 --- agents/special/agent_aws | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 9f63232..6fdb871 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -97,7 +97,7 @@ class ResultDistributor(object): AWSSectionResults = NamedTuple("AWSSectionResults", [ ("results", List), - ("cache_timestamp", int), + ("cache_timestamp", float), ]) AWSSectionResult = NamedTuple("AWSSectionResult", [ @@ -163,15 +163,24 @@ class AWSSection(object): assert isinstance( colleague_contents, AWSColleagueContents ), "%s: Colleague contents must be of type 'AWSColleagueContents'" % self.name + assert isinstance( + colleague_contents.cache_timestamp, + float), "%s: Cache timestamp of colleague contents must be of type 'float'" % self.name raw_content = self._get_raw_content(colleague_contents, use_cache=use_cache) assert isinstance( raw_content, AWSRawContent), "%s: Raw content must be of type 'AWSRawContent'" % self.name + assert isinstance( + raw_content.cache_timestamp, + float), "%s: Cache timestamp of raw content must be of type 'float'" % self.name computed_content = self._compute_content(raw_content, colleague_contents) assert isinstance(computed_content, AWSComputedContent ), "%s: Computed content must be of type 'AWSComputedContent'" % self.name + assert isinstance( + computed_content.cache_timestamp, + float), "%s: Cache timestamp of computed content must be of type 'float'" % self.name self._send(computed_content) created_results = self._create_results(computed_content) @@ -183,6 +192,9 @@ class AWSSection(object): AWSSectionResult), "%s: Result mut be of type 'AWSSectionResult'" % self.name if result.content is None: continue + assert isinstance( + result.piggyback_hostname, + str), "%s: Piggyback hostname of created result must be of type 'str'" % self.name # In the related check plugin aws.include we parse these results and # extend list of json-loaded results. assert isinstance(result.content, @@ -232,7 +244,7 @@ class AWSSection(object): raw_content = f.read().strip() except IOError as e: if e.errno == errno.ENOENT: # No such file or directory - return None, time.time() + return None, 0.0 else: raise try: @@ -353,7 +365,7 @@ class CostsAndUsage(AWSSectionGeneric): return 86400 def _get_colleague_contents(self): - return AWSColleagueContents(None, 0) + return AWSColleagueContents(None, 0.0) def _fetch_raw_content(self, colleague_contents): fmt = "%Y-%m-%d" @@ -412,7 +424,7 @@ class EC2Summary(AWSSectionGeneric): return 300 def _get_colleague_contents(self): - return AWSColleagueContents(None, 0) + return AWSColleagueContents(None, 0.0) def _fetch_raw_content(self, colleague_contents): response = self._describe_instances() @@ -460,7 +472,7 @@ class EC2SecurityGroups(AWSSectionGeneric): colleague = self._received_results.get('ec2_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0) + return AWSColleagueContents({}, 0.0) def _fetch_raw_content(self, colleague_contents): response = self._describe_security_groups() @@ -507,7 +519,7 @@ class EC2(AWSSectionCloudwatch): colleague = self._received_results.get('ec2_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0) + return AWSColleagueContents({}, 0.0) def _get_metrics(self, colleague_contents): metrics = [] @@ -595,7 +607,7 @@ class S3Summary(AWSSectionGeneric): return 86400 def _get_colleague_contents(self): - return AWSColleagueContents(None, 0) + return AWSColleagueContents(None, 0.0) def _fetch_raw_content(self, colleague_contents): found_buckets = [] @@ -658,7 +670,7 @@ class S3Summary(AWSSectionGeneric): def _compute_content(self, raw_content, colleague_contents): return AWSComputedContent({bucket['Name']: bucket for bucket in raw_content.content}, - raw_content.content) + raw_content.cache_timestamp) def _create_results(self, computed_content): return [AWSSectionResult("", None)] @@ -677,7 +689,7 @@ class S3(AWSSectionCloudwatch): colleague = self._received_results.get('s3_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0) + return AWSColleagueContents({}, 0.0) def _get_metrics(self, colleague_contents): metrics = [] @@ -761,7 +773,7 @@ class ELBSummary(AWSSectionGeneric): return 300 def _get_colleague_contents(self): - return AWSColleagueContents(None, 0) + return AWSColleagueContents(None, 0.0) def _fetch_raw_content(self, colleague_contents): found_load_balancers = [] @@ -826,7 +838,7 @@ class ELBHealth(AWSSectionGeneric): colleague = self._received_results.get('elb_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0) + return AWSColleagueContents({}, 0.0) def _fetch_raw_content(self, colleague_contents): load_balancers = {} @@ -864,7 +876,7 @@ class ELB(AWSSectionCloudwatch): colleague = self._received_results.get('elb_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0) + return AWSColleagueContents({}, 0.0) def _get_metrics(self, colleague_contents): metrics = [] @@ -951,7 +963,7 @@ class EBSSummary(AWSSectionGeneric): colleague = self._received_results.get('ec2_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) - return AWSColleagueContents({}, 0) + return AWSColleagueContents({}, 0.0) def _fetch_raw_content(self, colleague_contents): response_volumes, response_volume_stats = self._describe_volumes() @@ -1024,7 +1036,7 @@ class EBS(AWSSectionCloudwatch): return AWSColleagueContents([(instance_name, row['VolumeId'], row['VolumeType']) for instance_name, rows in colleague.content.iteritems() for row in rows], colleague.cache_timestamp) - return AWSColleagueContents([], 0) + return AWSColleagueContents([], 0.0) def _get_metrics(self, colleague_contents): metrics = []

5 years, 4 months

azure_agent_info: new default levels for API reads

by Moritz Kiemer

Module: check_mk Branch: master Commit: 45e572590b0d11e2359fe41a9e73ae16d73952d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45e572590b0d11… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 8 19:57:22 2019 +0100 azure_agent_info: new default levels for API reads If we are using API calls at a larger rate than 200 per minute, we are going to run out of them sooner or later anyway. Warn a little earlier, to give the user more time to react. Change-Id: I2fdfbb9b7472aa8d6dbd40410e3313fab8e5f2ef --- checks/azure_agent_info | 2 +- cmk/gui/plugins/wato/check_parameters/azure.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/azure_agent_info b/checks/azure_agent_info index 9007ffe..69c852c 100644 --- a/checks/azure_agent_info +++ b/checks/azure_agent_info @@ -28,7 +28,7 @@ import json factory_settings['azure_agent_info_levels'] = { 'warning_levels': (1, 10), 'exception_levels': (1, 1), - 'remaining_reads_levels_lower': (1000, 100), + 'remaining_reads_levels_lower': (6000, 3000), 'remaining_reads_unknown_state': 1, } diff --git a/cmk/gui/plugins/wato/check_parameters/azure.py b/cmk/gui/plugins/wato/check_parameters/azure.py index c3b294b..760566f 100644 --- a/cmk/gui/plugins/wato/check_parameters/azure.py +++ b/cmk/gui/plugins/wato/check_parameters/azure.py @@ -63,8 +63,8 @@ register_check_parameters( Tuple( title=_("Lower levels for remaining API reads"), elements=[ - Integer(title=_("Warning below"), default_value=1000), - Integer(title=_("Critical below"), default_value=100), + Integer(title=_("Warning below"), default_value=6000), + Integer(title=_("Critical below"), default_value=3000), ], )), ("remaining_reads_unknown_state",

5 years, 4 months

docker: mark deprecated parse results

by Moritz Kiemer

Module: check_mk Branch: master Commit: 438993e3bc9d4881edc57257c5a5294517306d1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438993e3bc9d48… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 8 10:45:21 2019 +0100 docker: mark deprecated parse results Change-Id: Ie3c2c7adb3d8fdb5c807a4f821ff14a8a40972a3 --- checks/legacy_docker.include | 87 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 18 deletions(-) diff --git a/checks/legacy_docker.include b/checks/legacy_docker.include index 7c0c681..87b30fd 100644 --- a/checks/legacy_docker.include +++ b/checks/legacy_docker.include @@ -27,6 +27,49 @@ import json import re +class DeprecatedDict(dict): + pass + + +class DeprecatedList(list): + pass + + +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 _legacy_docker_get_bytes(string): '''get number of bytes from string @@ -77,20 +120,20 @@ def _get_repo_tag(string): def parse_legacy_docker_node_info(info): '''parse output of "docker info"''' + parsed = DeprecatedDict() if not info: - return {} + return parsed # parse legacy json output (verisons 1.5.0 - 1.5.0p6) joined = " ".join(info[0]) if joined.endswith("permission denied"): - return {} + return parsed try: # this may contain a certificate containing newlines. return json.loads(joined.replace("\n", "\\n")) except ValueError: pass - parsed = {} prefix = "" for row in info: if not row: @@ -193,12 +236,12 @@ def parse_legacy_docker_system_df(info): except ValueError: table = _legacy_docker_parse_table(info, field_map[0], field_map[1]) - parsed = {} + parsed = DeprecatedDict() for line in table: for key, type_ in zip(field_map[1], field_map[2]): - v = line.get(key) - if v is not None: - line[key] = type_(v) + val = line.get(key) + if val is not None: + line[key] = type_(val) parsed[line.get("Type").lower()] = line return parsed @@ -221,11 +264,11 @@ def parse_legacy_docker_subsection_images(info): table = _get_json_list(info) - parsed = {} + parsed = DeprecatedDict() for item in table: - v = item.get("VirtualSize") - if v is not None: - item["VirtualSize"] = _legacy_docker_get_bytes(v) + val = item.get("VirtualSize") + if val is not None: + item["VirtualSize"] = _legacy_docker_get_bytes(val) parsed[item.get("ID")] = item return parsed @@ -235,22 +278,29 @@ def parse_legacy_docker_subsection_image_labels(info): table = _get_json_list(info) - return {_legacy_docker_trunk_id(long_id): data for long_id, data in table if data is not None} + parsed = DeprecatedDict() + for long_id, data in table: + if data is not None: + parsed[_legacy_docker_trunk_id(long_id)] = data + return parsed def parse_legacy_docker_subsection_image_inspect(info): + parsed = DeprecatedDict() try: table = json.loads(' '.join(' '.join(row) for row in info if row)) except ValueError: - return {} - return {_legacy_docker_trunk_id(image["Id"]): image for image in table} + return parsed + for image in table: + parsed[_legacy_docker_trunk_id(image["Id"])] = image + return parsed def parse_legacy_docker_subsection_containers(info): table = _get_json_list(info) - parsed = {} + parsed = DeprecatedDict() for item in table: image_name = item.get("Image", "") item["Repository"], item["Tag"] = _get_repo_tag(image_name) @@ -332,11 +382,12 @@ def parse_legacy_docker_node_images(info): if isinstance(labels, (str, unicode)): cont["Labels"] = parse_legacy_docker_messed_up_labels(labels) - return {"images": images, "containers": containers} + return DeprecatedDict((("images", images), ("containers", containers))) def parse_legacy_docker_network_inspect(info): try: - return json.loads(''.join(row[0] for row in info if row)) + raw = json.loads(''.join(row[0] for row in info if row)) except ValueError: - return [] + raw = [] + return DeprecatedList(raw)

5 years, 4 months

agent_aws: Cleaned up section coherencies

by Simon Betz

Module: check_mk Branch: master Commit: ca452c7be412e9c3cd4ce83e9fa67f138459985d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca452c7be412e9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 11 09:21:35 2019 +0100 agent_aws: Cleaned up section coherencies Change-Id: I946f461535349dea899437695ee1fab7d65e4652 --- agents/special/agent_aws | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 801794c..9f63232 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -417,13 +417,10 @@ class EC2Summary(AWSSectionGeneric): def _fetch_raw_content(self, colleague_contents): response = self._describe_instances() try: - return { - instance["PrivateDnsName"]: instance for reservation in response['Reservations'] - for instance in reservation.get('Instances', []) - } + return response['Reservations'] except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - return {} + return [] def _describe_instances(self): if self._names is not None: @@ -433,10 +430,16 @@ class EC2Summary(AWSSectionGeneric): return self._client.describe_instances() def _compute_content(self, raw_content, colleague_contents): - return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) + return AWSComputedContent({ + instance["PrivateDnsName"]: instance for reservation in raw_content.content + for instance in reservation.get('Instances', []) + }, raw_content.cache_timestamp) def _create_results(self, computed_content): - return [AWSSectionResult("", [computed_content.content])] + return [ + AWSSectionResult(instance_name, [instance]) + for instance_name, instance in computed_content.content.iteritems() + ] class EC2SecurityGroups(AWSSectionGeneric): @@ -509,8 +512,8 @@ class EC2(AWSSectionCloudwatch): def _get_metrics(self, colleague_contents): metrics = [] idx = 0 - for instance_name, attrs in colleague_contents.content.iteritems(): - instance_id = attrs['InstanceId'] + for instance_name, instance in colleague_contents.content.iteritems(): + instance_id = instance['InstanceId'] for metric_name, unit in [ ("CPUCreditUsage", "Count"), ("CPUCreditBalance", "Count"), @@ -654,7 +657,8 @@ class S3Summary(AWSSectionGeneric): return False def _compute_content(self, raw_content, colleague_contents): - return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) + return AWSComputedContent({bucket['Name']: bucket for bucket in raw_content.content}, + raw_content.content) def _create_results(self, computed_content): return [AWSSectionResult("", None)] @@ -672,8 +676,7 @@ class S3(AWSSectionCloudwatch): def _get_colleague_contents(self): colleague = self._received_results.get('s3_summary') if colleague and colleague.content: - return AWSColleagueContents({bucket['Name']: bucket for bucket in colleague.content}, - colleague.cache_timestamp) + return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0) def _get_metrics(self, colleague_contents): @@ -807,10 +810,7 @@ class ELBSummary(AWSSectionGeneric): return AWSComputedContent(content_by_piggyback_hosts, raw_content.cache_timestamp) def _create_results(self, computed_content): - return [ - AWSSectionResult(piggyback_hostname, [content]) - for piggyback_hostname, content in computed_content.content.iteritems() - ] + return [AWSSectionResult("", computed_content.content.values())] class ELBHealth(AWSSectionGeneric): @@ -950,8 +950,7 @@ class EBSSummary(AWSSectionGeneric): def _get_colleague_contents(self): colleague = self._received_results.get('ec2_summary') if colleague and colleague.content: - mapping = {v['InstanceId']: k for k, v in colleague.content.iteritems()} - return AWSColleagueContents(mapping, colleague.cache_timestamp) + return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0) def _fetch_raw_content(self, colleague_contents): @@ -990,11 +989,16 @@ class EBSSummary(AWSSectionGeneric): volume.update(volume_states.get(volume_id, {})) content.append(volume) + instance_name_mapping = { + v['InstanceId']: k for k, v in colleague_contents.content.iteritems() + } content_by_piggyback_hosts = {} for row in content: for attachment in row['Attachments']: attachment_id = attachment['InstanceId'] - instance_name = colleague_contents.content.get(attachment_id, attachment_id) + instance_name = instance_name_mapping.get(attachment_id) + if instance_name is None: + instance_name = "" content_by_piggyback_hosts.setdefault(instance_name, []).append(row) return AWSComputedContent(content_by_piggyback_hosts, raw_content.cache_timestamp)

5 years, 4 months

CMK-1582: upadate python-cryptography, to avoid crash on startup

by Alex Zurhake

Module: check_mk Branch: master Commit: 80feaeeebbed3dea1cbee9df6a92ff3fa79e5088 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80feaeeebbed3d… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Jan 30 14:13:25 2019 +0100 CMK-1582: upadate python-cryptography, to avoid crash on startup Change-Id: I8419f37229c0f0c8d174f9dedc2c62112a15820f --- omd/packages/python-modules/python-modules.make | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 49dbd39..26857ee 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -111,17 +111,10 @@ PYTHON_MODULES_LIST += dnspython-1.15.0.zip # needed for LDAP (nearest DC detect PYTHON_MODULES_LIST += python-ad-0.9.tar.gz # needed for LDAP (nearest DC detection) PYTHON_MODULES_LIST += idna-2.7.tar.gz -ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 squeeze),) +ifneq ($(filter $(DISTRO_CODE),el5 sles11sp1 lucid squeeze),) PYTHON_MODULES_LIST += cryptography-1.4.tar.gz PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0005-NID_ecdsa_with_SHA-fix.patch PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-1.4-disable-version-warning.patch -else ifneq ($(filter $(DISTRO_CODE),el6),) -# Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 -# (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst), -# so we stick with 1.5.3. - PYTHON_MODULES_LIST += cryptography-1.5.3.tar.gz - PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0004-CMS_DEBUG_DECRYPT-fix.patch - PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-1.5.3-disable-version-warning.patch else PYTHON_MODULES_LIST += asn1crypto-0.24.0.tar.gz PYTHON_MODULES_LIST += cryptography-2.4.1.tar.gz

5 years, 4 months

azure: be more consistent in valuespec

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3960bffb0512efdf3117483236f4599d5edf2257 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3960bffb0512ef… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 8 19:54:18 2019 +0100 azure: be more consistent in valuespec Change-Id: I4f4bd1c4c73dc87bebdfd40567be6ab638e09fc1 --- cmk/gui/plugins/wato/datasource_programs.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 9dc2178..0b399b0 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1617,11 +1617,14 @@ class RulespecSpecialAgentsAzure(HostRulespec): ], )), ("sequential", - FixedValue( - True, - title=_("Run agent in single thread"), + DropdownChoice( + title=_("Force agent to run in single thread"), help=_("Check this to turn off multiprocessing." " Recommended for debugging purposes only."), + choices=[ + (False, _("Run agent multithreaded")), + (True, _("Run agent in single thread")), + ], )), ], optional_keys=["piggyback_vms", "sequential"],

5 years, 4 months

← Newer
1
...
34
35
36
37
38
39
40
...
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