Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

by Jukka Aro

Module: check_mk Branch: master Commit: f26a40f416d1e19e7bf2e30d7b5d7e24d3cbdaa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f26a40f416d1e1… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Jan 22 13:41:12 2018 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index cc3fa79..2a71636 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5698 +5708

6 years, 7 months

Introduced <regex> facade and use it.

by Sven Panne

Module: check_mk Branch: master Commit: 4e8187288b4fdcab3df3690f51802988ade30761 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e8187288b4fdc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 19 15:01:34 2018 +0100 Introduced <regex> facade and use it. This enables us to swap out regex implementations easily. Change-Id: I9931aa4e340a39cf199bc949f1cd73bc035a0d10 --- livestatus/src/CustomVarsDictFilter.cc | 8 +++--- livestatus/src/CustomVarsDictFilter.h | 4 +-- livestatus/src/ListFilter.cc | 18 ++++++------- livestatus/src/ListFilter.h | 4 +-- livestatus/src/Makefile.am | 1 + livestatus/src/RegExp.cc | 41 ++++++++++++++++++++++++++++++ livestatus/src/RegExp.h | 46 ++++++++++++++++++++++++++++++++++ livestatus/src/StringFilter.cc | 8 +++--- livestatus/src/StringFilter.h | 4 +-- 9 files changed, 110 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4e8187288b…

6 years, 7 months

Windows agent: refactor section MRPE

by Jukka Aro

Module: check_mk Branch: master Commit: abfdddda6a1b4f607bbc9dfc2dd2aab19aca025e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abfdddda6a1b4f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 17 11:51:43 2018 +0100 Windows agent: refactor section MRPE * Struct mrpe_entry: std::string members instead of C char arrays. * Do not store mrpe_entry pointers in std::vector. * Refactor updateIncludes and from_string. * Use file streams instead of old C file pointers. * Replace buggy PathIsRelative from Win API with correct and unit-tested implementation that works also with unix-style paths with forward slashes and UNC paths. Change-Id: Ib116b49f4f5a4fe12615395aa7aa90b3ed693800 --- agents/windows/WinApi.cc | 4 - agents/windows/WinApi.h | 1 - agents/windows/WinApiAdaptor.h | 1 - agents/windows/sections/SectionMRPE.cc | 147 +++++++++++---------------------- agents/windows/sections/SectionMRPE.h | 26 ++++-- agents/windows/stringutil.h | 17 ++++ agents/windows/test/MockWinApi.h | 1 - agents/windows/test/stringutilTest.cc | 56 +++++++++++++ 8 files changed, 138 insertions(+), 115 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=abfdddda6a…

6 years, 7 months

Windows: new integration tests for section MRPE

by Jukka Aro

