Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Fixed recently introduced typo in slightly obscure dictionary filter.

by Sven Panne

Module: check_mk Branch: master Commit: 7004320d62caa880b780decee055ffe220cd6d2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7004320d62caa8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 27 14:22:12 2018 +0200 Fixed recently introduced typo in slightly obscure dictionary filter. Change-Id: Id4d37c6aaf6dab04398750394130b31127966565 --- livestatus/src/CustomVarsDictFilter.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/CustomVarsDictFilter.cc b/livestatus/src/CustomVarsDictFilter.cc index 37e83a3..443be5c 100644 --- a/livestatus/src/CustomVarsDictFilter.cc +++ b/livestatus/src/CustomVarsDictFilter.cc @@ -31,6 +31,7 @@ #include "RegExp.h" #include "Row.h" #include "StringUtils.h" +#include "Logger.h" CustomVarsDictFilter::CustomVarsDictFilter(Kind kind, const CustomVarsDictColumn &column, @@ -54,10 +55,10 @@ bool CustomVarsDictFilter::accepts( switch (oper()) { case RelationalOperator::equal: case RelationalOperator::equal_icase: - return _regExp->match(_ref_string); + return _regExp->match(act_string); case RelationalOperator::not_equal: case RelationalOperator::not_equal_icase: - return !_regExp->match(_ref_string); + return !_regExp->match(act_string); case RelationalOperator::matches: case RelationalOperator::matches_icase: return _regExp->search(act_string);

6 years, 3 months

Minor cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: ac865a448782b8930898b30ceb2e3796fc10fd18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac865a448782b8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 27 13:00:24 2018 +0200 Minor cleanup Change-Id: I245bb7bc62ee0bee9e8d8ca5a2b1c50b69d2f8d6 --- checks/logwatch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 088b324..a54eb4c 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -338,15 +338,13 @@ precompile_params['logwatch'] = logwatch_precompile #. -# .--lw.groups-----------------------------------------------------------. +# .--logwatch.groups-----------------------------------------------------. # | _ | # | | |_ ____ _ _ __ ___ _ _ _ __ ___ | # | | \ \ /\ / / _` | '__/ _ \| | | | '_ \/ __| | # | | |\ V V / (_| | | | (_) | |_| | |_) \__ \ | # | |_| \_/\_(_)__, |_| \___/ \__,_| .__/|___/ | # | |___/ |_| | -# +----------------------------------------------------------------------+ -# | | # '----------------------------------------------------------------------'

6 years, 3 months

Clang-format Windows agent code

by Jukka Aro

Module: check_mk Branch: master Commit: 590ac4ef71e158cfae6d3d3c9166150bfa30b63e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=590ac4ef71e158… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 27 12:06:30 2018 +0200 Clang-format Windows agent code --- agents/windows/PerfCounterPdh.h | 2 +- agents/windows/sections/SectionLogwatch.h | 2 +- agents/windows/sections/SectionPluginGroup.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/agents/windows/PerfCounterPdh.h b/agents/windows/PerfCounterPdh.h index fcb675e..4dd8554 100644 --- a/agents/windows/PerfCounterPdh.h +++ b/agents/windows/PerfCounterPdh.h @@ -39,7 +39,7 @@ #include <utility> #include <vector> -using StringList = std::vector<std::wstring>;; +using StringList = std::vector<std::wstring>; class PerfCounterQuery { HQUERY _query; diff --git a/agents/windows/sections/SectionLogwatch.h b/agents/windows/sections/SectionLogwatch.h index a692710..075d188 100644 --- a/agents/windows/sections/SectionLogwatch.h +++ b/agents/windows/sections/SectionLogwatch.h @@ -158,7 +158,7 @@ class GlobListConfigurable : public ListConfigurable<GlobListT, BlockMode::Nop<GlobListT>, AddMode::PriorityAppendGrouped<GlobListT>> { using SuperT = ListConfigurable<GlobListT, BlockMode::Nop<GlobListT>, - AddMode::PriorityAppendGrouped<GlobListT>>; + AddMode::PriorityAppendGrouped<GlobListT>>; public: GlobListConfigurable(Configuration &config, const char *section, diff --git a/agents/windows/sections/SectionPluginGroup.h b/agents/windows/sections/SectionPluginGroup.h index fcc8906..9d79547 100644 --- a/agents/windows/sections/SectionPluginGroup.h +++ b/agents/windows/sections/SectionPluginGroup.h @@ -144,7 +144,8 @@ class SectionPluginGroup : public Section { #endif // _WIN32 || _WIN64 DataCollectionThread(LPVOID lpParam); - using containers_t = std::map<std::string, std::shared_ptr<script_container>>; + using containers_t = + std::map<std::string, std::shared_ptr<script_container>>; static const int DEFAULT_PLUGIN_TIMEOUT = 60; static const int DEFAULT_LOCAL_TIMEOUT = 60;

