Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Validation of performance data values: raise if one contains spaces

by Simon Betz

Module: check_mk Branch: master Commit: 5b78bb4fb05e0df3a41386f4b00e801f4755a1bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b78bb4fb05e0d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 7 14:25:02 2018 +0100 Validation of performance data values: raise if one contains spaces Change-Id: Ic5d15284a2587dd3208441f0fd013666c3b6b32a --- cmk_base/checking.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index d5c696c..dc4764b 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -489,6 +489,7 @@ def _item_not_found(is_snmp): def _sanitize_tuple_check_result(result, allow_missing_infotext=False): if len(result) >= 3: state, infotext, perfdata = result[:3] + _validate_perf_data_values(perfdata) else: state, infotext = result perfdata = None @@ -498,6 +499,15 @@ def _sanitize_tuple_check_result(result, allow_missing_infotext=False): return state, infotext, perfdata +def _validate_perf_data_values(perfdata): + if not isinstance(perfdata, list): + return + for v in [value for entry in perfdata for value in entry[1:]]: + if " " in str(v): + # See Nagios performance data spec for detailed information + raise MKGeneralException("Performance data values must not contain spaces") + + def _sanitize_check_result_infotext(infotext, allow_missing_infotext): if infotext == None and not allow_missing_infotext: raise MKGeneralException("Invalid infotext from check: \"None\"")

6 years, 4 months

Use pimpl idiom to hide regex implementation.

by Sven Panne

Module: check_mk Branch: master Commit: e8f2aa00285412a6cdeb238131ce99b195790d8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8f2aa00285412… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 8 09:51:00 2018 +0100 Use pimpl idiom to hide regex implementation. Change-Id: I2c17da9d678abab031fe48447573abae5ce0c192 --- livestatus/src/RegExp.cc | 31 ++++++++++++++++++++++++++----- livestatus/src/RegExp.h | 16 +++++++++++++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index 2e9545b..9a6d8bd 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -23,19 +23,40 @@ // Boston, MA 02110-1301 USA. #include "RegExp.h" +#include <regex> + +struct RegExp::Impl { + std::regex _regex; +}; + +RegExp::RegExp() : _impl(std::make_unique<Impl>()) {} + +RegExp::~RegExp() = default; + +RegExp::RegExp(const RegExp &rhs) noexcept + : _impl(std::make_unique<Impl>(*rhs._impl)) {} + +RegExp &RegExp::operator=(const RegExp &rhs) noexcept { + *_impl = *rhs._impl; + return *this; +} + +RegExp::RegExp(RegExp &&rhs) noexcept = default; + +RegExp &RegExp::operator=(RegExp &&rhs) noexcept = default; void RegExp::assign(const std::string &str, Case c) { - _regex.assign(str, c == Case::ignore - ? std::regex::extended | std::regex::icase - : std::regex::extended); + _impl->_regex.assign(str, c == Case::ignore + ? std::regex::extended | std::regex::icase + : std::regex::extended); } std::string RegExp::replace(const std::string &str, const std::string &replacement) const { - return std::regex_replace(str, _regex, replacement, + return std::regex_replace(str, _impl->_regex, replacement, std::regex_constants::format_sed); } bool RegExp::search(const std::string &str) const { - return regex_search(str, _regex); + return regex_search(str, _impl->_regex); } diff --git a/livestatus/src/RegExp.h b/livestatus/src/RegExp.h index d7b96b4..0d5feea 100644 --- a/livestatus/src/RegExp.h +++ b/livestatus/src/RegExp.h @@ -26,21 +26,31 @@ #define RegExp_h #include "config.h" // IWYU pragma: keep -#include <regex> +#include <memory> #include <string> class RegExp { public: enum class Case { ignore, respect }; + // Standard pimpl boileplate code, see Scott Meyer's "Effective Modern C++", + // item 22: "When using the Pimpl Idiom, define special member functions in + // the implementation file." + RegExp(); + ~RegExp(); + RegExp(const RegExp &rhs) noexcept; + RegExp &operator=(const RegExp &rhs) noexcept; + RegExp(RegExp &&rhs) noexcept; + RegExp &operator=(RegExp &&rhs) noexcept; + void assign(const std::string &str, Case c); std::string replace(const std::string &str, const std::string &replacement) const; - bool search(const std::string &str) const; private: - std::regex _regex; + struct Impl; + std::unique_ptr<Impl> _impl; }; #endif // RegExp_h

