Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Ronny Bruska

Module: check_mk Branch: master Commit: 08495a10efbd419ef61c4579e724a6c91b260622 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08495a10efbd41… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Mon Apr 8 21:45:23 2019 +0200 7406 Opsgenie: Notification plugin Check_MK now supports integration with Opsgenie. You can create, close and acknowledge alerts. It is possible to set optional parameter via the associated WATO rule, eg. "Responsible Team", "Actions", "Tags" and "Entity". Change-Id: Ib5268d8e6163434390443380df8186f31f298002 --- .werks/7406 | 14 ++ cmk/gui/plugins/wato/notifications.py | 137 ++++++++++++++ cmk/notification_plugins/opsgenie_issues.py | 205 +++++++++++++++++++++ notifications/opsgenie_issues | 9 + tests/unit/cmk/gui/test_gui_config.py | 1 + .../cmk/gui/wato/test_notification_parameters.py | 1 + 6 files changed, 367 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=08495a10ef…

5 years, 5 months

[CMK-1970] - plugin processing fix, now agent removes duplicated plugins, not binaries as before

by Sergey Kipnis

Module: check_mk Branch: master Commit: 278071154e84131a7ab6f225736375c73047ac52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=278071154e8413… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Apr 15 20:25:33 2019 +0200 [CMK-1970] - plugin processing fix, now agent removes duplicated plugins, not binaries as before - service uses now separate mailslot to avoid collisions with test software Change-Id: If88c3062c7073d306412acfb46b964ed479f84bb --- agents/wnx/src/common/cfg_info.h | 4 ++++ agents/wnx/src/engine/cfg.cpp | 11 +++++++++ agents/wnx/src/engine/cfg.h | 7 +++++- agents/wnx/src/engine/cma_core.cpp | 36 +++++++++++++++++++++------- agents/wnx/src/engine/cma_core.h | 3 +++ agents/wnx/src/engine/providers/plugins.cpp | 1 - agents/wnx/src/engine/service_processor.h | 9 +++++-- agents/wnx/src/main/check_mk_service.cpp | 9 +++---- agents/wnx/src/main/check_mk_service.h | 7 ++---- agents/wnx/watest/test-plugin.cpp | 23 ++++++++++++++++++ agents/wnx/watest/test-service-processor.cpp | 10 ++++---- 11 files changed, 93 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=278071154e…

5 years, 5 months

Fix Z_DATA_ERROR

by Alex Zurhake

Module: check_mk Branch: master Commit: 88b1324a92033492cce460fb55ff151df316f524 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88b1324a920334… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Apr 12 12:43:58 2019 +0200 Fix Z_DATA_ERROR Change-Id: I67052663ddec4b683efa2d9321bbf64fa855b9de --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 800e851..88080ad 100644 --- a/Makefile +++ b/Makefile @@ -324,6 +324,7 @@ optimize-images: # tests and building versions. Once we have the then build system this should not # be necessary anymore. node_modules: package.json + npm update -g npm install --unsafe-perm web/htdocs/js/%_min.js: node_modules webpack.config.js $(JAVASCRIPT_SOURCES)

5 years, 5 months

fix typo

by Moritz Kiemer

Module: check_mk Branch: master Commit: ed48717255a276651194043a124bb1daa886e05f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed48717255a276… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 16 07:07:18 2019 +0200 fix typo Change-Id: Ibc7f60082b6f7d747aafe767658d9dc45ef036f6 --- .werks/7143 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.werks/7143 b/.werks/7143 index 91b885f..4110ca3 100644 --- a/.werks/7143 +++ b/.werks/7143 @@ -16,14 +16,14 @@ If you where using both plugins, you can use the new plugin in its default configuration to replace them. If you have been using only one of them, you can disable the opposite parts of the new plugin, either by using the bakery rule "Docker node and containers" or via -the configuration file (please refer to the example files in -agents/cfg_examples fo rmore details). +the configuration file (please refer to the example files in +agents/cfg_examples for more details). The previous rule "Piggybacked docker containers" is deprecated - please set up a corresponding new one. To deploy this plugin you must have the 'docker-py' python library -installed on the monitored system. You can install it using the +installed on the monitored system. You can install it using the python package manager pip (using the shell command "pip install docker-py").

5 years, 5 months

agent_aws: ELB/Limits provides load balancer info for other ELB sections

by Simon Betz

