Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

agent_aws: Fixed default value for AWSColleagueContents content in S3 section

by Simon Betz

Module: check_mk Branch: master Commit: 020a6e65a27c0c628e3915d2da6eeb4784d769a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=020a6e65a27c0c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 9 16:15:52 2019 +0100 agent_aws: Fixed default value for AWSColleagueContents content in S3 section Change-Id: I478538a36760324e3adc01ebdf258cc8cfe46df4 --- agents/special/agent_aws | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 2aaf6f3..801794c 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -617,7 +617,6 @@ class S3Summary(AWSSectionGeneric): #_response = self._client.get_public_access_block(Bucket=bucket_name) #_response = self._client.get_bucket_policy_status(Bucket=bucket_name) # 'S3' object has no attribute 'get_bucket_policy_status' - # 'list' object has no attribute 'iterkeys' try: response = self._client.get_bucket_tagging(Bucket=bucket_name) @@ -675,7 +674,7 @@ class S3(AWSSectionCloudwatch): if colleague and colleague.content: return AWSColleagueContents({bucket['Name']: bucket for bucket in colleague.content}, colleague.cache_timestamp) - return AWSColleagueContents([], 0) + return AWSColleagueContents({}, 0) def _get_metrics(self, colleague_contents): metrics = []

5 years, 4 months

aws_ec2.cpu_credits: Added default levels 10, 5 for balance

by Simon Betz