6 years, 4 months

Remove 'This is bridge'-like comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: e0dfb97ce011e47f4312f5f2b81be1ebfa1b96f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0dfb97ce011e4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 6 11:30:37 2018 +0100 Remove 'This is bridge'-like comment Change-Id: I25f10a8a78518f33c63504351c946d813f6156d6 --- checks/veritas_vcs | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/veritas_vcs b/checks/veritas_vcs index 7494419..a3a215e 100644 --- a/checks/veritas_vcs +++ b/checks/veritas_vcs @@ -149,7 +149,6 @@ def parse_veritas_vcs(info): -# Handle states def veritas_vcs_aggregate_states_in_cluster(states): if "FAULTED" in states: return 2

6 years, 4 months

5740 FIX mkeventd: reload configuration on SIGHUP used e.g. by omd reload

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4bce1070c5937c26ef31641cef00f57214adc0b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bce1070c5937c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Feb 7 10:52:33 2018 +0100 5740 FIX mkeventd: reload configuration on SIGHUP used e.g. by omd reload Change-Id: Iea9e98b1c337e21cef0876e236fe606c44dc2521 --- .werks/5740 | 10 ++++++++++ bin/mkeventd | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.werks/5740 b/.werks/5740 new file mode 100644 index 0000000..4ef49bd --- /dev/null +++ b/.werks/5740 @@ -0,0 +1,10 @@ +Title: mkeventd: reload configuration on SIGHUP used e.g. by omd reload +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517997070 +Class: fix + + diff --git a/bin/mkeventd b/bin/mkeventd index dd1d877..2fbc162 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3780,13 +3780,7 @@ class StatusServer(ECServerThread): log_event_history(event, "CHANGESTATE", user) def handle_command_reload(self): - with lock_configuration: - load_configuration() - initialize_snmptrap_handling() - g_event_server.reload_configuration() - - g_status_server.reload_configuration() - self.logger.info("Reloaded configuration.") + reload_configuration() def handle_command_reopenlog(self): self.logger.info("Closing this logfile") @@ -3912,6 +3906,7 @@ def run_eventd(): except MKSignalException as e: if e._signum == 1: logger.info("Received SIGHUP - going to reload configuration") + reload_configuration() else: logger.info("Signalled to death by signal %d" % e._signum) terminate() @@ -5032,6 +5027,16 @@ def load_configuration(): g_last_config_reload = time.time() +def reload_configuration(): + with lock_configuration: + load_configuration() + initialize_snmptrap_handling() + g_event_server.reload_configuration() + + g_status_server.reload_configuration() + logger.info("Reloaded configuration.") + + def snmptrap_translation_enabled(): return g_config["translate_snmptraps"] is not False

6 years, 4 months

Remove ancient snippet of commented-out obsolete code

by Konstantin Büttner

