Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

Terminate make-agent on failure; Fixed apt installation from chroot

by Lars Michelsen

Module: check_mk Branch: master Commit: 8aa7963cd898495ae0d44366c6add31a9413b619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aa7963cd89849… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 09:35:27 2017 +0200 Terminate make-agent on failure; Fixed apt installation from chroot Change-Id: I7244bcdfd758b81885f0bc8a2ddd4186296549cf --- agents/windows/make-agent | 2 ++ agents/windows/make-chroot | 3 +++ 2 files changed, 5 insertions(+) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 5cd235c..ab91780 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -8,6 +8,8 @@ # Possible make targets. By default, a parallel build and # install-strip (non-debug) is done and an msi installer produced. +set -e + . build.sh parse-args "$@" diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 9a76a7e..96f0528 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -144,6 +144,9 @@ if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then ln -sf python2.7 $CHROOT_PATH/usr/bin/python fi +# "Disable" apt privilege dropping in chroot +sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd + # We need to enable 32bit Wine ./do-chroot "dpkg --add-architecture i386 && apt-get update && apt-get -y install wine32"

6 years, 11 months

Swap expressions to avoid error when checking if a notification context has to be split

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 9ba8bda8a28930d2911a382087704409da3c2eb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ba8bda8a28930… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 18 09:23:00 2017 +0200 Swap expressions to avoid error when checking if a notification context has to be split Change-Id: Ib3de07bb217642547faadbbc876945b1c5b8b920 --- cmk_base/notify.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 2f0ed09..95035de 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -524,8 +524,9 @@ def notify_rulebased(raw_context, analyse=False): plugin_context = create_plugin_context(raw_context, params) rbn_add_contact_information(plugin_context, contacts) - split_contexts = (params.get("disable_multiplexing") or - plugin not in ["", "mail", "asciimail"] or + split_contexts = (plugin not in ["", "mail", "asciimail"] or + # params can be a list (e.g. for custom notificatios) + params.get("disable_multiplexing") or bulk) if not split_contexts: plugin_contexts = [plugin_context]

6 years, 11 months

Updated unreachable notification tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 38e989a164a1c0aa9203c7d28fd1350adf323a99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38e989a164a1c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 09:09:34 2017 +0200 Updated unreachable notification tests Change-Id: Ib8119be9b0736aa7a3038e8694fc0d4e67b84a5b --- .../test_unreachable_notifications.py | 211 ++++++++++----------- 1 file changed, 103 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=38e989a164…

6 years, 11 months

Cleaned up some debug output; execute "omd config set" + restart only when needed

by Lars Michelsen

Module: check_mk Branch: master Commit: 7da5c18a660dd706d36673dd7a386d0f4c866eaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7da5c18a660dd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 08:21:09 2017 +0200 Cleaned up some debug output; execute "omd config set" + restart only when needed Change-Id: I897c65b4b0745b4483b86011a0c6dd78983c6da0 --- tests/testlib/__init__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f5228fd..d0b1b52 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -611,10 +611,15 @@ class Site(object): def set_config(self, key, val, with_restart=False): + if self.get_config(key) == val: + print "omd config: %s is already at %r" % (key, val) + return + if with_restart: print "Stopping site" self.stop() + print "omd config: Set %s to %r" % (key, val) assert self.omd("config", "set", key, val) == 0 if with_restart: @@ -1080,7 +1085,6 @@ class CMKWebSession(WebSession): host = self.get_host(hostname) - print host assert host["hostname"] == hostname assert host["path"] == folder assert host["attributes"] == attributes @@ -1109,7 +1113,6 @@ class CMKWebSession(WebSession): }), }, output_format="python") - print result assert type(result) == dict assert "ruleset" in result assert "configuration_hash" in result @@ -1268,7 +1271,6 @@ class CMKWebSession(WebSession): # might not reflect the changes yet. Ask the core for a successful reload. def config_reloaded(): new_t = self.site.live.query_value("GET status\nColumns: program_start\n") - print "New config load time: %s" % new_t return new_t > old_t reload_time, timeout = time.time(), 10 @@ -1362,14 +1364,14 @@ class CMKEventConsole(CMKWebSession): def activate_changes(self, web): old_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") - print "Old config load time: %s" % old_t + #print "Old config load time: %s" % old_t assert old_t > time.time() - 86400 super(CMKEventConsole, self).activate_changes(allow_foreign_changes=True) def config_reloaded(): new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") - print "New config load time: %s" % new_t + #print "New config load time: %s" % new_t return new_t > old_t reload_time, timeout = time.time(), 10

