Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

[CMK-1850] - msi content is divided onto two parts fixed.cab and product.cab. This is required for bakery

by Sergey Kipnis

Module: check_mk Branch: master Commit: 4367a2a3d95846027e4317cb2740568fde117304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4367a2a3d95846… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Apr 3 13:59:30 2019 +0200 [CMK-1850] - msi content is divided onto two parts fixed.cab and product.cab. This is required for bakery Change-Id: Ie8e0d2d3c073fb8b49e4e806b775c8b5f44277e5 --- agents/wnx/install/Product.wxs | 95 +++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4367a2a3d9…

5 years, 3 months

[CMK-1791] - handle leak fixed

by Sergey Kipnis

Module: check_mk Branch: master Commit: 392d2cb8457495d1a377c9c3943e4534af91fd24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=392d2cb8457495… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Apr 3 08:47:28 2019 +0200 [CMK-1791] - handle leak fixed - API changed to "tupled" - added disabled test to check leaks in handles - cosmetics: error_code used in log proactive and more or less unified Change-Id: I1d1353c920d43511592029bcd6dead224695939b --- agents/wnx/include/tools/_process.h | 46 +++++++++-------- agents/wnx/src/common/wtools.cpp | 48 ++++++++++++++++++ agents/wnx/src/common/wtools.h | 71 +++++++++------------------ agents/wnx/src/engine/cfg.cpp | 60 ++++++++++++++-------- agents/wnx/src/engine/cfg.h | 4 +- agents/wnx/src/engine/cfg_details.h | 16 ++++++ agents/wnx/src/engine/service_api.cpp | 28 +++-------- agents/wnx/src/engine/service_api.h | 4 +- agents/wnx/src/engine/windows_service_api.cpp | 10 +++- agents/wnx/watest/test-plugin.cpp | 9 ++-- agents/wnx/watest/test-service.cpp | 2 +- agents/wnx/watest/test-wtools.cpp | 25 +++++++++- 12 files changed, 200 insertions(+), 123 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=392d2cb845…

5 years, 3 months

7194 ibm_svc_enclosure: Configurable required online canisters

by Florian Kromer

Module: check_mk Branch: master Commit: 412d9fc0c53bfb50d9c1c72a6d1df60a030634a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=412d9fc0c53bfb… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Apr 1 17:50:04 2019 +0200 7194 ibm_svc_enclosure: Configurable required online canisters Previously the check status was CRIT if not all of the canisters were online. This werk adds optional configuration of the lower levels for online canisters. CMK-1269 Change-Id: I9be6a04ed045e4248b5f22bfeebac377cb8444e7 --- .werks/7194 | 11 +++ checkman/ibm_svc_enclosure | 12 ++- checks/ibm_svc_enclosure | 35 +++++--- .../wato/check_parameters/ibm_svc_enclosure.py | 96 ++++++++++++++++++++++ .../datasets/ibm_svc_enclosure_regression_13.py | 26 +++--- .../datasets/ibm_svc_enclosure_regression_15.py | 6 +- .../datasets/ibm_svc_enclosure_regression_17.py | 8 +- .../datasets/ibm_svc_enclosure_regression_9.py | 2 +- 8 files changed, 159 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=412d9fc0c5…

5 years, 3 months