Module: check_mk Branch: master Commit: 20eb732492e7dcfbde8582acc5691c37d7a4249a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20eb732492e7dc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 7 14:08:50 2018 +0100 Remove ancient snippet of commented-out obsolete code Change-Id: I88728ee6e4cb2ea19e598b71229913b35203c39e --- pnp-templates/check_mk-ipmi_sensors.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pnp-templates/check_mk-ipmi_sensors.php b/pnp-templates/check_mk-ipmi_sensors.php index 4456936..c2e11df 100644 --- a/pnp-templates/check_mk-ipmi_sensors.php +++ b/pnp-templates/check_mk-ipmi_sensors.php @@ -26,18 +26,6 @@ $parts = explode("_", $servicedesc); $sensorname = implode(" ", $parts); -/* This is obsolete. ipmi_sensors does not longer send perfdata - for fans... -if ($parts[2] == "Fan") -{ - $opt[1] = "--vertical-label 'RPM' -X0 -l0 -u6000 --title \"$sensorname\" "; - - $def[1] = "DEF:rpm=$RRDFILE[1]:$DS[1]:MIN "; - $def[1] .= "AREA:rpm#0080a0:\"Rotations per minute\" "; - $def[1] .= "LINE:rpm#004060 "; - $def[1] .= "HRULE:$CRIT[1]#ff0000:\"Critical below $CRIT[1] RPM\" "; -} -else */ if ($parts[2] == "Temperature") { $upper = max(60, $CRIT[1] + 3);

6 years, 4 months

parse_brocade_fcport: Mark optional values as such

by Konstantin Büttner

Module: check_mk Branch: master Commit: e790403555d3397ecbea72dc826a032c3404789f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e790403555d339… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 7 13:53:07 2018 +0100 parse_brocade_fcport: Mark optional values as such Change-Id: I11ac7bc7c2176e6c2874ed7090f84cbe8216a95f --- checks/brocade_fcport | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 073b36f..d3e5f1b 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -173,8 +173,8 @@ def parse_brocade_fcport(info): "porttype": porttype, "ifspeed": int(ifspeed), "is_isl": index in isl_ports, - "islspeed": islspeed, - "bbcredits": bbcredits, + "islspeed": islspeed, # Might be None + "bbcredits": bbcredits, # Might be None }) except: # missing vital data. Skipping this port continue

6 years, 4 months

Check tests: Add some conditions to what constitutes a proper perfvalue key

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5bd5d70a296363bd0059583ce126842f91e0d71e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bd5d70a296363… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 7 13:31:30 2018 +0100 Check tests: Add some conditions to what constitutes a proper perfvalue key Change-Id: I36f5fe58485587cae7c888afe306722f6036601b --- tests/checks/checktestlib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 86691f0..dbabbcc 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -29,6 +29,9 @@ class PerfValue(Tuploid): # in what kind of values are allowed as metric names. # I'm not too sure unicode should be allowed, either. assert type(key) in [str, unicode] + assert " " not in key # This leads to serious errors + assert "=" not in key # The parsing around this is way too funky and doesn't work properly + assert "\n" not in key self.key = key # NOTE: The CMC as well as all other Nagios-compatible cores do accept a

6 years, 4 months

Remove superfluous monkeypatch argument from some check tests

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3fed0c2236960bea3bb95db693f3d7ba9da7ee14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fed0c2236960b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 7 13:28:02 2018 +0100 Remove superfluous monkeypatch argument from some check tests Change-Id: I85250579c5528fead71d0ccfd6676e9f65eb5093 --- tests/checks/test_df_check.py | 2 +- tests/checks/test_kernel_check.py | 2 +- tests/checks/test_mkbackup_check.py | 2 +- tests/checks/test_statgrab_cpu_check.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 1681b5c..b34eee1 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -260,7 +260,7 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu (u'New_Volume E:/', "default", info_df_win, {}), (u'btrfs /dev/sda1', "default", info_df_btrfs, {}), ]) -def test_df_check_with_parse(check_manager, monkeypatch, item, params, info, expected_result): +def test_df_check_with_parse(check_manager, item, params, info, expected_result): check = check_manager.get_check("df") if params == "default": diff --git a/tests/checks/test_kernel_check.py b/tests/checks/test_kernel_check.py index f8c495b..6c3dd90 100644 --- a/tests/checks/test_kernel_check.py +++ b/tests/checks/test_kernel_check.py @@ -9,7 +9,7 @@ pytestmark = pytest.mark.checks @pytest.mark.parametrize("time_to_info,params,predicate", [ (lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {}, lambda cr: True), ]) -def test_kernel_util_check(check_manager, monkeypatch, time_to_info, params, predicate): +def test_kernel_util_check(check_manager, time_to_info, params, predicate): check = check_manager.get_check("kernel.util") try: list(check.run_check(None, params, time_to_info(0))) diff --git a/tests/checks/test_mkbackup_check.py b/tests/checks/test_mkbackup_check.py index a93bccb..1128973 100644 --- a/tests/checks/test_mkbackup_check.py +++ b/tests/checks/test_mkbackup_check.py @@ -157,6 +157,6 @@ info_3 = [[u'[[[system:test1]]]'], info_2, info_3, ]) -def test_mkbackup_parse(check_manager, monkeypatch, info): +def test_mkbackup_parse(check_manager, info): check = check_manager.get_check("mkbackup") check.run_parse(info) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index e001129..ffc390e 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -21,7 +21,7 @@ info_statgrab_cpu_hpux = lambda t: [[u'idle', u'%d' % int(t*5)], ("wait", 20.0) in cr.perfdata ), ]) -def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, predicate): +def test_statgrab_cpu_check(check_manager, time_to_info, params, predicate): check = check_manager.get_check("statgrab_cpu") # NOTE: We do not mock the time module here, because the check does not depend on any # absolute rates. The mocking that was included in this test previously had no

