Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

mk_docker.py: introduce capability to parse new plugin output

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0d17996b086a11aee3816225fb9b4c7ab8c956cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d17996b086a11… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Feb 5 12:30:27 2019 +0100 mk_docker.py: introduce capability to parse new plugin output Change-Id: Ia840afc07e5a5a94248f703d4e02244b585424e2 --- checks/docker_container_status | 12 +++++++----- checks/docker_node_disk_usage | 9 +++++++-- checks/docker_node_info | 14 ++++++++++++-- inventory/docker_container_labels | 4 +++- inventory/docker_container_network | 5 ++++- inventory/docker_container_node_name | 8 ++++++-- inventory/docker_node_images | 25 +++++++++++++++++++++---- inventory/docker_node_network | 12 +++++++++--- 8 files changed, 69 insertions(+), 20 deletions(-) diff --git a/checks/docker_container_status b/checks/docker_container_status index 9a22335..9920e05 100644 --- a/checks/docker_container_status +++ b/checks/docker_container_status @@ -33,11 +33,13 @@ def parse_docker_container_status(info): When a container got piggyback data from multiple hosts (e.g. a cluster) this results in multiple JSON objects handed over to this check. ''' - if not info or not info[0]: - return + version = docker_get_version(info) # pylint: disable=undefined-variable - parsed = docker_json_get_obj(info[0]) or {} + index = 0 if version is None else 1 + parsed = docker_json_get_obj(info[index]) or {} if info[index:] else {} # pylint: disable=undefined-variable + if version is None: + return DeprecatedDict(parsed) # pylint: disable=undefined-variable return parsed @@ -77,7 +79,7 @@ check_info["docker_container_status.health"] = { "inventory_function": inventory_docker_container_status_health, "check_function": check_docker_container_status_health, "service_description": "Docker container health", - 'includes': ['docker.include'], + 'includes': ['docker.include', 'legacy_docker.include'], } #. @@ -108,5 +110,5 @@ check_info['docker_container_status'] = { 'inventory_function': discover_single, 'check_function': check_docker_container_status, 'service_description': 'Docker container status', - 'includes': ['docker.include'], + 'includes': ['docker.include', 'legacy_docker.include'], } diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage index 3712103..21e770b 100644 --- a/checks/docker_node_disk_usage +++ b/checks/docker_node_disk_usage @@ -26,8 +26,13 @@ def parse_docker_node_disk_usage(info): + version = docker_get_version(info) # pylint: disable=undefined-variable - return parse_legacy_docker_system_df(info) # pylint: disable=undefined-variable + if version is None: + return parse_legacy_docker_system_df(info) # pylint: disable=undefined-variable + + table_rows = map(docker_json_get_obj, info[1:]) # pylint: disable=undefined-variable + return {r.get('type'): r for r in table_rows if r is not None} @get_parsed_item_data @@ -60,7 +65,7 @@ check_info["docker_node_disk_usage"] = { "inventory_function": discover(), "check_function": check_docker_node_disk_usage, "service_description": "Docker disk usage - %s", - "includes": ["legacy_docker.include"], + "includes": ['docker.include', 'legacy_docker.include'], "has_perfdata": True, "group": "docker_node_disk_usage", } diff --git a/checks/docker_node_info b/checks/docker_node_info index 531bd10..ce80041 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -26,8 +26,16 @@ def parse_docker_node_info(info): + version = docker_get_version(info) # pylint: disable=undefined-variable - return parse_legacy_docker_node_info(info) # pylint: disable=undefined-variable + if version is None: + return parse_legacy_docker_node_info(info) # pylint: disable=undefined-variable + + if len(info) < 2: + return {} + + loaded = docker_json_get_obj(info[1]) # pylint: disable=undefined-variable + return loaded or {} def check_docker_node_info(_no_item, _no_params, parsed): @@ -40,7 +48,7 @@ def check_docker_node_info(_no_item, _no_params, parsed): check_info['docker_node_info'] = { - 'includes': ['legacy_docker.include'], + 'includes': ['docker.include', 'legacy_docker.include'], 'parse_function': parse_docker_node_info, 'inventory_function': discover_single, 'check_function': check_docker_node_info, @@ -68,6 +76,7 @@ def check_docker_node_containers(_no_item, params, parsed): ("paused", "ContainersPaused", 'paused_'), ("stopped", "ContainersStopped", 'stopped_'), ): + count = parsed.get(key) if count is None: yield 3, "%s: count not present in agent output" % title @@ -89,4 +98,5 @@ check_info["docker_node_info.containers"] = { "service_description": "Docker containers", "has_perfdata": True, "group": "docker_node_containers", + 'includes': ['docker.include', 'legacy_docker.include'], } diff --git a/inventory/docker_container_labels b/inventory/docker_container_labels index b4d1655..197f692 100644 --- a/inventory/docker_container_labels +++ b/inventory/docker_container_labels @@ -28,7 +28,9 @@ def parse_docker_container_labels(info): - data = docker_json_get_obj(info[0]) if info[0:] else None + version = docker_get_version(info) + index = 0 if version is None else 1 + data = docker_json_get_obj(info[index]) if info[index:] else None return data diff --git a/inventory/docker_container_network b/inventory/docker_container_network index 70dc702..3ee9d44 100644 --- a/inventory/docker_container_network +++ b/inventory/docker_container_network @@ -26,7 +26,10 @@ def parse_docker_container_network(info): - parsed = docker_json_get_obj(info[0]) or {} # pylint: disable=undefined-variable + # pylint: disable=undefined-variable + version = docker_get_version(info) + index = 0 if version is None else 1 + parsed = docker_json_get_obj(info[index]) or {} return parsed diff --git a/inventory/docker_container_node_name b/inventory/docker_container_node_name index 03f7f9e..7454978 100644 --- a/inventory/docker_container_node_name +++ b/inventory/docker_container_node_name @@ -27,7 +27,11 @@ def parse_docker_container_node_name(info): # pylint: disable=undefined-variable - return {"NodeName": parse_legacy_docker_container_node_name(info)} + version = docker_get_version(info) + if version is None: + return {"NodeName": parse_legacy_docker_container_node_name(info)} + + return docker_json_get_obj(info[1]) or {} def inv_docker_container_node_name(info, inventory_tree): @@ -39,6 +43,6 @@ def inv_docker_container_node_name(info, inventory_tree): inv_info['docker_container_node_name'] = { # pylint: disable=undefined-variable - 'includes': ['legacy_docker.include'], + 'includes': ['docker.include', 'legacy_docker.include'], 'inv_function': inv_docker_container_node_name, } diff --git a/inventory/docker_node_images b/inventory/docker_node_images index a56cdd7..addcf62 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -39,9 +39,25 @@ def _split_subsections(info): def parse_docker_node_images(info): + # pylint: disable=undefined-variable + version = docker_get_version(info) - subsections = _split_subsections(info) - return parse_legacy_docker_node_images(subsections) # pylint: disable=undefined-variable + if version is None: + subsections = _split_subsections(info) + return parse_legacy_docker_node_images(subsections) + + subsections = _split_subsections(info[1:]) + i_images = (docker_json_get_obj(i) for i in subsections.get('images', [])) + images = {i["Id"]: i for i in i_images if i is not None} + i_containers = (docker_json_get_obj(c) for c in subsections.get('containers', [])) + containers = {c["Id"]: c for c in i_containers if c is not None} + + running_images = [c['Image'] for c in containers.itervalues()] + + for image_id in images: + images[image_id]['amount_containers'] = running_images.count(image_id) + + return {'images': images, 'containers': containers} def inv_docker_node_images(info, inventory_tree, status_data_tree): @@ -72,7 +88,8 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): for container_id, container in sorted(containers.iteritems()): status_node.append({ "id": docker_get_short_id(container_id), # pylint: disable=undefined-variable - "name": container["Names"], + "image": docker_get_short_id(container["Image"]), # pylint: disable=undefined-variable + "name": container["Name"], "creation": container["Created"], "labels": docker_format_labels(container), # pylint: disable=undefined-variable "status": container.get("State", {}).get("Status"), @@ -80,7 +97,7 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): inv_info['docker_node_images'] = { # pylint: disable=undefined-variable - 'includes': ['docker.include', 'legacy_docker.include'], + 'includes': ['legacy_docker.include', 'docker.include'], 'inv_function': inv_docker_node_images, 'has_status_data': True, } diff --git a/inventory/docker_node_network b/inventory/docker_node_network index 6b076dd..a585fb8 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -26,13 +26,19 @@ def parse_docker_network(info): + version = docker_get_version(info) # pylint: disable=undefined-variable - networks = parse_legacy_docker_network_inspect(info) # pylint: disable=undefined-variable - return dict((n["Id"], n) for n in networks) + if version is None: + networks = parse_legacy_docker_network_inspect(info) # pylint: disable=undefined-variable + return DeprecatedDict((n["Id"], n) for n in networks) + + networks = (docker_json_get_obj(line) for line in info[1:]) # pylint: disable=undefined-variable + return {n["Id"]: n for n in networks if n is not None} def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): parsed = parse_docker_network(info) + for network_id, network in parsed.iteritems(): containers = [] @@ -75,6 +81,6 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): inv_info["docker_node_network.networks"] = { # pylint: disable=undefined-variable - "includes": ["docker.include", "legacy_docker.include"], + "includes": ['docker.include', 'legacy_docker.include'], "inv_function": inv_docker_node_network_networks, }

5 years, 7 months

we use pyopenssl 16.2.0 with openssl 0.9.8

by Alex Zurhake

Module: check_mk Branch: master Commit: 995a77e36fb34ed23b4877a1d622b2a7e42698e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=995a77e36fb34e… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Feb 13 22:42:48 2019 +0100 we use pyopenssl 16.2.0 with openssl 0.9.8 Change-Id: Ie50b723768aab15975b84045ebe259bb3b825929 --- .../patches/0006-pyOpenSSL_with_0.9.8.dif | 40 ---------------------- 1 file changed, 40 deletions(-) diff --git a/omd/packages/python-modules/patches/0006-pyOpenSSL_with_0.9.8.dif b/omd/packages/python-modules/patches/0006-pyOpenSSL_with_0.9.8.dif deleted file mode 100644 index a6e19d5..0000000 --- a/omd/packages/python-modules/patches/0006-pyOpenSSL_with_0.9.8.dif +++ /dev/null @@ -1,40 +0,0 @@ ---- dest/pyOpenSSL-18.0.0.orig/src/OpenSSL/crypto.py 2018-05-16 21:14:32.000000000 +0200 -+++ dest/pyOpenSSL-18.0.0/src/OpenSSL/crypto.py 2018-10-25 13:36:23.656135919 +0200 -@@ -1566,7 +1566,10 @@ - EXPLICIT_POLICY = _lib.X509_V_FLAG_EXPLICIT_POLICY - INHIBIT_MAP = _lib.X509_V_FLAG_INHIBIT_MAP - NOTIFY_POLICY = _lib.X509_V_FLAG_NOTIFY_POLICY -- CHECK_SS_SIGNATURE = _lib.X509_V_FLAG_CHECK_SS_SIGNATURE -+ try: -+ CHECK_SS_SIGNATURE = _lib.X509_V_FLAG_CHECK_SS_SIGNATURE -+ except AttributeError: -+ pass - CB_ISSUER_CHECK = _lib.X509_V_FLAG_CB_ISSUER_CHECK - - ---- dest/pyOpenSSL-18.0.0.orig/src/OpenSSL/SSL.py 2018-05-16 21:14:32.000000000 +0200 -+++ dest/pyOpenSSL-18.0.0/src/OpenSSL/SSL.py 2018-10-25 13:36:23.656135919 +0200 -@@ -141,7 +141,10 @@ - OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1 - OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2 - --MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS -+try: -+ MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS -+except AttributeError: -+ pass - - OP_SINGLE_DH_USE = _lib.SSL_OP_SINGLE_DH_USE - OP_SINGLE_ECDH_USE = _lib.SSL_OP_SINGLE_ECDH_USE -@@ -166,7 +169,10 @@ - OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG = ( - _lib.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG - ) --OP_NO_COMPRESSION = _lib.SSL_OP_NO_COMPRESSION -+try: -+ OP_NO_COMPRESSION = _lib.SSL_OP_NO_COMPRESSION -+except AttributeError: -+ pass - - OP_NO_QUERY_MTU = _lib.SSL_OP_NO_QUERY_MTU - OP_COOKIE_EXCHANGE = _lib.SSL_OP_COOKIE_EXCHANGE

5 years, 7 months

7154 SEC OpenSSL update on our build platform

by Alex Zurhake

Module: check_mk Branch: master Commit: acf8a0ce451be8f90076d156e51240f5550ab66d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acf8a0ce451be8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Feb 12 08:59:10 2019 +0100 7154 SEC OpenSSL update on our build platform Centos 6, Suse Enterprise 11 SP2 and SP3 updated OpenSSL. Therefore, we updated our build systems and python packages. In case you experience SSL problems on one of these systems, please update your OS. Change-Id: I0214aa36794704e80ef99141a86c1c9bc51354eb --- .werks/7154 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/7154 b/.werks/7154 new file mode 100644 index 0000000..bb0f068 --- /dev/null +++ b/.werks/7154 @@ -0,0 +1,10 @@ +Title: OpenSSL update on our build platform +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1549958118 +Class: security + +Centos 6, Suse Enterprise 11 SP2 and SP3 updated OpenSSL. Therefore, we updated our build systems and python packages. In case you experience SSL problems on one of these systems, please update your OS.

5 years, 7 months

downgrade some py-modules, since they don't work with old openssl 0.9.8

by Alex Zurhake

Module: check_mk Branch: master Commit: 451ef6079e19a302ac221fc593a613b6b05fbe7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=451ef6079e19a3… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Feb 13 22:04:11 2019 +0100 downgrade some py-modules, since they don't work with old openssl 0.9.8 Change-Id: I0e76f4bf84ccbcbed22b48b5475572ee2a72fa5c --- omd/packages/python-modules/python-modules.make | 17 +++++++++++------ omd/packages/python-modules/src/paramiko-2.1.2.tar.gz | Bin 0 -> 1196746 bytes .../python-modules/src/pyOpenSSL-16.2.0.tar.gz | Bin 0 -> 167305 bytes omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz | Bin 0 -> 139198 bytes 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index a7621fa..2f11869 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -111,23 +111,30 @@ 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 +# Added for NetApp special agent, but may be used in other components too in future +PYTHON_MODULES_LIST += requests-2.20.1.tar.gz + ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 squeeze),) PYTHON_MODULES_LIST += cryptography-1.4.tar.gz + # Has requests as dependency -> must be built after + PYTHON_MODULES_LIST += pyOpenSSL-16.2.0.tar.gz + PYTHON_MODULES_LIST += paramiko-2.1.2.tar.gz + PYTHON_MODULES_LIST += pyghmi-1.2.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 PYTHON_MODULES_LIST += asn1crypto-0.24.0.tar.gz PYTHON_MODULES_LIST += cryptography-2.4.1.tar.gz + # Has requests as dependency -> must be built after + PYTHON_MODULES_LIST += pyOpenSSL-18.0.0.tar.gz + PYTHON_MODULES_LIST += paramiko-2.4.2.tar.gz + PYTHON_MODULES_LIST += pyghmi-1.2.14.tar.gz PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-2.4.1-disable-version-warning.patch endif PYTHON_MODULES_LIST += certifi-2018.10.15.tar.gz PYTHON_MODULES_LIST += chardet-3.0.4.tar.gz PYTHON_MODULES_LIST += urllib3-1.24.1.tar.gz -# Added for NetApp special agent, but may be used in other components too in future -PYTHON_MODULES_LIST += requests-2.20.1.tar.gz -# Has requests as dependency -> must be built after -PYTHON_MODULES_LIST += pyOpenSSL-18.0.0.tar.gz # Added for check_bi_aggr with kerberos support PYTHON_MODULES_LIST += pykerberos-1.2.1.tar.gz PYTHON_MODULES_LIST += requests-kerberos-0.12.0.tar.gz @@ -136,10 +143,8 @@ PYTHON_MODULES_LIST += tinkerforge-2.1.19.tar.gz # Added for check_sftp PYTHON_MODULES_LIST += bcrypt-3.1.4.tar.gz PYTHON_MODULES_LIST += PyNaCl-1.3.0.tar.gz -PYTHON_MODULES_LIST += paramiko-2.4.2.tar.gz # Added for IPMI monitoring of management interface PYTHON_MODULES_LIST += pbr-5.1.0.tar.gz -PYTHON_MODULES_LIST += pyghmi-1.2.14.tar.gz PYTHON_MODULES_LIST += typing-3.6.6.tar.gz PYTHON_MODULES_LIST += scandir-1.9.0.tar.gz diff --git a/omd/packages/python-modules/src/paramiko-2.1.2.tar.gz b/omd/packages/python-modules/src/paramiko-2.1.2.tar.gz new file mode 100644 index 0000000..34c3dd6 Binary files /dev/null and b/omd/packages/python-modules/src/paramiko-2.1.2.tar.gz differ diff --git a/omd/packages/python-modules/src/pyOpenSSL-16.2.0.tar.gz b/omd/packages/python-modules/src/pyOpenSSL-16.2.0.tar.gz new file mode 100644 index 0000000..568f255 Binary files /dev/null and b/omd/packages/python-modules/src/pyOpenSSL-16.2.0.tar.gz differ diff --git a/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz b/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz new file mode 100644 index 0000000..73ec860 Binary files /dev/null and b/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz differ

5 years, 7 months

diskstat.include: Added missing direction for latency levels

by Simon Betz

Module: check_mk Branch: master Commit: 2cc12374994a6ad89dfb71faa7c3418f6a1cfaba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cc12374994a6a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 13 18:36:06 2019 +0100 diskstat.include: Added missing direction for latency levels Change-Id: I87245b4230e1812093129e500b180762d18bb1d3 --- checks/diskstat.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index 7a413d3..75b77e2 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -478,7 +478,7 @@ def check_diskstat_dict(item, params, disks): # Read/write disk latency for what in ["read", "write"]: - latency_key = "%s_latency" + latency_key = "%s_latency" % what if latency_key not in disk: continue latency = disk.pop(latency_key)

5 years, 7 months

aws_ebs.burst_balance: New check for AWS/ EBS which monitors the burst balance of block storages

by Simon Betz

Module: check_mk Branch: master Commit: 6fe72f5cac0d417fed5c9ca1534db625c01628d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fe72f5cac0d41… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 12 16:08:05 2019 +0100 aws_ebs.burst_balance: New check for AWS/EBS which monitors the burst balance of block storages Change-Id: I84e26a7775e20ad5b18fb4b34f02793c9570ccd8 --- agents/special/agent_aws | 2 +- checkman/aws_ebs.burst_balance | 14 ++++++ checks/aws_ebs | 74 ++++++++++++++++++++++------ cmk/gui/plugins/metrics/check_mk.py | 6 +++ cmk/gui/plugins/wato/check_parameters/aws.py | 50 +++++++++++++++++++ 5 files changed, 129 insertions(+), 17 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index e4cdfca..fb4bca8 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -1057,12 +1057,12 @@ class EBS(AWSSectionCloudwatch): ("VolumeReadBytes", "Bytes", []), ("VolumeWriteBytes", "Bytes", []), ("VolumeQueueLength", "Count", []), + ("BurstBalance", "Percent", ["gp2", "st1", "sc1"]), #("VolumeThroughputPercentage", "Percent", ["io1"]), #("VolumeConsumedReadWriteOps", "Count", ["io1"]), #("VolumeTotalReadTime", "Seconds", []), #("VolumeTotalWriteTime", "Seconds", []), #("VolumeIdleTime", "Seconds", []), - #("BurstBalance", "Percent", ["gp2", "st1", "sc1"]), #("VolumeStatus", None, []), #("IOPerformance", None, ["io1"]), ]: diff --git a/checkman/aws_ebs.burst_balance b/checkman/aws_ebs.burst_balance new file mode 100644 index 0000000..f5ca2d5 --- /dev/null +++ b/checkman/aws_ebs.burst_balance @@ -0,0 +1,14 @@ +title: AWS EBS Burst Balance +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors burst balance of AWS EBS. + To make this check work you have to configure the related + special agent {Amazon Web Services (AWS)}. + + No default levels are set. Lower levels can be configured. + +inventory: + One service per volume is created. diff --git a/checks/aws_ebs b/checks/aws_ebs index 7f0e366..8febbdf 100644 --- a/checks/aws_ebs +++ b/checks/aws_ebs @@ -26,21 +26,32 @@ def parse_aws_ebs(info): - return _extract_aws_metrics_by_labels([ - "VolumeReadOps", - "VolumeWriteOps", - "VolumeReadBytes", - "VolumeWriteBytes", - "VolumeQueueLength", - "VolumeThroughputPercentage", - "VolumeConsumedReadWriteOps", - "VolumeTotalReadTime", - "VolumeTotalWriteTime", - "VolumeIdleTime", - "BurstBalance", - "VolumeStatus", - "IOPerformance", - ], parse_aws(info)) + return _extract_aws_metrics_by_labels( + [ + "VolumeReadOps", + "VolumeWriteOps", + "VolumeReadBytes", + "VolumeWriteBytes", + "VolumeQueueLength", + "BurstBalance", + #"VolumeThroughputPercentage", + #"VolumeConsumedReadWriteOps", + #"VolumeTotalReadTime", + #"VolumeTotalWriteTime", + #"VolumeIdleTime", + ], + parse_aws(info)) + + +def inventory_aws_ebs_generic(parsed, required_metrics): + for instance_name, instance in parsed.iteritems(): + discover = True + for required_metric in required_metrics: + if required_metric not in instance: + discover = False + break + if discover: + yield instance_name, {} # .--Disk IO-------------------------------------------------------------. @@ -77,10 +88,41 @@ def check_aws_ebs(item, params, parsed): check_info['aws_ebs'] = { 'parse_function': parse_aws_ebs, - 'inventory_function': discover(), + 'inventory_function': lambda p:\ + inventory_aws_ebs_generic(p, ['VolumeReadOps', 'VolumeWriteOps', 'VolumeReadBytes', 'VolumeWriteBytes', 'VolumeQueueLength']), 'check_function': check_aws_ebs, 'service_description': 'AWS/EBS Disk IO %s', 'includes': ['diskstat.include', 'aws.include'], 'group': 'diskstat', 'has_perfdata': True, } + +#. +# .--burst balance-------------------------------------------------------. +# | _ _ _ _ | +# | | |__ _ _ _ __ ___| |_ | |__ __ _| | __ _ _ __ ___ ___ | +# | | '_ \| | | | '__/ __| __| | '_ \ / _` | |/ _` | '_ \ / __/ _ \ | +# | | |_) | |_| | | \__ \ |_ | |_) | (_| | | (_| | | | | (_| __/ | +# | |_.__/ \__,_|_| |___/\__| |_.__/ \__,_|_|\__,_|_| |_|\___\___| | +# | | +# '----------------------------------------------------------------------' + + +@get_parsed_item_data +def check_aws_ebs_burst_balance(item, params, metrics): + warn, crit = params.get("burst_balance_levels_lower", (None, None)) + yield check_levels( + metrics['BurstBalance'], + "aws_burst_balance", (None, None, warn, crit), + human_readable_func=get_percent_human_readable, + infoname='Balance') + + +check_info['aws_ebs.burst_balance'] = { + 'inventory_function': lambda p:\ + inventory_aws_ebs_generic(p, ['BurstBalance']), + 'check_function': check_aws_ebs_burst_balance, + 'service_description': 'AWS/EBS Burst Balance %s', + 'group': 'aws_ebs_burst_balance', + 'has_perfdata': True +} diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 9dd4716..235211e 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4854,6 +4854,12 @@ metric_info['aws_backend_connection_errors_rate'] = { 'color': '15/a', } +metric_info['aws_burst_balance'] = { + 'title': _('Burst Balance'), + 'unit': '%', + 'color': '11/a', +} + metric_info["elapsed_time"] = { "title": _("Elapsed time"), "unit": "s", diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 8564d92..0a96bc2 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -34,14 +34,37 @@ from cmk.gui.valuespec import ( Percentage, Age, FixedValue, + TextAscii, ) from cmk.gui.plugins.wato import ( RulespecGroupCheckParametersApplications, CheckParameterRulespecWithoutItem, + CheckParameterRulespecWithItem, rulespec_registry, ) +def _vs_burst_balance(): + return ('burst_balance_levels_lower', + Alternative( + title=_("Lower levels for burst balance"), + style="dropdown", + elements=[ + Tuple( + title=_("Set levels"), + elements=[ + Percentage(title=_("Warning at or below")), + Percentage(title=_("Critical at or below")), + ]), + Tuple( + title=_("No levels"), + elements=[ + FixedValue(None, totext=""), + FixedValue(None, totext=""), + ]), + ])) + + @rulespec_registry.register class RulespecCheckgroupParametersAwsEc2CpuCredits(CheckParameterRulespecWithoutItem): @property @@ -305,3 +328,30 @@ class RulespecCheckgroupParametersAwsElbBackendConnectionErrors(CheckParameterRu ], ), )],) + + +(a)rulespec_registry.register +class RulespecCheckgroupParametersAwsEbsBurstBalance(CheckParameterRulespecWithItem): + @property + def group(self): + return RulespecGroupCheckParametersApplications + + @property + def check_group_name(self): + return "aws_ebs_burst_balance" + + @property + def title(self): + return _("AWS/EBS Burst Balance") + + @property + def match_type(self): + return "dict" + + @property + def parameter_valuespec(self): + return Dictionary(elements=[_vs_burst_balance()]) + + @property + def item_spec(self): + return TextAscii(title=_("Block storage name"))

5 years, 7 months

7097 diskstat.include: Read/write latency are configurable now

by Simon Betz

Module: check_mk Branch: master Commit: 4ec762e5e012a8915a9fbd6f7b0c6075d40715d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ec762e5e012a8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 12 16:55:12 2019 +0100 7097 diskstat.include: Read/write latency are configurable now Change-Id: I4306534b98569aec26ef21b25727a003341bb2b3 --- .werks/7097 | 12 ++++++++++++ checks/diskstat.include | 16 ++++++++++++++++ cmk/gui/plugins/wato/check_parameters/diskstat.py | 12 ++++++++++++ 3 files changed, 40 insertions(+) diff --git a/.werks/7097 b/.werks/7097 new file mode 100644 index 0000000..d65d173 --- /dev/null +++ b/.werks/7097 @@ -0,0 +1,12 @@ +Title: diskstat.include: Read/write latency are configurable now +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1549986859 +Class: feature + +Nearly all check plugins which use the diskstat.include in order to check +disk IO provide an average value for the disk latency. Newer checks may +provide values for disk read and write latency. diff --git a/checks/diskstat.include b/checks/diskstat.include index 8abb2de..7a413d3 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -476,6 +476,22 @@ def check_diskstat_dict(item, params, disks): statemarkers=False, infoname='Latency') + # Read/write disk latency + for what in ["read", "write"]: + latency_key = "%s_latency" + if latency_key not in disk: + continue + latency = disk.pop(latency_key) + if latency is not None: + yield check_levels( + latency, + "disk_%s" % latency_key, + params.get(latency_key), + unit="ms", + scale=0.001, + statemarkers=False, + infoname='%s latency' % what.title()) + # Queue lengths for what, plugin_text in [ ("queue_length", "Queue Length"), diff --git a/cmk/gui/plugins/wato/check_parameters/diskstat.py b/cmk/gui/plugins/wato/check_parameters/diskstat.py index a584a73..11d64f3 100644 --- a/cmk/gui/plugins/wato/check_parameters/diskstat.py +++ b/cmk/gui/plugins/wato/check_parameters/diskstat.py @@ -126,6 +126,18 @@ class RulespecCheckgroupParametersDiskstat(CheckParameterRulespecWithItem): unit=_("ms"), default_levels=(80.0, 160.0), )), + ("read_latency", + Levels( + title=_("Disk Read Latency"), + unit=_("ms"), + default_levels=(80.0, 160.0), + )), + ("write_latency", + Levels( + title=_("Disk Write Latency"), + unit=_("ms"), + default_levels=(80.0, 160.0), + )), ("read_wait", Levels( title=_("Read wait"), unit=_("ms"), default_levels=(30.0, 50.0))), ("write_wait",

5 years, 7 months

Fixed applying custom host attribute changes to folder hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d388ccd9bbeb27c9c18ecdec4244f7e27ecb7af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d388ccd9bbeb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 18:07:22 2019 +0100 Fixed applying custom host attribute changes to folder hierarchy When a custom host attribute is changed this may directly apply the hosts.mk files, for example when toggling the option "Add as custom macro". In previous 1.6 code this change was only applied after rewriting the hosts.mk files (by editing hosts or folders or some other action). Change-Id: I2602223cddcb88d6cefbe5c37d64e119942ce5bc --- cmk/gui/wato/pages/custom_attributes.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/wato/pages/custom_attributes.py b/cmk/gui/wato/pages/custom_attributes.py index 0a01d92..dbe0598 100644 --- a/cmk/gui/wato/pages/custom_attributes.py +++ b/cmk/gui/wato/pages/custom_attributes.py @@ -30,6 +30,7 @@ import os import pprint import re +import cmk.gui.config as config import cmk.gui.forms as forms from cmk.gui.table import table_element import cmk.gui.userdb as userdb @@ -39,7 +40,6 @@ from cmk.gui.exceptions import MKUserError from cmk.gui.globals import html from cmk.gui.i18n import _ from cmk.gui.watolib.host_attributes import ( - declare_custom_host_attrs, host_attribute_topic_registry, transform_pre_16_host_topics, ) @@ -52,8 +52,8 @@ def update_user_custom_attrs(): userdb.rewrite_users() -def update_host_custom_attrs(): - declare_custom_host_attrs() +def _update_host_custom_attrs(): + config.load_config() Folder.invalidate_caches() Folder.root_folder().rewrite_hosts_files() @@ -367,7 +367,7 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): "e.g. in check commands or in notifications.") def _update_config(self): - update_host_custom_attrs() + _update_host_custom_attrs() def title(self): if self._new: @@ -486,7 +486,7 @@ class ModeCustomHostAttrs(ModeCustomAttrs): return 'host' def _update_config(self): - update_host_custom_attrs() + _update_host_custom_attrs() def title(self): return _("Custom Host Attributes")

5 years, 7 months

agent_aws: Reordered configuration of services, use DNSName for load balancers and fixed some blemishes

by Simon Betz

Module: check_mk Branch: master Commit: 133534b2a478798261b3e68c71ad76a0d7efd744 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=133534b2a47879… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 13 10:27:23 2019 +0100 agent_aws: Reordered configuration of services, use DNSName for load balancers and fixed some blemishes Change-Id: Ibb23fb8a560a98b20d60867c90f3ad0fd7b55b85 --- agents/special/agent_aws | 27 ++++++++++++++++----------- checks/agent_aws | 6 ++++-- checks/aws_ec2 | 2 +- checks/aws_s3 | 7 +++++-- cmk/gui/plugins/wato/check_parameters/aws.py | 4 ++-- cmk/gui/plugins/wato/datasource_programs.py | 22 ++++++++++++---------- 6 files changed, 40 insertions(+), 28 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index d68c489..e4cdfca 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -450,8 +450,10 @@ class EC2Summary(AWSSectionGeneric): return self._client.describe_instances() def _compute_content(self, raw_content, colleague_contents): + # PrivateIpAddress and InstanceId is available although the instance is stopped return AWSComputedContent({ - instance["PrivateDnsName"]: instance for reservation in raw_content.content + "%s-%s-%s" % (instance['PrivateIpAddress'], self._region, instance['InstanceId']): + instance for reservation in raw_content.content for instance in reservation.get('Instances', []) }, raw_content.cache_timestamp) @@ -784,18 +786,20 @@ class ELBSummary(AWSSectionGeneric): found_load_balancers = [] for load_balancer in self._describe_load_balancers(): load_balancer_name = load_balancer['LoadBalancerName'] - tag_descrs = [] + tagging = [] try: response = self._client.describe_tags(LoadBalancerNames=[load_balancer_name]) - tag_descrs = response['TagDescriptions'] + tagging = [ + tag for tag_descr in response['TagDescriptions'] for tag in tag_descr['Tags'] + ] except botocore.exceptions.ClientError as e: # If there are no tags attached to a bucket we receive a 'ClientError' logging.info("%s/%s: No tags set, %s", self.name, load_balancer_name, e) except KeyError as e: logging.info("%s/%s: KeyError %s; Available are %s", self.name, load_balancer_name, e, response.keys()) - if self._matches_conditions(tag_descrs): - load_balancer['TagDescriptions'] = tag_descrs + if self._matches_conditions(tagging): + load_balancer['TagDescriptions'] = tagging found_load_balancers.append(load_balancer) return found_load_balancers @@ -823,7 +827,7 @@ class ELBSummary(AWSSectionGeneric): def _compute_content(self, raw_content, colleague_contents): content_by_piggyback_hosts = {} for load_balancer in raw_content.content: - content_by_piggyback_hosts.setdefault(load_balancer['LoadBalancerName'], load_balancer) + content_by_piggyback_hosts.setdefault(load_balancer['DNSName'], load_balancer) return AWSComputedContent(content_by_piggyback_hosts, raw_content.cache_timestamp) def _create_results(self, computed_content): @@ -847,7 +851,8 @@ class ELBHealth(AWSSectionGeneric): def _fetch_raw_content(self, colleague_contents): load_balancers = {} - for load_balancer_name in colleague_contents.content.iterkeys(): + for load_balancer_dns_name, load_balancer in colleague_contents.content.iteritems(): + load_balancer_name = load_balancer['LoadBalancerName'] response = self._client.describe_instance_health(LoadBalancerName=load_balancer_name) try: states = response['InstanceStates'] @@ -855,7 +860,7 @@ class ELBHealth(AWSSectionGeneric): logging.info("%s/%s: KeyError %s; Available are %s", self.name, load_balancer_name, e, response.keys()) else: - load_balancers.setdefault(load_balancer_name, states) + load_balancers.setdefault(load_balancer_dns_name, states) return load_balancers def _compute_content(self, raw_content, colleague_contents): @@ -886,7 +891,8 @@ class ELB(AWSSectionCloudwatch): def _get_metrics(self, colleague_contents): metrics = [] idx = 0 - for load_balancer_name in colleague_contents.content.iterkeys(): + for load_balancer_dns_name, load_balancer in colleague_contents.content.iteritems(): + load_balancer_name = load_balancer['LoadBalancerName'] for metric_name, stat in [ ("RequestCount", "Sum"), ("SurgeQueueLength", "Maximum"), @@ -904,7 +910,7 @@ class ELB(AWSSectionCloudwatch): ]: metrics.append({ 'Id': "%s_%s" % (metric_name.lower(), idx), - 'Label': load_balancer_name, + 'Label': load_balancer_dns_name, 'MetricStat': { 'Metric': { 'Namespace': 'AWS/ELB', @@ -1368,7 +1374,6 @@ def parse_arguments(argv): parser.add_argument( "--regions", nargs='+', - required=True, help="Regions to use:\n%s" % "\n".join(["%-15s %s" % e for e in AWSRegions])) parser.add_argument( diff --git a/checks/agent_aws b/checks/agent_aws index 0ee1b79..e641e42 100644 --- a/checks/agent_aws +++ b/checks/agent_aws @@ -71,8 +71,10 @@ def agent_aws_arguments(params, hostname, ipaddress): "--secret-access-key", passwordstore_get_cmdline("%s", params["secret_access_key"]), ] - args.append("--regions") - args += params["regions"] + regions = params.get("regions") + if regions: + args.append("--regions") + args += regions global_services = params.get("global_services", {}) if global_services: diff --git a/checks/aws_ec2 b/checks/aws_ec2 index f9e8e92..6c405ee 100644 --- a/checks/aws_ec2 +++ b/checks/aws_ec2 @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -EC2DefaultItemName = "DEFAULT" +EC2DefaultItemName = "Summary" def parse_aws_ec2(info): diff --git a/checks/aws_s3 b/checks/aws_s3 index 9e84e2f..fc032a1 100644 --- a/checks/aws_s3 +++ b/checks/aws_s3 @@ -70,8 +70,11 @@ def check_aws_s3_objects(item, params, metrics): storage_infos.append( "%s: %s" % (aws_s3_storage_mapping[storage_type], get_bytes_human_readable(value))) sum_size = sum(bucket_sizes.values()) - yield (0, - 'Bucket size: %s (%s)' % (get_bytes_human_readable(sum_size), ", ".join(storage_infos)), + if storage_infos: + storage_infos_str = " (%s)" % ", ".join(storage_infos) + else: + storage_infos_str = "" + yield (0, 'Bucket size: %s%s' % (get_bytes_human_readable(sum_size), storage_infos_str), [('aws_bucket_size', sum_size)]) num_objects = sum(metrics['numberofobjects'].values()) diff --git a/cmk/gui/plugins/wato/check_parameters/aws.py b/cmk/gui/plugins/wato/check_parameters/aws.py index 0d4a238..8564d92 100644 --- a/cmk/gui/plugins/wato/check_parameters/aws.py +++ b/cmk/gui/plugins/wato/check_parameters/aws.py @@ -111,8 +111,8 @@ class RulespecCheckgroupParametersAwsCostsAndUsage(CheckParameterRulespecWithout Tuple( title=_("Upper levels for unblended costs"), elements=[ - Integer(title=_("Warning at")), - Integer(title=_("Critical at")), + Integer(title=_("Warning at"), unit=_("USD per day")), + Integer(title=_("Critical at"), unit=_("USD per day")), ], ), )],) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index e5c9bae..ddd5d44 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1890,12 +1890,24 @@ class RulespecSpecialAgentsAws(HostRulespec): TextAscii( title=_("The access key for your AWS account"), allow_empty=False, + size=50, )), ("secret_access_key", IndividualOrStoredPassword( title=_("The secret key for your AWS account"), allow_empty=False, )), + ("global_services", + Dictionary( + title=_("Global services to monitor"), + elements=[ + ("ce", + FixedValue( + None, + totext=_("Monitor costs and usage"), + title=_("Costs and usage (CE)"))), + ], + )), ("regions", ListChoice( title=_("Regions to use"), @@ -1922,16 +1934,6 @@ class RulespecSpecialAgentsAws(HostRulespec): ], key=lambda x: x[1]), )), - ("global_services", - Dictionary( - title=_("Global services to monitor"), - elements=[ - ("ce", - FixedValue( - None, totext=_("Monitor costs and usage"), - title=_("Costs and usage"))), - ], - )), ("services", Dictionary( title=_("Services per region to monitor"),

5 years, 7 months

agent_aws: Use AnyStr for piggyback hostname

by Simon Betz

Module: check_mk Branch: master Commit: 84921acee7b36bf31c320fba610a32ef838eaf8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84921acee7b36b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 13 15:13:54 2019 +0100 agent_aws: Use AnyStr for piggyback hostname Change-Id: I92b9c3119b7e2f42c1f3c174613db1756de9964e --- agents/special/agent_aws | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 4693b61..d68c489 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -35,7 +35,7 @@ import logging import sys import time import errno -from typing import NamedTuple, Any, List +from typing import NamedTuple, Any, List, AnyStr from pathlib2 import Path import boto3 # type: ignore import botocore # type: ignore @@ -101,7 +101,7 @@ AWSSectionResults = NamedTuple("AWSSectionResults", [ ]) AWSSectionResult = NamedTuple("AWSSectionResult", [ - ("piggyback_hostname", Any), + ("piggyback_hostname", AnyStr), ("content", Any), ])

5 years, 7 months

← Newer
1
...
24
25
26
27
28
29
30
...
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