Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Split computation of default and effective check parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: 38170570b6df39575132b22408abbcc186a080df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38170570b6df39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:29:24 2017 +0100 Split computation of default and effective check parameters Change-Id: I513f0643ecf225fd4341f82943bb545199a62f76 --- cmk_base/checks.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 4fb4ecb..195789d 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -513,6 +513,13 @@ def compute_check_parameters(host, checktype, item, params): if checktype not in check_info: # handle vanished checktype return None + params = _update_with_default_check_parameters(checktype, params) + params = _update_with_configured_check_parameters(host, checktype, item, params) + + return params + + +def _update_with_default_check_parameters(checktype, params): # Handle dictionary based checks def_levels_varname = check_info[checktype].get("default_levels_variable") # TODO: Can we skip this? @@ -552,6 +559,10 @@ def compute_check_parameters(host, checktype, item, params): new_params.update(params) params = new_params + return params + + +def _update_with_configured_check_parameters(host, checktype, item, params): descr = config.service_description(host, checktype, item) # Get parameters configured via checkgroup_parameters

6 years, 7 months

Check tests: Automatically use fresh config/runtime caches

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ed6f3b7280ec3ad8ad54695f9984bd37eb22083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed6f3b7280ec3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:31:21 2017 +0100 Check tests: Automatically use fresh config/runtime caches Change-Id: I7f029f1b64919e6fe2208ac3c260eeac77be87f6 --- tests/checks/conftest.py | 9 +++++++++ tests/checks/test_df_check.py | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/checks/conftest.py b/tests/checks/conftest.py index d5a7c38..a80ce04 100644 --- a/tests/checks/conftest.py +++ b/tests/checks/conftest.py @@ -11,3 +11,12 @@ def check_manager(): manager = testlib.CheckManager() manager.load() return manager + + +# Automatically refresh caches for each test +(a)pytest.fixture(autouse=True, scope="function") +def clear_config_caches(monkeypatch): + import cmk_base + import cmk_base.caching + monkeypatch.setattr(cmk_base, "config_cache", cmk_base.caching.CacheManager()) + monkeypatch.setattr(cmk_base, "runtime_cache", cmk_base.caching.CacheManager()) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 288e07c..ce4061d 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -239,7 +239,6 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu check = check_manager.get_check("df") monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) assert check.run_discovery(check.run_parse(info)) == expected_result - cmk_base.config_cache.clear_all() # TODO: Make this work by finding a way to get a check's default levels in this context. @@ -247,7 +246,6 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu (u"/", "default", info_df_lnx, {}) ]) def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, expected_result): - import cmk_base check = check_manager.get_check("df") if params == "default": @@ -260,5 +258,3 @@ def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, exp assert result[1] == expected_result["infotext"] if "perfdata" in expected_result: assert result[2] == expected_result["perfdata"] - - cmk_base.config_cache.clear_all()

6 years, 7 months

Use real default parameters for test

by Lars Michelsen

Module: check_mk Branch: master Commit: 10ab6fee4fdbb8b6f74fc4165a731d4f2cc9927b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10ab6fee4fdbb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 10:30:19 2017 +0100 Use real default parameters for test Change-Id: I8603f8a58821627610d2c2f4306befefb8fd5663 --- tests/checks/test_df_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index e2b9f80..288e07c 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -244,14 +244,14 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu # TODO: Make this work by finding a way to get a check's default levels in this context. @pytest.mark.parametrize("item,params,info,expected_result", [ -# (u"/", "default", info_df_lnx, {}) + (u"/", "default", info_df_lnx, {}) ]) def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, expected_result): import cmk_base check = check_manager.get_check("df") if params == "default": - params = check.default_levels + params = check.default_parameters() result = check.run_check(item, params, check.run_parse(info)) if "status" in expected_result:

6 years, 7 months

test_df_check: Add non-operational test case for check function, missing default params

by Konstantin Büttner