Module: check_mk Branch: master Commit: 4ffa20ad1671b61da8ebf0c5b6c2dad4097aafb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ffa20ad1671b6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 19 14:50:45 2018 +0100 Windows: new integration tests for section MRPE * Test forward slashes in paths. * Test whitespace in path (failing). Change-Id: I06a9242fe13c1f250feba65bed655d165a75f269 --- agents/windows/it/test_section_mrpe.py | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/agents/windows/it/test_section_mrpe.py b/agents/windows/it/test_section_mrpe.py index 530bfbc..3fe12a5 100644 --- a/agents/windows/it/test_section_mrpe.py +++ b/agents/windows/it/test_section_mrpe.py @@ -10,11 +10,12 @@ from remote import (actual_output, assert_subprocess, config, remote_ip, class Globals(object): section = 'mrpe' pluginname = 'check_crit.bat' + param = 'foobar' checkname = 'Dummy' mrpedir = 'mrpe' - includedir = 'testinclude' + includedir = 'test include' # space in directory name! cfgfile = 'test.cfg' - newline = None + newline = -1 @pytest.fixture @@ -27,7 +28,7 @@ def testconfig(config): config.set("global", "sections", Globals.section) config.set("global", "crash_debug", "yes") config.add_section(Globals.section) - if Globals.newline is None: + if Globals.newline < 0: config.set(Globals.section, 'check', '%s %s' % (Globals.checkname, os.path.join(Globals.mrpedir, Globals.pluginname))) @@ -48,13 +49,16 @@ def expected_output(): @pytest.fixture( - params=[None, False, True], - ids=['direct', 'include_without_newline', 'include_with_newline'], + params=[-1, 0, 1, 2], + ids=[ + 'direct', 'include_without_newline', 'include_with_newline', + 'include_with_newline_forward_slash' + ], autouse=True) def manage_plugin(request): Globals.newline = request.param plugindir = (Globals.mrpedir - if Globals.newline is None else Globals.includedir) + if Globals.newline < 0 else Globals.includedir) source = os.path.join( os.path.dirname(os.path.dirname(os.path.abspath(__file__))), Globals.mrpedir, Globals.pluginname) @@ -64,23 +68,24 @@ def manage_plugin(request): cmds = [[ 'ssh', sshopts, '%s@%s' % (remoteuser, remote_ip), - 'if not exist %s md %s' % (targetdir_windows, targetdir_windows) + 'if not exist "%s" md "%s"' % (targetdir_windows, targetdir_windows) ], [ 'scp', sshopts, source, - '%s@%s:%s' % (remoteuser, remote_ip, targetdir) + '%s@%s:"%s"' % (remoteuser, remote_ip, targetdir) ]] for cmd in cmds: assert_subprocess(cmd) - elif Globals.newline is not None: + elif Globals.newline >= 0: with open(os.path.join(targetdir, Globals.cfgfile), 'wb') as cfg: - cfg.write("check = %s %s%s" % - (Globals.checkname, - os.path.join(targetdir_windows, Globals.pluginname), - "\n" if Globals.newline else "")) + path = os.path.join(targetdir_windows, Globals.pluginname) + if Globals.newline == 2: + path = path.replace('\\', '/') + cfg.write('check = %s "%s"%s' % (Globals.checkname, path, "\n" + if Globals.newline > 0 else "")) yield if platform.system() == 'Windows': os.unlink(os.path.join(targetdir, Globals.pluginname)) - if Globals.newline is not None: + if Globals.newline >= 0: os.unlink(os.path.join(targetdir, Globals.cfgfile))

6 years, 7 months

checktestlib: Fix inheritance from Tuploid

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9a53061a0a07c3c4914e0a376924fdfaa9826704 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a53061a0a07c3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 15:55:12 2018 +0100 checktestlib: Fix inheritance from Tuploid Change-Id: I8c60c7fca75e87f97cad184eb9346bb59f4fbb42 --- tests/checks/checktestlib.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 6ab4f8d..097f25e 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -5,7 +5,7 @@ class Tuploid(object): def __eq__(self, other_value): if isinstance(other_value, self.__class__): - return all(x==y for x, y in zip(other_value.tuple, self.tuple)) + return other_value.tuple == self.tuple elif type(other_value) == tuple: return all(x==y for x, y in zip(other_value, self.tuple)) @@ -14,7 +14,7 @@ class Tuploid(object): @property def tuple(self): - return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) + raise NotImplementedError() class PerfValue(Tuploid): @@ -44,6 +44,10 @@ class PerfValue(Tuploid): assert type(maximum) in [int, float, types.NoneType] self.maximum = maximum + @property + def tuple(self): + return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) + class BasicCheckResult(Tuploid): """ @@ -72,6 +76,10 @@ class BasicCheckResult(Tuploid): else: self.perfdata = None + @property + def tuple(self): + return (self.status, self.infotext, self.perfdata) + class CheckResult(object): """

6 years, 7 months

Make building Windows agent great again

by Jukka Aro