6 years, 11 months

Made symlink calls compatible with old debian

by Lars Michelsen

Module: check_mk Branch: master Commit: 6630e05e208885a721ab4dfda85a5348d31c2c44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6630e05e208885… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 08:48:16 2017 +0200 Made symlink calls compatible with old debian Change-Id: Ie734883f130c6624d7fd3764a1b7091b949d5c82 --- agents/windows/make-chroot | 2 +- agents/windows/test/build-googletest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index c1c5247..9a76a7e 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -141,7 +141,7 @@ EOF # Debian pkg installation does not seem to link python executable if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then - ln -frs $CHROOT_PATH/usr/bin/python2.7 $CHROOT_PATH/usr/bin/python + ln -sf python2.7 $CHROOT_PATH/usr/bin/python fi # We need to enable 32bit Wine diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index 48b07d9..1ccfc24 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -31,7 +31,7 @@ for project in test mock ; do cp -r include/g${project} /usr/share/mingw-w64/include/ for arch in 32 64 ; do cp ${builddirs[$arch]}/lib/.libs/libg${project}.a /usr/${archs[$arch]}${common}/lib/ - ln -frs /usr/share/mingw-w64/include/g${project} /usr/${archs[$arch]}${common}/include/g${project} + ln -sf ../../share/mingw-w64/include/g${project} /usr/${archs[$arch]}${common}/include/g${project} done cd - done

6 years, 11 months

Set up Google Test & Mock in Windows agent chroot

by Jukka Aro

Module: check_mk Branch: master Commit: 8145871bdddec49ab77b64a5629556f27817240e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8145871bdddec4… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Oct 13 15:43:41 2017 +0200 Set up Google Test & Mock in Windows agent chroot * Build Google Test and Mock from tarball found in Git repository. Patch a known MinGW compilation bug in Google Test header. * Install 32 and 64 bit libs and headers in chroot. * Enable 32bit Wine for running the test executable (for some curious reason, this is necessary even for running the 64 bit test exe). Change-Id: Icce9758c5d2d4cf9b0b3395df96ce814d574efc2 --- agents/windows/build-agent | 68 +------------ agents/windows/build.sh | 79 +++++++++++++++ agents/windows/chroot_version | 2 +- agents/windows/make-agent | 24 +---- agents/windows/make-chroot | 112 +++++++++++---------- agents/windows/test/build-googletest | 40 ++++++++ .../googletest/googletest-release-1.8.0.tar.gz | Bin 0 -> 1281617 bytes ...-googletest-compilation-MinGW-gtest-port.h.diff | 38 +++++++ 8 files changed, 226 insertions(+), 137 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8145871bdd…

6 years, 11 months

Windows agent: unit tests for RotatingFileHandler

by Jukka Aro

Module: check_mk Branch: master Commit: 2c96a1175b13ef783d1e428989039331740b541f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c96a1175b13ef… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Oct 17 12:25:44 2017 +0200 Windows agent: unit tests for RotatingFileHandler Change-Id: I5e4de6094179f6f9c67c5f0baa1a29906e1bc0a5 --- agents/windows/Makefile.am | 2 + agents/windows/test/RotatingFileHandlerTest.cc | 263 +++++++++++++++++++++++++ 2 files changed, 265 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c96a1175b…

6 years, 11 months

Build unit tests in Win-agent autotools project

by Jukka Aro

Module: check_mk Branch: master Commit: da536e08f51792915c862566db67c392d6660bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da536e08f51792… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Oct 16 15:57:10 2017 +0200 Build unit tests in Win-agent autotools project * Only run 64 bit unit tests: 64 bit should cover some rare code paths only built in 64 bit but also all code that is built in 32 bit. Change-Id: If6c4bb44373069b5405734314407a387f30d7ddd --- agents/windows/Makefile.am | 20 +- agents/windows/build-agent | 17 +- agents/windows/configure.ac | 2 +- agents/windows/do-chroot | 4 +- agents/windows/test/MockLogger.cc | 6 + agents/windows/test/MockLogger.h | 27 +++ agents/windows/test/MockWinApi.cc | 6 + agents/windows/test/MockWinApi.h | 455 ++++++++++++++++++++++++++++++++++++++ agents/windows/test/gtest_main.cc | 38 ++++ 9 files changed, 567 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=da536e08f5…

6 years, 11 months

Windows agent: unit tests for Environment

by Jukka Aro

