Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

5362 FIX Fixed possible exception on global settings page related to " diskspace cleanup"

by Lars Michelsen

Module: check_mk Branch: master Commit: ab176998fd2e048ca770beab9c4812ac2d203946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab176998fd2e04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 11:16:51 2017 +0200 5362 FIX Fixed possible exception on global settings page related to "diskspace cleanup" In 1.2.8 or older it was possible to configure "max_file_age = None" in the etc/diskspace.conf file. This value was not interpreted correctly by the current code which lead to an exception "TypeError: unsupported operand type(s) for divmod(): 'NoneType' and 'int'" on the global settings page. To workaround this issue, you could remove this option form the etc/diskspace.conf file. Change-Id: If6ed76861a6596d034af4209b2c6765b2ca533ea --- .werks/5362 | 15 +++++++++++++++ web/plugins/wato/omd_configuration.py | 3 +++ 2 files changed, 18 insertions(+) diff --git a/.werks/5362 b/.werks/5362 new file mode 100644 index 0000000..6b42b14 --- /dev/null +++ b/.werks/5362 @@ -0,0 +1,15 @@ +Title: Fixed possible exception on global settings page related to "diskspace cleanup" +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507194818 +Class: fix + +In 1.2.8 or older it was possible to configure "max_file_age = None" in the etc/diskspace.conf +file. This value was not interpreted correctly by the current code which lead to an exception +"TypeError: unsupported operand type(s) for divmod(): 'NoneType' and 'int'" on the global settings +page. + +To workaround this issue, you could remove this option form the etc/diskspace.conf file. diff --git a/web/plugins/wato/omd_configuration.py b/web/plugins/wato/omd_configuration.py index c7b3937..11d7734 100644 --- a/web/plugins/wato/omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -198,6 +198,9 @@ class ConfigDomainDiskspace(ConfigDomain): if cleanup_settings.get("cleanup_abandoned_host_files", False) == None: del cleanup_settings["cleanup_abandoned_host_files"] + if cleanup_settings.get("max_file_age", False) == None: + del cleanup_settings["max_file_age"] + return { "diskspace_cleanup": cleanup_settings, }

6 years, 11 months

TextOrRegExp can now hand over allow_empty attribute to sub valuespecs

by Lars Michelsen

