Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: dc747b848348d6f8c8ecffcfe77461ba7bb4549d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc747b848348d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 18 10:00:26 2018 +0200 Add integration tests for active checks a) Verify active checks work at all b) Verify standard macro resolution Change-Id: I3cb94a3792ce394a66dee29e1538fcfd34ceeb22 --- tests/integration/core/test_active_checks.py | 144 +++++++++++++++++++++++++++ tests/integration/web/test_webapi.py | 4 +- tests/testlib/__init__.py | 63 +++++++++--- 3 files changed, 196 insertions(+), 15 deletions(-) diff --git a/tests/integration/core/test_active_checks.py b/tests/integration/core/test_active_checks.py new file mode 100644 index 0000000..0f17a7b --- /dev/null +++ b/tests/integration/core/test_active_checks.py @@ -0,0 +1,144 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import pytest + +from testlib import web + +import cmk_base.rulesets as rulesets + +(a)pytest.fixture(scope="module") +def test_cfg(web, site): + print "Applying default config" + web.add_host("test-host", attributes={ + "ipaddress": "127.0.0.1", + "tag_agent": "no-agent", + }) + + web.activate_changes() + yield None + + # + # Cleanup code + # + print "Cleaning up test config" + + web.delete_host("test-host") + + +(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +def test_active_check_execution(test_cfg, site, web, core): + site.set_config("CORE", core, with_restart=True) + + try: + web.set_ruleset("custom_checks", { + "ruleset": { + # Main folder + "": [ + { + "value": { + 'service_description': u'\xc4ctive-Check', + 'command_line': 'echo "123"' + }, + "conditions": { + "host_specs": rulesets.ALL_HOSTS, + "host_tags": [], + }, + "options": {}, + }, + ], + } + }) + web.activate_changes() + + site.schedule_check("test-host", u'\xc4ctive-Check', 0) + + result = site.live.query_row("GET services\nColumns: host_name description state plugin_output has_been_checked\nFilter: host_name = test-host\nFilter: description = Äctive-Check") + assert result[4] == 1 + assert result[0] == "test-host" + assert result[1] == u'\xc4ctive-Check' + assert result[2] == 0 + assert result[3] == "123" + finally: + web.set_ruleset("custom_checks", { + "ruleset": { + "": [], # -> folder + } + }) + web.activate_changes() + + +(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +def test_active_check_macros(test_cfg, site, web, core): + site.set_config("CORE", core, with_restart=True) + + macros = { + "$HOSTADDRESS$": "127.0.0.1", + "$HOSTNAME$": "test-host", + "$_HOSTTAGS$": "/wato/ ip-v4 ip-v4-only lan no-agent no-snmp ping prod site:%s wato" % site.id, + "$_HOSTADDRESS_4$": "127.0.0.1", + "$_HOSTADDRESS_6$": "", + "$_HOSTADDRESS_FAMILY$": "4", + "$USER1$": "/omd/sites/%s/lib/nagios/plugins" % site.id, + "$USER2$": "/omd/sites/%s/local/lib/nagios/plugins" % site.id, + "$USER3$": site.id, + "$USER4$": site.root, + } + + def descr(var): + return "Macro %s" % var.strip("$") + + ruleset = [] + for var, value in macros.items(): + ruleset.append({ + "value": { + 'service_description': descr(var), + 'command_line': 'echo "Output: %s"' % var, + }, + "conditions": { + "host_specs": rulesets.ALL_HOSTS, + "host_tags": [], + }, + }) + + try: + web.set_ruleset("custom_checks", { + "ruleset": { + # Main folder + "": ruleset, + } + }) + web.activate_changes() + + for var, value in macros.items(): + description = descr(var) + site.schedule_check("test-host", description, 0) + + row = site.live.query_row( + "GET services\n" + "Columns: host_name description state plugin_output has_been_checked\n" + "Filter: host_name = test-host\n" + "Filter: description = %s\n" % description + ) + + name, description, state, plugin_output, has_been_checked = row + + assert name == "test-host" + assert has_been_checked == 1 + assert state == 0 + + expected_output = "Output: %s" % value + # TODO: Cleanup difference between nagios/cmc + if core == "nagios": + expected_output = expected_output.strip() + + assert expected_output == plugin_output, \ + "Macro %s has wrong value (%r instead of %r)" % (var, plugin_output, expected_output) + + finally: + web.set_ruleset("custom_checks", { + "ruleset": { + "": [], # -> folder + } + }) + web.activate_changes() diff --git a/tests/integration/web/test_webapi.py b/tests/integration/web/test_webapi.py index 61d7945..cad20c1 100644 --- a/tests/integration/web/test_webapi.py +++ b/tests/integration/web/test_webapi.py @@ -356,9 +356,7 @@ def test_get_graph(web, site): }) web.discover_services("test-host-get-graph") web.activate_changes() - - # Issue a reschedule - site.live.command("[%d] SCHEDULE_FORCED_SERVICE_CHECK;test-host-get-graph;Check_MK;%d" % (int(time.time()), int(time.time()))) + web.schedule_check("test-host-get-graph", "Check_MK") # Wait for RRD file creation # Isn't this a bug that the graph is not instantly available? diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index ecfb6ca..6e6a1b4 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -293,11 +293,7 @@ class Site(object): if expected_state is None: expected_state = state - last_check_before = self.live.query_value( - "GET hosts\n" \ - "Columns: last_check\n" \ - "Filter: host_name = %s\n" % (hostname)) - + last_check_before = self._get_last_check(hostname) schedule_ts, wait_timeout = time.time(), 20 # Ensure the next check result is not in same second as the previous check @@ -308,26 +304,69 @@ class Site(object): print "last_check_before", last_check_before, "schedule_ts", schedule_ts self.live.command("[%d] PROCESS_HOST_CHECK_RESULT;%s;%d;%s" % (schedule_ts, hostname, state, output)) + self._wait_for_next_check(hostname, last_check_before, schedule_ts, wait_timeout, expected_state) + + + def schedule_check(self, hostname, service_description, expected_state): + last_check_before = self._get_last_check(hostname) + schedule_ts, wait_timeout = int(time.time()), 20 + + # Ensure the next check result is not in same second as the previous check + while int(last_check_before) == int(schedule_ts): + schedule_ts = time.time() + time.sleep(0.1) + + print "last_check_before", last_check_before, "schedule_ts", schedule_ts + self.live.command("[%d] SCHEDULE_FORCED_SVC_CHECK;%s;%s;%d" % + (schedule_ts, hostname, service_description.encode("utf-8"), schedule_ts)) + + self._wait_for_next_check(hostname, last_check_before, schedule_ts, wait_timeout, expected_state, service_description=service_description) + - last_check, host_state = self.live.query_row( - "GET hosts\n" \ + + def _wait_for_next_check(self, hostname, last_check_before, schedule_ts, wait_timeout, expected_state, service_description=None): + if not service_description: + table = "hosts" + filt = "Filter: host_name = %s\n" % hostname + wait_obj = "%s" % hostname + else: + table = "services" + filt = "Filter: host_name = %s\nFilter: description = %s\n" % (hostname, service_description) + wait_obj = "%s;%s" % (hostname, service_description) + + last_check, state = self.live.query_row( + "GET %s\n" \ "Columns: last_check state\n" \ - "Filter: host_name = %s\n" \ + "%s" \ "WaitObject: %s\n" \ "WaitTimeout: %d\n" \ "WaitCondition: last_check > %d\n" \ "WaitCondition: state = %d\n" \ - "WaitTrigger: check\n" % (hostname, hostname, wait_timeout*1000, last_check_before, expected_state)) + "WaitTrigger: check\n" % (table, filt, wait_obj, wait_timeout*1000, last_check_before, expected_state)) - print "processing host check result took %0.2f seconds" % (time.time() - schedule_ts) + print "processing check result took %0.2f seconds" % (time.time() - schedule_ts) assert last_check > last_check_before, \ "Check result not processed within %d seconds (last check before reschedule: %d, " \ "scheduled at: %d, last check: %d)" % \ (wait_timeout, last_check_before, schedule_ts, last_check) - assert host_state == expected_state, \ - "Expected %d state, got %d state" % (expected_state, host_state) + assert state == expected_state, \ + "Expected %d state, got %d state" % (expected_state, state) + + + def _get_last_check(self, hostname, service_description=None): + if not service_description: + return self.live.query_value( + "GET hosts\n" \ + "Columns: last_check\n" \ + "Filter: host_name = %s\n" % (hostname)) + else: + return self.live.query_value( + "GET services\n" \ + "Columns: last_check\n" \ + "Filter: host_name = %s\n" \ + "Filter: service_description = %s\n" % (hostname, service_description)) def get_host_state(self, hostname):