Module: check_mk Branch: master Commit: 9db0c6db7c27700b9cf77036107ccc5910a78d10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9db0c6db7c2770… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 9 16:11:28 2019 +0100 aws_ec2.cpu_credits: Added default levels 10, 5 for balance Change-Id: Ib5e02e5b0497b5d58aa725b4f92ea6221a607520 --- checkman/aws_ec2.cpu_credits | 3 +++ checks/aws.include | 4 ++++ checks/aws_ec2 | 3 ++- cmk/gui/plugins/wato/check_parameters/aws.py | 19 ++++++++++++++++--- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/checkman/aws_ec2.cpu_credits b/checkman/aws_ec2.cpu_credits index 312fbbb..77e7844 100644 --- a/checkman/aws_ec2.cpu_credits +++ b/checkman/aws_ec2.cpu_credits @@ -10,5 +10,8 @@ description: To make this check work you have to configure the related special agent {Amazon Web Services (AWS)}. + Lower default levels for balance are set to 10, 5. + These are configurable. + inventory: One service will be created. diff --git a/checks/aws.include b/checks/aws.include index 117375d..ae9547c 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -46,6 +46,10 @@ AWSRegions = { "us-west-2": "US West Oregon", } +factory_settings['aws_cpu_credits'] = { + 'balance_levels_lower': (10, 5), +} + def parse_aws(info): import json diff --git a/checks/aws_ec2 b/checks/aws_ec2 index acafedc..9df16c3 100644 --- a/checks/aws_ec2 +++ b/checks/aws_ec2 @@ -112,7 +112,7 @@ def check_aws_ec2_cpu_credits(item, params, parsed): return yield 0, "Usage: %.2f" % metrics['CPUCreditUsage'] - warn, crit = params.get("levels_lower", (None, None)) + warn, crit = params["balance_levels_lower"] yield check_levels( metrics['CPUCreditBalance'], "aws_ec2_credit_balance", (None, None, warn, crit), @@ -127,6 +127,7 @@ check_info['aws_ec2.cpu_credits'] = { 'service_description': 'AWS/EC2 CPU Credits', 'group': 'aws_ec2_cpu_credits', 'includes': ['aws.include'], + 'default_levels_variable': 'aws_cpu_credits', } #. diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index a52ac51..19838db 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -26,12 +26,14 @@ from cmk.gui.i18n import _ from cmk.gui.valuespec import ( + Alternative, Dictionary, Integer, Tuple, Float, Percentage, Age, + FixedValue, ) from cmk.gui.plugins.wato import ( RulespecGroupCheckParametersApplications, @@ -43,11 +45,22 @@ register_check_parameters( 'aws_ec2_cpu_credits', _("AWS/EC2 CPU Credits"), Dictionary(elements=[('balance_levels_lower', - Tuple( + Alternative( title=_("Lower levels for CPU balance"), + style="dropdown", elements=[ - Integer(title=_("Warning below")), - Integer(title=_("Critical below")), + Tuple( + title=_("Set levels"), + elements=[ + Integer(title=_("Warning at or below")), + Integer(title=_("Critical at or below")), + ]), + Tuple( + title=_("No levels"), + elements=[ + FixedValue(None, totext=""), + FixedValue(None, totext=""), + ]), ]))]), None, match_type='dict',

5 years, 4 months

agent_aws: Added some comments

by Simon Betz

Module: check_mk Branch: master Commit: 62f4b685a97af3269427992dbef991fa4505fc9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62f4b685a97af3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 9 15:58:37 2019 +0100 agent_aws: Added some comments Change-Id: I442a9b8bf11701bd3d4631ff3f93a752b41c756d --- agents/special/agent_aws | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 739ee8e..2aaf6f3 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -181,6 +181,8 @@ class AWSSection(object): assert isinstance( result, AWSSectionResult), "%s: Result mut be of type 'AWSSectionResult'" % self.name + if result.content is None: + continue # In the related check plugin aws.include we parse these results and # extend list of json-loaded results. assert isinstance(result.content, @@ -609,6 +611,14 @@ class S3Summary(AWSSectionGeneric): if location is None or location != self._region: continue bucket['LocationConstraint'] = location + + #TODO + # Why do we get the following error while calling these methods: + #_response = self._client.get_public_access_block(Bucket=bucket_name) + #_response = self._client.get_bucket_policy_status(Bucket=bucket_name) + # 'S3' object has no attribute 'get_bucket_policy_status' + # 'list' object has no attribute 'iterkeys' + try: response = self._client.get_bucket_tagging(Bucket=bucket_name) tagging = response['TagSet']

5 years, 4 months

agent_aws: Use Private DNS names for EC2 piggyback hosts

by Simon Betz

Module: check_mk Branch: master Commit: 0b440f697feb0a2e86420384231334498bf7921d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b440f697feb0a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 9 15:06:41 2019 +0100 agent_aws: Use Private DNS names for EC2 piggyback hosts Change-Id: I5908da505962c2cbc79fc86f27b268edeeb9d64d --- agents/special/agent_aws | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 440d354..739ee8e 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -416,8 +416,7 @@ class EC2Summary(AWSSectionGeneric): response = self._describe_instances() try: return { - self._extract_instance_name_from_tags(instance): instance - for reservation in response['Reservations'] + instance["PrivateDnsName"]: instance for reservation in response['Reservations'] for instance in reservation.get('Instances', []) } except KeyError as e: @@ -431,12 +430,6 @@ class EC2Summary(AWSSectionGeneric): return self._client.describe_instances(Filters=self._tags) return self._client.describe_instances() - def _extract_instance_name_from_tags(self, instance): - for tag in instance.get('Tags', []): - if tag.get('Key') == 'Name': - return tag['Value'] - return instance['InstanceId'] - def _compute_content(self, raw_content, colleague_contents): return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) @@ -445,6 +438,11 @@ class EC2Summary(AWSSectionGeneric): class EC2SecurityGroups(AWSSectionGeneric): + def __init__(self, client, region, config, distributor=None): + super(EC2SecurityGroups, self).__init__(client, region, config, distributor=distributor) + self._names = self._config.service_config['ec2']['names'] + self._tags = self._config.service_config['ec2']['tags'] + @property def name(self): return "ec2_security_groups" @@ -460,14 +458,20 @@ class EC2SecurityGroups(AWSSectionGeneric): return AWSColleagueContents({}, 0) def _fetch_raw_content(self, colleague_contents): - # TODO Filter - response = self._client.describe_security_groups() + response = self._describe_security_groups() try: return {group['GroupId']: group for group in response['SecurityGroups']} except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return {} + def _describe_security_groups(self): + if self._names is not None: + return self._client.describe_security_groups(InstanceIds=self._names) + elif self._tags is not None: + return self._client.describe_security_groups(Filters=self._tags) + return self._client.describe_security_groups() + def _compute_content(self, raw_content, colleague_contents): content_by_piggyback_hosts = {} for instance_name, instance in colleague_contents.content.iteritems():

5 years, 4 months

agent_aws: Separated global services from region dependent services, improved logging, removed dead code

by Simon Betz

Module: check_mk Branch: master Commit: b9e359231f6736f1845320e09d9ead702473df09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9e359231f6736… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Feb 9 13:22:33 2019 +0100 agent_aws: Separated global services from region dependent services, improved logging, removed dead code Change-Id: Idf11ff2ed1b30d80b63b76a644acd8547634704e --- agents/special/agent_aws | 240 +++++++++++----------------- checks/agent_aws | 20 ++- cmk/gui/plugins/wato/datasource_programs.py | 14 +- tests/unit/checks/test_agent_aws.py | 8 +- 4 files changed, 120 insertions(+), 162 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b9e359231f…