6 years, 3 months

Win-agent: clean typedefs and preprocessor defines

by Jukka Aro

Module: check_mk Branch: master Commit: 44c0643b8b998d7bf0238e3fbd1ecb6116687fc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44c0643b8b998d… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 27 11:45:02 2018 +0200 Win-agent: clean typedefs and preprocessor defines * Prefer C++11 'using' directive to old typedefs for type aliases. * Clean unused or redundant typedefs and preprocessor defines. * Clean the use of _WIN32_WINNT: - Our current MinGW-W64 default is _WIN32_WINNT_WS03 (Server 2003). - Only need to declare _WIN32_WINNT if need newer than default. - Windows Event Log API (>= _WIN32_WINNT_VISTA) is the only feature that needs this declaration. --- agents/windows/Configurable.h | 10 +++++----- agents/windows/CrashHandler.h | 17 ++++------------- agents/windows/EventLog.h | 2 -- agents/windows/EventLogVista.h | 5 ++--- agents/windows/PerfCounter.h | 9 +-------- agents/windows/PerfCounterCommon.h | 3 --- agents/windows/PerfCounterPdh.h | 2 +- agents/windows/SettingsCollector.h | 4 ++-- agents/windows/Thread.h | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 3 --- agents/windows/sections/SectionLogwatch.h | 9 ++++----- agents/windows/sections/SectionMem.cc | 2 +- agents/windows/sections/SectionPluginGroup.h | 3 +-- agents/windows/sections/SectionServices.cc | 1 - agents/windows/sections/SectionServices.h | 21 --------------------- agents/windows/sections/SectionUptime.cc | 3 --- agents/windows/sections/SectionUptime.h | 2 +- agents/windows/sections/SectionWinperf.h | 4 +--- agents/windows/types.h | 2 -- agents/windows/win_error.h | 5 ++--- 21 files changed, 27 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=44c0643b8b…

6 years, 3 months

Win-agent: use strongly typed enums, part 5

by Jukka Aro

Module: check_mk Branch: master Commit: ca7b4b023d2041c684ad70ad0758934d5807169b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca7b4b023d2041… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 27 09:34:25 2018 +0200 Win-agent: use strongly typed enums, part 5 Convert script_status and script_type in SectionPluginGroup.*. --- agents/windows/SectionManager.cc | 20 ++++++---- agents/windows/build_version | 2 +- agents/windows/sections/SectionPluginGroup.cc | 56 ++++++++++++++------------- agents/windows/sections/SectionPluginGroup.h | 16 +++++--- 4 files changed, 53 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ca7b4b023d…

6 years, 3 months

Removed outdated comment.

by Sven Panne

Module: check_mk Branch: master Commit: f380454a8e541eb893595e4d06f1fd24163f3dd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f380454a8e541e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 26 16:35:11 2018 +0200 Removed outdated comment. Change-Id: Ifdf52030245979f83347f21a74448b2f94c7cb3b --- cmk/ec/export.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 79ba2d7..23b08f7 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -185,7 +185,6 @@ def remove_exported_rule_pack(id_): export_file.unlink() -# Only called from cmk.ec.main.load_configuration. def _bind_to_rule_pack_proxies(rule_packs, mkp_rule_packs): # type: (Any, Any) -> None """

6 years, 3 months

Save/export of rule pack takes care of directory creation itself.

by Sven Panne

