Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5745 FIX handle deferred notification properly

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f996c5135956ecc4d9b998ce9067e5c7234e59b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f996c5135956ec… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 2 17:13:05 2018 +0100 5745 FIX handle deferred notification properly After the first retry deferred notification did not respect the cooldown time defined in the global settings anymore. Furthermore the counting of the configured retries was not done properly. If e.g. a retry count of one was specified actually three retries were performed. These two issues have now been fixed. Change-Id: Ic5ba66ed8f2deba410217c595ada5d3205bc0f7e --- .werks/5745 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5745 b/.werks/5745 new file mode 100644 index 0000000..83cabbe --- /dev/null +++ b/.werks/5745 @@ -0,0 +1,14 @@ +Title: handle deferred notification properly +Level: 1 +Component: notifications +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1520006666 +Class: fix + +After the first retry deferred notification did not respect the cooldown time +defined in the global settings anymore. Furthermore the counting of the +configured retries was not done properly. If e.g. a retry count of one was +specified actually three retries were performed. These two issues have now +been fixed.

6 years, 4 months

5876 FIX fileinfo_groups: Increased size of input fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 77ceffac0c2d4dcf6e00b35af330d9d3e20daff3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ceffac0c2d4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 16:28:42 2018 +0100 5876 FIX fileinfo_groups: Increased size of input fields Change-Id: I7bb35c14c5672575ea70d72b44e96b185dbf858a --- .werks/5876 | 11 +++++++++++ web/plugins/wato/check_parameters.py | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/5876 b/.werks/5876 new file mode 100644 index 0000000..bdda20f --- /dev/null +++ b/.werks/5876 @@ -0,0 +1,11 @@ +Title: fileinfo_groups: Increased size of input fields +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520004493 + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e361ef2..b87bc93 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6231,15 +6231,14 @@ register_rule(group + '/' + subgroup_storage, elements = [ TextAscii( title = _("Name of group"), - size = 10, ), Transform( Tuple( show_titles = True, orientation = "vertical", elements = [ - TextAscii(title = _("Include Pattern"), size=40), - TextAscii(title = _("Exclude Pattern"), size=40), + TextAscii(title = _("Include Pattern"), size=80), + TextAscii(title = _("Exclude Pattern"), size=80), ], ), forth = lambda params: type(params) == str and ( params, '' ) or params

6 years, 4 months

5875 FIX Git: Fixed error "git add --all ... is outside repository" with older git versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 247e5cf52613729b2aa0b2fb46e063204d05c462 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=247e5cf5261372… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 13:34:35 2018 +0100 5875 FIX Git: Fixed error "git add --all ... is outside repository" with older git versions When using older git versions (saw this with 1.7.1) an error could occur when enabling the git integration of WATO. This was caused by an incompatibility with the "git add" command used by WATO. It used absolute paths to add the new files that should be added to git instead of relative paths to the current working directory. This issue was present in all 1.4.0 releases. Change-Id: Iaffb451bb6b16840926093fa4b21742956c73128 --- .werks/5875 | 16 ++++++++++++++++ web/htdocs/watolib.py | 7 ++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/5875 b/.werks/5875 new file mode 100644 index 0000000..190f957 --- /dev/null +++ b/.werks/5875 @@ -0,0 +1,16 @@ +Title: Git: Fixed error "git add --all ... is outside repository" with older git versions +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1519993814 + +When using older git versions (saw this with 1.7.1) an error could occur when enabling the +git integration of WATO. This was caused by an incompatibility with the "git add" command +used by WATO. It used absolute paths to add the new files that should be added to git instead +of relative paths to the current working directory. + +This issue was present in all 1.4.0 releases. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 66b8cde..de3e45e 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -9758,7 +9758,7 @@ def unlock_exclusive(): def git_command(args): command = [ "git" ] + [ a.encode("utf-8") for a in args ] - logger.debug("GIT: Execute %s" % subprocess.list2cmdline(command)) + logger.debug("GIT: Execute in %s: %s" % (cmk.paths.default_config_dir, subprocess.list2cmdline(command))) try: p = subprocess.Popen(command, cwd=cmk.paths.default_config_dir, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) @@ -9815,8 +9815,9 @@ def do_git_commit(): def git_add_files(): - git_command(["add", "--all", ".gitignore"] - + glob.glob("%s/*.d/wato" % cmk.paths.default_config_dir)) + path_pattern = os.path.join(cmk.paths.default_config_dir, "*.d/wato") + rel_paths = [ os.path.relpath(p, cmk.paths.default_config_dir) for p in glob.glob(path_pattern) ] + git_command(["add", "--all", ".gitignore"] + rel_paths) def git_has_pending_changes():

6 years, 4 months

5874 FIX Improved diagnose logging for WATO integrated Git

by Lars Michelsen

Module: check_mk Branch: master Commit: 41425f77bbbeb924789cedea3ec5febeca59817b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41425f77bbbeb9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 13:25:14 2018 +0100 5874 FIX Improved diagnose logging for WATO integrated Git Set the user interface logging to debug to get detailed information about the WATO integrated git logic. The entries are written to the var/log/web.log file. Change-Id: I58c45c54a27646476217369dea83d1342e11c59f --- .werks/5874 | 13 +++++++++++++ web/htdocs/watolib.py | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5874 b/.werks/5874 new file mode 100644 index 0000000..f0cae0c --- /dev/null +++ b/.werks/5874 @@ -0,0 +1,13 @@ +Title: Improved diagnose logging for WATO integrated Git +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1519993446 + +Set the user interface logging to debug to get detailed information +about the WATO integrated git logic. The entries are written to +the var/log/web.log file. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fbd77f9..66b8cde 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -9758,6 +9758,7 @@ def unlock_exclusive(): def git_command(args): command = [ "git" ] + [ a.encode("utf-8") for a in args ] + logger.debug("GIT: Execute %s" % subprocess.list2cmdline(command)) try: p = subprocess.Popen(command, cwd=cmk.paths.default_config_dir, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) @@ -9783,6 +9784,7 @@ def do_git_commit(): author = "%s <%s>" % (config.user.id, config.user.email) git_dir = cmk.paths.default_config_dir + "/.git" if not os.path.exists(git_dir): + logger.debug("GIT: Initializing") git_command(["init"]) # Set git repo global user/mail. seems to be needed to prevent warning message @@ -9797,10 +9799,12 @@ def do_git_commit(): _("Initialized GIT for Check_MK")]) if git_has_pending_changes(): + logger.debug("GIT: Found pending changes - Update gitignore file") write_gitignore_files() # Writing the gitignore files might have reverted the change. So better re-check. if git_has_pending_changes(): + logger.debug("GIT: Still has pending changes") git_add_files() message = ", ".join(g_git_messages)

6 years, 4 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 9a4ad4340449172358f5ca21fa1a2115bd745113 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a4ad434044917… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 2 15:33:35 2018 +0100 Minor cleanup Change-Id: I796fd185ca5b4e989a60b27b4bd604ce9e51f80f --- checks/printer_supply | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/checks/printer_supply b/checks/printer_supply index 611a3cb..a7dffd7 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -56,14 +56,13 @@ printer_supply_some_remaining_status = 1 # TODO: This variable is deprecated. Remove it in future check_config_variables.append("printer_supply_some_remaining_status") - - - # Workaround for toners and drum units in c5900 devices # which have equal names for the single parts. # Add the color description to that item # Fix name for toners in DELL devices that have serial # numbers in item name + + def printer_supply_fix_infos(info): colors = [] new_info = [] @@ -89,6 +88,7 @@ def printer_supply_fix_infos(info): new_info.append([line_0] + line[1:]) return new_info + def inventory_printer_supply(info): # Ignore devices which show -2 for current value and -2 for max value -> useless # Also fix trailing zero bytes (seen on HP Jetdirect 143) @@ -96,6 +96,7 @@ def inventory_printer_supply(info): for line in printer_supply_fix_infos(info) if not (line[1] == '-2' and line[2] == '-2') and line[2] and len(line[1]) > 0 ] # ignore useless devices + def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info): if line[0].rstrip('\0') == item: @@ -156,7 +157,6 @@ def check_printer_supply(item, params, info): if upturn: leftperc = 100 - leftperc - infotext = "%.0f%% (warn/crit at %.0f%% / %.0f%%)" % (leftperc, warn, crit) if leftperc <= crit: return (2, infotext, perfdata) @@ -165,24 +165,22 @@ def check_printer_supply(item, params, info): else: return (0, infotext, perfdata) + check_info["printer_supply"] = { - 'check_function': check_printer_supply, - 'inventory_function': inventory_printer_supply, - 'service_description': 'Supply %s', - 'has_perfdata': True, - 'snmp_info': ( - '.1.3.6.1.2.1.43', [ - '11.1.1.6', # Printer-MIB::prtMarkerSuppliesDescription - '11.1.1.8', # Printer-MIB::prtMarkerSuppliesMaxCapacity - '11.1.1.9', # Printer-MIB::prtMarkerSuppliesLevel - '11.1.1.4', # Printer-MIB::prtMarkerSuppliesClass - '12.1.1.4', # Printer-MIB::prtMarkerColorantValue - ] - ), - 'snmp_scan_function': \ - lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None \ - # exclude ricoh printer - and oid(".1.3.6.1.2.1.1.2.0") != ".1.3.6.1.4.1.367.1.1", - 'group': 'printer_supply', - 'default_levels_variable' : "printer_supply_default_levels", + 'inventory_function' : inventory_printer_supply, + 'check_function' : check_printer_supply, + 'service_description' : 'Supply %s', + 'snmp_info' : ('.1.3.6.1.2.1.43', [ + '11.1.1.6', # Printer-MIB::prtMarkerSuppliesDescription + '11.1.1.8', # Printer-MIB::prtMarkerSuppliesMaxCapacity + '11.1.1.9', # Printer-MIB::prtMarkerSuppliesLevel + '11.1.1.4', # Printer-MIB::prtMarkerSuppliesClass + '12.1.1.4', # Printer-MIB::prtMarkerColorantValue + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None \ + # exclude ricoh printer + and oid(".1.3.6.1.2.1.1.2.0") != ".1.3.6.1.4.1.367.1.1", + 'has_perfdata' : True, + 'group' : 'printer_supply', + 'default_levels_variable' : 'printer_supply_default_levels', }

6 years, 4 months

Add operator<< for filters.

by Sven Panne

Module: check_mk Branch: master Commit: 90e23fb6663a87be913bca47d03e127da699a067 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90e23fb6663a87… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 2 14:37:46 2018 +0100 Add operator<< for filters. Change-Id: Id98a734cee4bc4e9a2efff3b813c16bc720690b1 --- livestatus/src/AndingFilter.cc | 14 ++++++++-- livestatus/src/AndingFilter.h | 12 +++++++-- livestatus/src/ColumnFilter.h | 20 +++++++++++++- livestatus/src/CustomVarsDictFilter.cc | 10 +++---- livestatus/src/CustomVarsDictFilter.h | 3 --- livestatus/src/DoubleFilter.cc | 13 ++++----- livestatus/src/DoubleFilter.h | 3 --- livestatus/src/Filter.h | 8 ++++++ livestatus/src/IntFilter.cc | 19 ++++++-------- livestatus/src/IntFilter.h | 3 --- livestatus/src/ListFilter.cc | 26 ++++++++---------- livestatus/src/ListFilter.h | 5 +--- livestatus/src/OringFilter.cc | 14 ++++++++-- livestatus/src/OringFilter.h | 12 +++++++-- livestatus/src/Query.cc | 48 ++++++++++++++++++++-------------- livestatus/src/Query.h | 8 ++++-- livestatus/src/StatsColumn.cc | 2 +- livestatus/src/StringFilter.cc | 28 +++++++++----------- livestatus/src/StringFilter.h | 5 +--- livestatus/src/TimeFilter.cc | 19 ++++++-------- livestatus/src/TimeFilter.h | 3 --- 21 files changed, 157 insertions(+), 118 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90e23fb666…

6 years, 4 months

Keep order of sub-filters.

by Sven Panne

Module: check_mk Branch: master Commit: 21b3a05d0bd173e190d7313cf0a709b0dbbfc3e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b3a05d0bd173… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 2 15:13:49 2018 +0100 Keep order of sub-filters. Change-Id: I970cbb136ffdc81042ffe68e212e15c302cc74ed --- livestatus/src/Query.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 289b223..2894c28 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "Query.h" +#include <algorithm> #include <cctype> #include <chrono> #include <cmath> @@ -240,6 +241,7 @@ void Query::parseAndOrLine(const std::string &header, subfilters.push_back(std::move(filters.back())); filters.pop_back(); } + std::reverse(subfilters.begin(), subfilters.end()); filters.push_back( makeFilter(header, negated_header, op, std::move(subfilters))); } @@ -272,6 +274,7 @@ void Query::parseStatsAndOrLine(const std::string &header, subfilters.push_back(_stats_columns.back()->stealFilter()); _stats_columns.pop_back(); } + std::reverse(subfilters.begin(), subfilters.end()); _stats_columns.push_back(std::make_unique<StatsColumnCount>( makeFilter(header, negated_header, op, std::move(subfilters)))); }

6 years, 4 months

Don't load check configuration for Mode notify

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 86b38c193c7d575d52f831a93f71e2d5f5637cc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86b38c193c7d57… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 2 13:27:35 2018 +0100 Don't load check configuration for Mode notify Change-Id: Ie533804e41474d4a8025d9b326b374743737945a --- cmk_base/modes/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 6a6110b..f1aab4f 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1348,6 +1348,7 @@ modes.register(Mode( long_option="notify", handler_function=mode_notify, needs_config=False, + needs_checks=False, argument=True, argument_descr="MODE", argument_optional=True,

6 years, 4 months

Win-agent: declare Environment public members virtual

by Jukka Aro

Module: check_mk Branch: master Commit: f226ad189dac3ff279229170092dd9470e114da9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f226ad189dac3f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 2 12:06:23 2018 +0100 Win-agent: declare Environment public members virtual Enable mocking by allowing an inherited mock class to be used polymorphically through a base class ref/pointer. --- agents/windows/Environment.h | 36 ++++++++++++++++++------------------ agents/windows/build_version | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/agents/windows/Environment.h b/agents/windows/Environment.h index f82b3b7..c1aa0bd 100644 --- a/agents/windows/Environment.h +++ b/agents/windows/Environment.h @@ -35,39 +35,39 @@ class Environment { public: Environment(bool use_cwd, bool with_stderr, Logger *logger, const WinApiAdaptor &winapi); - ~Environment(); + virtual ~Environment(); // TODO: this is an evil hack, but currently there is at least one global // function that requires access to the env that isn't easily refactored static Environment *instance(); - std::string hostname() const { return _hostname; } + virtual std::string hostname() const { return _hostname; } - std::string currentDirectory() const { return _current_directory; } - std::string agentDirectory() const { return _agent_directory; } + virtual std::string currentDirectory() const { return _current_directory; } + virtual std::string agentDirectory() const { return _agent_directory; } - std::string pluginsDirectory() const { return _plugins_directory; } - std::string configDirectory() const { return _config_directory; } - std::string localDirectory() const { return _local_directory; } - std::string spoolDirectory() const { return _spool_directory; } - std::string stateDirectory() const { return _state_directory; } - std::string tempDirectory() const { return _temp_directory; } - std::string logDirectory() const { return _log_directory; } - std::string binDirectory() const { return _bin_directory; } + virtual std::string pluginsDirectory() const { return _plugins_directory; } + virtual std::string configDirectory() const { return _config_directory; } + virtual std::string localDirectory() const { return _local_directory; } + virtual std::string spoolDirectory() const { return _spool_directory; } + virtual std::string stateDirectory() const { return _state_directory; } + virtual std::string tempDirectory() const { return _temp_directory; } + virtual std::string logDirectory() const { return _log_directory; } + virtual std::string binDirectory() const { return _bin_directory; } - std::string logwatchStatefile() const { return _logwatch_statefile; } - std::string eventlogStatefile() const { return _eventlog_statefile; } + virtual std::string logwatchStatefile() const { return _logwatch_statefile; } + virtual std::string eventlogStatefile() const { return _eventlog_statefile; } - const JobHandle<0> &workersJobObject() const { return _workers_job_object; } + virtual const JobHandle<0> &workersJobObject() const { return _workers_job_object; } - bool withStderr() const { return _with_stderr; } + virtual bool withStderr() const { return _with_stderr; } - bool isWinNt() const; + virtual bool isWinNt() const; // return windows version as a combined value, with major version in the // upper 8 bits // and minor in the lower bits, i.e. 0x0501 for windows xp (32-bit) - uint16_t winVersion() const; + virtual uint16_t winVersion() const; private: std::string determineHostname() const; diff --git a/agents/windows/build_version b/agents/windows/build_version index 3438fb6..7eea66e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3148 +3150

6 years, 4 months

Add more debug output for random build_version problem

by Lars Michelsen

Module: check_mk Branch: master Commit: de0706e5cacd96b90cff09987d65797e4e6c92d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de0706e5cacd96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 11:58:35 2018 +0100 Add more debug output for random build_version problem Change-Id: I4f71cd298b003b8d94dc69120e530d1132489603 --- agents/windows/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 70c2d62..8b28bb3 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -21,10 +21,14 @@ pytest_options = --maxfail=10 pytest_jenkins = $(pytest_options) --junitxml=$(bindir)/junit.xml build_version: $(check_mk_agent_SOURCES:.cc=.o) + echo "BUILD VERSION ls 1: $$(ls -al $(VPATH))" + echo "BUILD VERSION 1: $$(cat $(VPATH)/build_version)" echo $$(( $$(cat $(VPATH)/build_version) + 1 )) > $(VPATH)/build_version + echo "BUILD VERSION 2: $$(cat $(VPATH)/build_version)" + echo "BUILD VERSION ls 2: $$(ls -al $(VPATH))" check_mk_agent.rc: $(VPATH)/check_mk_agent.rc.in build_version - echo "BUILD VERSION: $$(cat $(VPATH)/build_version)" + echo "BUILD VERSION 3: $$(cat $(VPATH)/build_version)" sed -e "s/%VERSION%/$(VERSION)/g" \ -e "s/%YEAR%/$$(date +%Y)/g" \ -e "s/%BUILD_VERSION%/$$(cat $(VPATH)/build_version)/g" $< > $@

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018