Extend cmk_base.config unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: ba64302e70716a6feba74788a39aa454f8910758 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba64302e70716a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 08:24:38 2019 +0200 Extend cmk_base.config unit tests Change-Id: I5784208262cdd06d4f92d8f87d280bbf68cc32c6 --- cmk_base/config.py | 1 + tests/unit/cmk_base/test_config.py | 122 ++++++++++++++++++++++++++++++++++--- 2 files changed, 116 insertions(+), 7 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index af569be..a306b9f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2785,6 +2785,7 @@ class HostConfig(object): self.part_of_clusters = self._config_cache.clusters_of(hostname) tags = self._config_cache.tag_list_of_host(self.hostname) + # TODO: Rename self.tags to self.tag_list and self.tag_groups to self.tags self.tags = tags self.tag_groups = host_tags.get(hostname, {}) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index f572b33..f18895b 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -3,6 +3,7 @@ import pytest # type: ignore import cmk_base.config as config +import cmk_base.piggyback as piggyback @pytest.fixture(autouse=True, scope="function") @@ -21,8 +22,68 @@ def clear_config_caches(monkeypatch): ("testhost", ["no-ip"], False), ]) def test_is_ipv4_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + assert config.is_ipv4_host(hostname) == result + assert config.HostConfig(hostname).is_ipv4_host == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], False), + ("testhost", ["ip-v4"], False), + ("testhost", ["ip-v4", "ip-v6"], True), + ("testhost", ["ip-v6"], True), + ("testhost", ["no-ip"], False), +]) +def test_is_ipv6_host(monkeypatch, hostname, tags, result): + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + + assert config.is_ipv6_host(hostname) == result + assert config.HostConfig(hostname).is_ipv6_host == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], False), + ("testhost", ["ip-v4"], False), + ("testhost", ["ip-v4", "ip-v6"], True), + ("testhost", ["ip-v6"], False), + ("testhost", ["no-ip"], False), +]) +def test_is_ipv4v6_host(monkeypatch, hostname, tags, result): + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + + assert config.is_ipv4v6_host(hostname) == result + assert config.HostConfig(hostname).is_ipv4v6_host == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", ["piggyback"], True), + ("testhost", ["no-piggyback"], False), +]) +def test_is_piggyback_host(monkeypatch, hostname, tags, result): + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + + assert config.HostConfig(hostname).is_piggyback_host == result + + +(a)pytest.mark.parametrize("with_data,result", [ + (True, True), + (False, False), +]) +(a)pytest.mark.parametrize("hostname,tags", [ + ("testhost", []), + ("testhost", ["auto-piggyback"]), +]) +def test_is_piggyback_host_auto(monkeypatch, hostname, tags, with_data, result): + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + monkeypatch.setattr(piggyback, "has_piggyback_raw_data", lambda cache_age, hostname: with_data) + + assert config.HostConfig(hostname).is_piggyback_host == result @pytest.mark.parametrize("hostname,tags,result", [ @@ -33,8 +94,11 @@ def test_is_ipv4_host(monkeypatch, hostname, tags, result): ("testhost", ["no-ip"], True), ]) def test_is_no_ip_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + assert config.is_no_ip_host(hostname) == result + assert config.HostConfig(hostname).is_no_ip_host == result @pytest.mark.parametrize("hostname,tags,result,ruleset", [ @@ -56,14 +120,14 @@ def test_is_no_ip_host(monkeypatch, hostname, tags, result): ("testhost", ["no-ip"], False, []), ]) def test_is_ipv6_primary_host(monkeypatch, hostname, tags, result, ruleset): - monkeypatch.setattr(config, "all_hosts", ["%s|%s" % (hostname, "|".join(tags))]) - monkeypatch.setattr(config, "host_paths", {hostname: "/"}) - monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() monkeypatch.setattr(config, "primary_address_family", ruleset) config.get_config_cache().initialize() assert config.is_ipv6_primary(hostname) == result + assert config.HostConfig(hostname).is_ipv6_primary == result @pytest.mark.parametrize("result,attrs", [ @@ -98,7 +162,27 @@ def test_management_address_of(monkeypatch, attrs, result): def test_is_tcp_host(monkeypatch, hostname, tags, result): _setup_host(monkeypatch, hostname, tags) config.get_config_cache().initialize() + assert config.is_tcp_host(hostname) == result + assert config.HostConfig(hostname).is_tcp_host == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], False), + ("testhost", ["cmk-agent"], False), + ("testhost", ["snmp", "tcp"], False), + ("testhost", ["snmp", "tcp", "ping"], False), + ("testhost", ["snmp"], False), + ("testhost", ["no-agent", "no-snmp", "no-piggyback"], True), + ("testhost", ["no-agent", "no-snmp"], True), + ("testhost", ["ping"], True), +]) +def test_is_ping_host(monkeypatch, hostname, tags, result): + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + + assert config.is_ping_host(hostname) == result + assert config.HostConfig(hostname).is_ping_host == result @pytest.mark.parametrize("hostname,tags,result", [ @@ -110,7 +194,25 @@ def test_is_tcp_host(monkeypatch, hostname, tags, result): def test_is_snmp_host(monkeypatch, hostname, tags, result): _setup_host(monkeypatch, hostname, tags) config.get_config_cache().initialize() + assert config.is_snmp_host(hostname) == result + assert config.HostConfig(hostname).is_snmp_host == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], False), + ("testhost", ["tcp"], False), + ("testhost", ["snmp"], False), + ("testhost", ["cmk-agent", "snmp"], False), + ("testhost", ["no-agent", "no-snmp"], False), + ("testhost", ["tcp", "snmp"], True), +]) +def test_is_dual_host(monkeypatch, hostname, tags, result): + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + + assert config.is_dual_host(hostname) == result + assert config.HostConfig(hostname).is_dual_host == result @pytest.mark.parametrize("hostname,tags,result", [ @@ -121,8 +223,11 @@ def test_is_snmp_host(monkeypatch, hostname, tags, result): ("testhost", ["cmk-agent"], False), ]) def test_is_all_agents_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + assert config.is_all_agents_host(hostname) == result + assert config.HostConfig(hostname).is_all_agents_host == result @pytest.mark.parametrize("hostname,tags,result", [ @@ -133,8 +238,11 @@ def test_is_all_agents_host(monkeypatch, hostname, tags, result): ("testhost", ["cmk-agent"], False), ]) def test_is_all_special_agents_host(monkeypatch, hostname, tags, result): - monkeypatch.setattr(config, "tag_list_of_host", lambda h: {hostname: tags}[h]) + _setup_host(monkeypatch, hostname, tags) + config.get_config_cache().initialize() + assert config.is_all_special_agents_host(hostname) == result + assert config.HostConfig(hostname).is_all_special_agents_host == result def test_prepare_check_command_basics():