6 years, 4 months

5927 FIX Windows: use case-insensitive drive letters in fileinfo paths

by Jukka Aro

Module: check_mk Branch: master Commit: 3c0b9114edc5cf70c284c7cb0db5370e9f0dfd6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c0b9114edc5cf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri May 18 10:03:35 2018 +0200 5927 FIX Windows: use case-insensitive drive letters in fileinfo paths Werk #5920 (since 1.5.0b1) caused only uppercase drive letters to be allowed in section fileinfo paths. This is now fixed so that both uppercase and lowercase drive letters work in fileinfo paths. Change-Id: I1c8d204dc7f800fb3c0a109377e09f96ff30e974 --- .werks/5927 | 14 ++++ agents/windows/it/test_section_fileinfo.py | 111 +++++++++++++++++++---------- agents/windows/sections/SectionFileinfo.cc | 2 +- 3 files changed, 89 insertions(+), 38 deletions(-) diff --git a/.werks/5927 b/.werks/5927 new file mode 100644 index 0000000..a75d2fe --- /dev/null +++ b/.werks/5927 @@ -0,0 +1,14 @@ +Title: Windows: use case-insensitive drive letters in fileinfo paths +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526630401 +Class: fix + +Werk #5920 (since 1.5.0b1) caused only uppercase drive letters to be +allowed in section fileinfo paths. This is now fixed so that both +uppercase and lowercase drive letters work in fileinfo paths. + + diff --git a/agents/windows/it/test_section_fileinfo.py b/agents/windows/it/test_section_fileinfo.py index 533268d..f01a571 100644 --- a/agents/windows/it/test_section_fileinfo.py +++ b/agents/windows/it/test_section_fileinfo.py @@ -9,15 +9,38 @@ from remote import (actual_output, config, remotedir, remotetest, wait_agent, import shutil -class Globals: +class TestPaths(object): + drive = os.getcwd()[:2] + + def tempdir1(self): + return os.path.join(self.drive, remotedir, 'Testdir1') + + def tempdir2(self): + return os.path.join(self.tempdir1(), 'Testdir2') + + def tempfile1(self): + return os.path.join(self.tempdir1(), 'TestFile1') + + def tempfile2(self): + return os.path.join(self.tempdir1(), 'TestFile2') + + def tempfile3(self): + return os.path.join(self.tempdir2(), 'TestFile3') + + def missingfile(self): + return os.path.join(self.tempdir1(), 'foobar') + + def drive_upper(self): + self.drive = self.drive.upper() + + def drive_lower(self): + self.drive = self.drive.lower() + + +class Globals(object): section = 'fileinfo' alone = True - tempdir1 = os.path.join(remotedir, 'Testdir1') - tempdir2 = os.path.join(tempdir1, 'Testdir2') - tempfile1 = os.path.join(tempdir1, 'TestFile1') - tempfile2 = os.path.join(tempdir1, 'TestFile2') - tempfile3 = os.path.join(tempdir2, 'TestFile3') - missingfile = os.path.join(tempdir1, 'foobar') + paths = TestPaths() @pytest.fixture @@ -25,32 +48,45 @@ def testfile(request): return os.path.basename(__file__) +(a)pytest.fixture(params=['uppercase_drive', 'lowercase_drive']) +def testconfig_drive(request, config): + if request.param == 'uppercase_drive': + Globals.paths.drive_upper() + else: + Globals.paths.drive_lower() + return config + + @pytest.fixture( - params=[ - (os.path.join(Globals.tempdir1, '**'), True), - (os.path.join(Globals.tempdir2, 'Te*'), True), - (os.path.join(Globals.tempdir2, 'Te*'), False) - ], + params=[(Globals.paths.tempdir1, '**', True), + (Globals.paths.tempdir2, 'Te*', True), + (Globals.paths.tempdir2, 'Te*', False)], ids=['recursive_glob', 'simple_glob_alone', 'simple_glob_with_systemtime']) -def testconfig(request, config): +def testconfig(request, testconfig_drive): if platform.system() == 'Windows': - Globals.alone = request.param[1] + Globals.alone = request.param[2] if Globals.alone: - config.set('global', 'sections', Globals.section) + testconfig_drive.set('global', 'sections', Globals.section) else: - config.set('global', 'sections', '%s systemtime' % Globals.section) - config.set('global', 'crash_debug', 'yes') - config.add_section(Globals.section) - if request.param[0] != os.path.join(Globals.tempdir1, '**'): - config.set(Globals.section, 'path', Globals.tempfile1) - config.set( + testconfig_drive.set('global', 'sections', + '%s systemtime' % Globals.section) + testconfig_drive.set('global', 'crash_debug', 'yes') + testconfig_drive.add_section(Globals.section) + if request.param[0] != Globals.paths.tempdir1: + testconfig_drive.set(Globals.section, 'path', + Globals.paths.tempfile1()) + testconfig_drive.set( Globals.section, 'path', - os.path.join(Globals.tempdir1, - '?' + os.path.basename(Globals.tempfile2)[1:])) - config.set(Globals.section, 'path', request.param[0]) - config.set(Globals.section, 'path', Globals.missingfile) + os.path.join( + Globals.paths.tempdir1(), + '?' + os.path.basename(Globals.paths.tempfile2())[1:])) + testconfig_drive.set(Globals.section, 'path', + os.path.join(request.param[0](), + request.param[1])) + testconfig_drive.set(Globals.section, 'path', + Globals.paths.missingfile()) - return config + return testconfig_drive @pytest.fixture @@ -58,32 +94,33 @@ def expected_output(): if platform.system() == 'Windows': expected = [ re.escape(r'<<<%s:sep(124)>>>' % Globals.section), r'\d+', - re.escape(r'%s|' % Globals.tempfile1) + r'\d+\|\d+', - re.escape(r'%s|' % Globals.tempfile2) + r'\d+\|\d+', - re.escape(r'%s|' % Globals.tempfile3) + r'\d+\|\d+', - re.escape(r'%s|missing|' % Globals.missingfile) + r'\d+' + re.escape(r'%s|' % Globals.paths.tempfile1()) + r'\d+\|\d+', + re.escape(r'%s|' % Globals.paths.tempfile2()) + r'\d+\|\d+', + re.escape(r'%s|' % Globals.paths.tempfile3()) + r'\d+\|\d+', + re.escape(r'%s|missing|' % Globals.paths.missingfile()) + r'\d+' ] if not Globals.alone: - expected += [ - re.escape(r'<<<systemtime>>>'), - r'\d+' - ] + expected += [re.escape(r'<<<systemtime>>>'), r'\d+'] return expected @pytest.fixture def use_testfiles(): if platform.system() == 'Windows': - for d in [Globals.tempdir1, Globals.tempdir2]: + for d in [Globals.paths.tempdir1(), Globals.paths.tempdir2()]: os.mkdir(d) - for f in [Globals.tempfile1, Globals.tempfile2, Globals.tempfile3]: + for f in [ + Globals.paths.tempfile1(), + Globals.paths.tempfile2(), + Globals.paths.tempfile3() + ]: with open(f, 'w') as handle: handle.write(f) yield if platform.system() == 'Windows': - for d in [Globals.tempdir2, Globals.tempdir1]: + for d in [Globals.paths.tempdir2(), Globals.paths.tempdir1()]: shutil.rmtree(d) diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index cff4461..9c14856 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -53,7 +53,7 @@ enum class GlobType { None, Simple, Recursive }; std::pair<fs::path, PathDiffT> buildPathBeginning(const fs::path &filePath) { fs::path beginning; PathDiffT diff = 0; - const std::wregex drive{L"^[A-Z]:$"}; + const std::wregex drive{L"^[A-Za-z]:$"}; auto it = filePath.begin(), end = filePath.end(); std::wsmatch match;