Module: check_mk Branch: master Commit: c1306b6363ad28eff33535b5751bfdb9f2741727 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1306b6363ad28… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Jan 22 16:15:25 2018 +0100 Make building Windows agent great again Rename check_mk_agent.a -> libcheck_mk_agent.a as automake seems to expect that anyway (do not ask why). --- agents/windows/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index d0b3872..1ba5199 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = check_mk_agent check_PROGRAMS = WindowsAgentTest wmitest -noinst_LIBRARIES = check_mk_agent.a +noinst_LIBRARIES = libcheck_mk_agent.a AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++14 -gdwarf-2 \ @@ -8,10 +8,10 @@ AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++14 -gdwarf-2 \ AM_LDFLAGS = -static -static-libgcc -static-libstdc++ LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lntdll -check_mk_agent_LDADD = check_mk_agent.res check_mk_agent.a $(LD_COMMON) +check_mk_agent_LDADD = check_mk_agent.res libcheck_mk_agent.a $(LD_COMMON) WindowsAgentTest_CPPFLAGS = -I$(top_srcdir)/sections -I$(top_srcdir)/test -WindowsAgentTest_LDADD = check_mk_agent.a -lgtest -lgmock $(LD_COMMON) +WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) wmitest_LDADD = $(LD_COMMON) @@ -33,7 +33,7 @@ check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico unittest: WindowsAgentTest$(EXEEXT) DISPLAY="$$DISPLAY xterm" wine WindowsAgentTest$(EXEEXT) 2>/dev/null -check_mk_agent_a_SOURCES = \ +libcheck_mk_agent_a_SOURCES = \ Configurable.cc \ Configuration.cc \ CrashHandler.cc \

6 years, 7 months

Removed obsolete NOLINTs.

by Sven Panne

Module: check_mk Branch: master Commit: cbb4d3b7304e511a91b85e4941fc36a8d6a53273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbb4d3b7304e51… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 22 15:23:09 2018 +0100 Removed obsolete NOLINTs. Change-Id: I6500d003d8716fece81881c978666f8b9dfb198c --- livestatus/src/LogEntry.cc | 292 ++++++++++++++++++++++----------------------- livestatus/src/Logger.cc | 3 +- 2 files changed, 145 insertions(+), 150 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cbb4d3b730…

6 years, 7 months

Windows: new integration tests for section MRPE

by Jukka Aro

6 years, 7 months

Make building Windows agent great again

by Jukka Aro

6 years, 7 months

5698 FIX Windows agent: space in MRPE plugin path resulted in wrong plugin name

by Jukka Aro

Module: check_mk Branch: master Commit: 50841c33a841cfe2937b7a9e881e8c9ee1d25701 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50841c33a841cf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Jan 22 14:00:55 2018 +0100 5698 FIX Windows agent: space in MRPE plugin path resulted in wrong plugin name If the path of a(n included) MRPE plugin contained one or more spaces, the plugin name was parsed incorrectly. Quotes were incorrectly required for the whole command line including parameters within quotes, making it impossible to distinguish between a script path containing space(s) and space-separated script parameters. Now the MRPE plugin path must be enclosed in double quotes (") in order to be processed correctly. The same applies for script parameters with whitespace: also they must be separately enclosed in quotes. Example: check_mk.ini: [mrpe] include = C:\Temp\my.cfg C:\Temp\my.cfg: check = Dummy "C:\Program Files (x86)\check_mk\mrpe\check_crit.bat" some parameter "with space" --- .werks/5698 | 30 ++++++++ agents/windows/Makefile.am | 3 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 27 ++++++++ agents/windows/sections/SectionMRPE.cc | 91 +++++++++++++++++-------- agents/windows/stringutil.h | 4 +- agents/windows/test/sections/SectionMRPETest.cc | 71 +++++++++++++++++++ agents/windows/test/stringutilTest.cc | 39 ++++++++++- 8 files changed, 233 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=50841c33a8…

6 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018