Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: dc4c2ce065b9f919a7a8b316d37c85e63669fbce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc4c2ce065b9f9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 6 14:12:39 2018 +0100 fix unexpected snmp parsing Change-Id: I3e88d7277f448d4a071aaf051d95a7e2fc24cc0a --- checks/juniper_bgp_state | 19 ++++---- .../datasets/juniper_bgp_state_1_regression.py | 4 +- .../datasets/juniper_bgp_state_ip_addresses.py | 54 +++++++++------------- 3 files changed, 32 insertions(+), 45 deletions(-) diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index 04e26dc..6f4c96e 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -26,14 +26,14 @@ def _clean_v4_address(chunks): - return "%d.%d.%d.%d" % tuple(int(c, 16) for c in chunks) + return "%d.%d.%d.%d" % tuple(chunks) def _clean_v6_address(chunks): - ichunks = iter(chunks) + ichunks = iter('%02x' % i for i in chunks) blocks = ("%s%s" % pair for pair in zip(ichunks, ichunks)) stripped_blocks = ('0' if b == '0000' else b.lstrip('0') for b in blocks) - v6_string = ':'.join(b.lower() for b in stripped_blocks) + v6_string = ':'.join(b for b in stripped_blocks) # replace longest series of zeros for length in range(8, 0, -1): @@ -49,15 +49,14 @@ def _clean_v6_address(chunks): def juniper_bgp_state_create_item(peering_entry): - chunks = peering_entry.split() try: - if len(chunks) == 4: - return _clean_v4_address(chunks) - elif len(chunks) == 16: - return _clean_v6_address(chunks) + if len(peering_entry) == 4: + return _clean_v4_address(peering_entry) + elif len(peering_entry) == 16: + return _clean_v6_address(peering_entry) except (ValueError, IndexError): pass - return "'%s'" % peering_entry.strip() + return ' '.join('%02X' % i for i in peering_entry) # that's what has been in the data def parse_juniper_bgp_state(info): @@ -118,7 +117,7 @@ check_info["juniper_bgp_state"] = { [ 2, # jnxBgpM2PeerState 3, # jnxBgpM2PeerStatus (like operational status) - 11, # jnxBgpM2PeerRemoteAddr + BINARY(11), # jnxBgpM2PeerRemoteAddr ]), "snmp_scan_function": lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), diff --git a/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py b/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py index 83064b9..6ee3eb2 100644 --- a/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py +++ b/tests/unit/checks/generictests/datasets/juniper_bgp_state_1_regression.py @@ -1,8 +1,8 @@ checkname = 'juniper_bgp_state' info = [ - [u'6', u'2', '64 60 01 22'], - [u'3', u'2', '64 60 01 26'], + [u'6', u'2', [100, 96, 1, 34]], + [u'3', u'2', [100, 96, 1, 38]], ] discovery = { diff --git a/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py b/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py index 1d8c10c..b8c2eb4 100644 --- a/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py +++ b/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py @@ -1,37 +1,25 @@ + + checkname = 'juniper_bgp_state' -info = [ - [u'4', u'1', 'DE AD BE EF 00 40 01 11 00 00 00 00 00 00 00 01'], - [u'4', u'2', '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'], - [u'4', u'2', 'DE AD BE EF 00 40 01 11 00 00 00 00 00 00 00 00'], - [u'4', u'1', '00 00 00 00 00 40 01 11 00 00 10 0A 00 00 00 00'], - [u'5', u'2', 'this is not a valid IP'], + +info = [[u'4', + u'1', + [222, 173, 190, 239, 0, 64, 1, 17, 0, 0, 0, 0, 0, 0, 0, 1]], + [u'4', u'2', [0] * 16], ] -discovery = { - '': [ - (u'[dead:beef:40:111::1]', {}), (u'[::]', {}), - (u'[dead:beef:40:111::]', {}), (u'[::40:111:0:100a:0:0]', {}), - (u"'this is not a valid IP'", {}), - ] -} - -checks = { - '': [ - (u'[dead:beef:40:111::1]', 'default', - [(0, u'Status with peer [dead:beef:40:111::1] is opensent', []), - (1, 'operational status: halted', [])]), - (u'[::]', 'default', - [(2, u'Status with peer [::] is opensent', []), - (0, 'operational status: running', [])]), - (u'[dead:beef:40:111::]', 'default', - [(2, u'Status with peer [dead:beef:40:111::] is opensent', []), - (0, 'operational status: running', [])]), - (u'[::40:111:0:100a:0:0]', 'default', - [(0, u'Status with peer [::40:111:0:100a:0:0] is opensent', []), - (1, 'operational status: halted', [])]), - (u"'this is not a valid IP'", 'default', - [(2, u"Status with peer 'this is not a valid IP' is openconfirm", []), - (0, 'operational status: running', [])]), - ] -} + +discovery = {'': [('[dead:beef:40:111::1]', {}), ("[::]", {})]} + + +checks = {'': [('[dead:beef:40:111::1]', + 'default', + [(0, 'Status with peer [dead:beef:40:111::1] is opensent', []), + (1, 'operational status: halted', [])]), + (u"[::]", + 'default', + [(2, + u"Status with peer [::] is opensent", + []), + (0, 'operational status: running', [])])]}