5 years, 3 months

Fix: simplified check function and adapted wato rule

by Ronny Bruska

Module: check_mk Branch: master Commit: f5681b17e0a488f1265dccf0b454260ffb05da00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5681b17e0a488… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Mon Apr 1 11:56:54 2019 +0200 Fix: simplified check function and adapted wato rule Change-Id: I5cbd91648ae50c1d090af22bd5e3f747ef0fd6bf --- checks/elasticsearch_nodes | 29 +++---- .../wato/check_parameters/elasticsearch_nodes.py | 4 +- .../generictests/datasets/elasticsearch_nodes.py | 90 +++++++++++----------- 3 files changed, 59 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f5681b17e0…

5 years, 3 months

Add tests for OffsetStringServiceMacroColumn.

by Sven Panne

Module: check_mk Branch: master Commit: 0afde1a657b2841f865ade8b16fc1e0083edc19b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0afde1a657b284… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 3 09:25:35 2019 +0200 Add tests for OffsetStringServiceMacroColumn. Change-Id: I26cb77dc8130b14d442e61ed772e41bc7ed878df --- .../src/test/test_OffsetStringMacroColumn.cc | 215 ++++++++++++++++++--- 1 file changed, 192 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0afde1a657…

5 years, 3 months

7047 netapp_api_cpu: Allow configuration of CPU util averaging in cluster mode

by Florian Kromer