6 years, 4 months

Encapsulated lock/MongoDB in History object where they belong.

by Sven Panne

Module: check_mk Branch: master Commit: 2a52f8ccd66096e5af1d43885ee7708e89b0e2db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a52f8ccd66096… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 09:49:11 2018 +0200 Encapsulated lock/MongoDB in History object where they belong. Note that we use a plain threading.Lock() now, ECLock doesn't really serve a purpose and is even a bit harmful: Adding logging to locking may change the threading behavior, serializing things more than usual when logging is on. This gives a false sense of security... Change-Id: I2c4b023ac6c27120452be0dcfce5f0a1c54990cb --- cmk/ec/history.py | 7 ++++--- cmk/ec/main.py | 4 +--- tests/integration/cmk/ec/test_mkeventd_status.py | 16 +++------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/cmk/ec/history.py b/cmk/ec/history.py index 43f3167..2630440 100644 --- a/cmk/ec/history.py +++ b/cmk/ec/history.py @@ -27,6 +27,7 @@ import os import string import subprocess +import threading import time import cmk.ec.actions @@ -36,13 +37,13 @@ import cmk.render # TODO: As one can see clearly below, we should really have a class hierarchy here... class History(object): - def __init__(self, settings, config, logger, lock_history, mongodb): + def __init__(self, settings, config, logger): super(History, self).__init__() self._settings = settings self._config = config self._logger = logger - self._lock_history = lock_history - self._mongodb = mongodb + self._lock_history = threading.Lock() + self._mongodb = MongoDB() reload_configuration(self, self._config) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 4ec3253..184a663 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3948,9 +3948,7 @@ def main(): slave_status = default_slave_status_master() config = load_configuration(settings, logger, slave_status) - lock_history = ECLock(logger.getChild("lock.history")) - mongodb = cmk.ec.history.MongoDB() - history = cmk.ec.history.History(settings, config, logger, lock_history, mongodb) + history = cmk.ec.history.History(settings, config, logger) pid_path = settings.paths.pid_file.value if pid_path.exists(): diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 13e4cdc..f4944e0 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -58,28 +58,18 @@ def lock_configuration(): @pytest.fixture(scope="function") -def lock_history(): - return cmk.ec.main.ECLock(logging.getLogger("cmk.mkeventd.history")) - - -(a)pytest.fixture(scope="function") def slave_status(): return cmk.ec.main.default_slave_status_master() @pytest.fixture(scope="function") -def mongodb(): - return cmk.ec.history.MongoDB() - - -(a)pytest.fixture(scope="function") -def config(settings, lock_history, mongodb, slave_status): +def config(settings, slave_status): return cmk.ec.main.load_configuration(settings, logging.getLogger("cmk.mkeventd"), slave_status) @pytest.fixture(scope="function") -def history(settings, lock_history, mongodb, slave_status): - return cmk.ec.history.History(settings, conf, logging.getLogger("cmk.mkeventd"), lock_history, mongodb) +def history(settings, config): + return cmk.ec.history.History(settings, config, logging.getLogger("cmk.mkeventd")) @pytest.fixture(scope="function")