Module: check_mk Branch: master Commit: 575ae7e948e29001084f12c14ba06c7335bf6102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=575ae7e948e290… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 13:14:09 2017 +0200 TextOrRegExp can now hand over allow_empty attribute to sub valuespecs Change-Id: I59583a34b22701829f8e8002815852308612db0e --- web/htdocs/valuespec.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index dbbcdbe..2f2cb3c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4098,16 +4098,20 @@ class TextOrRegExp(Alternative): _regex_valuespec_class = RegExp def __init__(self, **kwargs): + allow_empty = kwargs.pop("allow_empty", True) + if "text_valuespec" in kwargs: vs_text = kwargs.pop("text_valuespec") else: vs_text = self._text_valuespec_class( title = _("Explicit match"), + allow_empty = allow_empty, ) vs_regex = self._regex_valuespec_class( mode = RegExp.prefix, title = _("Regular expression match"), + allow_empty = allow_empty, ) kwargs.update({

6 years, 11 months

Add new valuespec TextOrRegExp()

by Lars Michelsen

Module: check_mk Branch: master Commit: 05025b57195a6bfbdcca5592f0148d226445d59b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05025b57195a6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 13:04:43 2017 +0200 Add new valuespec TextOrRegExp() Change-Id: Ief9313b8474bebb5ed3ae575d7bf879be7756025 --- web/htdocs/valuespec.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index dba9eee..dbbcdbe 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -639,6 +639,7 @@ class RegExpUnicode(TextUnicode, RegExp): ValueSpec.custom_validate(self, value, varprefix) + class EmailAddress(TextAscii): def __init__(self, **kwargs): kwargs.setdefault("size", 40) @@ -4092,6 +4093,48 @@ class UploadOrPasteTextFile(Alternative): +class TextOrRegExp(Alternative): + _text_valuespec_class = TextAscii + _regex_valuespec_class = RegExp + + def __init__(self, **kwargs): + if "text_valuespec" in kwargs: + vs_text = kwargs.pop("text_valuespec") + else: + vs_text = self._text_valuespec_class( + title = _("Explicit match"), + ) + + vs_regex = self._regex_valuespec_class( + mode = RegExp.prefix, + title = _("Regular expression match"), + ) + + kwargs.update({ + "elements": [ + vs_text, + Transform( + vs_regex, + forth = lambda v: v[1:], # strip of "~" + back = lambda v: "~" + v, # add "~" + ), + ], + # Use RegExp field when value is prefixed with "~" + "match" : lambda v: 1 if v and v[0] == "~" else 0, + "style" : "dropdown", + "orientation" : "horizontal", + }) + + super(TextOrRegExp, self).__init__(**kwargs) + + + +class TextOrRegExpUnicode(TextOrRegExp): + _default_valuespec_class = TextUnicode + _regex_valuespec_class = RegExpUnicode + + + class IconSelector(ValueSpec): _categories = [ ('logos', _('Logos')),

6 years, 11 months

Agent Updater Refactoring: Add first test cases for cmk-update-agent

by Andreas Umbreit

Module: check_mk Branch: master Commit: 4d4810e819c633b965ea87bad9988abde7e908f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d4810e819c633… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Jul 6 06:54:32 2017 +0200 Agent Updater Refactoring: Add first test cases for cmk-update-agent - use pytest and pytest.mock framework - add unit tests for HttpHandler and EnvironmentHandler - add some component tests for registration and update scenarios - simulate requests communication with saved files from real communications Change-Id: Icd49b408c0223552fba41a7479f51b7c17824574 --- .gitignore | 1 + tests/requirements.txt | 2 ++ tests/testlib/__init__.py | 11 +++++++++++ 3 files changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index ef3b8d2..6f604ed 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ .bugs/.last .bugs/.my_ids .cache +.coverage .directory .metadata .ropeproject diff --git a/tests/requirements.txt b/tests/requirements.txt index b6156ae..e31504c 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,6 @@ pytest +pytest-cov +pytest-mock requests beautifulsoup4 pytest-stepwise diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 195c346..248dc6d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -320,6 +320,17 @@ class Site(object): return open(self.path(rel_path), "w").write(content) + def create_rel_symlink(self, link_rel_target, rel_link_name): + if not self._is_running_as_site_user(): + p = self.execute(["ln", "-s", link_rel_target, rel_link_name], + stdout=subprocess.PIPE, stdin=subprocess.PIPE) + p.communicate() + if p.wait() != 0: + raise Exception("Failed to create symlink from %s to ./%s. Exit-Code: %d" % (rel_link_name, link_rel_target, p.wait())) + else: + return os.symlink(link_rel_target, os.path.join(self.root, rel_link_name)) + + def file_exists(self, rel_path): if not self._is_running_as_site_user(): p = self.execute(["test", "-e", self.path(rel_path)], stdout=subprocess.PIPE)

6 years, 11 months

Moved final offset into Column base class, part 2.

by Sven Panne

Module: check_mk Branch: master Commit: 3b78c38ca13d8c59ae942557a8fd1459e41987cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b78c38ca13d8c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 5 08:01:19 2017 +0200 Moved final offset into Column base class, part 2. Change-Id: I68d3fd58580f3119bf97b0b8d829a0296cd6e14b --- livestatus/src/ColumnsColumn.cc | 4 +- livestatus/src/ColumnsColumn.h | 6 +- livestatus/src/CustomVarsColumn.cc | 25 +++-- livestatus/src/CustomVarsColumn.h | 6 +- livestatus/src/CustomVarsDictColumn.cc | 23 ++--- livestatus/src/CustomVarsDictColumn.h | 4 +- livestatus/src/CustomVarsExplicitColumn.cc | 9 +- livestatus/src/CustomVarsExplicitColumn.h | 15 ++- livestatus/src/CustomVarsNamesColumn.cc | 23 ++--- livestatus/src/CustomVarsNamesColumn.h | 4 +- livestatus/src/CustomVarsValuesColumn.cc | 23 ++--- livestatus/src/CustomVarsValuesColumn.h | 4 +- livestatus/src/OffsetPerfdataColumn.cc | 7 +- livestatus/src/OffsetPerfdataColumn.h | 9 +- livestatus/src/OffsetSStringColumn.cc | 10 +- livestatus/src/OffsetSStringColumn.h | 10 +- livestatus/src/OffsetStringColumn.cc | 10 +- livestatus/src/OffsetStringColumn.h | 10 +- livestatus/src/OffsetStringHostMacroColumn.h | 8 +- livestatus/src/OffsetStringMacroColumn.h | 10 +- livestatus/src/OffsetStringServiceMacroColumn.h | 8 +- livestatus/src/StringColumn.cc | 10 +- livestatus/src/StringColumn.h | 5 +- livestatus/src/StringPointerColumn.h | 2 +- livestatus/src/TableColumns.cc | 18 ++-- livestatus/src/TableCommands.cc | 8 +- livestatus/src/TableComments.cc | 8 +- livestatus/src/TableContactGroups.cc | 8 +- livestatus/src/TableContacts.cc | 39 ++++---- livestatus/src/TableDowntimes.cc | 8 +- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableHostGroups.cc | 16 ++-- livestatus/src/TableHosts.cc | 120 +++++++++++------------- livestatus/src/TableLog.cc | 34 +++---- livestatus/src/TableServiceGroups.cc | 14 +-- livestatus/src/TableServices.cc | 72 +++++++------- livestatus/src/TableStateHistory.cc | 26 +++-- livestatus/src/TableTimeperiods.cc | 8 +- 38 files changed, 285 insertions(+), 341 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3b78c38ca1…

6 years, 11 months

cppcheck is a bit behind the times regarding modern C++ and move semantics.

by Sven Panne

Module: check_mk Branch: master Commit: afafa74ab618a219708ba7589185055b1b984257 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afafa74ab618a2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 5 08:27:59 2017 +0200 cppcheck is a bit behind the times regarding modern C++ and move semantics. Let's disable its "passed by value" warnings, they often recommend exactly the opposite what clang and modern guides propose. Change-Id: I0f9b337239bc2b98dea14542052a8320e9f2b8c0 --- Makefile | 8 ++++---- livestatus/src/CustomVarsListFilter.cc | 2 -- livestatus/src/HostListFilter.cc | 5 +---- livestatus/src/IntFilter.cc | 2 -- livestatus/src/ListFilter.cc | 2 -- livestatus/src/StringFilter.cc | 2 -- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 6fdb237..63d0ab9 100644 --- a/Makefile +++ b/Makefile @@ -489,12 +489,12 @@ cppcheck: compile_commands.json @scripts/compiled_sources | \ grep /livestatus/src/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --suppress=passedByValue --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) ifeq ($(ENTERPRISE),yes) @scripts/compiled_sources | \ grep /enterprise/core/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --suppress=passedByValue --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) endif # XML output into file intended for machine processing. @@ -502,12 +502,12 @@ cppcheck-xml: compile_commands.json scripts/compiled_sources | \ grep /livestatus/src/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --suppress=passedByValue --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) ifeq ($(ENTERPRISE),yes) scripts/compiled_sources | \ grep /enterprise/core/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --suppress=passedByValue --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) endif # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in diff --git a/livestatus/src/CustomVarsListFilter.cc b/livestatus/src/CustomVarsListFilter.cc index ad423fe..c27f8ac 100644 --- a/livestatus/src/CustomVarsListFilter.cc +++ b/livestatus/src/CustomVarsListFilter.cc @@ -29,10 +29,8 @@ #include "Logger.h" #include "Row.h" -// Alas, cppcheck is a bit behind the times regarding move semantics... CustomVarsListFilter::CustomVarsListFilter(const CustomVarsColumn &column, RelationalOperator relOp, - // cppcheck-suppress passedByValue std::string value) : _column(column), _relOp(relOp), _ref_text(std::move(value)) {} diff --git a/livestatus/src/HostListFilter.cc b/livestatus/src/HostListFilter.cc index 8eed57e..0ce01fe 100644 --- a/livestatus/src/HostListFilter.cc +++ b/livestatus/src/HostListFilter.cc @@ -30,11 +30,8 @@ #include "Row.h" #include "nagios.h" -// Alas, cppcheck is a bit behind the times regarding move semantics... HostListFilter::HostListFilter(const HostListColumn &column, - RelationalOperator relOp, - // cppcheck-suppress passedByValue - std::string value) + RelationalOperator relOp, std::string value) : _column(column), _relOp(relOp), _ref_value(std::move(value)) {} bool HostListFilter::accepts(Row row, const contact * /* auth_user */, diff --git a/livestatus/src/IntFilter.cc b/livestatus/src/IntFilter.cc index 559dbf6..42e5100 100644 --- a/livestatus/src/IntFilter.cc +++ b/livestatus/src/IntFilter.cc @@ -30,9 +30,7 @@ #include "Logger.h" #include "Row.h" -// Alas, cppcheck is a bit behind the times regarding move semantics... IntFilter::IntFilter(const IntColumn &column, RelationalOperator relOp, - // cppcheck-suppress passedByValue std::string value) : _column(column), _relOp(relOp), _ref_string(std::move(value)) {} diff --git a/livestatus/src/ListFilter.cc b/livestatus/src/ListFilter.cc index 9ddcc11..9d85f9e 100644 --- a/livestatus/src/ListFilter.cc +++ b/livestatus/src/ListFilter.cc @@ -28,9 +28,7 @@ #include "Logger.h" #include "Row.h" -// Alas, cppcheck is a bit behind the times regarding move semantics... ListFilter::ListFilter(const ListColumn &column, RelationalOperator relOp, - // cppcheck-suppress passedByValue std::string element, std::unique_ptr<ListColumn::Contains> predicate, bool isEmptyValue) diff --git a/livestatus/src/StringFilter.cc b/livestatus/src/StringFilter.cc index 6cd77af..ae3ee6e 100644 --- a/livestatus/src/StringFilter.cc +++ b/livestatus/src/StringFilter.cc @@ -29,9 +29,7 @@ #include "Row.h" #include "StringColumn.h" -// Alas, cppcheck is a bit behind the times regarding move semantics... StringFilter::StringFilter(const StringColumn &column, RelationalOperator relOp, - // cppcheck-suppress passedByValue std::string value) : _column(column), _relOp(relOp), _ref_string(std::move(value)) { switch (_relOp) {

6 years, 11 months

5379 FIX Allow Windows logfiles to be monitored without monitoring also eventlog

by Jukka Aro

Module: check_mk Branch: master Commit: bb4c960cfd4668b135f6bbd7be38c79cfdd5ad22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb4c960cfd4668… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Oct 5 10:04:52 2017 +0200 5379 FIX Allow Windows logfiles to be monitored without monitoring also eventlog Since 1.4.0, monitoring Windows logfiles has required that also Windows eventlog is being monitored. The fix restores the functionality available until version 1.2.8 so that Windows logfiles and eventlogs can be selected for monitoring separately. Change-Id: Idcd49a455f27d631b92fdfade50d68fbc66e465f --- .werks/5379 | 14 ++++++++ agents/windows/Configurable.h | 7 ++-- agents/windows/Section.cc | 12 ++++--- agents/windows/Section.h | 9 +++-- agents/windows/SectionManager.cc | 52 ++++++++++++++++----------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 5 +-- agents/windows/sections/SectionCheckMK.cc | 2 +- agents/windows/sections/SectionDF.cc | 2 +- agents/windows/sections/SectionEventlog.cc | 2 +- agents/windows/sections/SectionFileinfo.cc | 2 +- agents/windows/sections/SectionGroup.cc | 8 +++-- agents/windows/sections/SectionGroup.h | 3 +- agents/windows/sections/SectionLogwatch.cc | 2 +- agents/windows/sections/SectionMRPE.cc | 2 +- agents/windows/sections/SectionMem.cc | 2 +- agents/windows/sections/SectionOHM.cc | 3 +- agents/windows/sections/SectionPS.cc | 8 ++--- agents/windows/sections/SectionPerfcounter.cc | 7 ++-- agents/windows/sections/SectionPerfcounter.h | 5 +-- agents/windows/sections/SectionPluginGroup.cc | 3 +- agents/windows/sections/SectionServices.cc | 2 +- agents/windows/sections/SectionSkype.cc | 10 +++--- agents/windows/sections/SectionSpool.cc | 2 +- agents/windows/sections/SectionSystemtime.cc | 2 +- agents/windows/sections/SectionUptime.cc | 2 +- agents/windows/sections/SectionWMI.cc | 7 ++-- agents/windows/sections/SectionWMI.h | 3 +- agents/windows/sections/SectionWinperf.cc | 4 +-- agents/windows/sections/SectionWinperf.h | 4 +-- 30 files changed, 115 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bb4c960cfd…

6 years, 11 months

Remove unused SectionCrashDebug

by Jukka Aro

Module: check_mk Branch: master Commit: 9117b72fb57d8127869026fe237a65e6ac2901a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9117b72fb57d81… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Oct 5 08:34:15 2017 +0200 Remove unused SectionCrashDebug SectionCrashDebug was removed in commit 8f4a78097b1472cccdc8f94ff7e2db7cbb9ec162. The files were accidentally left in Git and the header file was also unnecessarily included in SectionManager.cc. Change-Id: I7ea614f08d264bffd19fa766448d2e14e13b56f0 --- agents/windows/SectionManager.cc | 1 - agents/windows/sections/SectionCrashDebug.cc | 39 -------------------------- agents/windows/sections/SectionCrashDebug.h | 42 ---------------------------- 3 files changed, 82 deletions(-) diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index 534430f..cf202bb 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -3,7 +3,6 @@ #include "Configuration.h" #include "Environment.h" #include "sections/SectionCheckMK.h" -#include "sections/SectionCrashDebug.h" #include "sections/SectionDF.h" #include "sections/SectionEventlog.h" #include "sections/SectionFileinfo.h" diff --git a/agents/windows/sections/SectionCrashDebug.cc b/agents/windows/sections/SectionCrashDebug.cc deleted file mode 100644 index 56faeb2..0000000 --- a/agents/windows/sections/SectionCrashDebug.cc +++ /dev/null @@ -1,39 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | -// +------------------------------------------------------------------+ -// -// This file is part of Check_MK. -// The official homepage is at http://mathias-kettner.de/check_mk. -// -// check_mk is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation in version 2. check_mk is distributed -// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -// PARTICULAR PURPOSE. See the GNU General Public License for more de- -// ails. You should have received a copy of the GNU General Public -// License along with GNU Make; see the file COPYING. If not, write -// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -// Boston, MA 02110-1301 USA. - -#include "SectionCrashDebug.h" -#include "../Environment.h" -#include "../Logger.h" - -SectionCrashDebug::SectionCrashDebug(Configuration &config, Logger *logger, - const WinApiAdaptor &winapi) - : Section("logwatch", config.getEnvironment(), logger, winapi) - , _crash_debug(config, "global", "crash_debug", false, winapi) {} - -bool SectionCrashDebug::produceOutputInner(std::ostream &out) { - if (*_crash_debug) { - _logger.printCrashLog(out); - } - return true; -} diff --git a/agents/windows/sections/SectionCrashDebug.h b/agents/windows/sections/SectionCrashDebug.h deleted file mode 100644 index 5c97450..0000000 --- a/agents/windows/sections/SectionCrashDebug.h +++ /dev/null @@ -1,42 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | -// +------------------------------------------------------------------+ -// -// This file is part of Check_MK. -// The official homepage is at http://mathias-kettner.de/check_mk. -// -// check_mk is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation in version 2. check_mk is distributed -// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -// PARTICULAR PURPOSE. See the GNU General Public License for more de- -// ails. You should have received a copy of the GNU General Public -// License along with GNU Make; see the file COPYING. If not, write -// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -// Boston, MA 02110-1301 USA. - -#ifndef SectionCrashDebug_h -#define SectionCrashDebug_h - -#include "../Configurable.h" -#include "../Section.h" - -class SectionCrashDebug : public Section { - Configurable<bool> _crash_debug; - -public: - SectionCrashDebug(Configuration &config, Logger *logger, - const WinApiAdaptor &winapi); - -protected: - virtual bool produceOutputInner(std::ostream &out) override; -}; - -#endif // SectionCrashDebug_h

6 years, 11 months

dist: Packed agent files are now explicitly listed

by Lars Michelsen

Module: check_mk Branch: master Commit: 36457387492ebd7b6325ffbc3d6857383e5dd6b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36457387492ebd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 08:55:00 2017 +0200 dist: Packed agent files are now explicitly listed Change-Id: Ieea66bb0206f4423b040da8ac729470dd39e509d --- Makefile | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 4dd6638..6fdb237 100644 --- a/Makefile +++ b/Makefile @@ -270,30 +270,27 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI tar rf $(DISTNAME)/doc.tar $(TAROPTS) livestatus/api --exclude "*~" --exclude "*.pyc" --exclude ".gitignore" --exclude .f12 gzip $(DISTNAME)/doc.tar - tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents \ - --exclude "msibuild" \ - --exclude "build_version" \ - --exclude "*.rc" \ - --exclude "*.rc.in" \ - --exclude "bin_replace" \ - --exclude "*.nsi" \ - --exclude "*.ico" \ - --exclude "endless.bat" \ - --exclude "logstate.txt" \ - --exclude "*.res" \ - --exclude "*~" \ - --exclude "*.c" \ - --exclude "Makefile" \ - --exclude "windows/README" \ - --exclude "windows/crash.exe" \ - --exclude "windows/*.cc" \ - --exclude "windows/*.h" \ - --exclude "windows/openhardwaremonitor" \ - --exclude "windows/sections" \ - --exclude "windows/frozen_binaries" \ - --exclude "windows/chroot" \ - --exclude "special/lib" \ - --exclude .f12 $$(cd agents ; ls) + cd agents ; tar czf ../$(DISTNAME)/agents.tar.gz $(TAROPTS) \ + --exclude check_mk_agent.spec \ + --exclude special/lib \ + cfg_examples \ + plugins \ + sap \ + special \ + z_os \ + check-mk-agent_*.deb \ + check-mk-agent-*.rpm \ + check_mk_agent.* \ + check_mk_caching_agent.linux \ + CONTENTS \ + mk-job* \ + waitmax \ + windows/cfg_examples \ + windows/check_mk_agent*.{exe,msi} \ + windows/check_mk.example.ini \ + windows/CONTENTS \ + windows/mrpe \ + windows/plugins cd $(DISTNAME) ; ../scripts/make_package_info $(VERSION) > package_info install -m 755 scripts/*.{sh,py} $(DISTNAME) install -m 644 COPYING AUTHORS ChangeLog standalone.make $(DISTNAME)

6 years, 11 months

Updated bug entries #2312

by Lars Michelsen

Module: check_mk Branch: master Commit: ea8641202bbfdf222116afff8f816a24a0060381 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea8641202bbfdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 18:53:11 2017 +0200 Updated bug entries #2312 Change-Id: I29221008ab0bed58414b8ab642c75e238568c58f --- .bugs/2312 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/2312 b/.bugs/2312 index 29f8eb6..0fa5723 100644 --- a/.bugs/2312 +++ b/.bugs/2312 @@ -1,7 +1,12 @@ Title: Notifications: on exception send a notification mail to fallback address Component: notification -State: open +Class: bug +State: done Date: 2015-04-09 10:09:22 Targetversion: future -Class: bug + +2017-10-04 18:52:50: changed state open -> done +Failed notifications handling is implemented now. There are also fallback notification +settings configurable to configure recipients that get notifications that do not match +any notification rule.

6 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017