Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

3985 FIX mrpe: fixed broken long output when using the CMC

by Andreas Boesl

Module: check_mk Branch: master Commit: 6caee5e3fdcb117fd89d2ec27cc9cb2bc2120119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6caee5e3fdcb11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 26 11:05:25 2016 +0200 3985 FIX mrpe: fixed broken long output when using the CMC The long output of the mrpe check was appended to the plugin output. This has been fixed. --- .werks/3985 | 10 ++++++++++ ChangeLog | 1 + checks/mrpe | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3985 b/.werks/3985 new file mode 100644 index 0000000..b09e927 --- /dev/null +++ b/.werks/3985 @@ -0,0 +1,10 @@ +Title: mrpe: fixed broken long output when using the CMC +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1477472567 +Class: fix + +The long output of the mrpe check was appended to the plugin output. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 99234fd..15e5f0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 3829 FIX: Skype for Business checks: refactored most of the checks... * 3961 FIX: fixed error sections handling if parse function is available * 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated... + * 3985 FIX: mrpe: fixed broken long output when using the CMC... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/mrpe b/checks/mrpe index 118fbeb..f4db5ab 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -106,7 +106,7 @@ def check_mrpe(item, params, info): # name of check command needed for PNP to choose the correct template if check_name: perf_parsed.append(check_name) - best_result = state, "\\n".join(output), perf_parsed + best_result = state, "\n".join(output), perf_parsed best_state = state

7 years, 10 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 083667a78e6cef3fe8b6b68e447f65b7eb078004 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=083667a78e6cef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 26 11:02:34 2016 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6cd1cb4..c34588c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3985 +4035

7 years, 10 months

3831 FIX ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated

by Andreas Boesl

Module: check_mk Branch: master Commit: d39e5853c3192da85db784938adfeabe6f81c4da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39e5853c3192d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 25 17:06:19 2016 +0200 3831 FIX ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated The check now raises an MKCounterWrapped instead. This means that the check might go stale, when the data no longer updates. --- .werks/3831 | 11 +++++++++++ ChangeLog | 1 + checks/ucd_cpu_util | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3831 b/.werks/3831 new file mode 100644 index 0000000..732a8fc --- /dev/null +++ b/.werks/3831 @@ -0,0 +1,11 @@ +Title: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1477407867 +Class: fix + +The check now raises an MKCounterWrapped instead. +This means that the check might go stale, when the data no longer updates. + diff --git a/ChangeLog b/ChangeLog index 2e265af..99234fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 3966 FIX: apc_symmetra raritan_emx: Fixed wrong include "temperature.includes"... * 3829 FIX: Skype for Business checks: refactored most of the checks... * 3961 FIX: fixed error sections handling if parse function is available + * 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index bd17d85..591c553 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -53,7 +53,7 @@ def check_ucd_cpu_util(item, params, info): total = sum(rates) if total == 0: - return (3, "counters have not moved since last check, looks like state fake data") + raise MKCounterWrapped("Rates have not changed since last interval") parts = [ r/total for r in rates ] user = 100 * (parts[0] + parts[1])

7 years, 10 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: fb5a9ee6ced09b20bf0bee7d3ec842b3210151b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb5a9ee6ced09b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Oct 26 10:50:38 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 0ddadaa..29de79e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2526 +2527

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 793493bfa35d54cac9f334d2cf6e9c62b3b62cd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=793493bfa35d54… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 26 10:13:46 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/EventConsoleConnection.cc | 13 ++- livestatus/src/EventConsoleConnection.h | 2 +- livestatus/src/Logger.cc | 97 ++++++++++++++++---- livestatus/src/Logger.h | 148 +++++++++++++++++-------------- 4 files changed, 172 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=793493bfa3…

7 years, 10 months

More clear help text. Avoid jargon like "glob".

by Mathias Kettner