6 years, 4 months

Centralize History construction.

by Sven Panne

Module: check_mk Branch: master Commit: 2497a8fb8e9393c185aa4dc82c9382f133cf698f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2497a8fb8e9393… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 09:24:39 2018 +0200 Centralize History construction. Change-Id: I325cf1a285407edb2266f85f09e3d862b7139422 --- cmk/ec/history.py | 4 ++- cmk/ec/main.py | 38 +++++++++++------------- tests/integration/cmk/ec/test_mkeventd_status.py | 21 ++++++------- 3 files changed, 31 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2497a8fb8e…

6 years, 4 months

Fixed typo in test.

by Sven Panne

Module: check_mk Branch: master Commit: 38f603eedd671c1cef6a413d32745eb7f7813450 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38f603eedd671c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 09:15:28 2018 +0200 Fixed typo in test. Change-Id: I4cffc4312d5b24d23b41dd42b700d328f9fbefa5 --- tests/integration/cmk/ec/test_mkeventd_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 933c933..ff2bcef 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -73,7 +73,7 @@ def mongodb(): @pytest.fixture(scope="function") -def config(settings, lock_lock_history, mongodb, slave_status): +def config(settings, lock_history, mongodb, slave_status): conf = cmk.ec.main.load_configuration(settings, logging.getLogger("cmk.mkeventd"), slave_status) history = cmk.ec.history.History(settings, conf, logger, lock_history, mongodb) cmk.ec.history.configure_event_history(history)