6 years, 4 months

Revert "5761 FIX ipmi: Fixed wrong perfdata format which led to RRD creation errors"

by Simon Betz

Module: check_mk Branch: master Commit: 8ccb7d750ad4de0e0af56996dc359e6e428af9b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ccb7d750ad4de… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 7 09:51:16 2018 +0100 Revert "5761 FIX ipmi: Fixed wrong perfdata format which led to RRD creation errors" This reverts commit 3eaa413f13d32007eb9f585cd8de76ecde76ab2c. --- .werks/5761 | 11 ----------- checks/ipmi_common.include | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.werks/5761 b/.werks/5761 deleted file mode 100644 index 27aa203..0000000 --- a/.werks/5761 +++ /dev/null @@ -1,11 +0,0 @@ -Title: ipmi: Fixed wrong perfdata format which led to RRD creation errors -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0i3 -Date: 1517992409 - - diff --git a/checks/ipmi_common.include b/checks/ipmi_common.include index 9fe5d1c..e568fe8 100644 --- a/checks/ipmi_common.include +++ b/checks/ipmi_common.include @@ -92,7 +92,7 @@ def check_ipmi_common_detailed(item, params, data, what, status_txt_mapping): if what == "ipmitool": old_perf_val = str(val) if unit is not None: - old_perf_val += " %s" % unit + old_perf_val += unit perfdata = [ (item, old_perf_val, warn_high, crit_high) ] elif what == "freeipmi" and \

6 years, 4 months

5761 FIX ipmi: Fixed wrong perfdata format which led to RRD creation errors

by Simon Betz

Module: check_mk Branch: master Commit: 3eaa413f13d32007eb9f585cd8de76ecde76ab2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3eaa413f13d320… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 7 09:35:55 2018 +0100 5761 FIX ipmi: Fixed wrong perfdata format which led to RRD creation errors Change-Id: Id08d6423bf401e9fefe29de79eb315eaabaf3e26 --- .werks/5761 | 11 +++++++++++ checks/ipmi_common.include | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5761 b/.werks/5761 new file mode 100644 index 0000000..27aa203 --- /dev/null +++ b/.werks/5761 @@ -0,0 +1,11 @@ +Title: ipmi: Fixed wrong perfdata format which led to RRD creation errors +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1517992409 + + diff --git a/checks/ipmi_common.include b/checks/ipmi_common.include index e568fe8..9fe5d1c 100644 --- a/checks/ipmi_common.include +++ b/checks/ipmi_common.include @@ -92,7 +92,7 @@ def check_ipmi_common_detailed(item, params, data, what, status_txt_mapping): if what == "ipmitool": old_perf_val = str(val) if unit is not None: - old_perf_val += unit + old_perf_val += " %s" % unit perfdata = [ (item, old_perf_val, warn_high, crit_high) ] elif what == "freeipmi" and \

6 years, 4 months

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018