Module: check_mk Branch: master Commit: 679d30bb00cf9b3733fec99296bc68dfe6555a8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679d30bb00cf9b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Oct 17 12:24:57 2017 +0200 Windows agent: unit tests for Environment Change-Id: I7203cee950782e3bed26acfcb09b49d0a8f1ac27 --- agents/windows/Makefile.am | 3 + agents/windows/test/EnvironmentTest.cc | 222 +++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=679d30bb00…

6 years, 11 months

Unreachable tests: Fixed access to site specific files

by Lars Michelsen

Module: check_mk Branch: master Commit: d025b63dda7e60fcc17bdb66d7e2adf36fd4a916 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d025b63dda7e60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 17 15:16:08 2017 +0200 Unreachable tests: Fixed access to site specific files Change-Id: Ie5102ebd9384ab988ed0e769f9a12a783bee215f --- .../test_unreachable_notifications.py | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/notifications/test_unreachable_notifications.py b/tests/notifications/test_unreachable_notifications.py index 9b2740b..47e78d6 100644 --- a/tests/notifications/test_unreachable_notifications.py +++ b/tests/notifications/test_unreachable_notifications.py @@ -102,7 +102,8 @@ def initial_state(site, scenario): class HistoryLog(object): - def __init__(self, core): + def __init__(self, site, core): + self._site = site self._core = core self._log = self._open_log() self._buf = [] @@ -118,10 +119,10 @@ class HistoryLog(object): def _open_log(self): - if not os.path.exists(self._log_path()): - open(self._log_path(), "a+") + if not self._site.file_exists(self._log_path()): + self._site.write_file(self._log_path(), "") - fobj = open(self._log_path(), "r", 1) + fobj = open(self._site.path(self._log_path()), "r") fobj.seek(0, 2) # go to end of file return fobj @@ -156,7 +157,7 @@ class HistoryLog(object): # b) Parent goes down # c) child becomes unreachable def test_unreachable_child_down_before_parent_down(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set child down, expect DOWN notification site.send_host_check_result("notify-test-child", STATE_DOWN, "DOWN") @@ -190,7 +191,7 @@ def test_unreachable_child_down_before_parent_down(scenario, site, initial_state # a) Parent goes down # b) Child goes down, becomes unreachable def test_unreachable_child_after_parent_is_down(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set parent down, expect DOWN notification site.send_host_check_result("notify-test-parent", STATE_DOWN, "DOWN") @@ -215,7 +216,7 @@ def test_unreachable_child_after_parent_is_down(scenario, site, initial_state): # b) Parent goes down # c) Child goes up while parent is down def test_parent_down_child_up_on_up_result(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set child down, expect DOWN notification site.send_host_check_result("notify-test-child", STATE_DOWN, "DOWN") @@ -240,7 +241,7 @@ def test_parent_down_child_up_on_up_result(scenario, site, initial_state): # c) Child goes up while parent is down # d) Child goes down and becomes unreachable while parent is down def test_parent_down_child_state_changes(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set parent down, expect DOWN notification site.send_host_check_result("notify-test-parent", STATE_DOWN, "DOWN") @@ -283,7 +284,7 @@ def test_parent_down_child_state_changes(scenario, site, initial_state): # c) Parent goes up # d) Child is still down and becomes down def test_child_down_after_parent_recovers(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set parent down, expect DOWN notification site.send_host_check_result("notify-test-parent", STATE_DOWN, "DOWN") @@ -326,7 +327,7 @@ def test_child_down_after_parent_recovers(scenario, site, initial_state): # c) Parent goes up # d) Child goes up def test_child_up_after_parent_recovers(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set parent down, expect DOWN notification site.send_host_check_result("notify-test-parent", STATE_DOWN, "DOWN") @@ -367,7 +368,7 @@ def test_child_up_after_parent_recovers(scenario, site, initial_state): # b) Parent goes down, child becomes unreachable # d) Parent goes up, child becomes down def test_down_child_becomes_unreachable_and_down_again(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set child down, expect DOWN notification site.send_host_check_result("notify-test-child", STATE_DOWN, "DOWN") @@ -430,7 +431,7 @@ def test_down_child_becomes_unreachable_and_down_again(scenario, site, initial_s # b) Parent goes down, child becomes unreachable # c) Child goes up def test_down_child_becomes_unreachable_then_up(scenario, site, initial_state): - log = HistoryLog(scenario.core) + log = HistoryLog(site, scenario.core) # - Set child down, expect DOWN notification site.send_host_check_result("notify-test-child", STATE_DOWN, "DOWN")

6 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
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