6 years, 4 months

Moved configure_event_history call out of load_config, it doesn' t belong there.

by Sven Panne

Module: check_mk Branch: master Commit: f4ba768a1a8092e8ef1c42646f9ec7cfe72c4da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ba768a1a8092… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 18 08:48:43 2018 +0200 Moved configure_event_history call out of load_config, it doesn't belong there. Change-Id: I4903b4008f1130bc61eb63bd609612f8eda636e7 --- cmk/ec/main.py | 15 ++++++++------- tests/integration/cmk/ec/test_mkeventd_status.py | 6 +++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 56c4ad7..76713c9 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3876,7 +3876,7 @@ def update_slave_status(slave_status, settings, config): # | Loading of the configuration files | # '----------------------------------------------------------------------' -def load_configuration(settings, logger, lock_history, mongodb, slave_status): +def load_configuration(settings, logger, slave_status): config = cmk.ec.export.load_config(settings) # If not set by command line, set the log level by configuration @@ -3888,9 +3888,6 @@ def load_configuration(settings, logger, lock_history, mongodb, slave_status): logger.getChild("StatusServer").setLevel(levels["cmk.mkeventd.StatusServer"]) logger.getChild("lock").setLevel(levels["cmk.mkeventd.lock"]) - history = cmk.ec.history.History(settings, config, logger, lock_history, mongodb) - cmk.ec.history.configure_event_history(history) - # Are we a replication slave? Parts of the configuration # will be overridden by values from the master. update_slave_status(slave_status, settings, config) @@ -3911,7 +3908,9 @@ def load_configuration(settings, logger, lock_history, mongodb, slave_status): def reload_configuration(settings, logger, lock_configuration, lock_history, mongodb, event_status, event_server, status_server, slave_status): with lock_configuration: - config = load_configuration(settings, logger, lock_history, mongodb, slave_status) + config = load_configuration(settings, logger, slave_status) + history = cmk.ec.history.History(settings, config, logger, lock_history, mongodb) + cmk.ec.history.configure_event_history(history) event_server.reload_configuration(config) event_status.reload_configuration(config) @@ -3950,10 +3949,12 @@ def main(): logger.info("-" * 65) logger.info("mkeventd version %s starting" % cmk.__version__) + slave_status = default_slave_status_master() + config = load_configuration(settings, logger, slave_status) lock_history = ECLock(logger.getChild("lock.history")) mongodb = cmk.ec.history.MongoDB() - slave_status = default_slave_status_master() - config = load_configuration(settings, logger, lock_history, mongodb, slave_status) + history = cmk.ec.history.History(settings, config, logger, lock_history, mongodb) + cmk.ec.history.configure_event_history(history) pid_path = settings.paths.pid_file.value if pid_path.exists(): diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 3285de0..933c933 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -74,7 +74,11 @@ def mongodb(): @pytest.fixture(scope="function") def config(settings, lock_lock_history, mongodb, slave_status): - return cmk.ec.main.load_configuration(settings, logging.getLogger("cmk.mkeventd"), lock_history, mongodb, slave_status) + conf = cmk.ec.main.load_configuration(settings, logging.getLogger("cmk.mkeventd"), slave_status) + history = cmk.ec.history.History(settings, conf, logger, lock_history, mongodb) + cmk.ec.history.configure_event_history(history) + return conf + @pytest.fixture(scope="function")