5 years, 4 months

Again: Made naming more consistent, this time for HostServiceState.

by Sven Panne

Module: check_mk Branch: master Commit: dbd9d9a10a2d3edcad09f041bd577e0d69428fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbd9d9a10a2d3e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 8 15:59:17 2019 +0100 Again: Made naming more consistent, this time for HostServiceState. Change-Id: Ic6c42ce609b32751809baf7f7d28ed80ebe1a90f --- livestatus/src/HostServiceState.cc | 60 +++++++++++++++++------------------ livestatus/src/HostServiceState.h | 20 ++++++------ livestatus/src/TableStateHistory.cc | 62 ++++++++++++++++++------------------- 3 files changed, 71 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dbd9d9a10a…

5 years, 4 months

Made naming more consistent.

by Sven Panne

Module: check_mk Branch: master Commit: fa628868b7227090d413306cdfabcdd55b10b252 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa628868b72270… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 8 14:49:13 2019 +0100 Made naming more consistent. LogEntry fields and enum constants have the same name as their corresponding Livestatus column now. The previous naming was highly confusing... Change-Id: I0f70af8c3971cbfaaafadc560a4d89f2960cb81c --- livestatus/src/LogEntry.cc | 204 ++++++++++++++++++------------------ livestatus/src/LogEntry.h | 22 ++-- livestatus/src/Logfile.cc | 10 +- livestatus/src/TableLog.cc | 20 ++-- livestatus/src/TableStateHistory.cc | 108 +++++++++---------- 5 files changed, 183 insertions(+), 181 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fa628868b7…

5 years, 4 months

docker_node_info: cleanups & new API

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4eeb6042e118f26071da2a486e5c3d137a88c548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4eeb6042e118f2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 8 08:02:34 2019 +0100 docker_node_info: cleanups & new API Change-Id: Ib0e1aa9239db7b11f96b50e90681987859f4b969 --- checks/docker_node_info | 60 +++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/checks/docker_node_info b/checks/docker_node_info index 42f1d76..c0e72ae 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -25,39 +25,24 @@ # Boston, MA 02110-1301 USA. -def inventory_docker_node_info(parsed): - if parsed and isinstance(parsed, dict): - return [(None, {})] - - -def check_docker_node_info(item, params, parsed): - if isinstance(parsed, dict): - # TODO use other infos from this section? - return 0, 'Daemon running on host %s' % parsed["Name"] - - return 2, parsed +def check_docker_node_info(_no_item, _no_params, parsed): + if "Name" in parsed: + yield 0, 'Daemon running on host %s' % parsed["Name"] check_info['docker_node_info'] = { 'includes': ['legacy_docker.include'], 'parse_function': parse_legacy_docker_node_info, - 'inventory_function': inventory_docker_node_info, + 'inventory_function': discover_single, 'check_function': check_docker_node_info, 'service_description': 'Docker node info', } -def inventory_docker_node_containers(parsed): - if parsed and isinstance(parsed, dict): - return [(None, {})] - - -def check_docker_node_containers(item, params, parsed): - if not isinstance(parsed, dict): - # String with error message in case the daemon is not running - return - - def check_node_levels(count, warn, crit, warn_lower, crit_lower): +def check_docker_node_containers(_no_item, params, parsed): + def check_node_levels(count, levels, levels_lower): + warn, crit = levels + warn_lower, crit_lower = levels_lower if crit is not None and count >= crit: return 2, " (warn/crit at %s/%s)" % (warn, crit) if crit_lower is not None and count < crit_lower: @@ -68,32 +53,29 @@ def check_docker_node_containers(item, params, parsed): return 1, " (warn/crit below %s/%s)" % (warn_lower, crit_lower) return 0, "" - for title, key, upper_name, lower_name in ( - ("containers", "Containers", 'upper_levels', 'lower_levels'), - ("running", "ContainersRunning", 'running_upper_levels', 'running_lower_levels'), - ("paused", "ContainersPaused", 'paused_upper_levels', 'paused_lower_levels'), - ("stopped", "ContainersStopped", 'stopped_upper_levels', 'stopped_lower_levels'), + for title, key, levels_prefix in ( + ("containers", "Containers", ''), + ("running", "ContainersRunning", 'running_'), + ("paused", "ContainersPaused", 'paused_'), + ("stopped", "ContainersStopped", 'stopped_'), ): - raw_count = parsed.get(key) - if raw_count is None: + count = parsed.get(key) + if count is None: yield 3, "%s: count not present in agent output" % title continue - count = int(raw_count) - warn, crit = params.get(upper_name, (None, None)) - lower_warn, lower_crit = params.get(lower_name, (None, None)) + levels = params.get('%supper_levels' % levels_prefix, (None, None)) + levels_lower = params.get('%slower_levels' % levels_prefix, (None, None)) - status, level_text = check_node_levels(count, warn, crit, lower_warn, lower_crit) - infotext = "%s: %d" % (title, count) - if level_text: - infotext += level_text - perfdata = [(title.lower(), count, warn, crit, lower_warn, lower_crit)] + status, level_text = check_node_levels(count, levels, levels_lower) + infotext = "%s: %d%s" % (title, count, level_text) + perfdata = [(title, count) + levels] yield status, infotext, perfdata check_info["docker_node_info.containers"] = { - "inventory_function": inventory_docker_node_containers, + "inventory_function": discover_single, "check_function": check_docker_node_containers, "service_description": "Docker containers", "has_perfdata": True,

