Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

6921 FIX pushover: Fixed not working proxy setting

by Lars Michelsen

Module: check_mk Branch: master Commit: 5241b9bae259b6c8e5dc45503d5ebef7b39d892f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5241b9bae259b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 13:12:20 2018 +0100 6921 FIX pushover: Fixed not working proxy setting The proxy setting of the pushover notification script was not working at all since its implementation with werk #4592. Change-Id: Ib229e70d2d4befec323accb775fe85305f032790 --- .werks/6921 | 12 ++++++++++++ cmk/notification_plugins/pushover.py | 8 ++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.werks/6921 b/.werks/6921 new file mode 100644 index 0000000..97eadc9 --- /dev/null +++ b/.werks/6921 @@ -0,0 +1,12 @@ +Title: pushover: Fixed not working proxy setting +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1543914154 + +The proxy setting of the pushover notification script was not working at all +since its implementation with werk #4592. diff --git a/cmk/notification_plugins/pushover.py b/cmk/notification_plugins/pushover.py index 17c1fb4..aa458da 100644 --- a/cmk/notification_plugins/pushover.py +++ b/cmk/notification_plugins/pushover.py @@ -113,12 +113,8 @@ def send_push_notification(api_key, recipient_key, subject, text, context): params.append(("sound", context["PARAMETER_SOUND"])) s = requests.Session() - if context.get("PARAMETER_PROXY"): - if context["PARAMETER_PROXY"].startswith('https'): - protocol = 'https' - else: - protocol = 'http' - r = s.post(api_url, params=dict(params), proxies={protocol: context["PARAMETER_PROXY"]}) + if context.get("PARAMETER_PROXY_URL"): + r = s.post(api_url, params=dict(params), proxies={"https": context["PARAMETER_PROXY_URL"]}) else: r = s.post(api_url, params=dict(params))

5 years, 6 months

Add missing autoconf and libtool for building googletest

by Lars Michelsen

Module: check_mk Branch: master Commit: 851befb2a1659b954011fa825d6472215d3bc3e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=851befb2a1659b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 13:06:34 2018 +0100 Add missing autoconf and libtool for building googletest Change-Id: Ie2718bda0e1f1039a3dbe898a7d3d51b8ea547d0 --- omd/distros/UBUNTU_16.04.mk | 2 ++ omd/distros/UBUNTU_16.10.mk | 2 ++ omd/distros/UBUNTU_17.04.mk | 2 ++ omd/distros/UBUNTU_17.10.mk | 2 ++ omd/distros/UBUNTU_18.04.mk | 2 ++ omd/distros/UBUNTU_18.10.mk | 2 ++ 6 files changed, 12 insertions(+) diff --git a/omd/distros/UBUNTU_16.04.mk b/omd/distros/UBUNTU_16.04.mk index 366d7c7..6bf1242 100644 --- a/omd/distros/UBUNTU_16.04.mk +++ b/omd/distros/UBUNTU_16.04.mk @@ -35,6 +35,8 @@ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libpcap-dev # needed for CMC BUILD_PACKAGES += gettext # needed for german l10n BUILD_PACKAGES += libfreeradius-dev +BUILD_PACKAGES += autoconf # needed for building googletest +BUILD_PACKAGES += libtool # needed for building googletest # # Check_MK build specific packages below # diff --git a/omd/distros/UBUNTU_16.10.mk b/omd/distros/UBUNTU_16.10.mk index 745fc91..42de851 100644 --- a/omd/distros/UBUNTU_16.10.mk +++ b/omd/distros/UBUNTU_16.10.mk @@ -35,6 +35,8 @@ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libpcap-dev # needed for CMC BUILD_PACKAGES += gettext # needed for german l10n BUILD_PACKAGES += libfreeradius-dev +BUILD_PACKAGES += autoconf # needed for building googletest +BUILD_PACKAGES += libtool # needed for building googletest # # Check_MK build specific packages below # diff --git a/omd/distros/UBUNTU_17.04.mk b/omd/distros/UBUNTU_17.04.mk index 69c8728..bcc4669 100644 --- a/omd/distros/UBUNTU_17.04.mk +++ b/omd/distros/UBUNTU_17.04.mk @@ -35,6 +35,8 @@ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libpcap-dev # needed for CMC BUILD_PACKAGES += gettext # needed for german l10n BUILD_PACKAGES += libfreeradius-dev +BUILD_PACKAGES += autoconf # needed for building googletest +BUILD_PACKAGES += libtool # needed for building googletest # # Check_MK build specific packages below # diff --git a/omd/distros/UBUNTU_17.10.mk b/omd/distros/UBUNTU_17.10.mk index b61d005..1f34012 100644 --- a/omd/distros/UBUNTU_17.10.mk +++ b/omd/distros/UBUNTU_17.10.mk @@ -35,6 +35,8 @@ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libpcap-dev # needed for CMC BUILD_PACKAGES += gettext # needed for german l10n BUILD_PACKAGES += libfreeradius-dev +BUILD_PACKAGES += autoconf # needed for building googletest +BUILD_PACKAGES += libtool # needed for building googletest # # Check_MK build specific packages below # diff --git a/omd/distros/UBUNTU_18.04.mk b/omd/distros/UBUNTU_18.04.mk index e0e1f47..43e252f 100644 --- a/omd/distros/UBUNTU_18.04.mk +++ b/omd/distros/UBUNTU_18.04.mk @@ -35,6 +35,8 @@ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libpcap-dev # needed for CMC BUILD_PACKAGES += gettext # needed for german l10n BUILD_PACKAGES += libfreeradius-dev +BUILD_PACKAGES += autoconf # needed for building googletest +BUILD_PACKAGES += libtool # needed for building googletest # # Check_MK build specific packages below # diff --git a/omd/distros/UBUNTU_18.10.mk b/omd/distros/UBUNTU_18.10.mk index f0c3de1..ffb881b 100644 --- a/omd/distros/UBUNTU_18.10.mk +++ b/omd/distros/UBUNTU_18.10.mk @@ -35,6 +35,8 @@ BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman BUILD_PACKAGES += libpcap-dev # needed for CMC BUILD_PACKAGES += gettext # needed for german l10n BUILD_PACKAGES += libfreeradius-dev +BUILD_PACKAGES += autoconf # needed for building googletest +BUILD_PACKAGES += libtool # needed for building googletest # # Check_MK build specific packages below #