Module: check_mk Branch: master Commit: fe3876192d285aeb969176172c79f57bee3bc01f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe3876192d285a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 28 16:25:45 2017 +0100 test_df_check: Add non-operational test case for check function, missing default params Change-Id: I01ef435279df7252ffbf5e6fbe80403d0d93f532 --- tests/checks/test_df_check.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 9ca654a..e2b9f80 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -240,3 +240,25 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) assert check.run_discovery(check.run_parse(info)) == expected_result cmk_base.config_cache.clear_all() + + +# TODO: Make this work by finding a way to get a check's default levels in this context. +(a)pytest.mark.parametrize("item,params,info,expected_result", [ +# (u"/", "default", info_df_lnx, {}) +]) +def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, expected_result): + import cmk_base + check = check_manager.get_check("df") + + if params == "default": + params = check.default_levels + + result = check.run_check(item, params, check.run_parse(info)) + if "status" in expected_result: + assert result[0] == expected_result["status"] + if "infotext" in expected_result: + assert result[1] == expected_result["infotext"] + if "perfdata" in expected_result: + assert result[2] == expected_result["perfdata"] + + cmk_base.config_cache.clear_all()

6 years, 7 months

5547 FIX Errors in pre-activate-changes hooks prevent configuration activation now (regression since 1.2.8)

by Lars Michelsen

Module: check_mk Branch: master Commit: 03089b7be12d3a54163cbd059f1e3af25370356b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03089b7be12d3a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 28 15:55:42 2017 +0100 5547 FIX Errors in pre-activate-changes hooks prevent configuration activation now (regression since 1.2.8) Exceptions in pre-activate-changes hooks, that one can register to extend the WATO functionality before loading changes into the monitoring core were suppressed and only shown to the user if the debug mode of the GUI is enabled. These issues are now shown to the user during activation of a site in form of a short exception message. The full trace is shown in the var/log/web.log of the site the error happens on. Change-Id: Ib699ff57de056c043e6a145f42ca2290397dee0d --- .werks/5547 | 16 ++++++++++++++++ web/htdocs/watolib.py | 8 +------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/5547 b/.werks/5547 new file mode 100644 index 0000000..8c9bf95 --- /dev/null +++ b/.werks/5547 @@ -0,0 +1,16 @@ +Title: Errors in pre-activate-changes hooks prevent configuration activation now (regression since 1.2.8) +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1511880767 + +Exceptions in pre-activate-changes hooks, that one can register to extend the WATO functionality +before loading changes into the monitoring core were suppressed and only shown to the user if +the debug mode of the GUI is enabled. + +These issues are now shown to the user during activation of a site in form of a short exception +message. The full trace is shown in the var/log/web.log of the site the error happens on. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4f9dcb5..f51c95e 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6922,13 +6922,7 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti cmd = [ 'check_mk', '--automation', command, '--' ] + args if command in [ 'restart', 'reload' ]: - try: - call_hook_pre_activate_changes() - except Exception, e: - if config.debug: - raise - html.show_error(_("<h1>Cannot activate changes</h1>%s") % e) - return + call_hook_pre_activate_changes() cmd = [ make_utf8(a) for a in cmd ] try:

6 years, 7 months

5448 mssql checks: Added prefix 'MSSQL' to each MSSQL service description

by Simon Betz

Module: check_mk Branch: master Commit: e0549d554d67d2879156ad0979d0ecca54f42b2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0549d554d67d2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 28 15:14:46 2017 +0100 5448 mssql checks: Added prefix 'MSSQL' to each MSSQL service description In order to use these new service descriptions you have to enable them below {Global settings}, {Use new service descriptions}. Renaming of existing services has many implications - including existing rules, performance data and availability history - these renamings are disabled per default for existing installations. Here you can switch to the new descriptions for selected check types Change-Id: If0eb671a1c431765edfbcd771cd1d17b5eeccae1 --- .werks/5448 | 14 ++++++++++++++ checks/mssql_backup | 2 +- checks/mssql_counters | 14 +++++++------- checks/mssql_databases | 2 +- checks/mssql_datafiles | 2 +- checks/mssql_tablespaces | 2 +- checks/mssql_transactionlogs | 2 +- checks/mssql_versions | 2 +- cmk_base/config.py | 14 ++++++++++++++ web/htdocs/wato.py | 13 +++++++++++++ web/plugins/wato/check_mk_configuration.py | 13 +++++++++++++ 11 files changed, 67 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e0549d554d…

6 years, 7 months

5466 FIX Fixed filtering of services table for host name

