Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

Windows agent: build check_mk_agent.a library

by Jukka Aro

Module: check_mk Branch: master Commit: 355e515d63f67199b5ac2c0041df6dd33d687ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355e515d63f671… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 19 14:35:56 2018 +0100 Windows agent: build check_mk_agent.a library Link this lib to both check_mk_agent.exe and WindowsAgentTest.exe. The target was to allow different compile options (include path) for test sources than for the rest of the sources but reuse same object files / libraries for both the exe and tests without the need to compile them twice. Fix linkage by replacing global extern variables with_stderr and g_workers_job_object with member variables in Environment. Change-Id: Ic77e14c1d252adae674de37009b53d7f8d1500b3 --- agents/windows/Environment.cc | 7 ++++-- agents/windows/Environment.h | 13 ++++++++++- agents/windows/ExternalCmd.cc | 13 +++++------ agents/windows/ExternalCmd.h | 9 +++++--- agents/windows/Makefile.am | 27 ++++++---------------- agents/windows/check_mk_agent.cc | 23 ++++-------------- agents/windows/configure.ac | 1 + agents/windows/test/EnvironmentTest.cc | 20 ++++++++++------ .../windows/test/sections/SectionEventlogTest.cc | 20 ++++++++-------- .../windows/test/sections/SectionLogwatchTest.cc | 24 +++++++++---------- 10 files changed, 75 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=355e515d63…

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

Use artful for windows agent builds - zesty is EOL

by Lars Michelsen

Module: check_mk Branch: master Commit: dd562a095120eac80b3147bc3e3b20b32c620e5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd562a095120ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 19 14:34:52 2018 +0100 Use artful for windows agent builds - zesty is EOL Change-Id: I22933521bba3b26c3a3a822e4660c1c032c84e43 --- agents/windows/make-chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index d586ec1..9b6824b 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -4,7 +4,7 @@ set -e -DISTRO=zesty +DISTRO=artful MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot

6 years, 7 months

Basic test for kernel.util

by Konstantin Büttner

Module: check_mk Branch: master Commit: f8b5d21912f9792150dba53d3aef05a9c0168b87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8b5d21912f979… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 14:50:24 2018 +0100 Basic test for kernel.util Change-Id: I3e4118dd892cb20bd3c6f89ecea8c2b53b0d6ddf --- tests/checks/test_kernel_check.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/checks/test_kernel_check.py b/tests/checks/test_kernel_check.py new file mode 100644 index 0000000..f8c495b --- /dev/null +++ b/tests/checks/test_kernel_check.py @@ -0,0 +1,19 @@ +import pytest +import pprint +from cmk_base.check_api import MKCounterWrapped +import checktestlib + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("time_to_info,params,predicate", [ +(lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {}, lambda cr: True), +]) +def test_kernel_util_check(check_manager, monkeypatch, time_to_info, params, predicate): + check = check_manager.get_check("kernel.util") + try: + list(check.run_check(None, params, time_to_info(0))) + except MKCounterWrapped: + pass + result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) + assert predicate(result)

6 years, 7 months

Tests: Not try to clean up versions when no version is installed

by Lars Michelsen

Module: check_mk Branch: master Commit: aac0e510bda6288bca53cc4b66327fa88fa16008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aac0e510bda628… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 19 19:17:55 2018 +0100 Tests: Not try to clean up versions when no version is installed Change-Id: I5f8dfdfc378af8f3fc216bdfb1160c07423f76b0 --- tests/testlib/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d5b3570..19612fa 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -585,6 +585,9 @@ class Site(object): def cleanup_old_sites(self, cleanup_pattern): + if not os.path.exists("/omd/sites"): + return + for site_id in os.listdir("/omd/sites"): if site_id != self.id and site_id.startswith(cleanup_pattern): print "Cleaning up old site: %s" % site_id

6 years, 7 months

test_statgrab_cpu_check: Remove monkeypatching of time module, as it doesn 't work this way and is unnecessary

by Konstantin Büttner

Module: check_mk Branch: master Commit: 69357eb52eb6ec4e7ee49325ea9406566bf4e0d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69357eb52eb6ec… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 14:02:16 2018 +0100 test_statgrab_cpu_check: Remove monkeypatching of time module, as it doesn't work this way and is unnecessary Change-Id: Ic86f0871393cc57d199699855b33209ed9466b54 --- tests/checks/test_statgrab_cpu_check.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index e43b017..e001129 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -22,12 +22,13 @@ info_statgrab_cpu_hpux = lambda t: [[u'idle', u'%d' % int(t*5)], ), ]) def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, predicate): - import time check = check_manager.get_check("statgrab_cpu") + # NOTE: We do not mock the time module here, because the check does not depend on any + # absolute rates. The mocking that was included in this test previously had no + # effect, which went unnoticed because it doesn't matter in this case. try: list(check.run_check(None, params, time_to_info(0))) except MKCounterWrapped: pass - monkeypatch.setattr("time.time", lambda: 60) result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) assert predicate(result)

6 years, 7 months

Reserved 10 Werk IDS

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

kernel.util: Remove dysfunctional default levels variable

by Konstantin Büttner

Module: check_mk Branch: master Commit: 848c87b65da0dca21e8511f4281724a789a72c47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=848c87b65da0dc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 19 15:33:49 2018 +0100 kernel.util: Remove dysfunctional default levels variable This particular combination of passing an empty dict at discovery, declaring a default_levels_variable in check_info but not using factory_settings does not work. Any value this variable might be set to would simply be ignored. Change-Id: Iee7748ace8480e64a7482e99bc10622465c7da91 --- checks/kernel | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/kernel b/checks/kernel index 6a9e2f8..f4f5e9c 100644 --- a/checks/kernel +++ b/checks/kernel @@ -106,7 +106,6 @@ check_info["kernel"] = { # | Check system/user/io-wait | # '----------------------------------------------------------------------' -kernel_util_default_levels = None def inventory_cpu_utilization(info): for x in info: @@ -160,7 +159,6 @@ check_info["kernel.util"] = { 'inventory_function': inventory_cpu_utilization, 'service_description': 'CPU utilization', 'has_perfdata': True, - 'default_levels_variable': 'kernel_util_default_levels', 'group': 'cpu_iowait', 'includes': ['cpu_util.include'], }

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

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

← Newer
1
...
8
9
10
11
12
13
14
...
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