Module: check_mk Branch: master Commit: 0263b8514744cf1901f29a0bffb9b5671e4dedb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0263b8514744cf… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Mar 18 10:55:46 2019 +0100 7047 netapp_api_cpu: Allow configuration of CPU util averaging in cluster mode This werk adds the possibility to configure averaging of the CPU utilization of NetApps in cluster mode. CMK-1321 Change-Id: I7263d40c042a8497a2ba99edcfc2edb64704f424 --- .werks/7047 | 12 ++ checkman/netapp_api_cpu | 4 + .../check_parameters/cpu_utilization_multiitem.py | 12 ++ tests/unit/checks/test_netapp_api_cpu.py | 122 +++++++++++++++++++++ 4 files changed, 150 insertions(+) diff --git a/.werks/7047 b/.werks/7047 new file mode 100644 index 0000000..e1e55e1 --- /dev/null +++ b/.werks/7047 @@ -0,0 +1,12 @@ +Title: netapp_api_cpu: Optional averaging of CPU utilization in cluster mode +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552902773 +Class: feature + +Users can now configure averaging for the CPU utilization of NetApp devices using +the WATO rule {CPU utilization of Devices with Modules}. If configured, the CPU +utilization is averaged over the specified time period before levels are applied. diff --git a/checkman/netapp_api_cpu b/checkman/netapp_api_cpu index 3b83d03..c23f92f 100644 --- a/checkman/netapp_api_cpu +++ b/checkman/netapp_api_cpu @@ -8,6 +8,10 @@ description: Returns {WARN}/{CRIT} if the current utilization is above the given levels. + The {WARN}/{CRIT} levels may be configured with WATO rule group + {CPU utilization of Devices with Modules}. It is possible to configure + averaging of the CPU utilization via parameter {Averaging}. + inventory: Creates one check. diff --git a/cmk/gui/plugins/wato/check_parameters/cpu_utilization_multiitem.py b/cmk/gui/plugins/wato/check_parameters/cpu_utilization_multiitem.py index db854f5..db7df80 100644 --- a/cmk/gui/plugins/wato/check_parameters/cpu_utilization_multiitem.py +++ b/cmk/gui/plugins/wato/check_parameters/cpu_utilization_multiitem.py @@ -27,6 +27,7 @@ from cmk.gui.i18n import _ from cmk.gui.valuespec import ( Dictionary, + Integer, Percentage, TextAscii, Tuple, @@ -74,6 +75,17 @@ class RulespecCheckgroupParametersCpuUtilizationMultiitem(CheckParameterRulespec ], ), ), + ("average", + Integer( + title=_("Averaging"), + help= + _("Average the CPU utilization over the specified time period before levels are applied." + ), + unit=_("minutes"), + minvalue=1, + default_value=15, + label=_("Compute average over last "), + )), ], ) diff --git a/tests/unit/checks/test_netapp_api_cpu.py b/tests/unit/checks/test_netapp_api_cpu.py new file mode 100644 index 0000000..504ac0e --- /dev/null +++ b/tests/unit/checks/test_netapp_api_cpu.py @@ -0,0 +1,122 @@ +import pytest +from cmk_base.check_api import MKCounterWrapped +from checktestlib import BasicCheckResult, CheckResult, DiscoveryResult, assertDiscoveryResultsEqual, PerfValue + +pytestmark = pytest.mark.checks + +agent_info = [ + [ + ['cpu_busy', '8362860064'], + ['num_processors', '2'], + ], + [ + ['cpu-info clu1-01', 'num_processors 2'], + ['cpu-info clu1-02', 'num_processors 2'], + ['cpu-info clu1-01', 'cpu_busy 5340000', 'nvram-battery-status battery_ok'], + ['cpu-info clu1-02', 'cpu_busy 5400000', 'nvram-battery-status battery_ok'], + ], +] + +result_parsed = [ + { + '7mode': { + 'cpu_busy': '8362860064', + 'num_processors': '2' + } + }, + { + 'clustermode': { + 'clu1-01': { + 'cpu_busy': '5340000', + 'num_processors': '2', + 'nvram-battery-status': 'battery_ok' + }, + 'clu1-02': { + 'cpu_busy': '5400000', + 'num_processors': '2', + 'nvram-battery-status': 'battery_ok' + } + } + }, +] + +result_parsed_over_time = [ + { + 'clustermode': { + 'clu1-01': { + 'cpu_busy': '0', + 'num_processors': '2', + 'nvram-battery-status': 'battery_ok' + }, + }, + }, + { + 'clustermode': { + 'clu1-01': { + 'cpu_busy': '8000000', + 'num_processors': '2', + 'nvram-battery-status': 'battery_ok' + } + } + }, + { + 'clustermode': { + 'clu1-01': { + 'cpu_busy': '9000000', + 'num_processors': '2', + 'nvram-battery-status': 'battery_ok' + } + } + }, +] + + +(a)pytest.mark.parametrize("info, result_parsed", zip(agent_info, result_parsed)) +def test_parse_function(check_manager, info, result_parsed): + check = check_manager.get_check("netapp_api_cpu") + parsed = check.run_parse(info) + assert parsed == result_parsed + + +(a)pytest.mark.parametrize("params, first_result_change, second_result_change", [ + ( + { + 'levels': (80.0, 90.0) + }, + (0, 'Total CPU: 13.3%, 2 CPUs', [('util', 13.333333333333334, 80.0, 90.0, 0, 2)]), + (0, 'Total CPU: 0.833%, 2 CPUs', [('util', 0.8333333333333334, 80.0, 90.0, 0, 2)]), + ), + ( + { + 'levels': (10.0, 90.0) + }, + (1, 'Total CPU: 13.3% (warn/crit at 10.0%/90.0%), 2 CPUs', [('util', 13.333333333333334, + 10.0, 90.0, 0, 2)]), + (0, 'Total CPU: 0.833%, 2 CPUs', [('util', 0.8333333333333334, 10.0, 90.0, 0, 2)]), + ), + ( + { + 'levels': (80.0, 90.0), + 'average': 2, + }, + (0, '2min average: 0%, 2 CPUs', [('util', 13.333333333333334, 80.0, 90.0, 0, 2), + ('util_average', 0, 80.0, 90.0, 0, 100)]), + (0, '2min average: 0.417%, 2 CPUs', [('util', 0.8333333333333334, 80.0, 90.0, 0, 2), + ('util_average', 0.4166666666666666, 80.0, 90.0, 0, + 100)]), + ), +]) +def test_cluster_mode_check_function(check_manager, monkeypatch, params, first_result_change, + second_result_change): + check = check_manager.get_check("netapp_api_cpu") + monkeypatch.setattr('time.time', lambda: 0) + try: + check.run_check('clu1-01', params, result_parsed_over_time[0]) + except MKCounterWrapped: + pass + monkeypatch.setattr('time.time', lambda: 60) + result = check.run_check('clu1-01', params, result_parsed_over_time[1]) + assert result == first_result_change + monkeypatch.setattr('time.time', lambda: 180) + result = check.run_check('clu1-01', params, result_parsed_over_time[2]) + assert result == second_result_change