Module: check_mk Branch: master Commit: 89c36dcf1849afcda92eeb8951aa40871aa9bc7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89c36dcf1849af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 08:46:50 2016 +0200 More clear help text. Avoid jargon like "glob". --- web/plugins/wato/check_parameters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 929d1ac..3182585 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4388,8 +4388,9 @@ register_rule(group + '/' + subgroup_storage, 'file but also on the count. You can define one or several ' 'patterns for a group containing <tt>*</tt> and <tt>?</tt>, for example ' '<tt>/var/log/apache/*.log</tt>. If the pattern begins with a tilde then ' - 'this pattern is interpreted as a regular expression otherwise it is a ' - 'glob. For files contained in a group ' + 'this pattern is interpreted as a regular expression instead of as a filename ' + 'globbing pattern and <tt>*</tt> and <tt>?</tt> are treated differently. ' + 'For files contained in a group ' 'the discovery will automatically create a group service instead ' 'of single services for each file. This rule also applies when ' 'you use manually configured checks instead of inventorized ones. '

7 years, 10 months

Cleanup: Remove superfluous has_perfdata: False from checks

by Konstantin Büttner

7 years, 10 months

3749 storcli_pdisks, storcli_vdrives: New checks to monitor RAID status via StorCLI utility

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1a96062e43009eedbc70093759f4492971e4f9e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a96062e43009e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Oct 25 17:29:42 2016 +0200 3749 storcli_pdisks, storcli_vdrives: New checks to monitor RAID status via StorCLI utility --- .werks/3749 | 8 ++++ ChangeLog | 1 + agents/windows/plugins/storcli.bat | 13 ++++++ checkman/megaraid_ldisks | 2 +- checkman/megaraid_pdisks | 2 +- checkman/storcli_pdisks | 16 +++++++ checkman/storcli_vdrives | 16 +++++++ checks/storcli_pdisks | 87 ++++++++++++++++++++++++++++++++++ checks/storcli_vdrives | 95 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 238 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1a96062e43…

7 years, 10 months

Fixed test for manpage generation

by Mathias Kettner

Module: check_mk Branch: master Commit: 986c4b26f49dc39b22e65d0e0eff4ad5f449c875 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=986c4b26f49dc3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 15:43:24 2016 +0200 Fixed test for manpage generation --- tests/lib/test_man_pages.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/lib/test_man_pages.py b/tests/lib/test_man_pages.py index c845dbe..a851e2c 100644 --- a/tests/lib/test_man_pages.py +++ b/tests/lib/test_man_pages.py @@ -158,17 +158,9 @@ def test_load_man_page_format(): _check_man_page_structure(page) # Check optional keys - for key in [ 'perfdata', 'item', 'examples', 'inventory']: + for key in [ 'item', 'inventory']: assert key in page["header"] - for entry in page["configuration"]: - assert type(entry) == tuple - assert len(entry) == 2 - - for entry in page["parameters"]: - assert type(entry) == tuple - assert len(entry) == 2 - def test_print_man_page_nowiki_index(capsys): renderer = man_pages.NowikiManPageRenderer("if64") @@ -190,7 +182,8 @@ def test_print_man_page_nowiki_content(capsys): assert err == "" assert content.startswith("TI:") - assert "\nH1:" in content + assert "\nSA:" in content + assert "License:" in content def test_print_man_page(capsys):

7 years, 10 months

Fixed using in_binary_hostlist cache

by Lars Michelsen

Module: check_mk Branch: master Commit: ba9755d899ea4f0087196e4076c68cd599aa7e6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba9755d899ea4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 25 15:23:32 2016 +0200 Fixed using in_binary_hostlist cache --- modules/check_mk.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 259f31d..564ada8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -821,10 +821,14 @@ def host_extra_conf_merged(hostname, conf): def in_binary_hostlist(hostname, conf): - # TODO: This cache is never used. And now? cache = cmk_base.config_cache.get_dict("in_binary_hostlist") cache_id = id(conf), hostname + try: + return cache[cache_id] + except KeyError: + pass + # if we have just a list of strings just take it as list of hostnames if conf and type(conf[0]) == str: result = hostname in conf

7 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016