Module: check_mk Branch: master Commit: 149a9298ceb3fe5ff3084cb541854095bd7cccd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=149a9298ceb3fe… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 26 16:11:52 2018 +0200 Save/export of rule pack takes care of directory creation itself. Change-Id: Ia7e20882d2c93d23c91561ea4ad9da53275a1e6f --- cmk/ec/export.py | 8 ++++---- web/plugins/wato/mkeventd.py | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index ab6b53f..79ba2d7 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -264,8 +264,8 @@ def save_rule_packs(rule_packs, pretty_print=False, dir_=None): if not dir_: dir_ = rule_pack_dir() - file_ = str(dir_ / "rules.mk") - cmk.store.save_file(file_, output) + dir_.mkdir(parents=True, exist_ok=True) + cmk.store.save_file(str(dir_ / "rules.mk"), output) # NOTE: It is essential that export_rule_pack() is called *before* @@ -298,8 +298,8 @@ def export_rule_pack(rule_pack, pretty_print=False, dir_=None): if not dir_: dir_ = mkp_rule_pack_dir() - file_ = str(dir_ / ("%s.mk" % rule_pack['id'])) - cmk.store.save_file(file_, output) + dir_.mkdir(parents=True, exist_ok=True) + cmk.store.save_file(str(dir_ / ("%s.mk" % rule_pack['id'])), output) def add_rule_pack_proxies(file_names): diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index aa07226..c5e5b3b 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1007,12 +1007,10 @@ def load_mkeventd_rules(): def save_mkeventd_rules(rule_packs): - make_nagios_directories(str(ec.rule_pack_dir())) ec.save_rule_packs(rule_packs, config.mkeventd_pprint_rules) def export_mkp_rule_pack(rule_pack): - make_nagios_directories(str(ec.mkp_rule_pack_dir())) ec.export_rule_pack(rule_pack, config.mkeventd_pprint_rules)

6 years, 3 months

Fixed typing info for pathlib2.mkdir.

by Sven Panne

Module: check_mk Branch: master Commit: 3aab45aabe8c421f9666e1c2686c91ac6508fd58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aab45aabe8c42… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 26 16:07:34 2018 +0200 Fixed typing info for pathlib2.mkdir. Change-Id: Id95506775fb9fbc63ef374373a62571d06b1042b --- tests/typeshed/pathlib2.pyi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/typeshed/pathlib2.pyi b/tests/typeshed/pathlib2.pyi index e9cf3fe..0f99381 100644 --- a/tests/typeshed/pathlib2.pyi +++ b/tests/typeshed/pathlib2.pyi @@ -72,7 +72,10 @@ class Path(PurePath): def iterdir(self) -> Generator[Path, None, None]: ... def lchmod(self, mode: int) -> None: ... def lstat(self) -> os.stat_result: ... - if sys.version_info < (3, 5): + if sys.version_info < (3, 0): + def mkdir(self, mode: int = ..., parents: bool = ..., + exist_ok: bool = ...) -> None: ... + elif sys.version_info < (3, 5): def mkdir(self, mode: int = ..., parents: bool = ...) -> None: ... else:

6 years, 3 months

Extended Werk 5907: added php-xml as dependency

by Lars Michelsen