6 years, 4 months

6110 FIX inv_if: Don' t return Unknown if no data for OID 1.3.6.1.2.1.2.1.0 is present

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4f02f3c0e81be7bb9da47d81e014e88792c84cb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f02f3c0e81be7… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri May 18 08:57:43 2018 +0200 6110 FIX inv_if: Don't return Unknown if no data for OID 1.3.6.1.2.1.2.1.0 is present Previously, the scan function raised a TypeError if no data was delivered for OID 1.3.6.1.2.1.2.1.0 which resulted in an UNKNOWN status of the HW/SW Inventory service. Now, a missing value indicates that the inventory function should not be executed. Change-Id: I04224ffdf9aca5bfe917168e86c5c69c4111c1a1 --- .werks/6110 | 13 +++++++++++++ inventory/if | 2 ++ 2 files changed, 15 insertions(+) diff --git a/.werks/6110 b/.werks/6110 new file mode 100644 index 0000000..84c9596 --- /dev/null +++ b/.werks/6110 @@ -0,0 +1,13 @@ +Title: inv_if: Don't return Unknown if no data for OID 1.3.6.1.2.1.2.1.0 is present +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526625999 +Class: fix + +Previously, the scan function raised a TypeError if no data was delivered for +OID 1.3.6.1.2.1.2.1.0 which resulted in an UNKNOWN status of the HW/SW +Inventory service. Now, a missing value indicates that the inventory function +should not be executed. diff --git a/inventory/if b/inventory/if index 4bef0ed..f58cef8 100644 --- a/inventory/if +++ b/inventory/if @@ -30,6 +30,8 @@ def scan_inv_if(oid): return int(oid(".1.3.6.1.2.1.2.1.0")) >= 2 except ValueError: return False + except TypeError: + return False # TODO unify with other if inventory plugins