by Sven Panne

Module: check_mk Branch: master Commit: 064939e49f11502980992af314c66ee1592ef247 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=064939e49f1150… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 28 14:04:25 2017 +0100 5466 FIX Fixed filtering of services table for host name Using a filter of the form 'host_name != ...' on the services table did not work, the result set was always empty. This has been fixed. Change-Id: Iec63cebd731606b7598a40d150215b328443909d --- .werks/5466 | 11 +++++++++++ livestatus/src/StringFilter.cc | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/5466 b/.werks/5466 new file mode 100644 index 0000000..3f2ab41 --- /dev/null +++ b/.werks/5466 @@ -0,0 +1,11 @@ +Title: Fixed filtering of services table for host name +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511873723 +Class: fix + +Using a filter of the form 'host_name != ...' on the services table did not +work, the result set was always empty. This has been fixed. diff --git a/livestatus/src/StringFilter.cc b/livestatus/src/StringFilter.cc index 313f451..ae211da 100644 --- a/livestatus/src/StringFilter.cc +++ b/livestatus/src/StringFilter.cc @@ -90,10 +90,8 @@ const std::string *StringFilter::valueForIndexing( const std::string &column_name) const { switch (_relOp) { case RelationalOperator::equal: - case RelationalOperator::not_equal: - // TODO(sp) The cast looks very dubious, but the whole void* story - // is quite dangerous... return column_name == columnName() ? &_value : nullptr; + case RelationalOperator::not_equal: case RelationalOperator::matches: case RelationalOperator::doesnt_match: case RelationalOperator::equal_icase:

6 years, 7 months

Rename test parameter

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9167df85fc114b854c3da1171dec007c34963706 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9167df85fc114b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 28 12:58:22 2017 +0100 Rename test parameter Change-Id: I965447db38e9fb096a2fea2b85711cbed86b51f7 --- tests/checks/test_df_check.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 3f66fd2..9ca654a 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -216,7 +216,7 @@ info_df_btrfs = \ # | | # '----------------------------------------------------------------------' -(a)pytest.mark.parametrize("info,result,include_volume_name", [ +(a)pytest.mark.parametrize("info,expected_result,include_volume_name", [ ([], [], False), (info_df_lnx, [(u'/', {})], False), (info_df_lnx, [(u'/dev/sda4 /', {})], True), @@ -227,8 +227,7 @@ info_df_btrfs = \ (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], False), (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), ]) -def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, include_volume_name): - import cmk_base.checks +def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result, include_volume_name): import cmk_base # NOTE: This commented-out code is the result of trying to mock the the ruleset variable itself instead of the @@ -239,5 +238,5 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, inclu check = check_manager.get_check("df") monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) - assert check.run_discovery(check.run_parse(info)) == result + assert check.run_discovery(check.run_parse(info)) == expected_result cmk_base.config_cache.clear_all()

6 years, 7 months

Yet another IWYU fix... :-/

by Sven Panne

Module: check_mk Branch: master Commit: cd95fa7b65c8e87cea85bd6e984f357e4791b89c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd95fa7b65c8e8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 28 12:06:47 2017 +0100 Yet another IWYU fix... :-/ Change-Id: Ie10975864c856fb0b36ecf48dd25744d98f16470 --- livestatus/src/Column.h | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index f55e626..2a073bc 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -35,7 +35,6 @@ #include "Row.h" #include "contact_fwd.h" #include "opids.h" -class Aggregation; class Filter; class Logger; class RowRenderer;

6 years, 7 months

Fixed a Python classic. :-)

by Sven Panne

Module: check_mk Branch: master Commit: cf63eab734311488343750c3975635ad1bcb26d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf63eab7343114… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 28 11:48:07 2017 +0100 Fixed a Python classic. :-) Change-Id: I155f6dcc9957399d61b1ba996bfe7f721b071258 --- web/plugins/wato/ac_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index e8d00e3..a7a480f 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -391,7 +391,7 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): def _get_average_process_size(self): try: ppid = int(open("%s/tmp/apache/run/apache.pid" % cmk.paths.omd_root).read()) - except IOError, ValueError: + except (IOError, ValueError): raise MKGeneralException(_("Failed to read the apache process ID")) sizes = []

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017