Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Removed global variable g_event_server, part 4.

by Sven Panne

Module: check_mk Branch: master Commit: 56e44e554ef50c13cdceb737b9000a3e214c41fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56e44e554ef50c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 14:13:09 2018 +0200 Removed global variable g_event_server, part 4. Change-Id: I90770c347182983c240ec1d6f406008ef94116f3 --- cmk/ec/main.py | 14 +++++++++----- tests/integration/cmk/ec/test_mkeventd_status.py | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 55afb06..e0148c5 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3489,8 +3489,12 @@ class StatusTableStatus(StatusTable): prefix = "status" columns = EventServer.status_columns() + def __init__(self, event_server): + super(StatusTableStatus, self).__init__() + self._event_server = event_server + def _enumerate(self, query): - return g_event_server.get_status() + return self._event_server.get_status() #. @@ -3506,7 +3510,7 @@ class StatusTableStatus(StatusTable): # '----------------------------------------------------------------------' class StatusServer(ECServerThread): - def __init__(self, settings, perfcounters, event_status): + def __init__(self, settings, perfcounters, event_status, event_server): super(StatusServer, self).__init__(name="StatusServer", settings=settings, profiling_enabled=settings.options.profile_status, @@ -3518,7 +3522,7 @@ class StatusServer(ECServerThread): self.table_events = StatusTableEvents(event_status) self.table_history = StatusTableHistory(settings, self) self.table_rules = StatusTableRules(event_status) - self.table_status = StatusTableStatus() + self.table_status = StatusTableStatus(event_server) self._perfcounters = perfcounters self._event_status = event_status @@ -3751,7 +3755,7 @@ class StatusServer(ECServerThread): log_event_history(self.settings, self, event, "UPDATE", user) def handle_command_create(self, arguments): - # Would rather use g_event_server.process_raw_line(), but we are already + # Would rather use process_raw_line(), but we are already # holding lock_eventstatus and it's sub functions are setting # lock_eventstatus too. The lock can not be allocated twice. # TODO: Change the lock type in future? @@ -5051,8 +5055,8 @@ def main(): global g_status_server, g_event_server perfcounters = Perfcounters() event_status = EventStatus(settings, perfcounters) - g_status_server = StatusServer(settings, perfcounters, event_status) g_event_server = EventServer(settings, perfcounters, event_status) + g_status_server = StatusServer(settings, perfcounters, event_status, event_server) event_status.load_status(g_event_server) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 981e0db..07a06ac 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -68,8 +68,8 @@ def event_server(settings, config, perfcounters, event_status): @pytest.fixture(scope="function") -def status_server(settings, config, perfcounters, event_status): - cmk.ec.main.g_status_server = cmk.ec.main.StatusServer(settings, perfcounters, event_status) +def status_server(settings, config, perfcounters, event_status, event_server): + cmk.ec.main.g_status_server = cmk.ec.main.StatusServer(settings, perfcounters, event_status, event_server) return cmk.ec.main.g_status_server @@ -83,7 +83,7 @@ def test_handle_client(event_status, event_server, status_server): assert "event_id" in response[0] -def test_mkevent_check_query_perf(config, status_server, event_status, perfcounters): +def test_mkevent_check_query_perf(config, perfcounters, event_status, status_server): for num in range(10000): event_status.new_event(CMKEventConsole.new_event({ "host": "heute-%d" % num,

6 years, 5 months

Removed global variable g_status_server, part 5.

by Sven Panne

Module: check_mk Branch: master Commit: a253d4f37cacd6b8592b71041fd5b98610612265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a253d4f37cacd6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 13:22:23 2018 +0200 Removed global variable g_status_server, part 5. Change-Id: I173c95e11706628a3aa8d06d52b247e1b25b3eb2 --- cmk/ec/main.py | 65 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a253d4f37c…

6 years, 5 months

Synched test with latest EC changes.

by Sven Panne