6 years, 4 months

Refactoring: Introduce parameter object.

by Sven Panne

Module: check_mk Branch: master Commit: c031689132af8fb7ce917671b6cd43deb1baa0f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c031689132af8f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 17 15:20:48 2018 +0200 Refactoring: Introduce parameter object. Baby steps towards a sane class hierarchy for history handling... Change-Id: Ib90fc946a024b2b13cceeefd22a7650a71478193 --- cmk/ec/actions.py | 14 ++-- cmk/ec/history.py | 48 +++++++----- cmk/ec/main.py | 97 ++++++++++++------------ tests/integration/cmk/ec/test_mkeventd_status.py | 32 ++++---- 4 files changed, 99 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c031689132…

6 years, 4 months

Fixed wrong find and replace syntax

by Simon Betz

Module: check_mk Branch: master Commit: 8ea044b63a29c2ba47f472b6cff0eaa4048a5f82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea044b63a29c2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 18 08:08:41 2018 +0200 Fixed wrong find and replace syntax Change-Id: Ib85a712bfb32c471cd735755b7ad975f02681e03 --- agents/plugins/mk_oracle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 75b8219..9e56e7d 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -807,7 +807,7 @@ set_oraenv () { ORACLE_HOME=$(grep "^${ORACLE_SID}:" <"${ORATAB}" | cut -d":" -f2) if [ -z "${ORACLE_HOME}" ]; then # cut last number from SID for Oracle RAC to find entry in oratab - ORACLE_SID_SHORT=${ORACLE_SID%/[0-9]/} + ORACLE_SID_SHORT=${ORACLE_SID/%[0-9]/} ORACLE_HOME=$(grep "^${ORACLE_SID_SHORT}:" <"${ORATAB}" | cut -d":" -f2) fi fi

6 years, 4 months

RPMs: Improved setting default versions of removed versions

by Lars Michelsen

Module: check_mk Branch: master Commit: da609d9ea538af02359bbacd9858131c26285aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da609d9ea538af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 17 17:30:47 2018 +0200 RPMs: Improved setting default versions of removed versions Change-Id: I20d29885f2b3915c23dd43082716eb762a23ab8f --- omd/omd.spec.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/omd/omd.spec.in b/omd/omd.spec.in index 3bb7139..b24691e 100644 --- a/omd/omd.spec.in +++ b/omd/omd.spec.in @@ -181,12 +181,13 @@ fi v=$(ls -A /omd/versions 2>/dev/null| sort -n | tail -n 1) if [ -n "$v" ] then - DEFAULT_VERSION=$(readlink /omd/versions/default 2>/dev/null) - DEFAULT_VERSION=${DEFAULT_VERSION##*/} - if [ "$v" = "$DEFAULT_VERSION" ]; then + # Test for broken default version symlink and replace with available version + if [ ! -e /omd/versions/default ]; then echo "New default version is $v" ln -sfn "$v" /omd/versions/default else + DEFAULT_VERSION=$(readlink /omd/versions/default 2>/dev/null) + DEFAULT_VERSION=${DEFAULT_VERSION##*/} echo "Leaving default version $DEFAULT_VERSION" fi else

6 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018