Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Adjust number of allowed Azure API requests

by Moritz Kiemer

Module: check_mk Branch: master Commit: da4e9810dfe573e7089d494e4ebd928cb614347f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da4e9810dfe573… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Nov 27 12:07:06 2018 +0100 Adjust number of allowed Azure API requests Change-Id: Idc0296735f0f18f9b3e12c677996e6df3efc44a1 --- checkman/azure_agent_info | 2 +- cmk/gui/plugins/wato/datasource_programs.py | 53 ++++++++++++++++------------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/checkman/azure_agent_info b/checkman/azure_agent_info index 42d0830..27a1cdc 100644 --- a/checkman/azure_agent_info +++ b/checkman/azure_agent_info @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This check reports the general state of the azure special agent. - It reports the remaining API calls (which are limited to 15.000 per hour), + It reports the remaining API calls (which are limited by Microsoft), the monitored groups and encountered issues. item: diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index c2ec3b4..5a0f7fe 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1295,30 +1295,35 @@ register_rule( title=_("Secret"), allow_empty=False, )), - ("config", - Dictionary( - title=_("Monitoring Settings"), - help=_("You can choose to to monitor all resources known to " - "the Azure API. However, be aware that Microsoft limits" - " API calls to 15,000 per hour (250 per minute)."), - elements=[ - ('explicit-config', - ListOf( - _azure_group_config(), - title=_("Explicitly specify groups"), - allow_empty=False, - magic="@-groups-@", - )), - ('fetchall', - FixedValue( - "fetchall", - title=_( - "Monitor all available resource groups (overrides previous settings)" - ), - totext="", - )), - ], - )), + ( + "config", + Dictionary( + title=_("Monitoring Settings"), + # Since we introduced this, Microsoft has already reduced the number + # of allowed API requests. At the time of this writing (11/2018) + # you can find the number here: + # https://docs.microsoft.com/de-de/azure/azure-resource-manager/resource-mana… + help=_("You can choose to to monitor all resources known to " + "the Azure API. However, be aware that Microsoft limits" + " API calls to %s per hour (%s per minute).") % ("12000", "200"), + elements=[ + ('explicit-config', + ListOf( + _azure_group_config(), + title=_("Explicitly specify groups"), + allow_empty=False, + magic="@-groups-@", + )), + ('fetchall', + FixedValue( + "fetchall", + title= + _("Monitor all available resource groups (overrides previous settings)" + ), + totext="", + )), + ], + )), ("--piggyback-vms", DropdownChoice( title=_("Create piggyback VM data"),

5 years, 7 months

6914 FIX LDAP: Fixed wrong diagnose results when using fallback server option

by Lars Michelsen

Module: check_mk Branch: master Commit: e12187e9a3af7cb0c3d36450713955322ce90400 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e12187e9a3af7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 27 16:27:32 2018 +0100 6914 FIX LDAP: Fixed wrong diagnose results when using fallback server option The LDAP connection diagnose was showing wrong results for fallback servers when a connetion to the server could not be established in the first step. The diagnose was reusing the established connection to previous servers. Change-Id: Iba9e127d29d51579c6c093cefc0eec0c8856cdc7 --- .werks/6914 | 14 ++++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 2 ++ 2 files changed, 16 insertions(+) diff --git a/.werks/6914 b/.werks/6914 new file mode 100644 index 0000000..88ee6a0 --- /dev/null +++ b/.werks/6914 @@ -0,0 +1,14 @@ +Title: LDAP: Fixed wrong diagnose results when using fallback server option +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1543237371 + +The LDAP connection diagnose was showing wrong results for fallback servers +when a connetion to the server could not be established in the first step. + +The diagnose was reusing the established connection to previous servers. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 888b8bb..eac85c7 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -306,6 +306,7 @@ class LDAPUserConnector(UserConnector): return # Use existing connections (if connection settings have not changed) else: self._logger.info('LDAP CONNECT - Connecting...') + self.disconnect() # Some major config var validations @@ -347,6 +348,7 @@ class LDAPUserConnector(UserConnector): def disconnect(self): self._ldap_obj = None + self._ldap_obj_config = None def _discover_nearest_dc(self, domain): cached_server = self._get_nearest_dc_from_cache()

5 years, 7 months

6818 FIX netapp_api_volumes: Added forgotten 'operations/s' metrics

by Simon Betz

Module: check_mk Branch: master Commit: d3e2e1cfc353a39438c76dbdb85236cd093d32df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3e2e1cfc353a3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 27 15:36:43 2018 +0100 6818 FIX netapp_api_volumes: Added forgotten 'operations/s' metrics Change-Id: I9dc536cd00b641ef0c19d05a29cd848eec486cfc --- .werks/6818 | 10 ++++++++++ cmk/gui/plugins/metrics/check_mk.py | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/.werks/6818 b/.werks/6818 new file mode 100644 index 0000000..ef32eda --- /dev/null +++ b/.werks/6818 @@ -0,0 +1,10 @@ +Title: netapp_api_volumes: Added forgotten 'operations/s' metrics +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543329287 +Class: fix + + diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index b97dd37..24d160c 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -3374,6 +3374,7 @@ for volume_info in ["NFS", "NFSv4", "NFSv4.1", "CIFS", "SAN", "FCP", "ISCSI"]: ("latency", "s"), ("ios", "1/s"), ("throughput", "bytes/s"), + ("ops", "1/s"), ]: volume = volume_info.lower().replace(".", "_") @@ -5403,6 +5404,8 @@ for protocol in ["nfs", "cifs", "san", "fcp", "iscsi", "nfsv4", "nfsv4_1"]: df_netapp_perfvarnames.append("%s_write_data" % protocol) df_netapp_perfvarnames.append("%s_read_latency" % protocol) df_netapp_perfvarnames.append("%s_write_latency" % protocol) + df_netapp_perfvarnames.append("%s_read_ops" % protocol) + df_netapp_perfvarnames.append("%s_write_ops" % protocol) # TODO: this special regex construct below, needs to be replaced by something managable # The current df_translation implementation is unable to automatically detect new parameters @@ -9278,6 +9281,14 @@ for what, text in [ ], } + graph_info["%s_ops" % what] = { + "title": _("%s latency") % text, + "metrics": [ + ("%s_read_ops" % what, "-area"), + ("%s_write_ops" % what, "area"), + ], + } + graph_info["harddrive_health_statistic"] = { "title": _("Harddrive health statistic"), "metrics": [

5 years, 7 months

Fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 931bd55428f2a04967003952a1cffbe1f8deafcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931bd55428f2a0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 27 16:17:10 2018 +0100 Fixed typo Change-Id: I32d14c08314cefcf2628f9dcb22bcd1674c3faa2 --- cmk/gui/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 24d160c..63db392 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -9282,7 +9282,7 @@ for what, text in [ } graph_info["%s_ops" % what] = { - "title": _("%s latency") % text, + "title": _("%s operations") % text, "metrics": [ ("%s_read_ops" % what, "-area"), ("%s_write_ops" % what, "area"),

5 years, 7 months

k8s_resources: now returns n.a. limits

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f08722ff76c02f0f32266357369371583f28ffff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f08722ff76c02f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sat Nov 24 13:32:31 2018 +0100 k8s_resources: now returns n.a. limits If at least one container on a node does not specify CPU or memory limits the check now returns "Limit: unbound" since the container may consume any amound of resources on that node. CMK-511 Change-Id: I15db41ea125fa5ea6a723e7afbf2a30e21e06aad --- agents/special/agent_kubernetes | 13 +++++++++++-- checkman/k8s_resources.cpu | 7 +++++-- checkman/k8s_resources.memory | 7 +++++-- checks/k8s_resources | 8 ++++++-- .../generictests/datasets/k8s_resources_regression.py | 3 ++- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index 79c3da6..5936d3a 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -221,6 +221,11 @@ class Pods(object): return view def resources_per_node(self): + """ + Returns the limits and requests of all containers grouped by node. If at least + one container does not specify a limit, infinity is returned as the container + may consume any amount of resources. + """ # TODO: add annotation from below and fix parse_cpu and parse_memory view = {} # type: Dict[str, Dict[str, Dict[str, Optional[float]]]] for pod in self.items: @@ -241,9 +246,13 @@ class Pods(object): if resources: limits = resources.limits if limits: - node_data['limits']['cpu'] += parse_cpu(limits.get('cpu', '0.0')) + node_data['limits']['cpu'] += parse_cpu(limits.get('cpu', 'inf')) node_data['limits']['memory'] += parse_memory( - limits.get('memory', '0.0')) + limits.get('memory', 'inf')) + else: + node_data['limits']['cpu'] += float('inf') + node_data['limits']['memory'] += float('inf') + requests = resources.requests if requests: node_data['requests']['cpu'] += parse_cpu(requests.get('cpu', '0.0')) diff --git a/checkman/k8s_resources.cpu b/checkman/k8s_resources.cpu index a1b14a0..5442cce 100644 --- a/checkman/k8s_resources.cpu +++ b/checkman/k8s_resources.cpu @@ -4,8 +4,11 @@ catalog: app/kubernetes license: GPL distribution: check_mk description: - This check monitors the CPU resources of a Kubernetes node. - It always returns {OK}. + This check monitors the requested CPU as well as the CPU limits and capacity of + a Kubernetes node. If at least one container running on a node does not specify + limits, the node has no applicable limits. + + The check always returns {OK}. inventory: One service is created. \ No newline at end of file diff --git a/checkman/k8s_resources.memory b/checkman/k8s_resources.memory index 2549d74..3da7fea 100644 --- a/checkman/k8s_resources.memory +++ b/checkman/k8s_resources.memory @@ -4,8 +4,11 @@ catalog: app/kubernetes license: GPL distribution: check_mk description: - This check monitors the memory resources of a Kubernetes node. - It always returns {OK}. + This check monitors the requested memory as well as the memory limits and capacity + of a Kubernetes node. If at least one container running on a node does not specify + limits, the node has no applicable limits. + + The check always returns {OK}. inventory: One service is created. \ No newline at end of file diff --git a/checks/k8s_resources b/checks/k8s_resources index 826e24e..7913b38 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -65,7 +65,9 @@ def check_k8s_cpu_resources(_no_item, _no_params, parsed): yield 0, 'Request: %.3f' % request limit = parsed.get('limits', {}).get('cpu') - if limit: + if math.isinf(limit): + yield 0, 'Limit: n.a.' + else: yield 0, 'Limit: %.3f' % limit capacity = parsed.get('capacity', {}).get('cpu', 0.0) @@ -89,7 +91,9 @@ def check_k8s_mem_resources(_no_item, _no_params, parsed): yield 0, 'Request: %s' % get_bytes_human_readable(request) limit = parsed.get('limits', {}).get('memory') - if limit: + if math.isinf(limit): + yield 0, 'Limit: n.a.' + else: yield 0, 'Limit: %s' % get_bytes_human_readable(limit) capacity = parsed.get('capacity', {}).get('memory', 0.0) diff --git a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py index be6f4e6..dc1e039 100644 --- a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py +++ b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py @@ -1,7 +1,7 @@ checkname = 'k8s_resources' info = [[ - u'{"capacity": {"pods": 110, "cpu": 1.0, "memory": 609845248.0}, "requests": {"cpu": 0.2, "memory": 0.0}, "limits": {"cpu": 0.5, "memory": 0.0}, "allocations": {}}' + u'{"capacity": {"pods": 110, "cpu": 1.0, "memory": 609845248.0}, "requests": {"cpu": 0.2, "memory": 0.0}, "limits": {"cpu": 0.5, "memory": Infinity}, "allocations": {}}' ]] discovery = { @@ -18,6 +18,7 @@ checks = { ])], 'memory': [(None, 'default', [ (0, 'Request: 0.00 B', []), + (0, 'Limit: n.a.', []), (0, 'Capacity: 581.59 MB', []), ])], 'pods': [(None, 'default', [

5 years, 7 months

agent_kubernetes: introduce base class with generic transformations

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 34d7ff4cd0b41f9648d5ff0a6da91b227bd89c48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34d7ff4cd0b41f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sun Nov 25 14:04:18 2018 +0100 agent_kubernetes: introduce base class with generic transformations Add the generic operations filter, map, group_by and fold to list like data structures (Nodes, Pods, Namespaces, etc.). This commit renames the list like classes and splits the former Roles class into RoleList and ClusterRoleList, as well. CMK-1308 Change-Id: Ifb1b2cdaff3feb433bace1a6a0c281d086c09425 --- agents/special/agent_kubernetes | 130 +++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 56 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index fd4656d..897a116 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -35,13 +35,14 @@ from __future__ import ( import argparse from collections import OrderedDict -import itertools import json import logging import os import sys import time -from typing import Any, Dict, List, Mapping, Optional, Union # pylint: disable=unused-import +from typing import ( # pylint: disable=unused-import + Any, Callable, Dict, Generic, Hashable, List, Mapping, NewType, Optional, TypeVar, Union, +) from kubernetes import client @@ -139,12 +140,40 @@ def parse_memory(value): return float(value) -class Nodes(object): +T = TypeVar('T') +ListElem = TypeVar('ListElem') + + +class ListLike(Generic[ListElem]): def __init__(self, items): - # type: (List[client.V1Node]) -> None - super(Nodes, self).__init__() + # type: (List[ListElem]) -> None self.items = items + def filter(self, predicate): + # type: (Callable[[ListElem], bool]) -> ListLike + return self.__class__([item for item in self.items if predicate(item)]) + + def map(self, func): + # type: (Callable[[ListElem], T]) -> List[T] + return [func(item) for item in self.items] + + def group_by(self, func): + # type: (Callable[[ListElem], Hashable]) -> Dict[Hashable, ListLike] + d = {} # type: Dict[Hashable, ListLike] + for item in self.items: + value = d.setdefault(func(item), self.__class__([])) + value.items.append(item) + return d + + def fold(self, func, initial): + # type: (Callable[[ListElem, T], T], T) -> T + result = initial + for item in self.items: + result = func(item, result) + return result + + +class NodeList(ListLike): def list_nodes(self): # type: () -> Dict[str, List[str]] return {'nodes': [node.metadata.name for node in self.items if node.metadata.name]} @@ -193,12 +222,7 @@ class Nodes(object): return view -class ComponentStatuses(object): - def __init__(self, items): - # type: (List[client.V1ComponentStatus]) -> None - super(ComponentStatuses, self).__init__() - self.items = items - +class ComponentStatusList(ListLike): def list_statuses(self): # type: () -> Dict[str, List[Dict[str, str]]] view = {} @@ -212,12 +236,7 @@ class ComponentStatuses(object): return view -class Pods(object): - def __init__(self, items): - # type: (List[client.V1Pod]) -> None - super(Pods, self).__init__() - self.items = items - +class PodList(ListLike): def pods_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, int]]] view = {} # type: Dict[str, Dict[str, Dict[str, int]]] @@ -268,12 +287,7 @@ class Pods(object): return view -class Namespaces(object): - def __init__(self, items): - # type: (List[client.V1Namespace]) -> None - super(Namespaces, self).__init__() - self.items = items - +class NamespaceList(ListLike): def list_namespaces(self): # type: () -> Dict[str, Dict[str, Dict[str, str]]] # TODO: namespaces may have resource quotas and limits @@ -287,12 +301,7 @@ class Namespaces(object): } -class PersistentVolumes(object): - def __init__(self, items): - # type: (List[client.V1PersistentVolume]) -> None - super(PersistentVolumes, self).__init__() - self.items = items - +class PersistentVolumeList(ListLike): def list_volumes(self): # type: () -> Dict[str, Dict[str, Union[str, Optional[float], Dict[str, str]]]] # TODO: Output details of the different types of volumes @@ -307,12 +316,7 @@ class PersistentVolumes(object): } -class PersistentVolumeClaims(object): - def __init__(self, items): - # type: (List[client.V1PersistentVolumeClaim]) -> None - super(PersistentVolumeClaims, self).__init__() - self.items = items - +class PersistentVolumeClaimList(ListLike): def list_volume_claims(self): # type: () -> Dict[str, Dict[str, str]] return { @@ -325,12 +329,7 @@ class PersistentVolumeClaims(object): } -class StorageClasses(object): - def __init__(self, items): - # type: (List[client.V1StorageClass]) -> None - super(StorageClasses, self).__init__() - self.items = items - +class StorageClassList(ListLike): def list_storage_classes(self): view = {} for storage_class in self.items: @@ -344,16 +343,33 @@ class StorageClasses(object): return view -class Roles(object): - def __init__(self, roles, cluster_roles): - # type: (List[client.V1Role], List[client.V1ClusterRole]) -> None - super(Roles, self).__init__() - self.roles = roles - self.cluster_roles = cluster_roles +# TODO: combine duplicate logic from ClusterRoleList +class RoleList(ListLike): + def list_roles(self): + view = {} + for role in self.items: + metadata = role.metadata + if not metadata: + continue + name = metadata.name + if not name: + continue + creation = metadata.creation_timestamp + if creation: + creation = time.mktime(creation.timetuple()) + + view[name] = { + 'namespace': metadata.namespace, + 'creation_timestamp': creation, + } + return view + +# TODO: combine duplicate logic from RoleList +class ClusterRoleList(ListLike): def list_roles(self): view = {} - for role in itertools.chain(self.roles, self.cluster_roles): + for role in self.items: metadata = role.metadata if not metadata: continue @@ -475,14 +491,15 @@ class ApiData(object): pods = core_api.list_pod_for_all_namespaces() logging.debug('Assigning collected data') - self.storage_classes = StorageClasses(storage_classes.items) - self.namespaces = Namespaces(namespaces.items) - self.roles = Roles(roles.items, cluster_roles.items) - self.component_statuses = ComponentStatuses(component_statuses.items) - self.nodes = Nodes(nodes.items) - self.persistent_volumes = PersistentVolumes(pvs.items) - self.persistent_volume_claims = PersistentVolumeClaims(pvcs.items) - self.pods = Pods(pods.items) + self.storage_classes = StorageClassList(storage_classes.items) + self.namespaces = NamespaceList(namespaces.items) + self.roles = RoleList(roles.items) + self.cluster_roles = ClusterRoleList(cluster_roles.items) + self.component_statuses = ComponentStatusList(component_statuses.items) + self.nodes = NodeList(nodes.items) + self.persistent_volumes = PersistentVolumeList(pvs.items) + self.persistent_volume_claims = PersistentVolumeClaimList(pvcs.items) + self.pods = PodList(pods.items) def cluster_sections(self): # type: () -> str @@ -496,6 +513,7 @@ class ApiData(object): self.persistent_volume_claims.list_volume_claims()) e.get('k8s_storage_classes').insert(self.storage_classes.list_storage_classes()) e.get('k8s_roles').insert(self.roles.list_roles()) + e.get('k8s_roles').insert(self.cluster_roles.list_roles()) return '\n'.join(e.output()) def node_sections(self):

5 years, 7 months

k8s_resources: additionally return allocatable Pods, CPU and memory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 484dfc9468b1867cd4cbc4c6be1b13ee151c5553 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=484dfc9468b186… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sat Nov 24 14:12:46 2018 +0100 k8s_resources: additionally return allocatable Pods, CPU and memory CMK-511 Change-Id: Ia8549b57e187b1b9ce626afbf074078550253708 --- agents/special/agent_kubernetes | 7 +++++++ checks/k8s_resources | 11 ++++++++++- .../checks/generictests/datasets/k8s_resources_regression.py | 5 ++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index 5936d3a..fd4656d 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -182,6 +182,13 @@ class Nodes(object): 'memory': parse_memory(capacity.get('memory')), 'pods': parse_int(capacity.get('pods')), } + allocatable = status.allocatable + if allocatable: + node_data['allocatable'] = { + 'cpu': parse_cpu(allocatable.get('cpu')), + 'memory': parse_memory(allocatable.get('memory')), + 'pods': parse_int(allocatable.get('pods')), + } view[node.metadata.name] = node_data return view diff --git a/checks/k8s_resources b/checks/k8s_resources index 7913b38..705eef7 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -44,8 +44,11 @@ def check_k8s_pod_resources(_no_item, _no_params, parsed): pods = parsed.get('allocations', {}).get('pods', 0) yield 0, 'Pods: %d' % pods + allocatable = parsed.get('allocatable', {}).get('pods', 0) + yield 0, 'Allocatable: %d' % allocatable + capacity = parsed.get('capacity', {}).get('pods', 0) - yield 0, 'Capacity: %s' % capacity + yield 0, 'Capacity: %d' % capacity check_info['k8s_resources.pods'] = { @@ -70,6 +73,9 @@ def check_k8s_cpu_resources(_no_item, _no_params, parsed): else: yield 0, 'Limit: %.3f' % limit + allocatable = parsed.get('allocatable', {}).get('cpu', 0.0) + yield 0, 'Allocatable: %.3f' % allocatable + capacity = parsed.get('capacity', {}).get('cpu', 0.0) yield 0, 'Capacity: %.3f' % capacity @@ -96,6 +102,9 @@ def check_k8s_mem_resources(_no_item, _no_params, parsed): else: yield 0, 'Limit: %s' % get_bytes_human_readable(limit) + allocatable = parsed.get('allocatable', {}).get('memory', 0.0) + yield 0, 'Allocatable: %s' % get_bytes_human_readable(allocatable) + capacity = parsed.get('capacity', {}).get('memory', 0.0) yield 0, 'Capacity: %s' % get_bytes_human_readable(capacity) diff --git a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py index dc1e039..ee81cf3 100644 --- a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py +++ b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py @@ -1,7 +1,7 @@ checkname = 'k8s_resources' info = [[ - u'{"capacity": {"pods": 110, "cpu": 1.0, "memory": 609845248.0}, "requests": {"cpu": 0.2, "memory": 0.0}, "limits": {"cpu": 0.5, "memory": Infinity}, "allocations": {}}' + u'{"allocatable": {"pods": 110, "cpu": 0.9400000000000001, "memory": 609845248.0}, "capacity": {"pods": 110, "cpu": 1.0, "memory": 609845248.0}, "requests": {"cpu": 0.2, "memory": 0.0}, "limits": {"cpu": 0.5, "memory": Infinity}, "allocations": {}}' ]] discovery = { @@ -14,15 +14,18 @@ checks = { 'cpu': [(None, 'default', [ (0, 'Request: 0.200', []), (0, 'Limit: 0.500', []), + (0, 'Allocatable: 0.940', []), (0, 'Capacity: 1.000', []), ])], 'memory': [(None, 'default', [ (0, 'Request: 0.00 B', []), (0, 'Limit: n.a.', []), + (0, 'Allocatable: 581.59 MB', []), (0, 'Capacity: 581.59 MB', []), ])], 'pods': [(None, 'default', [ (0, 'Pods: 0', []), + (0, 'Allocatable: 110', []), (0, 'Capacity: 110', []), ])], }

5 years, 7 months

agent_kubernetes: Add classes, use transformation and fix generic type

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 63f338aba414d1f344b77148b7cc1e0821588343 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63f338aba414d1… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 26 12:09:28 2018 +0100 agent_kubernetes: Add classes, use transformation and fix generic type Add individual classes for Pods, Namespaces etc. and use the previously defined transformation function. Furthermore, the generic type ListElem is fixed in the subclasses and the type annotations are corrected. CMK-1308 Change-Id: Iefe5a25884e0d35be7fba49e2a36bd26aea93d24 --- agents/special/agent_kubernetes | 464 +++++++++++++-------- .../kubernetes/client/models/v1_namespace.pyi | 5 +- .../client/models/v1_namespace_status.pyi | 4 +- .../kubernetes/client/models/v1_object_meta.pyi | 5 +- .../client/models/v1_persistent_volume.pyi | 13 +- .../client/models/v1_persistent_volume_claim.pyi | 13 +- .../models/v1_persistent_volume_claim_spec.pyi | 18 +- .../models/v1_persistent_volume_claim_status.pyi | 19 +- .../client/models/v1_persistent_volume_spec.pyi | 10 +- .../client/models/v1_persistent_volume_status.pyi | 4 +- .../kubernetes/client/models/v1_storage_class.pyi | 22 +- 11 files changed, 347 insertions(+), 230 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=63f338aba4…

5 years, 7 months

agent_kubernetes: Use collections.Sequence as base class of ListLike.

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 8674609d4725f95194a4b44fda0b945624aec5ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8674609d4725f9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 26 17:28:21 2018 +0100 agent_kubernetes: Use collections.Sequence as base class of ListLike. CMK-1308 Change-Id: Ie8668e5e711922959c538add7faf9a963d980810 --- agents/special/agent_kubernetes | 84 +++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index d3fa795..85ea7ca 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -34,14 +34,15 @@ from __future__ import ( ) import argparse -from collections import OrderedDict +from collections import OrderedDict, Sequence +import itertools import json import logging import os import sys import time from typing import ( # pylint: disable=unused-import - Any, Callable, Dict, Generic, Hashable, List, Mapping, NewType, Optional, TypeVar, Union, + Any, Dict, Generic, List, Mapping, Optional, TypeVar, Union, ) from kubernetes import client @@ -332,71 +333,49 @@ class Role(Metadata): super(Role, self).__init__(role.metadata) -T = TypeVar('T') ListElem = TypeVar('ListElem') -class ListLike(Generic[ListElem]): - def __init__(self, items): +class ListLike(Generic[ListElem], Sequence): + def __init__(self, elements): # type: (List[ListElem]) -> None - self.items = items - - def filter(self, predicate): - # type: (Callable[[ListElem], bool]) -> ListLike - return self.__class__([item for item in self.items if predicate(item)]) - - def map(self, func): - # type: (Callable[[ListElem], T]) -> List[T] - return [func(item) for item in self.items] - - def group_by(self, func): - # type: (Callable[[ListElem], Optional[str]]) -> Dict[str, ListLike] - # TODO: don't drop items which are None - d = {} # type: Dict[str, ListLike] - for item in self.items: - key = func(item) - if key: - value = d.setdefault(key, self.__class__([])) - value.items.append(item) - return d - - def fold(self, func, initial): - # type: (Callable[[ListElem, T], T], T) -> T - result = initial - for item in self.items: - result = func(item, result) - return result + super(ListLike, self).__init__() + self.elements = elements + + def __getitem__(self, index): + return self.elements[index] def __len__(self): # type: () -> int - return len(self.items) + return len(self.elements) class NodeList(ListLike[Node]): def list_nodes(self): # type: () -> Dict[str, List[str]] - return {'nodes': [node.name for node in self.items if node.name]} + return {'nodes': [node.name for node in self if node.name]} def conditions(self): # type: () -> Dict[str, Dict[str, str]] - return {node.name: node.conditions for node in self.items if node.name and node.conditions} + return {node.name: node.conditions for node in self if node.name and node.conditions} def resources(self): # type: () -> Dict[str, Dict[str, Dict[str, Optional[float]]]] - return {node.name: node.resources for node in self.items if node.name} + return {node.name: node.resources for node in self if node.name} class ComponentStatusList(ListLike[ComponentStatus]): def list_statuses(self): # type: () -> Dict[str, List[Dict[str, str]]] - return {status.name: status.conditions for status in self.items if status.name} + return {status.name: status.conditions for status in self if status.name} class PodList(ListLike[Pod]): def pods_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, int]]] - by_node = self.group_by(lambda pod: pod.node) - return {node: {'allocations': {'pods': len(pods)}} for node, pods in by_node.iteritems()} + 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} def resources_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, float]]] @@ -405,8 +384,6 @@ class PodList(ListLike[Pod]): one container does not specify a limit, infinity is returned as the container may consume any amount of resources. """ - by_node = self.group_by(lambda pod: pod.node) - initial = { 'limits': { 'cpu': 0.0, @@ -418,20 +395,21 @@ class PodList(ListLike[Pod]): }, } - def merge(pod, resources): - r = pod.resources + def merge(res_a, res_b): return { 'limits': { - 'cpu': r['limits']['cpu'] + resources['limits']['cpu'], - 'memory': r['limits']['memory'] + resources['limits']['memory'], + 'cpu': res_a['limits']['cpu'] + res_b['limits']['cpu'], + 'memory': res_a['limits']['memory'] + res_b['limits']['memory'], }, 'requests': { - 'cpu': r['requests']['cpu'] + resources['requests']['cpu'], - 'memory': r['requests']['memory'] + resources['requests']['memory'], + 'cpu': res_a['requests']['cpu'] + res_b['requests']['cpu'], + 'memory': res_a['requests']['memory'] + res_b['requests']['memory'], }, } - return {node: pods.fold(merge, initial) for node, pods in by_node.iteritems()} + pods_sorted = sorted(self, key=lambda pod: pod.node) + by_node = itertools.groupby(pods_sorted, lambda pod: pod.node) + return {node: reduce(merge, [p.resources for p in pods], initial) for node, pods in by_node} class NamespaceList(ListLike[Namespace]): @@ -442,7 +420,7 @@ class NamespaceList(ListLike[Namespace]): 'status': { 'phase': namespace.phase, }, - } for namespace in self.items if namespace.name + } for namespace in self if namespace.name } @@ -457,7 +435,7 @@ class PersistentVolumeList(ListLike[PersistentVolume]): 'status': { 'phase': pv.phase, }, - } for pv in self.items if pv.name + } for pv in self if pv.name } @@ -471,7 +449,7 @@ class PersistentVolumeClaimList(ListLike[PersistentVolumeClaim]): 'condition': pvc.conditions, 'phase': pvc.phase, 'volume': pvc.volume_name, - } for pvc in self.items if pvc.name + } for pvc in self if pvc.name } @@ -483,7 +461,7 @@ class StorageClassList(ListLike[StorageClass]): storage_class.name: { 'provisioner': storage_class.provisioner, 'reclaim_policy': storage_class.reclaim_policy - } for storage_class in self.items if storage_class.name + } for storage_class in self if storage_class.name } @@ -493,7 +471,7 @@ class RoleList(ListLike[Role]): role.name: { 'namespace': role.namespace, 'creation_timestamp': role.creation_timestamp - } for role in self.items if role.name + } for role in self if role.name }

5 years, 7 months

k8s_resources: add perfdata and metrics

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7aab7e33a8f6323d43625a11452bcb574fbc573d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aab7e33a8f632… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sat Nov 24 14:19:45 2018 +0100 k8s_resources: add perfdata and metrics CMK-511 Change-Id: I570ca14fb94c745c18309a72e008e0d573180ac4 --- checks/k8s_resources | 27 +++--- cmk/gui/plugins/metrics/check_mk.py | 97 ++++++++++++++++++++++ .../datasets/k8s_resources_regression.py | 20 ++--- 3 files changed, 123 insertions(+), 21 deletions(-) diff --git a/checks/k8s_resources b/checks/k8s_resources index 705eef7..a9a3127 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -42,19 +42,20 @@ def inventory_k8s_pod_resources(parsed): def check_k8s_pod_resources(_no_item, _no_params, parsed): pods = parsed.get('allocations', {}).get('pods', 0) - yield 0, 'Pods: %d' % pods + yield 0, 'Pods: %d' % pods, [('k8s_pods', pods)] allocatable = parsed.get('allocatable', {}).get('pods', 0) - yield 0, 'Allocatable: %d' % allocatable + yield 0, 'Allocatable: %d' % allocatable, [('k8s_pods_allocatable', allocatable)] capacity = parsed.get('capacity', {}).get('pods', 0) - yield 0, 'Capacity: %d' % capacity + yield 0, 'Capacity: %d' % capacity, [('k8s_pods_capacity', capacity)] check_info['k8s_resources.pods'] = { 'inventory_function': inventory_k8s_pod_resources, 'check_function': check_k8s_pod_resources, 'service_description': 'Pod resources', + 'has_perfdata': True, } @@ -65,25 +66,26 @@ def inventory_k8s_cpu_resources(parsed): def check_k8s_cpu_resources(_no_item, _no_params, parsed): request = parsed.get('requests', {}).get('cpu', 0.0) - yield 0, 'Request: %.3f' % request + 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 + yield 0, 'Limit: %.3f' % limit, [('k8s_cpu_limit', limit)] allocatable = parsed.get('allocatable', {}).get('cpu', 0.0) - yield 0, 'Allocatable: %.3f' % allocatable + yield 0, 'Allocatable: %.3f' % allocatable, [('k8s_cpu_allocatable', allocatable)] capacity = parsed.get('capacity', {}).get('cpu', 0.0) - yield 0, 'Capacity: %.3f' % capacity + yield 0, 'Capacity: %.3f' % capacity, [('k8s_cpu_capacity', capacity)] check_info['k8s_resources.cpu'] = { 'inventory_function': inventory_k8s_cpu_resources, 'check_function': check_k8s_cpu_resources, 'service_description': 'CPU resources', + 'has_perfdata': True, } @@ -94,23 +96,26 @@ def inventory_k8s_mem_resources(parsed): def check_k8s_mem_resources(_no_item, _no_params, parsed): request = parsed.get('requests', {}).get('memory', 0.0) - yield 0, 'Request: %s' % get_bytes_human_readable(request) + 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) + 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) + 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) + yield 0, 'Capacity: %s' % get_bytes_human_readable(capacity), [('k8s_memory_capacity', + capacity)] check_info['k8s_resources.memory'] = { 'inventory_function': inventory_k8s_mem_resources, 'check_function': check_k8s_mem_resources, 'service_description': 'Memory resources', + 'has_perfdata': True } diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 452e272..b97dd37 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4369,6 +4369,72 @@ metric_info["k8s_nodes"] = { "color": "11/a", } +metric_info["k8s_pods"] = { + "title": _("Pods"), + "unit": "count", + "color": "16/b", +} + +metric_info["k8s_pods_allocatable"] = { + "title": _("Allocatable"), + "unit": "count", + "color": "#e0e0e0", +} + +metric_info["k8s_pods_capacity"] = { + "title": _("Capacity"), + "unit": "count", + "color": "c0c0c0", +} + +metric_info["k8s_cpu_request"] = { + "title": _("Request"), + "unit": "", + "color": "26/b", +} + +metric_info["k8s_cpu_limit"] = { + "title": _("Limit"), + "unit": "", + "color": "26/a", +} + +metric_info["k8s_cpu_allocatable"] = { + "title": _("Allocatable"), + "unit": "", + "color": "#e0e0e0", +} + +metric_info["k8s_cpu_capacity"] = { + "title": _("Capacity"), + "unit": "", + "color": "#c0c0c0", +} + +metric_info["k8s_memory_request"] = { + "title": _("Request"), + "unit": "bytes", + "color": "42/b", +} + +metric_info["k8s_memory_limit"] = { + "title": _("Limit"), + "unit": "bytes", + "color": "42/a", +} + +metric_info["k8s_memory_allocatable"] = { + "title": _("Allocatable"), + "unit": "bytes", + "color": "#e0e0e0", +} + +metric_info["k8s_memory_capacity"] = { + "title": _("Capacity"), + "unit": "bytes", + "color": "#c0c0c0", +} + metric_info["active_vms"] = { "title": _("Active VMs"), "unit": "count", @@ -8060,6 +8126,37 @@ graph_info["citrix_serverload"] = { "range": (0, 100), } +graph_info["k8s_resources.pods"] = { + "title": _("Pods"), + "metrics": [ + ("k8s_pods_capacity", "area"), + ("k8s_pods_allocatable", "area"), + ("k8s_pods", "area"), + ], +} + +graph_info["k8s_resources.cpu"] = { + "title": _("CPU"), + "metrics": [ + ("k8s_cpu_capacity", "area"), + ("k8s_cpu_allocatable", "area"), + ("k8s_cpu_limit", "area"), + ("k8s_cpu_request", "area"), + ], + "optional_metrics": ["k8s_cpu_limit"], +} + +graph_info["k8s_resources.memory"] = { + "title": _("Memory"), + "metrics": [ + ("k8s_memory_capacity", "area"), + ("k8s_memory_allocatable", "area"), + ("k8s_memory_limit", "area"), + ("k8s_memory_request", "area"), + ], + "optional_metrics": ["k8s_memory_limit"], +} + graph_info["used_cpu_time"] = { "title": _("Used CPU Time"), "metrics": [ diff --git a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py index ee81cf3..df75a4d 100644 --- a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py +++ b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py @@ -12,20 +12,20 @@ discovery = { checks = { 'cpu': [(None, 'default', [ - (0, 'Request: 0.200', []), - (0, 'Limit: 0.500', []), - (0, 'Allocatable: 0.940', []), - (0, 'Capacity: 1.000', []), + (0, 'Request: 0.200', [('k8s_cpu_request', 0.2)]), + (0, 'Limit: 0.500', [('k8s_cpu_limit', 0.5)]), + (0, 'Allocatable: 0.940', [('k8s_cpu_allocatable', 0.9400000000000001)]), + (0, 'Capacity: 1.000', [('k8s_cpu_capacity', 1.0)]), ])], 'memory': [(None, 'default', [ - (0, 'Request: 0.00 B', []), + (0, 'Request: 0.00 B', [('k8s_memory_request', 0.0)]), (0, 'Limit: n.a.', []), - (0, 'Allocatable: 581.59 MB', []), - (0, 'Capacity: 581.59 MB', []), + (0, 'Allocatable: 581.59 MB', [('k8s_memory_allocatable', 609845248.0)]), + (0, 'Capacity: 581.59 MB', [('k8s_memory_capacity', 609845248.0)]), ])], 'pods': [(None, 'default', [ - (0, 'Pods: 0', []), - (0, 'Allocatable: 110', []), - (0, 'Capacity: 110', []), + (0, 'Pods: 0', [('k8s_pods', 0)]), + (0, 'Allocatable: 110', [('k8s_pods_allocatable', 110)]), + (0, 'Capacity: 110', [('k8s_pods_capacity', 110)]), ])], }

5 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018