Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 2c1c21b7109b0070251ac6214f94425bfee2a50f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c1c21b7109b00… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 15:59:56 2017 +0100 Renamings only. Change-Id: I9a25ceb1a504c153ce811a3cb27e6b2b037c9ad1 --- livestatus/src/AndingFilter.cc | 16 ++++++++-------- livestatus/src/OringFilter.cc | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index aa657d1..571aa79 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -62,19 +62,19 @@ bool AndingFilter::optimizeBitmask(const std::string &column_name, } std::unique_ptr<Filter> AndingFilter::copy() const { - auto af = std::make_unique<AndingFilter>(); - for (const auto &sf : _subfilters) { - af->addSubfilter(sf->copy()); + auto result = std::make_unique<AndingFilter>(); + for (const auto &filter : _subfilters) { + result->addSubfilter(filter->copy()); } - return af; + return result; } std::unique_ptr<Filter> AndingFilter::negate() const { - auto af = std::make_unique<OringFilter>(); - for (const auto &sf : _subfilters) { - af->addSubfilter(sf->negate()); + auto result = std::make_unique<OringFilter>(); + for (const auto &filter : _subfilters) { + result->addSubfilter(filter->negate()); } - return af; + return result; } const std::string *AndingFilter::findValueForIndexing( diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index b0cd074..ec882af 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -68,17 +68,17 @@ bool OringFilter::optimizeBitmask(const std::string &column_name, } std::unique_ptr<Filter> OringFilter::copy() const { - auto af = std::make_unique<OringFilter>(); - for (const auto &sf : _subfilters) { - af->addSubfilter(sf->copy()); + auto result = std::make_unique<OringFilter>(); + for (const auto &filter : _subfilters) { + result->addSubfilter(filter->copy()); } - return af; + return result; } std::unique_ptr<Filter> OringFilter::negate() const { - auto af = std::make_unique<AndingFilter>(); - for (const auto &sf : _subfilters) { - af->addSubfilter(sf->negate()); + auto result = std::make_unique<AndingFilter>(); + for (const auto &filter : _subfilters) { + result->addSubfilter(filter->negate()); } - return af; + return result; }

6 years, 10 months

Improved typing of FilterVisitor.

by Sven Panne

Module: check_mk Branch: master Commit: 154cf31ee1489f6355a05fe2fb6dffa0382c8b8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=154cf31ee1489f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 14:47:00 2017 +0100 Improved typing of FilterVisitor. Change-Id: Icb1ae71d4df3f00c582f2a81ef9e61b60f2a9826 --- livestatus/src/AndingFilter.h | 2 ++ livestatus/src/FilterVisitor.h | 6 ++++-- livestatus/src/OringFilter.h | 2 ++ livestatus/src/TableStateHistory.cc | 11 ++++++----- livestatus/src/VariadicFilter.h | 2 -- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index c399f67..8e4133a 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -53,6 +53,8 @@ public: const std::string &column_name) const; std::unique_ptr<Filter> stealLastSubFilter(); size_t size() const { return _subfilters.size(); } + auto begin() const { return _subfilters.begin(); } + auto end() const { return _subfilters.end(); } }; #endif // AndingFilter_h diff --git a/livestatus/src/FilterVisitor.h b/livestatus/src/FilterVisitor.h index 02eb4e6..6028b8c 100644 --- a/livestatus/src/FilterVisitor.h +++ b/livestatus/src/FilterVisitor.h @@ -26,14 +26,16 @@ #define FilterVisitor_h #include "config.h" // IWYU pragma: keep +class AndingFilter; class ColumnFilter; -class VariadicFilter; +class OringFilter; class FilterVisitor { public: virtual ~FilterVisitor() {} virtual void visit(const ColumnFilter &) = 0; - virtual void visit(const VariadicFilter &) = 0; + virtual void visit(const AndingFilter &) = 0; + virtual void visit(const OringFilter &) = 0; }; #endif // FilterVisitor_h diff --git a/livestatus/src/OringFilter.h b/livestatus/src/OringFilter.h index 63d47b0..55214e6 100644 --- a/livestatus/src/OringFilter.h +++ b/livestatus/src/OringFilter.h @@ -47,6 +47,8 @@ public: std::chrono::seconds timezone_offset) const override; std::unique_ptr<Filter> copy() const override; std::unique_ptr<Filter> negate() const override; + auto begin() const { return _subfilters.begin(); } + auto end() const { return _subfilters.end(); } }; #endif // OringFilter_h diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 379f5e4..37c9f97 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -50,7 +50,8 @@ #include "StringUtils.h" #include "TableHosts.h" #include "TableServices.h" -class VariadicFilter; +class AndingFilter; +class OringFilter; #ifdef CMC #include "Host.h" @@ -250,7 +251,8 @@ public: mk::starts_with(column_name, std::string("service_")); } } - void visit(const VariadicFilter & /*unused*/) override {} + void visit(const AndingFilter & /*unused*/) override {} + void visit(const OringFilter & /*unused*/) override {} bool _value = true; }; @@ -279,10 +281,9 @@ private: } // namespace void TableStateHistory::answerQuery(Query *query) { - // Create a partial filter, that contains only such filters that - // check attributes of current hosts and services + // Create a partial filter, that contains only such filters that check + // attributes of current hosts and services std::deque<Filter *> object_filter; - if (core()->stateHistoryFilteringEnabled()) { for (const auto &filter : *query->filter()) { IsObjectFilter is_obj; diff --git a/livestatus/src/VariadicFilter.h b/livestatus/src/VariadicFilter.h index 6e2435d..b430734 100644 --- a/livestatus/src/VariadicFilter.h +++ b/livestatus/src/VariadicFilter.h @@ -35,8 +35,6 @@ public: void addSubfilter(std::unique_ptr<Filter> f) { _subfilters.push_back(std::move(f)); } - auto begin() const { return _subfilters.begin(); } - auto end() const { return _subfilters.end(); } protected: std::vector<std::unique_ptr<Filter>> _subfilters;

6 years, 10 months

5410 FIX Windows agent: handle section Skype correctly

by Jukka Aro

Module: check_mk Branch: master Commit: 5b6abd681062410815f582aba92912c0caa6c177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b6abd68106241… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Nov 10 14:47:05 2017 +0100 5410 FIX Windows agent: handle section Skype correctly Windows agent was giving empty output for section Skype for a number of reasons for all agent versions since 1.4.0: * Windows registry was queried with an illegal parameter REG_MULTI_SZ passed to RegOpenKeyExW. Starting from Windows Server 2016, this illegal parameter caused the query to fail with "access denied". * Werk #4007 fix (commit b89af681c90) caused the entire Skype section to fall out if querying any of the subsection queries to Windows registry failed. Werk #4007 was fixed based on the incorrect assumption that Skype performance counters were queried over WMI. In fact, they query Windows registry PerfLib instead of WMI. * The perf counter name "LS:JoinLauncher - Join Launcher Service Failures" was misspelled in singular, causing also this query to fail. This subsection had never been working correctly. * On master branch, the refactoring done in 16d8a0f1affed78bbe910dcb62dc73c06ee14508 broke the resolving of counter base numbers based on their names. These causes of failure are now fixed in Windows agent. The spelling of LS:JoinLauncher is also corrected in Skype check code. The performance of Skype perf counter queries got awkward after reverting Werk #4007, that is, executing all of the subsection queries even if some of them failed due to missing perf counters. This is now fixed by mapping the perf counters names to their counter base numbers once and reusing this mapping for all desired perf counters. This avoids the unnecessary looping through Windows registry for each perf counter separately. New log entries are now being made for functionality related to perf counters in order to make debugging easier. Change-Id: I861f28f0efa39629c9dd9dbef649f452d2eac11b --- .werks/5410 | 46 +++++++ agents/windows/PerfCounter.cc | 183 ++------------------------ agents/windows/PerfCounter.h | 15 +-- agents/windows/PerfCounterCommon.cc | 71 +++------- agents/windows/PerfCounterCommon.h | 118 +++++++++++++++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 26 ++-- agents/windows/sections/SectionGroup.cc | 8 -- agents/windows/sections/SectionGroup.h | 1 - agents/windows/sections/SectionPS.cc | 3 +- agents/windows/sections/SectionPerfcounter.cc | 21 ++- agents/windows/sections/SectionPerfcounter.h | 5 +- agents/windows/sections/SectionSkype.cc | 107 +++++++++------ agents/windows/sections/SectionWinperf.cc | 2 +- agents/windows/types.cc | 5 +- checks/skype | 6 +- 16 files changed, 289 insertions(+), 330 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5b6abd6810…

6 years, 10 months

Moved more stuff out of VariadicFilter.

by Sven Panne

Module: check_mk Branch: master Commit: 8813ac51ed4c3894d4369e479b7aefc0263673d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8813ac51ed4c38… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 12:42:51 2017 +0100 Moved more stuff out of VariadicFilter. Change-Id: Ibb9c2fbd61d58bff4fe15058e262a8966109e526 --- livestatus/src/AndingFilter.cc | 9 ---- livestatus/src/AndingFilter.h | 4 +- livestatus/src/Makefile.am | 1 - livestatus/src/OffsetStringMacroColumn.cc | 4 +- livestatus/src/Query.cc | 74 +++++++++++++++++-------------- livestatus/src/Query.h | 14 +++--- livestatus/src/VariadicFilter.cc | 43 ------------------ livestatus/src/VariadicFilter.h | 9 ++-- 8 files changed, 57 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8813ac51ed…

6 years, 10 months

Mechanically pushed down a few methods from VariadicFilter to AndingFilter /OringFilter.

by Sven Panne

Module: check_mk Branch: master Commit: 5436295a6c4fa91d0a895df7ec9157fa18935d93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5436295a6c4fa9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 11:17:30 2017 +0100 Mechanically pushed down a few methods from VariadicFilter to AndingFilter/OringFilter. Not all of them are correct, this commit brings them to the places where they can be fixed. Some signatures were tightened on the way, making it explicit that Query sometimes abuses AndingFilter as a stack. Change-Id: I8d8a5e63c35e6e77d302d4a1f454659f2b3feb55 --- livestatus/src/AndingFilter.cc | 31 +++++++++++++++++++++++++++++++ livestatus/src/AndingFilter.h | 6 ++++++ livestatus/src/Filter.h | 2 -- livestatus/src/OringFilter.cc | 11 +++++++++++ livestatus/src/OringFilter.h | 4 ++++ livestatus/src/Query.cc | 8 ++++---- livestatus/src/Query.h | 8 ++++---- livestatus/src/VariadicFilter.cc | 29 ----------------------------- livestatus/src/VariadicFilter.h | 12 ++---------- 9 files changed, 62 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5436295a6c…

6 years, 10 months

Removed NegatingFilter.

by Sven Panne

Module: check_mk Branch: master Commit: ad6132eeaf73290d34aec24dc5677381f0efe831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad6132eeaf7329… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 10:03:12 2017 +0100 Removed NegatingFilter. We can immediately negate the subfilter, so we are left with fewer cases later. We might even normalize to CNF or DNF later, but this is not done yet because there is no pressing need. Change-Id: I1ee5e5fa8838a704eb22e8e0a67b5f5bf1501e48 --- livestatus/src/AndingFilter.cc | 17 ++++++++++++ livestatus/src/AndingFilter.h | 4 +++ livestatus/src/CustomVarsDictFilter.cc | 12 ++++++++- livestatus/src/CustomVarsDictFilter.h | 5 ++++ livestatus/src/DoubleFilter.cc | 15 ++++++++++- livestatus/src/DoubleFilter.h | 5 ++++ livestatus/src/Filter.h | 4 +++ livestatus/src/FilterVisitor.h | 2 -- livestatus/src/IntFilter.cc | 15 ++++++++++- livestatus/src/IntFilter.h | 5 ++++ livestatus/src/ListFilter.cc | 37 ++++++++++++++++---------- livestatus/src/ListFilter.h | 6 ++++- livestatus/src/Makefile.am | 1 - livestatus/src/NegatingFilter.cc | 44 ------------------------------- livestatus/src/NegatingFilter.h | 48 ---------------------------------- livestatus/src/OringFilter.cc | 17 ++++++++++++ livestatus/src/OringFilter.h | 4 +++ livestatus/src/Query.cc | 7 +++-- livestatus/src/StringFilter.cc | 32 +++++++++++++++-------- livestatus/src/StringFilter.h | 6 ++++- livestatus/src/TableStateHistory.cc | 2 -- livestatus/src/TimeFilter.cc | 15 ++++++++++- livestatus/src/TimeFilter.h | 5 ++++ livestatus/src/opids.cc | 30 +++++++++++++++++++++ livestatus/src/opids.h | 2 ++ 25 files changed, 208 insertions(+), 132 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ad6132eeaf…

6 years, 10 months

df: Discovery test for the behaviour of the include volume name rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: 101e3896f6120aedac845f74b7982a4469e3cac0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=101e3896f6120a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 8 17:05:01 2017 +0100 df: Discovery test for the behaviour of the include volume name rule Change-Id: I4cf914a938903be0c101ac2f31352348f15cefa1 --- tests/checks/test_df.py | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py index 10386e5..13bf982 100644 --- a/tests/checks/test_df.py +++ b/tests/checks/test_df.py @@ -1,11 +1,41 @@ import pytest +import pprint +import sys pytestmark = pytest.mark.check -(a)pytest.mark.parametrize("info,result", [ - ([], []) +(a)pytest.mark.parametrize("info,result,include_volume_name", [ + ([], [], False), + ([[u'/dev/sda4', + u'ext4', + u'143786696', + u'101645524', + u'34814148', + u'75%', + u'/'], + [u'[df_inodes_start]'], + [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], + [u'[df_inodes_end]']], [(u'/', {})], False), + ([[u'/dev/sda4', + u'ext4', + u'143786696', + u'101645524', + u'34814148', + u'75%', + u'/'], + [u'[df_inodes_start]'], + [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], + [u'[df_inodes_end]']], [(u'/dev/sda4 /', {})], True), ]) -def test_df_discovery_with_parse(check_manager, info, result): +def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, include_volume_name): + import cmk_base.checks + +# NOTE: This is the result of trying to mock the the ruleset variable itself instead of the +# host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. +# import cmk_base.rulesets +# monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "inventory_df_rules", +# [({"include_volume_name": include_volume_name}, [], cmk_base.rulesets.ALL_HOSTS, {})]) + 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 -

6 years, 10 months

df: Make tests compatible with test_service_extra_conf

by Konstantin Büttner

Module: check_mk Branch: master Commit: d4b668675ef3184e6321cc8e766d4d2590f09676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4b668675ef318… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 10 11:20:54 2017 +0100 df: Make tests compatible with test_service_extra_conf Change-Id: Ibaebb6e30393af165ee33922e5af4d9a1ccfbe8e --- tests/checks/test_df.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py index 13bf982..accc630 100644 --- a/tests/checks/test_df.py +++ b/tests/checks/test_df.py @@ -29,6 +29,7 @@ pytestmark = pytest.mark.check ]) def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, include_volume_name): import cmk_base.checks + import cmk_base # NOTE: This is the result of trying to mock the the ruleset variable itself instead of the # host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. @@ -39,3 +40,4 @@ 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 + cmk_base.config_cache.clear_all()

6 years, 10 months

df: Rudimentary test for discovery

by Konstantin Büttner

Module: check_mk Branch: master Commit: 05acf8934a5cd71a4084360db6cc76f71ca23e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05acf8934a5cd7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 7 14:04:05 2017 +0100 df: Rudimentary test for discovery Change-Id: I40a50491a8a09088ee7dbd66a7bb60c58686db6f --- tests/checks/test_df.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py new file mode 100644 index 0000000..10386e5 --- /dev/null +++ b/tests/checks/test_df.py @@ -0,0 +1,11 @@ +import pytest + +pytestmark = pytest.mark.check + +(a)pytest.mark.parametrize("info,result", [ + ([], []) +]) +def test_df_discovery_with_parse(check_manager, info, result): + check = check_manager.get_check("df") + assert check.run_discovery(check.run_parse(info)) == result +

6 years, 10 months

5434 FIX Views: Fixed exception when trying to display downtime IDs in views

by Lars Michelsen

Module: check_mk Branch: master Commit: 95e10265d355b6bb2ec952fc72722b76a1fd41bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95e10265d355b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 10 09:39:25 2017 +0100 5434 FIX Views: Fixed exception when trying to display downtime IDs in views Change-Id: I51ac1315da51aa2270361de4a54ace095c529e68 --- .werks/5434 | 11 +++++++++++ web/plugins/views/painters.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5434 b/.werks/5434 new file mode 100644 index 0000000..0116c0c --- /dev/null +++ b/.werks/5434 @@ -0,0 +1,11 @@ +Title: Views: Fixed exception when trying to display downtime IDs in views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1510303145 + + diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 4dea4aa..a01ac8b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2121,7 +2121,7 @@ multisite_painters["downtime_id"] = { "title" : _("Downtime id"), "short" : _("ID"), "columns" : ["downtime_id"], - "paint" : lambda row: (None, row["downtime_id"]), + "paint" : lambda row: (None, "%d" % row["downtime_id"]), } multisite_painters["downtime_author"] = {

6 years, 10 months

← Newer
1
...
22
23
24
25
26
27
28
...
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