Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Adapted tests to latest EC changes, part 4.

by Sven Panne

Module: check_mk Branch: master Commit: 7cdc4811bcb9af4b52ed3fe77715663189bae608 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cdc4811bcb9af… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 3 13:59:15 2018 +0200 Adapted tests to latest EC changes, part 4. Change-Id: I891b402e75362f00428c5aa408f4a361c406a33b --- tests/integration/cmk/ec/test_mkeventd_status.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index dafa8d0..3335a36 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -57,7 +57,7 @@ def perfcounters(): @pytest.fixture(scope="function") -def event_status(settings): +def event_status(settings, perfcounters): return cmk.ec.main.EventStatus(settings, perfcounters) @@ -78,11 +78,6 @@ def test_handle_client(status_server, event_status): def test_mkevent_check_query_perf(config, status_server, event_status, perfcounters): - assert isinstance(status_server, cmk.ec.main.StatusServer) - assert isinstance(event_status, cmk.ec.main.EventStatus) - assert isinstance(event_status._perfcounters, cmk.ec.main.Perfcounters) - assert isinstance(perfcounters, cmk.ec.main.Perfcounters) - for num in range(10000): event_status.new_event(CMKEventConsole.new_event({ "host": "heute-%d" % num,

6 years, 5 months

Win-agent: clear redundant cast to time_t

by Jukka Aro

Module: check_mk Branch: master Commit: 7197f9a77e58f888491a1b7d19e64dcd0af35d8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7197f9a77e58f8… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Apr 3 12:11:01 2018 +0200 Win-agent: clear redundant cast to time_t --- agents/windows/build_version | 2 +- agents/windows/sections/SectionPS.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index b860fd7..beb18d7 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3216 +3218 diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index a4e8ed0..655a4bd 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -218,8 +218,7 @@ bool SectionPS::outputWMI(std::ostream &out) { ss >> std::get_time(&t, L"%Y%m%d%H%M%S"); time_t creation_time = mktime(&t); auto uptime = static_cast<ULONGLONG>( - static_cast<time_t>(section_helpers::current_time()) - - creation_time); + section_helpers::current_time() - creation_time); outputProcess( out, std::stoull(result.get<std::string>(L"VirtualSize")),

6 years, 5 months

Temporary asserts to figure out what's going on...

by Sven Panne

Module: check_mk Branch: master Commit: 7b6c9b8f25f1f5079e21cff3e587926b4661f17f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6c9b8f25f1f5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 3 09:57:55 2018 +0200 Temporary asserts to figure out what's going on... Change-Id: Icf2d2c16646e4165b82cb6a38fd6c9176566ab1d --- tests/integration/cmk/ec/test_mkeventd_status.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 8daee26..dafa8d0 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -78,6 +78,11 @@ def test_handle_client(status_server, event_status): def test_mkevent_check_query_perf(config, status_server, event_status, perfcounters): + assert isinstance(status_server, cmk.ec.main.StatusServer) + assert isinstance(event_status, cmk.ec.main.EventStatus) + assert isinstance(event_status._perfcounters, cmk.ec.main.Perfcounters) + assert isinstance(perfcounters, cmk.ec.main.Perfcounters) + for num in range(10000): event_status.new_event(CMKEventConsole.new_event({ "host": "heute-%d" % num,

6 years, 5 months

Adapted tests to latest EC changes, part 3.

by Sven Panne

Module: check_mk Branch: master Commit: e8e2c2a3c4394c4926f92ab24eabf5c8b8b959c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e2c2a3c4394c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 3 09:34:57 2018 +0200 Adapted tests to latest EC changes, part 3. Change-Id: I81aac3d8930b5e380bcf04b3dff6c6435547ac73 --- tests/integration/cmk/ec/test_mkeventd_status.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 46d1edf..8daee26 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -38,12 +38,11 @@ class FakeStatusSocket(object): @pytest.fixture(scope="function") def settings(): - cmk.ec.main.g_settings = cmk.ec.settings.settings( + return cmk.ec.settings.settings( '1.2.3i45', pathlib.Path(cmk.paths.omd_root), pathlib.Path(cmk.paths.default_config_dir), ['mkeventd']) - return cmk.ec.main.g_settings @pytest.fixture(scope="function") @@ -54,14 +53,12 @@ def config(settings): @pytest.fixture(scope="function") def perfcounters(): - cmk.ec.main.g_perfcounters = cmk.ec.main.Perfcounters() - return cmk.ec.main.g_perfcounters + return cmk.ec.main.Perfcounters() @pytest.fixture(scope="function") def event_status(settings): - cmk.ec.main.g_event_status = cmk.ec.main.EventStatus(settings, perfcounters) - return cmk.ec.main.g_event_status + return cmk.ec.main.EventStatus(settings, perfcounters) @pytest.fixture(scope="function")

6 years, 5 months

Adapted tests to latest EC changes, part 2.

by Sven Panne

Module: check_mk Branch: master Commit: e3eb8e81df589a34d32ea332d56fdca05986066c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3eb8e81df589a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 3 09:02:15 2018 +0200 Adapted tests to latest EC changes, part 2. Change-Id: I6676972c17cf310db89e7e512d7c0498306122a8 --- 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 511a88c..46d1edf 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -60,7 +60,7 @@ def perfcounters(): @pytest.fixture(scope="function") def event_status(settings): - cmk.ec.main.g_event_status = cmk.ec.main.EventStatus(settings) + cmk.ec.main.g_event_status = cmk.ec.main.EventStatus(settings, perfcounters) return cmk.ec.main.g_event_status

6 years, 5 months

Adapted tests to latest EC changes.

by Sven Panne

Module: check_mk Branch: master Commit: 47b014337f549f4411f87108f4a3a7e3b28d2a5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47b014337f549f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 3 08:51:05 2018 +0200 Adapted tests to latest EC changes. Change-Id: I3ad91d290604f11e194d32b3fce0c0390d5f9c75 --- tests/integration/cmk/ec/test_mkeventd_status.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index acff3f5..511a88c 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -53,9 +53,9 @@ def config(settings): @pytest.fixture(scope="function") -def status_server(settings): - cmk.ec.main.g_status_server = cmk.ec.main.StatusServer(settings) - return cmk.ec.main.g_status_server +def perfcounters(): + cmk.ec.main.g_perfcounters = cmk.ec.main.Perfcounters() + return cmk.ec.main.g_perfcounters @pytest.fixture(scope="function") @@ -65,9 +65,9 @@ def event_status(settings): @pytest.fixture(scope="function") -def perfcounters(): - cmk.ec.main.g_perfcounters = cmk.ec.main.Perfcounters() - return cmk.ec.main.g_perfcounters +def status_server(settings, perfcounters, event_status): + cmk.ec.main.g_status_server = cmk.ec.main.StatusServer(settings, perfcounters, event_status) + return cmk.ec.main.g_status_server def test_handle_client(status_server, event_status):

6 years, 5 months

Removed global variable g_event_server, part 1.

by Sven Panne

Module: check_mk Branch: master Commit: 228465a06bc6977f65b31765083fcd9aac802353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=228465a06bc697… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 29 16:25:50 2018 +0200 Removed global variable g_event_server, part 1. Change-Id: I04763176e1171a496b1bc38c316244fde6f17592 --- cmk/ec/main.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a3e1160..a77f20d 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -303,10 +303,10 @@ class ECServerThread(threading.Thread): raise NotImplementedError() -def terminate(): +def terminate(event_server): g_terminate_main_event.set() g_status_server.terminate() - g_event_server.terminate() + event_server.terminate() def bail_out(reason): @@ -463,17 +463,17 @@ class MKClientError(Exception): # | Generic SNMP-Trap processing functions | # '----------------------------------------------------------------------' -def initialize_snmptrap_handling(settings): +def initialize_snmptrap_handling(settings, event_server): if settings.options.snmptrap_udp is None: return - initialize_snmptrap_engine() + initialize_snmptrap_engine(event_server) if snmptrap_translation_enabled(): - g_event_server.load_mibs() + event_server.load_mibs() -def initialize_snmptrap_engine(): +def initialize_snmptrap_engine(event_server): global g_snmp_engine, g_snmp_receiver g_snmp_engine = snmp_engine.SnmpEngine() @@ -482,7 +482,7 @@ def initialize_snmptrap_engine(): pduTypes = (snmp_v1.TrapPDU.tagSet, snmp_v2c.SNMPv2TrapPDU.tagSet) initialize_snmp_credentials() - g_snmp_receiver = ECNotificationReceiver(g_snmp_engine, g_event_server.handle_snmptrap) + g_snmp_receiver = ECNotificationReceiver(g_snmp_engine, event_server.handle_snmptrap) def initialize_snmp_credentials(): @@ -3702,7 +3702,7 @@ class StatusServer(ECServerThread): self.handle_command_reload() elif command == "SHUTDOWN": self.logger.info("Going to shut down") - terminate() + terminate(g_event_server) elif command == "REOPENLOG": self.handle_command_reopenlog() elif command == "FLUSH": @@ -3845,9 +3845,9 @@ class StatusServer(ECServerThread): # | Starten und Verwalten der beiden Threads. | # '----------------------------------------------------------------------' -def run_eventd(settings, perfcounters, event_status): +def run_eventd(settings, perfcounters, event_status, event_server): g_status_server.start() - g_event_server.start() + event_server.start() now = time.time() next_housekeeping = now + g_config["housekeeping_interval"] next_retention = now + g_config["retention_interval"] @@ -3869,7 +3869,7 @@ def run_eventd(settings, perfcounters, event_status): now = time.time() if now > next_housekeeping: - g_event_server.do_housekeeping() + event_server.do_housekeeping() next_housekeeping = now + g_config["housekeeping_interval"] if now > next_retention: @@ -3891,7 +3891,7 @@ def run_eventd(settings, perfcounters, event_status): reload_configuration(settings) else: logger.info("Signalled to death by signal %d" % e._signum) - terminate() + terminate(event_server) except Exception as e: logger.exception("Exception in main thread:\n%s" % e) if settings.options.debug: @@ -3899,7 +3899,7 @@ def run_eventd(settings, perfcounters, event_status): time.sleep(1) # Now wait for termination of the server threads - g_event_server.join() + event_server.join() g_status_server.join() @@ -4977,7 +4977,7 @@ def load_configuration(settings): def reload_configuration(settings): with lock_configuration: load_configuration(settings) - initialize_snmptrap_handling(settings) + initialize_snmptrap_handling(settings, g_event_server) g_event_server.reload_configuration() g_status_server.reload_configuration() @@ -5052,7 +5052,7 @@ def main(): event_status.load_status() - initialize_snmptrap_handling(settings) + initialize_snmptrap_handling(settings, g_event_server) g_event_server.compile_rules(g_config["rules"], g_config["rule_packs"]) @@ -5070,7 +5070,7 @@ def main(): signal.signal(signal.SIGTERM, signal_handler) # Now let's go... - run_eventd(settings, perfcounters, event_status) + run_eventd(settings, perfcounters, event_status, g_event_server) # We reach this point, if the server has been killed by # a signal or hitting Ctrl-C (in foreground mode)

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018