5 years, 7 months

Move CEE tests to regular tests hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 852b99679dc1717ac2616fbf7c8922a16ba6cd90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=852b99679dc171… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 10:26:55 2018 +0100 Move CEE tests to regular tests hierarchy * Pytest changed the symlink handling for the test and conftest.py discovery some versions ago. * This introduced several problems with the enterprise tests that were located below enterprise/tests but symlinked from different places below tests/... to register them with pytest. * The enterprise tests have now been moved to the regular hierarchy. * All CEE/CME tests should be located below a directory named "cee" or "cme". This marks the files to be internal and prevents them from being visible in the public repository. Change-Id: I582193ff9b0bb85223be46b80bc91f9551cf7524 --- tests/unit/cmk/cee | 1 - tests/unit/cmk/gui/cee | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/unit/cmk/cee b/tests/unit/cmk/cee deleted file mode 120000 index c9cb3b1..0000000 --- a/tests/unit/cmk/cee +++ /dev/null @@ -1 +0,0 @@ -../../../enterprise/tests/unit/cmk/cee \ No newline at end of file diff --git a/tests/unit/cmk/gui/cee b/tests/unit/cmk/gui/cee deleted file mode 120000 index 8de95c4..0000000 --- a/tests/unit/cmk/gui/cee +++ /dev/null @@ -1 +0,0 @@ -../../../../enterprise/tests/unit/cmk/gui/cee \ No newline at end of file

5 years, 7 months

jolokia_generic: warning in manpage

by Moritz Kiemer

Module: check_mk Branch: master Commit: 9a431c4ac9e12fc154e7e7fca930c22f61a50108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a431c4ac9e12f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 6 14:47:49 2018 +0100 jolokia_generic: warning in manpage CMK-1357 Change-Id: Ic9fe6317d39b67111ca392340b878cd4cf7cb8ed --- checkman/jolokia_generic | 8 ++++++++ checkman/jolokia_generic.rate | 8 ++++++++ checkman/jolokia_generic.string | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/checkman/jolokia_generic b/checkman/jolokia_generic index fd0f662..fabd03a 100644 --- a/checkman/jolokia_generic +++ b/checkman/jolokia_generic @@ -11,5 +11,13 @@ description: To use this plugin, Jolokia and the agent plugin need to be installed on the monitored server. + Please note that this check was designed with single values in mind. + It is best utilized using explicit configuration of specific MBeans + and their titles. + While bulk requests of MBeans may appear to work, it will probably + have undesired side effects (such as ugly formatting or discovery + of services always in UNKNOWN state), and is therefore strongly + discouraged. + inventory: One check is created for each numeric MBean value sent by the agent. diff --git a/checkman/jolokia_generic.rate b/checkman/jolokia_generic.rate index 87a45b9..e277d42 100644 --- a/checkman/jolokia_generic.rate +++ b/checkman/jolokia_generic.rate @@ -11,5 +11,13 @@ description: To use this plugin, Jolokia and the agent plugin need to be installed on the monitored server. + Please note that this check was designed with single values in mind. + It is best utilized using explicit configuration of specific MBeans + and their titles. + While bulk requests of MBeans may appear to work, it will probably + have undesired side effects (such as ugly formatting or discovery + of services always in UNKNOWN state), and is therefore strongly + discouraged. + inventory: One check is created for each numeric MBean rate value sent by the agent. diff --git a/checkman/jolokia_generic.string b/checkman/jolokia_generic.string index 393c52c..5dbd0eb 100644 --- a/checkman/jolokia_generic.string +++ b/checkman/jolokia_generic.string @@ -11,5 +11,13 @@ description: To use this plugin, Jolokia and the agent plugin need to be installed on the monitored server. + Please note that this check was designed with single values in mind. + It is best utilized using explicit configuration of specific MBeans + and their titles. + While bulk requests of MBeans may appear to work, it will probably + have undesired side effects (such as ugly formatting or discovery + of services always in UNKNOWN state), and is therefore strongly + discouraged. + inventory: One check is created for each MBean string value sent by the agent.