Module: check_mk Branch: master Commit: 2117acac63c7062211e1364bca25895a1b3e9d58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2117acac63c706… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 13:09:29 2018 +0200 Synched test with latest EC changes. Change-Id: I0d67d5ed5208030732910c3be792512a414c0497 --- tests/integration/cmk/ec/test_mkeventd_status.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index 39a7517..981e0db 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -62,15 +62,21 @@ def event_status(settings, perfcounters): @pytest.fixture(scope="function") +def event_server(settings, config, perfcounters, event_status): + cmk.ec.main.g_event_server = cmk.ec.main.StatusServer(settings, perfcounters, event_status) + return cmk.ec.main.g_event_server + + +(a)pytest.fixture(scope="function") def status_server(settings, config, 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): +def test_handle_client(event_status, event_server, status_server): s = FakeStatusSocket("GET events") - status_server.handle_client(s, True, "127.0.0.1") + status_server.handle_client(event_server, s, True, "127.0.0.1") response = s.get_response() assert len(response) == 1 @@ -100,7 +106,7 @@ def test_mkevent_check_query_perf(config, status_server, event_status, perfcount #import cProfile, StringIO, pstats #pr = cProfile.Profile() #pr.enable() - status_server.handle_client(s, True, "127.0.0.1") + status_server.handle_client(event_server, s, True, "127.0.0.1") #pr.disable() #ps = pstats.Stats(pr, stream=StringIO.StringIO()) #ps.dump_stats("/tmp/test_mkevent_check_query_perf.profile")

6 years, 5 months

Removed global variable g_status_server, part 4.

by Sven Panne

Module: check_mk Branch: master Commit: 2c0ed9474cff118f0a53fe993111cd4a32101e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c0ed9474cff11… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 12:47:43 2018 +0200 Removed global variable g_status_server, part 4. Change-Id: Ic46ae80886c543784dc912206129d4df3d550966 --- cmk/ec/main.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 33ddf9b..05cfdd5 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -284,7 +284,7 @@ class ECServerThread(threading.Thread): try: with cmk.profile.Profile(enabled=self._profiling_enabled, profile_file=str(self._profile_file)): - self.serve(g_event_server) + self.serve(g_event_server, g_status_server) except Exception: self.logger.exception("Exception in %s server" % self.name) if self._settings.options.debug: @@ -299,7 +299,7 @@ class ECServerThread(threading.Thread): def terminate(self): self._terminate_event.set() - def serve(self, event_server): + def serve(self, event_server, status_server): raise NotImplementedError() @@ -1593,7 +1593,7 @@ class EventServer(ECServerThread): return event - def serve(self, event_server): + def serve(self, event_server, status_server): pipe_fragment = '' pipe = self.open_pipe() listen_list = [pipe] @@ -1661,14 +1661,14 @@ class EventServer(ECServerThread): # Do we have any complete messages? if '\n' in data: complete, rest = data.rsplit("\n", 1) - self.process_raw_lines(complete + "\n", address) + self.process_raw_lines(status_server, complete + "\n", address) else: rest = data # keep for next time # Only complete messages else: if data: - self.process_raw_lines(data, address) + self.process_raw_lines(status_server, data, address) rest = "" # Connection still open? @@ -1700,17 +1700,17 @@ class EventServer(ECServerThread): if data[-1] != '\n': if '\n' in data: # at least one complete message contained messages, pipe_fragment = data.rsplit('\n', 1) - self.process_raw_lines(messages + '\n') # got lost in split + self.process_raw_lines(status_server, messages + '\n') # got lost in split else: pipe_fragment = data # keep beginning of message, wait for \n else: - self.process_raw_lines(data) + self.process_raw_lines(status_server, data) except Exception: pass # Read events from builtin syslog server if self._syslog is not None and self._syslog.fileno() in readable: - self.process_raw_lines(*self._syslog.recvfrom(4096)) + self.process_raw_lines(status_server, *self._syslog.recvfrom(4096)) # Read events from builtin snmptrap server if self._snmptrap is not None and self._snmptrap.fileno() in readable: @@ -1724,7 +1724,7 @@ class EventServer(ECServerThread): try: # process the first spool file we get spool_file = next(self.settings.paths.spool_dir.value.glob('[!.]*')) - self.process_raw_lines(spool_file.read_bytes()) + self.process_raw_lines(status_server, spool_file.read_bytes()) spool_file.unlink() select_timeout = 0 # enable fast processing to process further files except StopIteration: @@ -1744,13 +1744,13 @@ class EventServer(ECServerThread): self._perfcounters.count_time("processing", elapsed) # Takes several lines of messages, handles encoding and processes them separated - def process_raw_lines(self, data, address=None): + def process_raw_lines(self, status_server, data, address=None): lines = data.splitlines() for line in lines: line = scrub_and_decode(line.rstrip()) if line: try: - self.process_raw_data(self.process_line, (line, address)) + self.process_raw_data(self.process_line, (status_server, line, address)) except Exception as e: self.logger.exception('Exception handling a log line (skipping this one): %s' % e) @@ -2151,7 +2151,7 @@ class EventServer(ECServerThread): )) def process_line(self, data): - line, address = data + status_server, line, address = data line = line.rstrip() if g_config["debug_rules"]: if address: @@ -2160,7 +2160,7 @@ class EventServer(ECServerThread): self.logger.info(u"Processing message '%s'" % line) event = self.create_event_from_line(line, address) - self.process_event(g_status_server, event) + self.process_event(status_server, event) def process_event(self, status_server, event): self.do_translate_hostname(event) @@ -2213,7 +2213,7 @@ class EventServer(ECServerThread): return if cancelling: - self._event_status.cancel_events(self, event, match_groups, rule) + self._event_status.cancel_events(self, status_server, event, match_groups, rule) return else: # Remember the rule id that this event originated from @@ -3579,7 +3579,7 @@ class StatusServer(ECServerThread): def reload_configuration(self): self._reopen_sockets = True - def serve(self, event_server): + def serve(self, event_server, status_server): while not self._shal_terminate(): try: client_socket = None @@ -4134,7 +4134,7 @@ class EventStatus(object): # Cancel all events the belong to a certain rule id and are # of the same "breed" as a new event. - def cancel_events(self, event_server, new_event, match_groups, rule): + def cancel_events(self, event_server, status_server, new_event, match_groups, rule): with lock_eventstatus: to_delete = [] for nr, event in enumerate(self._events): @@ -4159,7 +4159,7 @@ class EventStatus(object): "is not 'open' but '%s'" % (event["id"], previous_phase)) else: - do_event_actions(self.settings, event_server, g_status_server, actions, event, is_cancelling=True) + do_event_actions(self.settings, event_server, status_server, actions, event, is_cancelling=True) to_delete.append(nr)

6 years, 5 months

Removed global variable g_status_server, part 3.

by Sven Panne

Module: check_mk Branch: master Commit: 5106dff49e4eb3e332e9095d9b76964177fe6872 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5106dff49e4eb3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 12:38:43 2018 +0200 Removed global variable g_status_server, part 3. Change-Id: Ica97749eac1d5da6c812f2f530fbf5903b0f6f47 --- cmk/ec/main.py | 60 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5106dff49e…

6 years, 5 months

5753 mk_postgres: reduce the amount of psql sessions opened by the plugin

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b203b62201128f321560036f92f58f8fea1c1c77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b203b62201128f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Mar 19 16:59:10 2018 +0100 5753 mk_postgres: reduce the amount of psql sessions opened by the plugin Previously, the number of psql sessions scaled linearly with the number of databases. Now the number of psql sessions opened by the plugin is constant. Additionally, the sessions of some sections were combined to further reduce the total number of psql sessions. Change-Id: If74c24a4d07ef1e19180fbee38d49b7486cf6402 --- .werks/5753 | 13 +++ agents/plugins/mk_postgres | 243 +++++++++++++++++++++++---------------------- 2 files changed, 137 insertions(+), 119 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b203b62201…

6 years, 5 months

5769 site_object_counts: New check which collects information about the amount of different host types or used check commands of OMD sites

by Simon Betz

Module: check_mk Branch: master Commit: 7fa80f4d2c5316a93635fe054ed65e33395afc9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fa80f4d2c5316… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 6 11:10:36 2018 +0100 5769 site_object_counts: New check which collects information about the amount of different host types or used check commands of OMD sites Change-Id: Ib86e3c60376c6302a2c8482168bef74906e799cb --- .werks/5769 | 119 ++++++++++++++++++++++++++++++ agents/plugins/mk_site_object_counts | 138 +++++++++++++++++++++++++++++++++++ checkman/site_object_counts | 138 +++++++++++++++++++++++++++++++++++ checks/site_object_counts | 101 +++++++++++++++++++++++++ 4 files changed, 496 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7fa80f4d2c…

6 years, 5 months

Removed global variable g_event_server, part 3.

by Sven Panne

Module: check_mk Branch: master Commit: f14be0a8b9cc9b36a8b5b689d723e998d4beb5c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f14be0a8b9cc9b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 09:47:28 2018 +0200 Removed global variable g_event_server, part 3. Change-Id: I589b22396927d5463abdd737ff35483dfa76a7ee --- cmk/ec/main.py | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f14be0a8b9…

6 years, 5 months

Synched test with latest EC changes.

by Sven Panne

Module: check_mk Branch: master Commit: 0938a3ba76969ff6ecdce1e4c400571d3360c194 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0938a3ba76969f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 10:07:09 2018 +0200 Synched test with latest EC changes. Change-Id: I5d6886b057a04809ff1da2683f4f48c3fbdd9bd5 --- 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 3335a36..39a7517 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -62,7 +62,7 @@ def event_status(settings, perfcounters): @pytest.fixture(scope="function") -def status_server(settings, perfcounters, event_status): +def status_server(settings, config, perfcounters, event_status): cmk.ec.main.g_status_server = cmk.ec.main.StatusServer(settings, perfcounters, event_status) return cmk.ec.main.g_status_server

6 years, 5 months

An initializer should, well, *initialize* things...

by Sven Panne

Module: check_mk Branch: master Commit: 2a7ae2d03ac61a84795c3edaaaafce4d19135a9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a7ae2d03ac61a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 09:44:28 2018 +0200 An initializer should, well, *initialize* things... Change-Id: I61fb9fb4e27259e10bf299fd8481464dfa1db2a0 --- cmk/ec/main.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 80c4486..d057906 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1269,7 +1269,6 @@ class EventServer(ECServerThread): self._perfcounters = perfcounters self._event_status = event_status - def open_sockets(self): self.create_pipe() self.open_eventsocket() self.open_syslog() @@ -3515,13 +3514,12 @@ class StatusServer(ECServerThread): self._perfcounters = perfcounters self._event_status = event_status - def table(self, name): - return getattr(self, "table_%s" % name) - - def open_sockets(self): self.open_unix_socket() self.open_tcp_socket() + def table(self, name): + return getattr(self, "table_%s" % name) + def open_unix_socket(self): path = self.settings.paths.unix_socket.value if path.exists(): @@ -5046,9 +5044,7 @@ def main(): perfcounters = Perfcounters() event_status = EventStatus(settings, perfcounters) g_status_server = StatusServer(settings, perfcounters, event_status) - g_status_server.open_sockets() g_event_server = EventServer(settings, perfcounters, event_status) - g_event_server.open_sockets() event_status.load_status()

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