Module: check_mk Branch: master Commit: 00267e9c4ce882bfa67e3edea07988d5b1313a2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00267e9c4ce882… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 15 13:04:33 2019 +0200 agent_aws: ELB/Limits provides load balancer info for other ELB sections Change-Id: Ic5a5e50a847f8adf48ee932a62d36333d5bf0587 --- cmk/special_agents/agent_aws.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 9968675..6db2ef1 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -1588,7 +1588,10 @@ class ELBSummary(AWSSectionGeneric): return 300 def _get_colleague_contents(self): - return AWSColleagueContents(None, 0.0) + colleague = self._received_results.get('elb_limits') + if colleague and colleague.content: + return AWSColleagueContents(colleague.content, colleague.cache_timestamp) + return AWSColleagueContents([], 0.0) def _fetch_raw_content(self, colleague_contents): found_load_balancers = []

5 years, 5 months

[CMK-1970] - MSI installation fix, removed non-compatible options and forced upgrading

by Sergey Kipnis

Module: check_mk Branch: master Commit: 6427ae13a1010a062feae9cb0960ae3c62f79d37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6427ae13a1010a… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Apr 15 12:45:04 2019 +0200 [CMK-1970] - MSI installation fix, removed non-compatible options and forced upgrading - version number is more realistic - changed name of component to meaningful Change-Id: I1af06e7497985b4850a581ba9be740d11b36cdb0 --- agents/wnx/install/Product.wxs | 11 ++++++++--- agents/wnx/src/engine/install_api.cpp | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/agents/wnx/install/Product.wxs b/agents/wnx/install/Product.wxs index 2188b6a..811c906 100644 --- a/agents/wnx/install/Product.wxs +++ b/agents/wnx/install/Product.wxs @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?define CompanyName = "Mathias Kettner GmbH"?> <?define ProductName = "Check MK Service"?> -<?define ProductVersion = "0.9.1"?> +<?define ProductVersion = "1.6.0"?> <?define ProductId = "{C3BDE55B-4C42-48D0-8792-B1DE5174C202}"?> <?define ProductUpgradeCode = "83F434E9-EA96-4881-AA93-E21B27285C05"?> <?define PackageCode = "BAEBF560-7308-4D53-B426-903EA74B1D7E"?> @@ -38,7 +38,12 @@  <Property Id="REINSTALLMODE" Value="amus" /> - <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> + +  + <MajorUpgrade AllowDowngrades="yes" /> <Upgrade Id="$(var.ProductUpgradeCode)"> <UpgradeVersion Minimum="$(var.ProductVersion)" @@ -275,7 +280,7 @@ </DirectoryRef>  - <Feature Id="plugin_player_binaries" Title="Binaries of Plugin Player" Level="1"> + <Feature Id="installable_binaries" Title="Binaries to be Installed" Level="1"> <!-- <ComponentRef Id="plugin_player32_" /> diff --git a/agents/wnx/src/engine/install_api.cpp b/agents/wnx/src/engine/install_api.cpp index d8c5e4d..cd478b2 100644 --- a/agents/wnx/src/engine/install_api.cpp +++ b/agents/wnx/src/engine/install_api.cpp @@ -177,8 +177,11 @@ bool CheckForUpdateFile(const std::wstring& Name, // Prepare Command std::wstring command = exe + L" "; - command = command + L" /i " + msi_to_install.wstring() + - L" REINSTALL=ALL REINSTALLMODE=amus "; + // original line includes also command REINSTALL=ALL + // this doesn't work well when you have more than one FEATURE(new agent) + // and no defined REINSTALL in the MSI + command = + command + L" /i " + msi_to_install.wstring() + L" REINSTALLMODE=amus "; if (Update == kMsiExecQuiet) // this is only normal method command += L" /quiet"; // but MS doesn't care at all :)

5 years, 5 months

Started implementing the ruleset matcher

by Lars Michelsen

Module: check_mk Branch: master Commit: ac4ce814e9ab7e5b84273df5b32dcec0f1b3365f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac4ce814e9ab7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 08:59:04 2019 +0200 Started implementing the ruleset matcher * It uses the RuleMatcher() to produce a list of matching rules for a host / service object. * It provides several methods that interpret the matched rules in different ways, depending on what the caller needs. * The functions replace the existing matching functions like this: is_matching() replaces in_binary_hostlist / in_boolean_serviceconf_list get_merged_dict() replaces host_extra_conf_merged / service_extra_conf_merged get_values() replaces host_extra_conf / service_extra_conf CMK-1941 Change-Id: I7223f835a65658b495430cdf749472f4fe84ef28 --- cmk/utils/rulesets/ruleset_matcher.py | 80 +++++++++++++ .../cmk/utils/rulesets/test_ruleset_matcher.py | 130 +++++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/cmk/utils/rulesets/ruleset_matcher.py b/cmk/utils/rulesets/ruleset_matcher.py new file mode 100644 index 0000000..2654f8e --- /dev/null +++ b/cmk/utils/rulesets/ruleset_matcher.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python2 +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. +"""This module provides generic Check_MK ruleset processing functionality""" + +# TODO: Reduce different ruleset types (item vs. non-item and binary vs. value) +# TODO: Use objects for object_spec. We already have +# cmk_base.config.HostConfig. We would need something similar for service +# objects + +from typing import List, Dict, Any # pylint: disable=unused-import + +from cmk.utils.rulesets.rule_matcher import RuleMatcher + + +class RulesetMatcher(object): + def __init__(self): + # type: () -> None + super(RulesetMatcher, self).__init__() + self._matcher = RuleMatcher() + + def is_matching(self, object_spec, ruleset): + # type: (Dict, List[Dict]) -> bool + """Compute outcome of a ruleset set that just says yes/no + + The binary match only cares about the first matching rule of an object. + Depending on the value the outcome is negated or not. + + Replaces in_binary_hostlist / in_boolean_serviceconf_list""" + for rule in ruleset: + if self._matcher.match(object_spec, rule["condition"]): + return rule["value"] + return False + + def get_merged_dict(self, object_spec, ruleset): + # type: (Dict, List[Dict]) -> Dict + """Returns a dictionary of the merged dict values of the matched rules + The first dict setting a key defines the final value. + + Replaces host_extra_conf_merged / service_extra_conf_merged""" + rule_dict = {} # type: Dict + for value_dict in self.get_values(object_spec, ruleset): + for key, value in value_dict.items(): + rule_dict.setdefault(key, value) + return rule_dict + + def get_values(self, object_spec, ruleset): + # type: (Dict, List) -> List[Any] + """Returns a list of the values of the matched rules + + Replaces host_extra_conf / service_extra_conf""" + return [r["value"] for r in self.get_matching_rules(object_spec, ruleset)] + + def get_matching_rules(self, object_spec, ruleset): + # type: (Dict, List) -> List[Dict] + """Filter the ruleset of this matcher for the given object and return the filtered rule list + """ + return [rule for rule in ruleset if self._matcher.match(object_spec, rule["condition"])] diff --git a/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py b/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py new file mode 100644 index 0000000..9cf519a --- /dev/null +++ b/tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py @@ -0,0 +1,130 @@ +# encoding: utf-8 +# pylint: disable=redefined-outer-name +from cmk.utils.rulesets.ruleset_matcher import RulesetMatcher + + +def test_basic_matching(): + ruleset = [{"condition": {"a": "b"}}, {"condition": {"a": "c"}}] + matcher = RulesetMatcher() + assert matcher.get_matching_rules({"a": "b"}, ruleset=ruleset) == [ruleset[0]] + + +ruleset = [ + { + "value": "BLA", + "condition": { + "host_name": "host1", + }, + "options": {}, + }, + { + "value": "BLUB", + "condition": { + "host_name": { + "$in": ["host1", "host2"] + }, + }, + "options": {}, + }, +] + + +def test_basic_host_ruleset_get_matching_rules(): + matcher = RulesetMatcher() + assert matcher.get_matching_rules({"host_name": "abc"}, ruleset=ruleset) == [] + assert matcher.get_matching_rules({"host_name": "host1"}, ruleset=ruleset) == ruleset + assert matcher.get_matching_rules({"host_name": "host2"}, ruleset=ruleset) == [ruleset[1]] + + +def test_basic_host_ruleset_get_values(): + matcher = RulesetMatcher() + assert matcher.get_values({"host_name": "abc"}, ruleset=ruleset) == [] + assert matcher.get_values({"host_name": "host1"}, ruleset=ruleset) == ["BLA", "BLUB"] + assert matcher.get_values({"host_name": "host2"}, ruleset=ruleset) == ["BLUB"] + + +dict_ruleset = [ + { + "value": { + "hu": "BLA" + }, + "condition": { + "host_name": "host1", + }, + "options": {}, + }, + { + "value": { + "ho": "BLA" + }, + "condition": { + "host_name": { + "$in": ["host1", "host2"] + }, + }, + "options": {}, + }, + { + "value": { + "hu": "BLUB", + "he": "BLUB", + }, + "condition": { + "host_name": { + "$in": ["host1", "host2"] + }, + }, + "options": {}, + }, +] + + +def test_basic_host_ruleset_get_merged_dict_values(): + matcher = RulesetMatcher() + assert matcher.get_merged_dict({"host_name": "abc"}, ruleset=dict_ruleset) == {} + assert matcher.get_merged_dict({"host_name": "host1"}, ruleset=dict_ruleset) == { + "hu": "BLA", + "ho": "BLA", + "he": "BLUB", + } + assert matcher.get_merged_dict({"host_name": "host2"}, ruleset=dict_ruleset) == { + "hu": "BLUB", + "ho": "BLA", + "he": "BLUB", + } + + +binary_ruleset = [ + { + "value": True, + "condition": { + "host_name": "host1", + }, + "options": {}, + }, + { + "value": False, + "condition": { + "host_name": { + "$in": ["host1", "host2"] + }, + }, + "options": {}, + }, + { + "value": True, + "condition": { + "host_name": { + "$in": ["host1", "host2"] + }, + }, + "options": {}, + }, +] + + +def test_basic_host_ruleset_is_matching(): + matcher = RulesetMatcher() + assert matcher.is_matching({"host_name": "abc"}, ruleset=binary_ruleset) is False + assert matcher.is_matching({"host_name": "host1"}, ruleset=binary_ruleset) is True + assert matcher.is_matching({"host_name": "host2"}, ruleset=binary_ruleset) is False

5 years, 5 months

7338 FIX Dropped ancient "no_discovery_possible" from check API

by Lars Michelsen

Module: check_mk Branch: master Commit: 19e6695ab6757b8536468e94c9a89a80528d48dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19e6695ab6757b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 15 15:51:55 2019 +0200 7338 FIX Dropped ancient "no_discovery_possible" from check API The function no_discovery_possible was provided by the check API in the early days were the check_info was declared as 3-element tuple. Since the checks are registered as dictionaries this function is not needed anymore. In case you get an issue with this after an update, you will have to migrate your checks to the current check_info syntax. Change-Id: Ied704a41cba892368f02f766af4c86999ddb3ab3 --- .werks/7338 | 15 +++++++++++++++ cmk_base/check_api.py | 9 --------- cmk_base/check_api_utils.py | 14 -------------- cmk_base/config.py | 2 -- cmk_base/discovery.py | 7 ++++++- 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.werks/7338 b/.werks/7338 new file mode 100644 index 0000000..19a827b --- /dev/null +++ b/.werks/7338 @@ -0,0 +1,15 @@ +Title: Dropped ancient "no_discovery_possible" from check API +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555336187 +Class: fix + +The function no_discovery_possible was provided by the check API in the early days +were the check_info was declared as 3-element tuple. Since the checks are registered +as dictionaries this function is not needed anymore. + +In case you get an issue with this after an update, you will have to migrate your +checks to the current check_info syntax. diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 78dd0a7..8ecf4da 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -201,15 +201,6 @@ def savefloat(f): return 0.0 -# The function no_discovery_possible is as stub function used for -# those checks that do not support inventory. It must be known before -# we read in all the checks -# -# TODO: This seems to be an old part of the check API and not used for -# a long time. Deprecate this as part of the and move it to the -# cmk_base.config module. -no_discovery_possible = _check_api_utils.no_discovery_possible - service_extra_conf = _config.service_extra_conf host_extra_conf = _config.host_extra_conf in_binary_hostlist = _config.in_binary_hostlist diff --git a/cmk_base/check_api_utils.py b/cmk_base/check_api_utils.py index 3c33c2f..9e47398 100644 --- a/cmk_base/check_api_utils.py +++ b/cmk_base/check_api_utils.py @@ -29,23 +29,9 @@ # But at the current state of affairs we have no choice, otherwise an # incremental cleanup is impossible. -import cmk_base.console as console - # Symbolic representations of states in plugin output state_markers = ["", "(!)", "(!!)", "(?)"] - -# The function no_discovery_possible is as stub function used for -# those checks that do not support inventory. It must be known before -# we read in all the checks -def no_discovery_possible(check_plugin_name, info): - """In old checks we used this to declare that a check did not support - a service discovery. Please don't use this for new checks. Simply - skip the "inventory_function" argument of the check_info declaration.""" - console.verbose("%s does not support discovery. Skipping it.\n", check_plugin_name) - return [] - - # Management board checks MGMT_ONLY = "mgmt_only" # Use host address/credentials when it's a SNMP HOST HOST_PRECEDENCE = "host_precedence" # Check is only executed for mgmt board (e.g. Managegment Uptime) diff --git a/cmk_base/config.py b/cmk_base/config.py index bea4422..0ac0ee0 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2279,8 +2279,6 @@ def convert_check_info(): if not isinstance(info, dict): # Convert check declaration from old style to new API check_function, descr, has_perfdata, inventory_function = info - if inventory_function == check_api_utils.no_discovery_possible: - inventory_function = None scan_function = snmp_scan_functions.get(check_plugin_name, snmp_scan_functions.get(section_name)) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 3ca66c2..04a77e8 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -854,11 +854,16 @@ def _get_discovery_function_of(check_plugin_name): raise MKGeneralException("No such check type '%s'" % check_plugin_name) if discovery_function is None: - return check_api_utils.no_discovery_possible + return lambda _info: _no_discovery_possible(check_plugin_name) return discovery_function +def _no_discovery_possible(check_plugin_name): + console.verbose("%s does not support discovery. Skipping it.\n", check_plugin_name) + return [] + + def _execute_discovery_function(discovery_function, section_content): discovered_items = discovery_function(section_content)

5 years, 5 months

lnx_if: Fixed check and inventory plugin

by Simon Betz

Module: check_mk Branch: master Commit: a9e53b52eeaa048810837e6e1a40b5599cc9cdf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9e53b52eeaa04… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 15 14:25:15 2019 +0200 lnx_if: Fixed check and inventory plugin Change-Id: I0e5aefc3d74c1187bd062b891080797463e9ffeb --- checks/lnx_if | 23 ++++++++++++----------- tests/unit/checks/test_lnx_if.py | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index d749232..a9b112a 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -144,16 +144,17 @@ def _parse_lnx_if_sections(info): if iface is not None: iface[line[0].strip()] = ":".join(line[1:]).strip() - parsed = {} - for k in set(ip_stats.keys()).union(ethtool_stats.keys()): - iface = ip_stats.get(k, {}) - iface.update(ethtool_stats.get(k, {})) - parsed[k] = iface - return parsed + return ip_stats, ethtool_stats def parse_lnx_if(info): - nic_info = _parse_lnx_if_sections(info) + ip_stats, ethtool_stats = _parse_lnx_if_sections(info) + + nic_info = {} + for k in set(ip_stats.keys()).union(ethtool_stats.keys()): + iface = ip_stats.get(k, {}) + iface.update(ethtool_stats.get(k, {})) + nic_info[k] = iface if_table = [] index = 0 @@ -239,19 +240,19 @@ def parse_lnx_if(info): if_table.append(row) - return if_table + return if_table, ip_stats def inventory_lnx_if(parsed): if linux_nic_check == "legacy": return [] # Always exclude dockers veth* interfaces on docker nodes - parsed = [e for e in parsed if not e[2].startswith("veth")] - return inventory_if_common(parsed, has_nodeinfo=True) + if_table = [e for e in parsed[0] if not e[2].startswith("veth")] + return inventory_if_common(if_table, has_nodeinfo=True) def check_lnx_if(item, params, parsed): - return check_if_common(item, params, parsed, has_nodeinfo=True) + return check_if_common(item, params, parsed[0], has_nodeinfo=True) check_info["lnx_if"] = { diff --git a/tests/unit/checks/test_lnx_if.py b/tests/unit/checks/test_lnx_if.py index be02eb2..b1293d5 100644 --- a/tests/unit/checks/test_lnx_if.py +++ b/tests/unit/checks/test_lnx_if.py @@ -33,7 +33,7 @@ def parsed_change(bandwidth_change): str(6570143 + 4 * bandwidth_change), '55994', '0', '0', '0', '0', '0', 'wlp2s0', 'd]\x86\xe4P/' ], - ] + ], {} DISCOVERY = [

5 years, 5 months

Rename rule matcher test file to match real module hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a60782a1eab14fc5e9fa4b57dff7047a520bf14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a60782a1eab14… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 12 11:57:46 2019 +0200 Rename rule matcher test file to match real module hierarchy Change-Id: I393fdb3eb11d95d25db25807656402635803bdc7 --- .../cmk/utils/{test_cmk_rulesets.py => rulesets/test_rule_matcher.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/cmk/utils/test_cmk_rulesets.py b/tests/unit/cmk/utils/rulesets/test_rule_matcher.py similarity index 100% rename from tests/unit/cmk/utils/test_cmk_rulesets.py rename to tests/unit/cmk/utils/rulesets/test_rule_matcher.py

5 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019