Module: check_mk Branch: master Commit: 4296cf80392615a9613058bba715546504e2e60e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4296cf80392615… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 26 15:58:51 2018 +0200 Extended Werk 5907: added php-xml as dependency Change-Id: I8b2ff23aa1762933497e9241f414625bd661999e --- .werks/5907 | 4 ++-- omd/distros/CENTOS_5.mk | 1 + omd/distros/CENTOS_6.mk | 1 + omd/distros/CENTOS_7.mk | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.werks/5907 b/.werks/5907 index 2ba5754..6c2fd3f 100644 --- a/.werks/5907 +++ b/.werks/5907 @@ -1,4 +1,4 @@ -Title: CentOS/RedHat: Add explicit dependency to php-cli to fix possible broken PNP graphs +Title: CentOS/RedHat: Add explicit dependency to php-cli and php-xml to fix possible broken PNP graphs Level: 1 Component: packages Compatible: compat @@ -16,4 +16,4 @@ Unfortunately there are third party packages that don't have this implicit dependency. To make Check_MK work out of the box with those PHP installations, we now added -php-cli as explicit dependency. +php-cli and php-xml as explicit dependency. diff --git a/omd/distros/CENTOS_5.mk b/omd/distros/CENTOS_5.mk index d399651..ff8344d 100644 --- a/omd/distros/CENTOS_5.mk +++ b/omd/distros/CENTOS_5.mk @@ -61,6 +61,7 @@ OS_PACKAGES += rpm-build # Needed by Check_MK Agent Bakery OS_PACKAGES += perl-Net-SNMP OS_PACKAGES += php OS_PACKAGES += php-cli +OS_PACKAGES += php-xml OS_PACKAGES += php-mbstring OS_PACKAGES += php-pdo OS_PACKAGES += php-gd diff --git a/omd/distros/CENTOS_6.mk b/omd/distros/CENTOS_6.mk index 8e79b76..4eff3e9 100644 --- a/omd/distros/CENTOS_6.mk +++ b/omd/distros/CENTOS_6.mk @@ -69,6 +69,7 @@ OS_PACKAGES += patch OS_PACKAGES += perl-Net-SNMP OS_PACKAGES += php OS_PACKAGES += php-cli +OS_PACKAGES += php-xml OS_PACKAGES += php-mbstring OS_PACKAGES += php-pdo OS_PACKAGES += php-gd diff --git a/omd/distros/CENTOS_7.mk b/omd/distros/CENTOS_7.mk index b87f918..b2cc57a 100644 --- a/omd/distros/CENTOS_7.mk +++ b/omd/distros/CENTOS_7.mk @@ -75,6 +75,7 @@ OS_PACKAGES += perl-Locale-Maketext-Simple OS_PACKAGES += perl-IO-Zlib OS_PACKAGES += php OS_PACKAGES += php-cli +OS_PACKAGES += php-xml OS_PACKAGES += php-mbstring OS_PACKAGES += php-pdo OS_PACKAGES += php-gd

6 years, 3 months

Centralized legacy contact_group conversion.

by Sven Panne

Module: check_mk Branch: master Commit: 43b21eccfb282041cabe82bc1d173d1505a3f9d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43b21eccfb2820… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 26 11:22:07 2018 +0200 Centralized legacy contact_group conversion. Change-Id: I3f44399f03d94bf943e2ba08525a48d350237c44 --- cmk/ec/export.py | 10 ++++++++++ cmk/ec/main.py | 10 ---------- web/plugins/wato/mkeventd.py | 10 ---------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 25a9913..ab6b53f 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -228,6 +228,16 @@ def load_config(settings): cmk.ec.defaults.default_rule_pack(config["rules"])] config["rules"] = [] + # Convert old contact_groups config + for rule_pack in config["rule_packs"]: + for rule in rule_pack["rules"]: + if isinstance(rule.get("contact_groups"), list): + rule["contact_groups"] = { + "groups": rule["contact_groups"], + "notify": False, + "precedence": "host", + } + return config diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a29c754..4d2a6a9 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -4964,16 +4964,6 @@ def load_configuration(settings): g_slave_status["mode"]) load_master_config(settings) - # Convert old contact_groups config - for rule_pack in g_config["rule_packs"]: - for rule in rule_pack["rules"]: - if type(rule.get("contact_groups")) == list: - rule["contact_groups"] = { - "groups": rule["contact_groups"], - "notify": False, - "precedence": "host", - } - # Create dictionary for actions for easy access g_config["action"] = {} for action in g_config["actions"]: diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 058b09a..aa07226 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1003,16 +1003,6 @@ def load_mkeventd_rules(): pack_hits += hits rule_pack["hits"] = pack_hits - # Migrate old contact_group key (+ add False for notify option) - for rule_pack in rule_packs: - for rule in rule_pack["rules"]: - if type(rule.get("contact_groups")) == list: - rule["contact_groups"] = { - "groups" : rule["contact_groups"], - "notify" : False, - "precedence" : "host", - } - return rule_packs

6 years, 3 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 March 2018