5 years, 7 months

k8s_resources: remove redundant code from inventory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 566f046bfccb67e9f5d897e5c32a475d64e97848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=566f046bfccb67… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Dec 5 08:48:47 2018 +0100 k8s_resources: remove redundant code from inventory CMK-511 Change-Id: Ib3c54014a30729779826e38620179ffe9cdd9276 --- checks/k8s_resources | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/checks/k8s_resources b/checks/k8s_resources index c6d294b..74ec4be 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -30,16 +30,19 @@ def parse_k8s_resources(info): return json.loads(info[0][0]) +def get_k8s_resources_inventory_function(name): + def inventory_function(parsed): + if parsed.get('capacity', {}).get(name): + return [(None, {})] + + return inventory_function + + check_info['k8s_resources'] = { 'parse_function': parse_k8s_resources, } -def inventory_k8s_pod_resources(parsed): - if parsed.get('capacity', {}).get('pods'): - return [(None, {})] - - def check_k8s_pod_resources(_no_item, params, parsed): pods = parsed.get('allocations', {}).get('pods', 0) yield 0, 'Pods: %d' % pods, [('k8s_pods', pods)] @@ -61,7 +64,7 @@ def check_k8s_pod_resources(_no_item, params, parsed): check_info['k8s_resources.pods'] = { - 'inventory_function': inventory_k8s_pod_resources, + 'inventory_function': get_k8s_resources_inventory_function('pods'), 'check_function': check_k8s_pod_resources, 'service_description': 'Pod resources', 'has_perfdata': True, @@ -69,11 +72,6 @@ check_info['k8s_resources.pods'] = { } -def inventory_k8s_cpu_resources(parsed): - if parsed.get('capacity', {}).get('cpu'): - return [(None, {})] - - def check_k8s_cpu_resources(_no_item, params, parsed): request = parsed.get('requests', {}).get('cpu', 0.0) yield 0, 'Request: %.3f' % request, [('k8s_cpu_request', request)] @@ -101,7 +99,7 @@ def check_k8s_cpu_resources(_no_item, params, parsed): check_info['k8s_resources.cpu'] = { - 'inventory_function': inventory_k8s_cpu_resources, + 'inventory_function': get_k8s_resources_inventory_function('cpu'), 'check_function': check_k8s_cpu_resources, 'service_description': 'CPU resources', 'has_perfdata': True, @@ -109,11 +107,6 @@ check_info['k8s_resources.cpu'] = { } -def inventory_k8s_mem_resources(parsed): - if parsed.get('capacity', {}).get('memory'): - return [(None, {})] - - def check_k8s_mem_resources(_no_item, params, parsed): request = parsed.get('requests', {}).get('memory', 0.0) yield 0, 'Request: %s' % get_bytes_human_readable(request), [('k8s_memory_request', request)] @@ -143,7 +136,7 @@ def check_k8s_mem_resources(_no_item, params, parsed): check_info['k8s_resources.memory'] = { - 'inventory_function': inventory_k8s_mem_resources, + 'inventory_function': get_k8s_resources_inventory_function('memory'), 'check_function': check_k8s_mem_resources, 'service_description': 'Memory resources', 'has_perfdata': True,

5 years, 7 months

k8s.include: Add common parse_function

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b7f97f5bc85fc41dad70c73b054afbdd2a24bc8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7f97f5bc85fc4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Dec 5 16:21:24 2018 +0100 k8s.include: Add common parse_function CMK-511 Change-Id: I3c9ce96070fa9c00804939466ce9d7e16c336e59 --- checks/k8s.include | 30 ++++++++++++++++++++++++++++++ checks/k8s_component_statuses | 8 ++------ checks/k8s_conditions | 8 ++------ checks/k8s_namespaces | 8 ++------ checks/k8s_nodes | 8 ++------ checks/k8s_persistent_volume_claims | 8 ++------ checks/k8s_persistent_volumes | 8 ++------ checks/k8s_resources | 8 ++------ checks/k8s_roles | 8 ++------ checks/k8s_storage_classes | 8 ++------ 10 files changed, 48 insertions(+), 54 deletions(-) diff --git a/checks/k8s.include b/checks/k8s.include new file mode 100644 index 0000000..1f76a9b --- /dev/null +++ b/checks/k8s.include @@ -0,0 +1,30 @@ +#!/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 parse_k8s(info): + import json + return json.loads(info[0][0]) diff --git a/checks/k8s_component_statuses b/checks/k8s_component_statuses index f441feb..99f754c 100644 --- a/checks/k8s_component_statuses +++ b/checks/k8s_component_statuses @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_component_statuses(info): - import json - return json.loads(info[0][0]) - - @get_parsed_item_data def check_k8s_component_statuses(item, _no_params, conditions): for condition in conditions: @@ -42,8 +37,9 @@ def check_k8s_component_statuses(item, _no_params, conditions): check_info['k8s_component_statuses'] = { - 'parse_function': parse_k8s_component_statuses, + 'parse_function': parse_k8s, 'inventory_function': discover(), 'check_function': check_k8s_component_statuses, 'service_description': 'Component %s', + 'includes': ['k8s.include'], } diff --git a/checks/k8s_conditions b/checks/k8s_conditions index fb6007b..6306dd1 100644 --- a/checks/k8s_conditions +++ b/checks/k8s_conditions @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_conditions(info): - import json - return json.loads(info[0][0]) - - @discover def inventory_k8s_conditions(condition, _value): return condition in { @@ -57,8 +52,9 @@ def check_k8s_conditions(item, _no_params, value): check_info['k8s_conditions'] = { - 'parse_function': parse_k8s_conditions, + 'parse_function': parse_k8s, 'inventory_function': inventory_k8s_conditions, 'check_function': check_k8s_conditions, 'service_description': 'Condition %s', + 'includes': ['k8s.include'], } diff --git a/checks/k8s_namespaces b/checks/k8s_namespaces index 0df4bf6..365c59b 100644 --- a/checks/k8s_namespaces +++ b/checks/k8s_namespaces @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_namespaces(info): - import json - return json.loads(info[0][0]) - - @discover def inventory_k8s_namespaces(_namespace, status): return status.get('status', {}).get('phase', '') == 'Active' @@ -45,8 +40,9 @@ def check_k8s_namespaces(item, _no_params, status): check_info['k8s_namespaces'] = { - 'parse_function': parse_k8s_namespaces, + 'parse_function': parse_k8s, 'inventory_function': inventory_k8s_namespaces, 'check_function': check_k8s_namespaces, 'service_description': 'Namespace %s', + 'includes': ['k8s.include'], } diff --git a/checks/k8s_nodes b/checks/k8s_nodes index 0a5a55b..23acd6c 100644 --- a/checks/k8s_nodes +++ b/checks/k8s_nodes @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_nodes(info): - import json - return json.loads(info[0][0]) - - def inventory_k8s_nodes(parsed): return [(None, {})] @@ -40,9 +35,10 @@ def check_k8s_nodes(_no_item, _no_params, parsed): check_info['k8s_nodes'] = { - 'parse_function': parse_k8s_nodes, + 'parse_function': parse_k8s, 'inventory_function': inventory_k8s_nodes, 'check_function': check_k8s_nodes, 'service_description': 'Nodes', 'has_perfdata': True, + 'includes': ['k8s.include'], } diff --git a/checks/k8s_persistent_volume_claims b/checks/k8s_persistent_volume_claims index 2f9a1e1..f7db8fd 100644 --- a/checks/k8s_persistent_volume_claims +++ b/checks/k8s_persistent_volume_claims @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_persistent_volume_claims(info): - import json - return json.loads(info[0][0]) - - @discover def inventory_k8s_persistent_volume_claims(_claim, data): return data.get('phase', '') == 'Bound' @@ -55,8 +50,9 @@ def check_k8s_persistent_volume_claims(_no_item, _no_params, claim): check_info['k8s_persistent_volume_claims'] = { - 'parse_function': parse_k8s_persistent_volume_claims, + 'parse_function': parse_k8s, 'inventory_function': inventory_k8s_persistent_volume_claims, 'check_function': check_k8s_persistent_volume_claims, 'service_description': 'PVC %s', + 'includes': ['k8s.include'], } diff --git a/checks/k8s_persistent_volumes b/checks/k8s_persistent_volumes index f8d5cfa..845e9f0 100644 --- a/checks/k8s_persistent_volumes +++ b/checks/k8s_persistent_volumes @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_persistent_volumes(info): - import json - return json.loads(info[0][0]) - - @discover def inventory_k8s_persistent_volumes(_pv, status): return status.get('status', {}).get('phase', '') == 'Bound' @@ -53,8 +48,9 @@ def check_k8s_persistent_volumes(item, _no_params, pv): check_info['k8s_persistent_volumes'] = { - 'parse_function': parse_k8s_persistent_volumes, + 'parse_function': parse_k8s, 'inventory_function': inventory_k8s_persistent_volumes, 'check_function': check_k8s_persistent_volumes, 'service_description': 'PV %s', + 'includes': ['k8s.include'], } diff --git a/checks/k8s_resources b/checks/k8s_resources index 74ec4be..d673380 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_resources(info): - import json - return json.loads(info[0][0]) - - def get_k8s_resources_inventory_function(name): def inventory_function(parsed): if parsed.get('capacity', {}).get(name): @@ -39,7 +34,8 @@ def get_k8s_resources_inventory_function(name): check_info['k8s_resources'] = { - 'parse_function': parse_k8s_resources, + 'parse_function': parse_k8s, + 'includes': ['k8s.include'], } diff --git a/checks/k8s_roles b/checks/k8s_roles index 6ebeacc..e5bda8d 100644 --- a/checks/k8s_roles +++ b/checks/k8s_roles @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_roles(info): - import json - return json.loads(info[0][0]) - - @get_parsed_item_data def check_k8s_roles(item, _no_params, role): age = time.time() - role['creation_timestamp'] @@ -43,8 +38,9 @@ def check_k8s_roles(item, _no_params, role): check_info['k8s_roles'] = { - 'parse_function': parse_k8s_roles, + 'parse_function': parse_k8s, 'inventory_function': discover(), 'check_function': check_k8s_roles, 'service_description': 'Role %s', + 'includes': ['k8s.include'], } diff --git a/checks/k8s_storage_classes b/checks/k8s_storage_classes index 609c31f..71efb6e 100644 --- a/checks/k8s_storage_classes +++ b/checks/k8s_storage_classes @@ -25,11 +25,6 @@ # Boston, MA 02110-1301 USA. -def parse_k8s_storage_classes(info): - import json - return json.loads(info[0][0]) - - @get_parsed_item_data def check_k8s_storage_classes(_no_item, _no_params, storage): reclaim_policy = storage.get('reclaim_policy') @@ -42,8 +37,9 @@ def check_k8s_storage_classes(_no_item, _no_params, storage): check_info['k8s_storage_classes'] = { - 'parse_function': parse_k8s_storage_classes, + 'parse_function': parse_k8s, 'inventory_function': discover(), 'check_function': check_k8s_storage_classes, 'service_description': 'Storage class %s', + 'includes': ['k8s.include'], }

5 years, 7 months

k8s_resources: unify the output of the special agent and the check_functions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 055e0db575631bb01edec2ec7ec2e2661ae9976e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=055e0db575631b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Dec 5 17:45:22 2018 +0100 k8s_resources: unify the output of the special agent and the check_functions CMK-511 Change-Id: Iff8457626cccd4efcba699f1af98b1b3b2df42ff --- agents/special/agent_kubernetes | 13 ++- checks/k8s_resources | 110 ++++++--------------- cmk/gui/plugins/metrics/check_mk.py | 4 +- .../datasets/k8s_resources_regression.py | 2 +- 4 files changed, 45 insertions(+), 84 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index 919710d..9d129c4 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -402,10 +402,10 @@ class PodList(ListLike[Pod]): # type: () -> Dict[str, Dict[str, Dict[str, int]]] pods_sorted = sorted(self, key=lambda pod: pod.node) by_node = itertools.groupby(pods_sorted, lambda pod: pod.node) - return {node: {'allocations': {'pods': len(list(pods))}} for node, pods in by_node} + return {node: {'requests': {'pods': len(list(pods))}} for node, pods in by_node} def pods_in_cluster(self): - return {'allocations': {'pods': len(self)}} + return {'requests': {'pods': len(self)}} def resources_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, float]]] @@ -561,7 +561,14 @@ class Section(object): def insert(self, data): # type: (Dict[str, Any]) -> None - self.content.update(data) + for key, value in data.iteritems(): + if key not in self.content: + self.content[key] = value + else: + if isinstance(value, dict): + self.content[key].update(value) + else: + raise ValueError('Key %s is already present and cannot be merged' % key) def output(self): # type: () -> str diff --git a/checks/k8s_resources b/checks/k8s_resources index d673380..47c482a 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -33,107 +33,61 @@ def get_k8s_resources_inventory_function(name): return inventory_function -check_info['k8s_resources'] = { - 'parse_function': parse_k8s, - 'includes': ['k8s.include'], -} +def get_k8s_resources_check_function(name, default, readable): + def check_resources(_no_item, params, parsed): + request = parsed.get('requests', {}).get(name, default) + yield 0, 'Request: %s' % readable(request), [('k8s_%s_request' % name, request)] + + limit = parsed.get('limits', {}).get(name) + if limit: + if math.isinf(limit): + yield 0, 'Limit: n.a.' + elif limit: + yield 0, 'Limit: %s' % readable(limit), [('k8s_%s_limit' % name, limit)] + allocatable = parsed.get('allocatable', {}).get(name, default) + yield 0, 'Allocatable: %s' % readable(allocatable), [('k8s_%s_allocatable' % name, + allocatable)] -def check_k8s_pod_resources(_no_item, params, parsed): - pods = parsed.get('allocations', {}).get('pods', 0) - yield 0, 'Pods: %d' % pods, [('k8s_pods', pods)] + capacity = parsed.get('capacity', {}).get(name, default) + yield 0, 'Capacity: %s' % readable(capacity), [('k8s_%s_capacity' % name, capacity)] - allocatable = parsed.get('allocatable', {}).get('pods', 0) - yield 0, 'Allocatable: %d' % allocatable, [('k8s_pods_allocatable', allocatable)] + if allocatable: + usage = 100.0 * request / allocatable + yield check_levels( + usage, + 'k8s_%s_usage' % name, + params.get(name), + infoname='Usage', + human_readable_func=get_percent_human_readable) - capacity = parsed.get('capacity', {}).get('pods', 0) - yield 0, 'Capacity: %d' % capacity, [('k8s_pods_capacity', capacity)] + return check_resources - if allocatable: - usage = 100.0 * pods / allocatable - yield check_levels( - usage, - 'k8s_pods_usage', - params.get('pods'), - infoname='Usage', - human_readable_func=get_percent_human_readable) +check_info['k8s_resources'] = { + 'parse_function': parse_k8s, + 'includes': ['k8s.include'], +} check_info['k8s_resources.pods'] = { 'inventory_function': get_k8s_resources_inventory_function('pods'), - 'check_function': check_k8s_pod_resources, + 'check_function': get_k8s_resources_check_function('pods', 0, str), 'service_description': 'Pod resources', 'has_perfdata': True, 'group': 'k8s_resources', } - -def check_k8s_cpu_resources(_no_item, params, parsed): - request = parsed.get('requests', {}).get('cpu', 0.0) - yield 0, 'Request: %.3f' % request, [('k8s_cpu_request', request)] - - limit = parsed.get('limits', {}).get('cpu') - if math.isinf(limit): - yield 0, 'Limit: n.a.' - else: - yield 0, 'Limit: %.3f' % limit, [('k8s_cpu_limit', limit)] - - allocatable = parsed.get('allocatable', {}).get('cpu', 0.0) - yield 0, 'Allocatable: %.3f' % allocatable, [('k8s_cpu_allocatable', allocatable)] - - capacity = parsed.get('capacity', {}).get('cpu', 0.0) - yield 0, 'Capacity: %.3f' % capacity, [('k8s_cpu_capacity', capacity)] - - if allocatable: - usage = 100.0 * request / allocatable - yield check_levels( - usage, - 'k8s_cpu_usage', - params.get('cpu'), - infoname='Usage', - human_readable_func=get_percent_human_readable) - - check_info['k8s_resources.cpu'] = { 'inventory_function': get_k8s_resources_inventory_function('cpu'), - 'check_function': check_k8s_cpu_resources, + 'check_function': get_k8s_resources_check_function('cpu', 0.0, lambda x: '%.3f' % x), 'service_description': 'CPU resources', 'has_perfdata': True, 'group': 'k8s_resources', } - -def check_k8s_mem_resources(_no_item, params, parsed): - request = parsed.get('requests', {}).get('memory', 0.0) - yield 0, 'Request: %s' % get_bytes_human_readable(request), [('k8s_memory_request', request)] - - limit = parsed.get('limits', {}).get('memory') - if math.isinf(limit): - yield 0, 'Limit: n.a.' - else: - yield 0, 'Limit: %s' % get_bytes_human_readable(limit), [('k8s_memory_limit', limit)] - - allocatable = parsed.get('allocatable', {}).get('memory', 0.0) - yield 0, 'Allocatable: %s' % get_bytes_human_readable(allocatable), [('k8s_memory_allocatable', - allocatable)] - - capacity = parsed.get('capacity', {}).get('memory', 0.0) - yield 0, 'Capacity: %s' % get_bytes_human_readable(capacity), [('k8s_memory_capacity', - capacity)] - - if allocatable: - usage = 100.0 * request / allocatable - yield check_levels( - usage, - 'k8s_memory_usage', - params.get('memory'), - infoname='Usage', - human_readable_func=get_percent_human_readable) - - check_info['k8s_resources.memory'] = { 'inventory_function': get_k8s_resources_inventory_function('memory'), - 'check_function': check_k8s_mem_resources, + 'check_function': get_k8s_resources_check_function('memory', 0.0, get_bytes_human_readable), 'service_description': 'Memory resources', 'has_perfdata': True, 'group': 'k8s_resources', diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index ed3976f..9bd0276 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4370,7 +4370,7 @@ metric_info["k8s_nodes"] = { "color": "11/a", } -metric_info["k8s_pods"] = { +metric_info["k8s_pods_request"] = { "title": _("Pods"), "unit": "count", "color": "16/b", @@ -8152,7 +8152,7 @@ graph_info["k8s_resources.pods"] = { "metrics": [ ("k8s_pods_capacity", "area"), ("k8s_pods_allocatable", "area"), - ("k8s_pods", "area"), + ("k8s_pods_request", "area"), ], } diff --git a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py index c9805f4..7b3bceb 100644 --- a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py +++ b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py @@ -26,7 +26,7 @@ checks = { (0, 'Usage: 0.0%', [('k8s_memory_usage', 0.0)]), ])], 'pods': [(None, 'default', [ - (0, 'Pods: 0', [('k8s_pods', 0)]), + (0, 'Request: 0', [('k8s_pods_request', 0)]), (0, 'Allocatable: 110', [('k8s_pods_allocatable', 110)]), (0, 'Capacity: 110', [('k8s_pods_capacity', 110)]), (0, 'Usage: 0.0%', [('k8s_pods_usage', 0.0)]),

5 years, 7 months

k8s_resources: make the usage of pods, CPU, and memory configurable via WATO

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 6514ba408ee5b474b2f7275190c3ad3b72d96509 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6514ba408ee5b4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Dec 4 16:42:43 2018 +0100 k8s_resources: make the usage of pods, CPU, and memory configurable via WATO CMK-511 Change-Id: I0376e61fc48f88b3e3db68d9c913bc6ef628c2a5 --- checkman/k8s_resources.cpu | 3 +- checkman/k8s_resources.memory | 3 +- checkman/k8s_resources.pods | 6 +- checks/k8s_resources | 38 +++++++++-- cmk/gui/plugins/metrics/check_mk.py | 18 ++++++ .../plugins/wato/check_parameters/k8s_resources.py | 73 ++++++++++++++++++++++ .../datasets/k8s_resources_regression.py | 3 + tests/unit/cmk/gui/test_watolib.py | 2 + 8 files changed, 138 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6514ba408e…

5 years, 7 months

Fix for log rotation wait logic

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ae929310252ff399a533c10ffdb5d85ddcf70dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ae929310252ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 13:58:57 2018 +0100 Fix for log rotation wait logic Change-Id: Icd6a757954641128b3cb31114c3b0e5ab6a63743 --- tests/integration/notifications/test_unreachable_notifications.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/notifications/test_unreachable_notifications.py b/tests/integration/notifications/test_unreachable_notifications.py index 9e57c0d..e15ac40 100644 --- a/tests/integration/notifications/test_unreachable_notifications.py +++ b/tests/integration/notifications/test_unreachable_notifications.py @@ -105,7 +105,8 @@ def initial_state(site, scenario): site.live.command("[%d] ROTATE_LOGFILE" % time.time()) def rotated_log(): - return inode_before != os.stat(site.path("var/check_mk/core/history")).st_ino + return os.path.exists(site.path("var/check_mk/core/history")) \ + and inode_before != os.stat(site.path("var/check_mk/core/history")).st_ino wait_until(rotated_log, timeout=10) else:

5 years, 7 months

6963 FIX Removed /bauen directory from .deb packages

by Sven Panne

Module: check_mk Branch: master Commit: 3f6d9026dbe2403a798a1e26c1499de463516b9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f6d9026dbe240… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 6 13:22:27 2018 +0100 6963 FIX Removed /bauen directory from .deb packages Caused by a recent change, the .deb packages inadvertendly contained some build artifacts, resulting in some files being installed below /bauen. The 1.5.0 releases p8 and p9 were affected, but not p7 and earlier. This has been fixed. Change-Id: I3a4727f2883c5a58fca261cf350e4d99f4ba1371 --- .werks/6963 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6963 b/.werks/6963 new file mode 100644 index 0000000..742fc1a --- /dev/null +++ b/.werks/6963 @@ -0,0 +1,13 @@ +Title: Removed /bauen directory from .deb packages +Level: 2 +Component: deb +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544098646 +Class: fix + +Caused by a recent change, the .deb packages inadvertendly contained some +build artifacts, resulting in some files being installed below /bauen. The +1.5.0 releases p8 and p9 were affected, but not p7 and earlier. This has +been fixed.

5 years, 7 months

6926 FIX Notify users: The list of contacts is now sorted

by Lars Michelsen

Module: check_mk Branch: master Commit: 17be987b4c6bfa21652ecf65df9eb1d5318c5fef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17be987b4c6bfa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 13:16:05 2018 +0100 6926 FIX Notify users: The list of contacts is now sorted Change-Id: Ie1431cefa9da4dd36d221325c6b9762f6657b1c3 --- .werks/6926 | 11 +++++++++++ cmk/gui/notify.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6926 b/.werks/6926 new file mode 100644 index 0000000..e4526e6 --- /dev/null +++ b/.werks/6926 @@ -0,0 +1,11 @@ +Title: Notify users: The list of contacts is now sorted +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544089270 + + diff --git a/cmk/gui/notify.py b/cmk/gui/notify.py index 237d1e5..68e0352 100644 --- a/cmk/gui/notify.py +++ b/cmk/gui/notify.py @@ -165,7 +165,9 @@ def _vs_notify(): ('broadcast', _('Everybody (Broadcast)')), ('list', _('A list of specific users'), DualListChoice( - choices=[(uid, u.get('alias', uid)) for uid, u in config.multisite_users.items()], + choices=sorted( + [(uid, u.get('alias', uid)) for uid, u in config.multisite_users.items()], + key=lambda x: x[1].lower()), allow_empty=False, )), #('contactgroup', _('All members of a contact group')),

5 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018