5 years, 4 months

docker: rename legacy functions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2a7c4745bc4eb36fc3e454c59962549b4f63b4d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a7c4745bc4eb3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 8 09:51:23 2019 +0100 docker: rename legacy functions Change-Id: Ia87454f582bae25eac929fdf98d15e792c1aa1c3 --- checks/docker_node_disk_usage | 2 +- checks/docker_node_info | 2 +- checks/legacy_docker.include | 47 +++++++++++----------- inventory/docker_node_images | 2 +- inventory/docker_node_network | 6 +-- tests/unit/checks/test_docker_parse_helpers.py | 8 ++-- .../checks/test_docker_parse_network_inspect.py | 4 +- tests/unit/checks/test_docker_parse_node_images.py | 8 ++-- tests/unit/checks/test_docker_parse_node_info.py | 4 +- .../test_docker_parse_subsection_image_inspect.py | 2 +- tests/unit/checks/test_docker_parse_system_df.py | 4 +- 11 files changed, 45 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2a7c4745bc…

5 years, 4 months

docker: preparing for new plugin 2

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6f21f6c526744ff21b76394bf9376f780bc09e55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f21f6c526744f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 7 13:52:30 2019 +0100 docker: preparing for new plugin 2 Change-Id: Iff89ec1c0a56f05f3e7330732af3244a019e9e2d --- checks/docker.include | 31 +++++++++++++++++++++++++++++++ inventory/docker_container_labels | 3 ++- inventory/docker_node_images | 12 +++--------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/checks/docker.include b/checks/docker.include new file mode 100644 index 0000000..fe7230e --- /dev/null +++ b/checks/docker.include @@ -0,0 +1,31 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def docker_format_labels(labels): + if isinstance(labels, dict): + labels = labels.iteritems() + return ", ".join(["%s: %s" % item for item in labels]) diff --git a/inventory/docker_container_labels b/inventory/docker_container_labels index beeeb88..00ae4af 100644 --- a/inventory/docker_container_labels +++ b/inventory/docker_container_labels @@ -29,9 +29,10 @@ def inv_docker_container_labels(info, inventory_tree): import json data = json.loads(" ".join(info[0])) container = inventory_tree.get_dict("software.applications.docker.container.") - container["labels"] = ", ".join(["%s: %s" % (k, v) for k, v in data.items()]) + container["labels"] = docker_format_labels(data) inv_info['docker_container_labels'] = { + 'includes': ['docker.include'], 'inv_function': inv_docker_container_labels, } diff --git a/inventory/docker_node_images b/inventory/docker_node_images index 5e8bbb6..b015389 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -39,7 +39,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): "id": image["ID"], "creation": image["CreatedAt"], "size": image["VirtualSize"], - "labels": _format_labels(image.get("__labels__", {})), + "labels": docker_format_labels(image.get("__labels__", {})), }) status_node.append({ @@ -59,19 +59,13 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): "tag": container["Tag"], "name": container["Names"], "creation": container["CreatedAt"], - "labels": _format_labels(container["Labels"]), + "labels": docker_format_labels(container["Labels"]), "status": container["Status"], }) -def _format_labels(labels): - if isinstance(labels, dict): - labels = labels.iteritems() - return ", ".join(["%s: %s" % item for item in labels]) - - inv_info['docker_node_images'] = { - 'includes': ['legacy_docker.include'], + 'includes': ['docker.include', 'legacy_docker.include'], 'inv_function': inv_docker_node_images, 'has_status_data': True, }

5 years, 4 months

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