5 years, 6 months

juniper_bgp_state: modernization

by Moritz Kiemer

Module: check_mk Branch: master Commit: b519cf0e6637d427cb889a1edc1b7f885c200b75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b519cf0e6637d4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Dec 3 13:25:22 2018 +0100 juniper_bgp_state: modernization Change-Id: I3cf44e6013ef02a059142cc75084d4cd102e51e0 --- checks/juniper_bgp_state | 88 +++++++++++----------- .../datasets/juniper_bgp_state_1_regression.py | 8 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index ba1d3cb..4bbcb60 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -29,61 +29,59 @@ def juniper_bgp_state_create_item(oid_end): return re.sub(r"[0-9]+\.1\.[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.1\.", "", oid_end) -def inventory_juniper_bgp_state(info): - inventory = [] - for oid_end, _bgp_state, _bgp_operational_state in info: - inventory.append((juniper_bgp_state_create_item(oid_end), None)) - return inventory +def parse_juniper_bgp_state(info): + bgp_state_map = { + "0": "undefined", # 0 does not exist + "1": "idle", # 1 + "2": "connect", # 2 + "3": "active", # 3 + "4": "opensent", # 4 + "5": "openconfirm", # 5 + "6": "established", # 6 + } + bgp_operational_state_map = { + "0": "undefined", # 0 does not exist + "1": "halted", # 1 + "2": "running" # 2 + } + parsed = {} + for oid_end, state, operational_state in info: + item = juniper_bgp_state_create_item(oid_end) + state_txt = bgp_state_map.get(state.strip(), "undefined") + operational_txt = bgp_operational_state_map.get(operational_state.strip(), "undefined") + parsed[item] = { + "state": state_txt, + "operational_state": operational_txt, + } + return parsed -def check_juniper_bgp_state(item, _no_params, info): - bgp_state_map = [ - "undefined", # 0 does not exist - "idle", # 1 - "connect", # 2 - "active", # 3 - "opensent", # 4 - "openconfirm", # 5 - "established", # 6 - ] - bgp_operational_state_map = [ - "undefined", # 0 does not exist - "halted", # 1 - "running" # 2 - ] - status = 0 - for oid_end, bgp_state, bgp_operational_state in info: - peering_partner_ip = juniper_bgp_state_create_item(oid_end) - if not bgp_state or not bgp_operational_state: - return 3, "Missing SNMP data" - bgp_state = int(bgp_state) - bgp_operational_state = int(bgp_operational_state) - if peering_partner_ip == item: - operational_state_error_string = "" - state_error_string = "" +@get_parsed_item_data +def check_juniper_bgp_state(item, _no_params, data): - if bgp_operational_state != 2: - status = 1 - operational_state_error_string = "(!)" - elif bgp_state != 6: - status = 2 - state_error_string = "(!!)" + state = data.get('state', "undefined") + operational_state = data.get('operational_state', "undefined") - return status, "Status with peer %s is %s%s, operational status: %s%s" % ( - peering_partner_ip, - bgp_state_map[bgp_state], - state_error_string, - bgp_operational_state_map[bgp_operational_state], - operational_state_error_string, - ) + status = { + "established": 0, + "undefined": 3, + }.get(state, 2) + # if we're halted, being un-established is fine + yield status if operational_state == "running" else 0, \ + "Status with peer %s is %s" % (item, state) - return 3, "Peering partner %s not configured" % item + op_status = { + "running": 0, + "undefined": 3, + }.get(operational_state, 1) + yield op_status, "operational status: %s" % operational_state check_info["juniper_bgp_state"] = { + "parse_function": parse_juniper_bgp_state, "check_function": check_juniper_bgp_state, - "inventory_function": inventory_juniper_bgp_state, + "inventory_function": discover(), "service_description": "BGP Status Peer %s", "snmp_info": ( '.1.3.6.1.4.1.2636.5.1.1.2.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 6ffbfd4..90ff830 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 @@ -6,15 +6,17 @@ info = [ ] discovery = { - '': [(u'80.81.192.24', None), (u'80.81.192.3', None), + '': [(u'80.81.192.24', {}), (u'80.81.192.3', {}), ] } checks = { '': [ (u'80.81.192.24', 'default', - [(2, u'Status with peer 80.81.192.24 is active(!!), operational status: running', [])]), + [(2, u'Status with peer 80.81.192.24 is active', []), + (0, 'operational status: running', [])]), (u'80.81.192.3', 'default', - [(0, u'Status with peer 80.81.192.3 is established, operational status: running', [])]), + [(0, u'Status with peer 80.81.192.3 is established', []), + (0, 'operational status: running', [])]), ] }

5 years, 6 months

agent_kubernetes: report CPU, memory and pod resources on the cluster

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a4e04dc922427052f917f15e7b09b606b79e27b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e04dc9224270… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 26 18:38:59 2018 +0100 agent_kubernetes: report CPU, memory and pod resources on the cluster The k8s_resources check can now be used on the cluster as well. Furthermore, the logic of merging dicts is now performed by the function left_join_dicts. CMK-511 Change-Id: I9189e8bf404a17817f041f6a9780d94595891450 --- agents/special/agent_kubernetes | 104 +++++++++++++++++++++++++--------------- checkman/k8s_resources.cpu | 2 +- checkman/k8s_resources.memory | 2 +- checkman/k8s_resources.pods | 2 +- 4 files changed, 69 insertions(+), 41 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index 8b1b88b..919710d 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -35,9 +35,11 @@ from __future__ import ( import argparse from collections import OrderedDict, Sequence +import functools import itertools import json import logging +import operator import os import sys import time @@ -129,6 +131,19 @@ def parse_memory(value): return float(value) +def left_join_dicts(initial, new, operation): + d = {} + for key, value in initial.iteritems(): + if isinstance(value, dict): + d[key] = left_join_dicts(value, new.get(key, {}), operation) + else: + if key in new: + d[key] = operation(value, new[key]) + else: + d[key] = value + return d + + class Metadata(object): def __init__(self, metadata): # type: (Optional[client.V1ObjectMeta]) -> None @@ -159,24 +174,36 @@ class Node(Metadata): return None return {c.type: c.status for c in conditions} + @staticmethod + def zero_resources(): + return { + 'capacity': { + 'cpu': 0.0, + 'memory': 0.0, + 'pods': 0, + }, + 'allocatable': { + 'cpu': 0.0, + 'memory': 0.0, + 'pods': 0, + }, + } + @property def resources(self): # type: () -> Dict[str, Dict[str, float]] + view = self.zero_resources() if not self._status: - return {} - view, capacity, allocatable = {}, self._status.capacity, self._status.allocatable + return view + capacity, allocatable = self._status.capacity, self._status.allocatable if capacity: - view['capacity'] = { - 'cpu': parse_cpu(capacity.get('cpu', '0.0')), - 'memory': parse_memory(capacity.get('memory', '0.0')), - 'pods': int(capacity.get('pods', '0')), - } + view['capacity']['cpu'] += parse_cpu(capacity.get('cpu', '0.0')) + view['capacity']['memory'] += parse_memory(capacity.get('memory', '0.0')) + view['capacity']['pods'] += int(capacity.get('pods', '0')) if allocatable: - view['allocatable'] = { - 'cpu': parse_cpu(allocatable.get('cpu', '0.0')), - 'memory': parse_memory(allocatable.get('memory', '0.0')), - 'pods': int(allocatable.get('pods', '0')), - } + view['allocatable']['cpu'] += parse_cpu(allocatable.get('cpu', '0.0')) + view['allocatable']['memory'] += parse_memory(allocatable.get('memory', '0.0')) + view['allocatable']['pods'] += int(allocatable.get('pods', '0')) return view @@ -202,9 +229,9 @@ class Pod(Metadata): self.node = spec.node_name if spec else None self.containers = spec.containers if spec else [] - @property - def resources(self): - view = { + @staticmethod + def zero_resources(): + return { 'limits': { 'cpu': 0.0, 'memory': 0.0, @@ -214,6 +241,10 @@ class Pod(Metadata): 'memory': 0.0, } } + + @property + def resources(self): + view = self.zero_resources() for container in self.containers: resources = container.resources if not resources: @@ -354,6 +385,11 @@ class NodeList(ListLike[Node]): # type: () -> Dict[str, Dict[str, Dict[str, Optional[float]]]] return {node.name: node.resources for node in self if node.name} + def cluster_resources(self): + initial = Node.zero_resources() + merge = functools.partial(left_join_dicts, operation=operator.add) + return reduce(merge, self.resources().itervalues(), initial) + class ComponentStatusList(ListLike[ComponentStatus]): def list_statuses(self): @@ -368,6 +404,9 @@ class PodList(ListLike[Pod]): by_node = itertools.groupby(pods_sorted, lambda pod: pod.node) return {node: {'allocations': {'pods': len(list(pods))}} for node, pods in by_node} + def pods_in_cluster(self): + return {'allocations': {'pods': len(self)}} + def resources_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, float]]] """ @@ -375,32 +414,18 @@ class PodList(ListLike[Pod]): one container does not specify a limit, infinity is returned as the container may consume any amount of resources. """ - initial = { - 'limits': { - 'cpu': 0.0, - 'memory': 0.0, - }, - 'requests': { - 'cpu': 0.0, - 'memory': 0.0, - }, - } - - def merge(res_a, res_b): - return { - 'limits': { - 'cpu': res_a['limits']['cpu'] + res_b['limits']['cpu'], - 'memory': res_a['limits']['memory'] + res_b['limits']['memory'], - }, - 'requests': { - 'cpu': res_a['requests']['cpu'] + res_b['requests']['cpu'], - 'memory': res_a['requests']['memory'] + res_b['requests']['memory'], - }, - } 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} + merge = functools.partial(left_join_dicts, operation=operator.add) + return { + node: reduce(merge, [p.resources for p in pods + ], Pod.zero_resources()) for node, pods in by_node + } + + def cluster_resources(self): + merge = functools.partial(left_join_dicts, operation=operator.add) + return reduce(merge, [p.resources for p in self], Pod.zero_resources()) class NamespaceList(ListLike[Namespace]): @@ -595,6 +620,9 @@ class ApiData(object): 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()) + e.get('k8s_resources').insert(self.nodes.cluster_resources()) + e.get('k8s_resources').insert(self.pods.cluster_resources()) + e.get('k8s_resources').insert(self.pods.pods_in_cluster()) return '\n'.join(e.output()) def node_sections(self): diff --git a/checkman/k8s_resources.cpu b/checkman/k8s_resources.cpu index 5442cce..9764e7f 100644 --- a/checkman/k8s_resources.cpu +++ b/checkman/k8s_resources.cpu @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: 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 + a Kubernetes entity. If at least one container running on a node does not specify limits, the node has no applicable limits. The check always returns {OK}. diff --git a/checkman/k8s_resources.memory b/checkman/k8s_resources.memory index 3da7fea..2b1681a 100644 --- a/checkman/k8s_resources.memory +++ b/checkman/k8s_resources.memory @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: 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 + of a Kubernetes entity. If at least one container running on a node does not specify limits, the node has no applicable limits. The check always returns {OK}. diff --git a/checkman/k8s_resources.pods b/checkman/k8s_resources.pods index 87f52b4..8618ed3 100644 --- a/checkman/k8s_resources.pods +++ b/checkman/k8s_resources.pods @@ -4,7 +4,7 @@ catalog: app/kubernetes license: GPL distribution: check_mk description: - This check monitors the pods of a Kubernetes node. + This check monitors the pods of a Kubernetes entity. It always returns {OK}. inventory:

5 years, 6 months

Refactored builtin permission section declarations to new API

by Lars Michelsen

Module: check_mk Branch: master Commit: b6f15f1bf49c17599df1b1bdb5bfd022249c0fb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6f15f1bf49c17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 3 07:15:52 2018 +0100 Refactored builtin permission section declarations to new API Change-Id: I81f4fcfaee244dc8e1b93974bca50ffa7e8e16e4 --- cmk/gui/bi.py | 18 ++++++++++++++++-- cmk/gui/dashboard.py | 26 ++++++++++++++++++++++++-- cmk/gui/gui_background_job.py | 27 ++++++++++++++++++--------- cmk/gui/mkeventd.py | 15 ++++++++++++++- cmk/gui/notifications.py | 22 +++++++++++++++++++--- cmk/gui/plugins/sidebar/utils.py | 19 +++++++++++++++++++ cmk/gui/plugins/views/commands.py | 23 +++++++++++++++++++++-- cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/nagvis_auth.py | 19 +++++++++++++++---- cmk/gui/plugins/wato/utils/__init__.py | 15 +++++++++++++++ cmk/gui/sidebar.py | 2 -- cmk/gui/views.py | 26 ++++++++++++++++++++++++-- cmk/gui/wato/__init__.py | 3 --- tests/unit/cmk/gui/test_gui_config.py | 2 +- 14 files changed, 187 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b6f15f1bf4…

5 years, 6 months

Refactored permission sections to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d18d5168ecd145b64b0291433f618bb46ffca1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d18d5168ecd14… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 30 23:59:57 2018 +0100 Refactored permission sections to plugin registry * Permission are now registered in a dedicated module cmk.gui.permissions * The sections are now all based on the PermissionSection class * They are registered to the permission_section_registry * The previous config.declare_permission_section() call is kept for compatibility with pre 1.6 GUI plugins * Added tests to verify the previous behaviour Change-Id: I0c113029a553365c3f20afb2e566203233ddc438 --- cmk/gui/config.py | 82 +- cmk/gui/default_permissions.py | 21 +- cmk/gui/mkeventd.py | 2 + cmk/gui/pagetypes.py | 5 +- cmk/gui/permissions.py | 152 ++ cmk/gui/plugins/views/commands.py | 2 + cmk/gui/views.py | 2 - cmk/gui/wato/mkeventd.py | 2 - cmk/gui/wato/pages/roles.py | 77 +- cmk/gui/watolib.py | 3 +- cmk/plugin_registry.py | 3 + tests/static/Makefile | 2 +- tests/unit/cmk/gui/test_gui_config.py | 2531 +++++++++++++++++++++++++++++++++ 13 files changed, 2779 insertions(+), 105 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1d18d5168e…

5 years, 6 months

Revert "Refactored builtin permission section declarations to new API"

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f2e76542981a4f7f6c149220ec11942a314e2c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f2e76542981a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 09:03:58 2018 +0100 Revert "Refactored builtin permission section declarations to new API" This reverts commit b6f15f1bf49c17599df1b1bdb5bfd022249c0fb1. --- cmk/gui/bi.py | 18 ++---------------- cmk/gui/dashboard.py | 26 ++------------------------ cmk/gui/gui_background_job.py | 27 +++++++++------------------ cmk/gui/mkeventd.py | 15 +-------------- cmk/gui/notifications.py | 22 +++------------------- cmk/gui/plugins/sidebar/utils.py | 19 ------------------- cmk/gui/plugins/views/commands.py | 23 ++--------------------- cmk/gui/plugins/wato/__init__.py | 1 - cmk/gui/plugins/wato/nagvis_auth.py | 19 ++++--------------- cmk/gui/plugins/wato/utils/__init__.py | 15 --------------- cmk/gui/sidebar.py | 2 ++ cmk/gui/views.py | 26 ++------------------------ cmk/gui/wato/__init__.py | 3 +++ tests/unit/cmk/gui/test_gui_config.py | 2 +- 14 files changed, 31 insertions(+), 187 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f2e765429…

5 years, 6 months

Additional permission function cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 0f1c9ba4a0eeba93b70d57e42665c085f64e0eb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f1c9ba4a0eeba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Dec 1 17:56:55 2018 +0100 Additional permission function cleanups * Replaced config.permission_exists() calls with direct permission_registry checks. * Moved compatibility declare_permission() and declare_permission_section() implementations to the permission module. Aliases in config.py need to be kept for compatibilty Change-Id: Ic4356821f7e6fdb1ec806969bdcf93cc20289930 --- cmk/gui/config.py | 41 +++++------------------------------ cmk/gui/pagetypes.py | 11 +++++++--- cmk/gui/permissions.py | 31 ++++++++++++++++++++++++++ cmk/gui/visuals.py | 7 +++--- tests/unit/cmk/gui/test_gui_config.py | 4 ++-- 5 files changed, 50 insertions(+), 44 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 176b6cb..9f35fea 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -75,8 +75,7 @@ config_dir = cmk.paths.var_dir + "/web" # Stores the initial configuration values default_config = {} -# Global table of available permissions. Plugins may add their own -# permissions by calling declare_permission() +# TODO: Clean this up permission_declaration_functions = [] # Constants for BI @@ -319,37 +318,9 @@ def tag_group_title(tag): # | Declarations of permissions and roles | # '----------------------------------------------------------------------' - -# Kept for compatibility with pre 1.6 GUI plugins -def declare_permission(name, title, description, defaults): - if isinstance(name, unicode): - name = name.encode("utf-8") - - section_name, permission_name = name.split(".", 1) - - cls = type( - "LegacyPermission%s%s" % (section_name.title(), permission_name.title()), - (permissions.Permission,), { - "_section_name": section_name, - "section": property(lambda s: permissions.permission_section_registry[s._section_name]), - "permission_name": permission_name, - "name": name, - "title": title, - "description": description, - "defaults": defaults, - }) - permissions.permission_registry.register(cls) - - # Kept for compatibility with pre 1.6 GUI plugins -def declare_permission_section(name, title, prio=50, do_sort=False): - cls = type("LegacyPermissionSection%s" % name.title(), (permissions.PermissionSection,), { - "name": name, - "title": title, - "sort_index": prio, - "do_sort": do_sort, - }) - permissions.permission_section_registry.register(cls) +declare_permission = permissions.declare_permission +declare_permission_section = permissions.declare_permission_section # Some module have a non-fixed list of permissions. For example for @@ -358,21 +329,19 @@ def declare_permission_section(name, title, prio=50, do_sort=False): # that purpose module can register functions. These functions should # just call declare_permission(). They are being called in the correct # situations. +# TODO: Clean this up def declare_dynamic_permissions(func): permission_declaration_functions.append(func) # This function needs to be called by all code that needs access # to possible dynamic permissions +# TODO: Clean this up def load_dynamic_permissions(): for func in permission_declaration_functions: func() -def permission_exists(pname): - return pname in permissions.permission_registry - - def get_role_permissions(): """Returns the set of permissions for all roles""" role_permissions = {} diff --git a/cmk/gui/pagetypes.py b/cmk/gui/pagetypes.py index cd655c6..b1bef71 100644 --- a/cmk/gui/pagetypes.py +++ b/cmk/gui/pagetypes.py @@ -57,7 +57,12 @@ from cmk.gui.valuespec import ( from cmk.gui.i18n import _u, _ from cmk.gui.globals import html -from cmk.gui.exceptions import MKUserError, MKGeneralException, MKAuthException +from cmk.gui.exceptions import ( + MKUserError, + MKGeneralException, + MKAuthException, +) +from cmk.gui.permissions import permission_registry # .--Base----------------------------------------------------------------. # | ____ | @@ -499,7 +504,7 @@ class Overridable(Base): # TODO: Wie is die Semantik hier genau? Umsetzung vervollständigen! def may_see(self): perm_name = "%s.%s" % (self.type_name(), self.name()) - if config.permission_exists(perm_name) and not config.user.may(perm_name): + if perm_name in permission_registry and not config.user.may(perm_name): return False # if self.owner() == "" and not config.user.may(perm_name): @@ -788,7 +793,7 @@ class Overridable(Base): @classmethod def declare_permission(cls, page): permname = "%s.%s" % (cls.type_name(), page.name()) - if page.is_public() and not config.permission_exists(permname): + if page.is_public() and permname not in permission_registry: config.declare_permission(permname, page.title(), page.description(), ['admin', 'user', 'guest']) diff --git a/cmk/gui/permissions.py b/cmk/gui/permissions.py index f1630b6..3caca95 100644 --- a/cmk/gui/permissions.py +++ b/cmk/gui/permissions.py @@ -150,3 +150,34 @@ class PermissionRegistry(cmk.plugin_registry.ClassRegistry): permission_registry = PermissionRegistry() + + +# Kept for compatibility with pre 1.6 GUI plugins +def declare_permission_section(name, title, prio=50, do_sort=False): + cls = type("LegacyPermissionSection%s" % name.title(), (PermissionSection,), { + "name": name, + "title": title, + "sort_index": prio, + "do_sort": do_sort, + }) + permission_section_registry.register(cls) + + +# Kept for compatibility with pre 1.6 GUI plugins +def declare_permission(name, title, description, defaults): + if isinstance(name, unicode): + name = name.encode("utf-8") + + section_name, permission_name = name.split(".", 1) + + cls = type( + "LegacyPermission%s%s" % (section_name.title(), permission_name.title()), (Permission,), { + "_section_name": section_name, + "section": property(lambda s: permission_section_registry[s._section_name]), + "permission_name": permission_name, + "name": name, + "title": title, + "description": description, + "defaults": defaults, + }) + permission_registry.register(cls) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 2db1310..1246f15 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -66,6 +66,7 @@ from cmk.gui.plugins.visuals.utils import ( # pylint: disable=unused-import FilterTristate, FilterUnicodeFilter, FilterSite, ) from cmk.gui.plugins.visuals.utils import _infos as infos +from cmk.gui.permissions import permission_registry if not cmk.is_raw_edition(): import cmk.gui.cee.plugins.visuals @@ -265,7 +266,7 @@ def load_visuals_of_a_user(what, builtin_visuals, skip_func, lock, path, user): def declare_visual_permission(what, name, visual): permname = "%s.%s" % (what[:-1], name) - if visual["public"] and not config.permission_exists(permname): + if visual["public"] and permname not in permission_registry: config.declare_permission(permname, visual["title"], visual["description"], ['admin', 'user', 'guest']) @@ -318,7 +319,7 @@ def available(what, all_visuals): u, "general.force_" + what): # Honor original permissions for the current user permname = "%s.%s" % (permprefix, n) - if config.permission_exists(permname) \ + if permname in permission_registry \ and not config.user.may(permname): continue visuals[n] = visual @@ -337,7 +338,7 @@ def available(what, all_visuals): u, "general.publish_" + what): # Is there a builtin visual with the same name? If yes, honor permissions. permname = "%s.%s" % (permprefix, n) - if config.permission_exists(permname) \ + if permname in permission_registry \ and not config.user.may(permname): continue visuals[n] = visual diff --git a/tests/unit/cmk/gui/test_gui_config.py b/tests/unit/cmk/gui/test_gui_config.py index 318e884..1e68c71b 100644 --- a/tests/unit/cmk/gui/test_gui_config.py +++ b/tests/unit/cmk/gui/test_gui_config.py @@ -2480,9 +2480,9 @@ def test_declare_permission(monkeypatch): assert "bla" in permissions.permission_section_registry monkeypatch.setattr(permissions, "permission_registry", permissions.PermissionRegistry()) - assert not config.permission_exists("bla.blub") + assert "bla.blub" not in permissions.permission_registry config.declare_permission("bla.blub", u"bla perm", u"descrrrrr", ["admin"]) - assert config.permission_exists("bla.blub") + assert "bla.blub" in permissions.permission_registry permission = permissions.permission_registry["bla.blub"]() assert permission.section == permissions.permission_section_registry["bla"]

5 years, 6 months

k8s_conditions: new check to monitor the condition of a node

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b71dfdf954ce946e67b545e650062b962008a3ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b71dfdf954ce94… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Nov 27 17:06:57 2018 +0100 k8s_conditions: new check to monitor the condition of a node CMK-1406 Change-Id: I12aeb10c5afbc7125b461f1f54138d259d6346e0 --- agents/special/agent_kubernetes | 1 + checkman/k8s_conditions | 13 +++++ checks/k8s_conditions | 64 ++++++++++++++++++++++ .../datasets/k8s_conditions_regression.py | 22 ++++++++ 4 files changed, 100 insertions(+) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index 85ea7ca..f0a52c6 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -613,6 +613,7 @@ class ApiData(object): g.join('k8s_resources', self.nodes.resources()) g.join('k8s_resources', self.pods.resources_per_node()) g.join('k8s_resources', self.pods.pods_per_node()) + g.join('k8s_conditions', self.nodes.conditions()) return '\n'.join(g.output()) diff --git a/checkman/k8s_conditions b/checkman/k8s_conditions new file mode 100644 index 0000000..af804d0 --- /dev/null +++ b/checkman/k8s_conditions @@ -0,0 +1,13 @@ +title: Kubernetes conditions +agents: linux +catalog: app/kubernetes +license: GPL +distribution: check_mk +description: + This check monitors different error conditions like disk pressure, kernel + deadlocks as well as the readiness status of nodes in a kubernetes cluster. + If an error condition is detected or a node is not ready the check returns + {CRIT} otherwise {OK}. + +inventory: + One service is created for each condition and one for the readiness status. \ No newline at end of file diff --git a/checks/k8s_conditions b/checks/k8s_conditions new file mode 100644 index 0000000..fb6007b --- /dev/null +++ b/checks/k8s_conditions @@ -0,0 +1,64 @@ +#!/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_conditions(info): + import json + return json.loads(info[0][0]) + + +@discover +def inventory_k8s_conditions(condition, _value): + return condition in { + "DiskPressure", + "OutOfDisk", + "MemoryPressure", + "Ready", + "NetworkUnavailable", + "KernelDeadlock", + } + + +@get_parsed_item_data +def check_k8s_conditions(item, _no_params, value): + expected_values = { + "DiskPressure": "False", + "OutOfDisk": "False", + "MemoryPressure": "False", + "Ready": "True", + "NetworkUnavailable": "False", + "KernelDeadlock": "False", + } + status = 0 if value == expected_values[item] else 2 + return status, value + + +check_info['k8s_conditions'] = { + 'parse_function': parse_k8s_conditions, + 'inventory_function': inventory_k8s_conditions, + 'check_function': check_k8s_conditions, + 'service_description': 'Condition %s', +} diff --git a/tests/unit/checks/generictests/datasets/k8s_conditions_regression.py b/tests/unit/checks/generictests/datasets/k8s_conditions_regression.py new file mode 100644 index 0000000..2084b7f --- /dev/null +++ b/tests/unit/checks/generictests/datasets/k8s_conditions_regression.py @@ -0,0 +1,22 @@ + + +checkname = 'k8s_conditions' + + +info = [[u'{"DiskPressure": "False", "OutOfDisk": "False", "MemoryPressure": "False", "Ready": "False", "NetworkUnavailable": "False", "KernelDeadlock": "True"}']] + + +discovery = {'': [(u'DiskPressure', {}), + (u'KernelDeadlock', {}), + (u'MemoryPressure', {}), + (u'NetworkUnavailable', {}), + (u'OutOfDisk', {}), + (u'Ready', {})]} + + +checks = {'': [(u'DiskPressure', 'default', [(0, u'False', [])]), + (u'KernelDeadlock', 'default', [(2, u'True', [])]), + (u'MemoryPressure', 'default', [(0, u'False', [])]), + (u'NetworkUnavailable', 'default', [(0, u'False', [])]), + (u'OutOfDisk', 'default', [(0, u'False', [])]), + (u'Ready', 'default', [(2, u'False', [])])]}

5 years, 6 months

Refactored builtin permission section declarations to new API

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e857f31b39ec73067c9af38a2338100012ebea0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e857f31b39ec7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 3 07:15:52 2018 +0100 Refactored builtin permission section declarations to new API Change-Id: I81f4fcfaee244dc8e1b93974bca50ffa7e8e16e4 --- cmk/gui/bi.py | 18 ++++++++++++++++-- cmk/gui/dashboard.py | 26 ++++++++++++++++++++++++-- cmk/gui/gui_background_job.py | 27 ++++++++++++++++++--------- cmk/gui/mkeventd.py | 15 ++++++++++++++- cmk/gui/notifications.py | 22 +++++++++++++++++++--- cmk/gui/plugins/sidebar/utils.py | 19 +++++++++++++++++++ cmk/gui/plugins/views/commands.py | 23 +++++++++++++++++++++-- cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/nagvis_auth.py | 19 +++++++++++++++---- cmk/gui/plugins/wato/utils/__init__.py | 15 +++++++++++++++ cmk/gui/sidebar.py | 2 -- cmk/gui/views.py | 26 ++++++++++++++++++++++++-- cmk/gui/wato/__init__.py | 3 --- tests/unit/cmk/gui/test_gui_config.py | 2 +- 14 files changed, 187 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9e857f31b3…

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018