5 years, 3 months

Improve host/service tag visibility in detail views

by Lars Michelsen

Module: check_mk Branch: master Commit: ed55f46e31d5e7a816848a3dcfa807dadc358bad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed55f46e31d5e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:55:23 2019 +0200 Improve host/service tag visibility in detail views * Display tags of hosts and services in a common place at the beginning of the detail views. * Moved host parent columns down some rows CMK-1815 Change-Id: I83398b9a3bbffbbcda0a3961d2f2d81a7fb9e3cf --- cmk/gui/plugins/views/builtin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/views/builtin.py b/cmk/gui/plugins/views/builtin.py index e248fab..7e0fb6e 100644 --- a/cmk/gui/plugins/views/builtin.py +++ b/cmk/gui/plugins/views/builtin.py @@ -1285,10 +1285,9 @@ multisite_builtin_views.update({ # 1. Identification and icons ('sitealias', None), ('host', 'host'), - ('host_parents', None), - ('host_childs', None), ('host_addresses', None), ('alias', None), + ('host_tags', None), ('host_icons', None), # 2. State and metrics @@ -1323,6 +1322,8 @@ multisite_builtin_views.update({ ('host_notification_postponement_reason', None), # 5. Configuration + ('host_parents', None), + ('host_childs', None), ('host_check_interval', None), ('host_contact_groups', None), ('host_contacts', None), @@ -1510,6 +1511,7 @@ multisite_builtin_views.update({ ('sitealias', None), ('host', 'hoststatus'), ('service_description', 'servicedesc'), + ('service_tags', None), ('service_icons', None), # 2. State and metrics

5 years, 3 months

Service tags are now configurable per ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ef3c1a153dc33f4cfd4f616ccc10a98e11edebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ef3c1a153dc33… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:25:58 2019 +0200 Service tags are now configurable per ruleset * Service tags are now configurable using the ruleset "Service tags" * These tag groups are made available via Livestatus using the "tags" column of the "services" table CMK-1815 Change-Id: I9b3b14402e71eafd0daadec1a11fed342f201953 --- cmk/gui/plugins/wato/check_mk_configuration.py | 49 +++++++++++++++++++++ cmk_base/config.py | 9 ++++ cmk_base/core_config.py | 59 +++++++++++++++++++++++--- cmk_base/core_nagios.py | 30 +++++++------ cmk_base/default_config/base.py | 1 + tests/unit/cmk_base/test_config.py | 30 +++++++++++++ tests/unit/cmk_base/test_core_config.py | 25 ++++++++++- 7 files changed, 182 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ef3c1a153…

5 years, 3 months

Add simple service tags query to livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d53fffefad25912817e8f0ff800316c81766754 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d53fffefad259… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 11:51:19 2019 +0200 Add simple service tags query to livestatus CMK-1815 Change-Id: I60f3ebb3019ee7424a3e9258027bcdc0b9861bf3 --- tests/integration/livestatus/test_livestatus.py | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index b44d2e4..4435e5a 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -116,3 +116,35 @@ def test_service_table(default_cfg, site): assert "Check_MK Discovery" in descriptions assert "CPU load" in descriptions assert "Memory" in descriptions + + +(a)pytest.fixture() +def configure_service_tags(site, web): + web.set_ruleset( + "service_tag_rules", { + "ruleset": { + "": [{ + "value": [("criticality", "prod")], + "conditions": { + "host_tags": [], + "host_specs": ["livestatus-test-host"], + "service_specs": ["CPU load$"], + }, + },], + } + }) + web.activate_changes() + yield + web.set_ruleset("service_tag_rules", {"ruleset": {"": [],}}) + web.activate_changes() + + +def test_service_custom_variables(configure_service_tags, default_cfg, site): + rows = site.live.query("GET services\n" + "Columns: custom_variables tags\n" + "Filter: host_name = livestatus-test-host\n" + "Filter: description = CPU load\n") + assert isinstance(rows, list) + custom_variables, tags = rows[0] + assert custom_variables == {} + assert tags == {u'criticality': u'prod'}

5 years, 3 months

← Newer
1
...
49
50
51
52
53
54
55
...
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