Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5233 agent_ucs_bladecenter: Now uses python requests to fetch the data

by Andreas Boesl

Module: check_mk Branch: master Commit: 7fd1a35c57a47b26edc1bf3d16f8669b5f5b2dd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd1a35c57a47b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 29 11:57:14 2017 +0200 5233 agent_ucs_bladecenter: Now uses python requests to fetch the data Change-Id: I92cfb1517fe142b3080303086a88d5e5849226e8 --- .werks/5233 | 11 +++++++++++ agents/special/agent_ucs_bladecenter | 28 ++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.werks/5233 b/.werks/5233 new file mode 100644 index 0000000..73d7c81 --- /dev/null +++ b/.werks/5233 @@ -0,0 +1,11 @@ +Title: agent_ucs_bladecenter: Now uses python requests to fetch the data +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506678996 + + diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index ca55b10..8bc678f 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -28,7 +28,8 @@ # about connection configuration and status. -import sys, getopt, httplib, socket, pprint, re, ssl +import sys, getopt, pprint, re, ssl +import requests def usage(): sys.stderr.write("""Check_MK UCS Bladecenter Agent @@ -93,9 +94,9 @@ def get_pattern(pattern, line): class Server: def __init__(self, host_address): - self.netloc = host_address - self.conn_handle = httplib.HTTPSConnection(self.netloc, context = ssl._create_unverified_context()) - self.cookie = None + self.netloc = host_address + self.session_handle = requests.Session() + self.cookie = None if opt_debug: sys.stderr.write("Connecting to %s...\n" % self.netloc) @@ -105,18 +106,21 @@ class Server: if params is None: params = {} - params.update({"cookie": self.cookie}) + cookies = {} + if self.cookie: + cookies.update({"cookie": self.cookie}) + payload = payload % params if opt_debug: sys.stderr.write("====> %s\n" % payload) - self.conn_handle.putrequest("POST", "/nuova") - self.conn_handle.putheader("Content-Length", "%d" % len(payload)) - self.conn_handle.putheader("Content-Type", 'text/xml; charset="utf-8"') - self.conn_handle.endheaders() - self.conn_handle.send(payload) - response = self.conn_handle.getresponse() - data = response.read() + headers = { + "Content-Length": "%d" % len(payload), + "Content-Type": 'text/xml; charset="utf-8"' + } + + response = self.session_handle.post("https://%s/nuova" % self.netloc, headers = headers, cookies = cookies) + data = response.text if opt_debug: sys.stderr.write("<==== %s\n" % data) return data

6 years, 12 months

cmk lib: Implemented new helper for profiling code

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cfa5e4b3b3df7018907e3bdca5676ee9b685c47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cfa5e4b3b3df7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 08:35:35 2017 +0200 cmk lib: Implemented new helper for profiling code Change-Id: I72b31f1f473f7c043a44d316abaa51208e958b4f --- lib/profile.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/lib/profile.py b/lib/profile.py new file mode 100644 index 0000000..f01b479 --- /dev/null +++ b/lib/profile.py @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +"""A helper module to implement profiling functionalitiy. The main part +is to provide a contextmanager that can be added to existing code with +minimal changes.""" + +import cProfile +import contextlib +import os + +import cmk.log + + +class Profile(object): + def __init__(self, enabled=True, profile_file=None, *args, **kwargs): + self._enabled = enabled + self._profile_file = profile_file + self._args = args + self._kwargs = kwargs + self._profile = None + + + def __enter__(self): + if self._enabled: + cmk.log.logger.info("Recording profile") + self._profile = cProfile.Profile(*self._args, **self._kwargs) + self._profile.enable() + return self + + + def __exit__(self, exc_type, exc_val, exc_tb): + if not self._enabled: + return + + self._profile.disable() + + if not self._profile_file: + self._profile.print_stats() + else: + self._profile.dump_stats(self._profile_file) + cmk.log.logger.info("Created profile file: %s" % self._profile_file) + + file(self._profile_file + ".py", "w").write( + "#!/usr/bin/env python\n" + "import pstats\n" + "stats = pstats.Stats(%r)\n" + "stats.sort_stats('time').print_stats()\n" % self._profile_file) + os.chmod(self._profile_file + ".py", 0o755) + cmk.log.logger.info("Created profile dump script: %s.py" % self._profile_file)

6 years, 12 months

EC status: Refactored query parsing to Query() class

by Lars Michelsen

Module: check_mk Branch: master Commit: e528a15aaeb19cad4af8b9e804d7b5acb40649f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e528a15aaeb19c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 11:08:43 2017 +0200 EC status: Refactored query parsing to Query() class Change-Id: I34c25073d8f86e5b1f1bbf9c292126ab5132f4aa --- bin/mkeventd | 95 ++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 28 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 46e3721..8605a02 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -499,6 +499,7 @@ class MKClientError(Exception): class Queries(object): def __init__(self, sock): + super(Queries, self).__init__() self._socket = sock self._buffer = "" @@ -518,7 +519,62 @@ class Queries(object): break self._buffer += data request, self._buffer = parts - return request.decode("utf-8").splitlines() + return Query(request.decode("utf-8").splitlines()) + + +class Query(object): + _allowed_methods = set(["GET", "REPLICATE", "COMMAND"]) + _allowed_formats = set(["python", "plain", "json"]) + _allowed_headers = set(["OutputFormat", "Filter", "Columns"]) + + def __init__(self, raw_query): + super(Query, self).__init__() + self._raw_query = raw_query + self._from_raw_query() + + + def _from_raw_query(self): + self._parse_method_and_table() + self._parse_header_lines() + + + def _parse_method_and_table(self): + parts = self._raw_query[0].split(None, 1) + if len(parts) != 2: + raise MKClientError("Invalid query. Need GET/COMMAND plus argument(s)") + + method, method_arg = parts + + if method not in self._allowed_methods: + raise MKClientError("Invalid method %s (allowed are %s) " % + ", ".join(self._allowed_methods)) + + self.method = method + # TODO: Subclass Query for the different query types to parse and validate + # the args query type specific + self.method_arg = method_arg + + + def _parse_header_lines(self): + self.output_format = "python" + + self.header_lines = [] + for line in self._raw_query[1:]: + header, argument = line.rstrip("\n").split(":", 1) + argument = argument.lstrip(" ") + + if header == "OutputFormat": + if argument not in self._allowed_formats: + raise MKClientError("Invalid output format \"%s\" " + "(allowed are: %s)" % ", ".join(self._allowed_formats)) + + self.output_format = argument + else: + self.header_lines.append(line) + + + def __repr__(self): + return repr("\\n".join(self._raw_query)) #. @@ -3251,42 +3307,26 @@ class StatusServer(ECServerThread): def handle_client(self, client_socket, allow_commands, client_ip): for query in Queries(client_socket): - self.logger.verbose("Client livestatus query: %s" % "\\n".join(query)) - parts = query[0].split(None, 1) - if len(parts) != 2: - raise MKClientError("Invalid query. Need GET/COMMAND plus argument(s)") - - method, table = parts - output_format = "python" - # TODO(sp) Handle all header lines centrally in a separate method - header_lines = [] - for line in query[1:]: - header, argument = line.rstrip().split(":", 1) - argument = argument.strip() - if header == "OutputFormat": - output_format = argument - else: - header_lines.append(line) + self.logger.verbose("Client livestatus query: %r" % query) with lock_eventstatus: - if method == "GET": - response = self.handle_get_request(table, header_lines) + if query.method == "GET": + response = self.handle_get_request(query.method_arg, query.header_lines) - elif method == "REPLICATE": - response = self.handle_replicate(table, client_ip) + elif query.method == "REPLICATE": + response = self.handle_replicate(query.method_arg, client_ip) - elif method == "COMMAND": + elif query.method == "COMMAND": if not allow_commands: raise MKClientError("Sorry. Commands are disallowed via TCP") - self.handle_command_request(table) + self.handle_command_request(query.method_arg) response = None else: - raise MKClientError("Invalid method %s (allowed are GET, COMMAND " - "and REPLICATE)" % method) + raise NotImplementedError() try: - self._answer_query(client_socket, output_format, response) + self._answer_query(client_socket, query.output_format, response) except socket.error as e: if e.errno == 32: # Broken pipe -> ignore this pass @@ -3311,8 +3351,7 @@ class StatusServer(ECServerThread): client_socket.sendall("\n") else: - raise MKClientError("Invalid output format \"%s\" " - "(allowed are python, json and plain)" % output_format) + raise NotImplementedError() # All commands are already locked with lock_eventstatus

6 years, 12 months

EC: Cleaned up termination handling (no self kill, clean thread exit)

by Lars Michelsen

Module: check_mk Branch: master Commit: ca2fa5522ba5c2a2c0c09e9d5ce2ce636308d336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca2fa5522ba5c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 10:27:20 2017 +0200 EC: Cleaned up termination handling (no self kill, clean thread exit) Change-Id: Ifa0c5dcae322f0ad8774915e41000e787144f75e --- bin/mkeventd | 114 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 91c50d0..46e3721 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -326,6 +326,48 @@ class ECLock(object): +class ECServerThread(threading.Thread): + def __init__(self, name): + super(ECServerThread, self).__init__(name=name) + self._terminate_event = threading.Event() + self.logger = logger.getChild(name) + + + def run(self): + self.logger.info("Starting up") + + while not self._shal_terminate(): + try: + with cmk.profile.Profile(enabled=opt_profile.get(self.name), + profile_file=cmk.paths.omd_root + "/var/mkeventd/%s.profile" % self.name): + self.serve() + except Exception: + self.logger.exception("Exception in %s server" % self.name) + if opt_debug: + raise + time.sleep(1) + + self.logger.info("Terminated") + + + def _shal_terminate(self): + return self._terminate_event.is_set() + + + def terminate(self): + self._terminate_event.set() + + + def serve(self): + raise NotImplementedError() + + +def terminate(): + g_terminate_main_event.set() + g_status_server.terminate() + g_event_server.terminate() + + def bail_out(reason): logger.error("FATAL ERROR: %s" % reason) sys.exit(1) @@ -1274,20 +1316,17 @@ class Perfcounters(object): # | Verarbeitung und Klassifizierung von eingehenden Events. | # '----------------------------------------------------------------------' -class EventServer(threading.Thread): +class EventServer(ECServerThread): month_names = { "Jan": 1, "Feb": 2, "Mar": 3, "Apr": 4, "May": 5, "Jun": 6, "Jul": 7, "Aug": 8, "Sep": 9, "Oct": 10, "Nov": 11, "Dec": 12, } def __init__(self): super(EventServer, self).__init__(name="EventServer") - # TODO: Change from daemon mode to explicit and clean termination - self.setDaemon(True) self._syslog = None self._syslog_tcp = None self._snmptrap = None self._mib_resolver = None - self.logger = logger.getChild("EventServer") self.create_pipe() self.open_eventsocket() @@ -1474,27 +1513,6 @@ class EventServer(threading.Thread): self._eventsocket = None - def run(self): - while not self._should_terminate: - with cmk.profile.profile(enabled=opt_profile.get("event"), - profile_file=cmk.paths.omd_root + "/var/mkeventd/event.profile"): - self.run_loop() - - - def run_loop(self): - c = 0 - while True: - c += 1 - try: - self.serve() - - except Exception: - self.logger.exception("Exception in event server:\n%s" % e) - if opt_debug: - raise - time.sleep(1) - - def open_pipe(self): # Beware: we must open the pipe also for writing. Otherwise # we will see EOF forever after one writer has finished and @@ -1698,7 +1716,7 @@ class EventServer(threading.Thread): # fd to (fileobject, data) client_sockets = {} select_timeout = 1 - while True: + while not self._shal_terminate(): try: readable = select.select(listen_list + client_sockets.keys(), [], [], select_timeout)[0] except select.error as e: @@ -3105,16 +3123,12 @@ class EventServer(threading.Thread): # | Beantworten von Status- und Kommandoanfragen über das UNIX-Socket | # '----------------------------------------------------------------------' -class StatusServer(threading.Thread): +class StatusServer(ECServerThread): def __init__(self): super(StatusServer, self).__init__(name="StatusServer") - # TODO: Change from daemon mode to explicit and clean termination - self.setDaemon(True) self._socket = None self._tcp_socket = None self._reopen_sockets = False - self._should_terminate = False - self.logger = logger.getChild("StatusServer") def open_sockets(self): @@ -3179,24 +3193,8 @@ class StatusServer(threading.Thread): self._reopen_sockets = True - # TODO: Wenn das hier komplexer wird, machen wir eine - # Klassenvererbung - def run(self): - while not self._should_terminate: - try: - with cmk.profile.profile(enabled=opt_profile.get("status"), - profile_file=cmk.paths.omd_root + "/var/mkeventd/status.profile"): - self.serve() - except Exception: - self.logger.exception("Exception in status server") - if opt_debug: - raise - time.sleep(1) - self.logger.info("Killing myself with signal 15") - os.kill(os.getpid(), 15) - def serve(self): - while not self._should_terminate: + while not self._shal_terminate(): try: client_socket = None addr_info = None @@ -3330,7 +3328,7 @@ class StatusServer(threading.Thread): self.handle_command_reload() elif command == "SHUTDOWN": self.logger.info("Going to shut down") - self._should_terminate = True + terminate() elif command == "REOPENLOG": self.handle_command_reopenlog() elif command == "FLUSH": @@ -3602,7 +3600,7 @@ def run_eventd(): next_statistics = now + g_config["statistics_interval"] next_replication = 0 # force immediate replication after restart - while True: + while not g_terminate_main_event.is_set(): try: # Wait until either housekeeping or retention is due, but at # maximum 60 seconds. That way changes of the interval from a very @@ -3640,7 +3638,7 @@ def run_eventd(): logger.info("Received SIGHUP - going to reload configuration") else: logger.info("Signalled to death by signal %d" % e._signum) - break + terminate() except Exception as e: logger.exception("Exception in main thread:\n%s" % e) @@ -3648,6 +3646,10 @@ def run_eventd(): raise time.sleep(1) + # Now wait for termination of the server threads + g_event_server.join() + g_status_server.join() + #. # .--EventStatus---------------------------------------------------------. @@ -4825,6 +4827,8 @@ lock_eventstatus = ECLock("eventstatus") lock_configuration = ECLock("configuration") lock_logging = ECLock("history") +g_terminate_main_event = threading.Event() + if __name__ == "__main__": os.unsetenv("LANG") @@ -4857,7 +4861,11 @@ if __name__ == "__main__": elif o == '--snmptrap-fd': opt_snmptrap_fd = int(a) elif o.startswith('--profile-'): - opt_profile[o[10:]] = True + what = o.split("-")[-1] + if what == "status": + opt_profile["StatusServer"] = True + elif what == "event": + opt_profile["EventServer"] = True cmk.log.open_log(sys.stderr) cmk.log.set_verbosity(opt_verbose) @@ -4946,6 +4954,8 @@ if __name__ == "__main__": # We reach this point, if the server has been killed by # a signal or hitting Ctrl-C (in foreground mode) + # TODO: Move this cleanup stuff to the classes that are responsible for these ressources + # Remove event pipe and drain it, so that we make sure # that processes (syslog, etc) will not hang when trying # to write into the pipe.

6 years, 12 months

EC: Cleaned up profiling code

by Lars Michelsen

Module: check_mk Branch: master Commit: e1602ad09dd941b63e7d3e99e508394bbfae6404 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1602ad09dd941… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 08:36:05 2017 +0200 EC: Cleaned up profiling code Change-Id: I2f4e912b8494e8a63d3429cf283963759d4a76aa --- bin/mkeventd | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 059a73e..91c50d0 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -55,6 +55,7 @@ import cmk.paths import cmk.defines as defines import cmk.daemon import cmk.event_console +import cmk.profile from cmk.regex import regex, is_regex import livestatus @@ -1474,24 +1475,12 @@ class EventServer(threading.Thread): def run(self): - if opt_profile.get("event"): - import cProfile - profilefile = cmk.paths.omd_root + "/var/mkeventd/event.profile" - self.logger.info("Writing profile of event thread to %s." % profilefile) - try: - cProfile.run("g_event_server.run_loop()", profilefile) - except: - raise - finally: - file(profilefile + ".py", "w").write("#!/usr/bin/env python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) - os.chmod(profilefile + ".py", 0o755) - self.logger.info("Created profile conversion script %s.py." % profilefile) - - else: + while not self._should_terminate: + with cmk.profile.profile(enabled=opt_profile.get("event"), + profile_file=cmk.paths.omd_root + "/var/mkeventd/event.profile"): self.run_loop() - def run_loop(self): c = 0 while True: @@ -1505,8 +1494,6 @@ class EventServer(threading.Thread): raise time.sleep(1) - if opt_profile.get("event") and c > 100: - return def open_pipe(self): # Beware: we must open the pipe also for writing. Otherwise @@ -1827,8 +1814,6 @@ class EventServer(threading.Thread): else: select_timeout = 1 # restore default select timeout - if opt_profile.get("event"): - return # Processes incoming data, just a wrapper between the real data and the # handler function to record some statistics etc. @@ -3199,15 +3184,9 @@ class StatusServer(threading.Thread): def run(self): while not self._should_terminate: try: - if opt_profile.get("status"): - import cProfile - profilefile = cmk.paths.omd_root + "/var/mkeventd/status.profile" - self.logger.info("Writing profile of status thread to %s." % profilefile) - cProfile.run("g_status_server.serve()", profilefile) - file(profilefile + ".py", "w").write("#!/usr/bin/env python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) - os.chmod(profilefile + ".py", 0o755) - else: - self.serve() + with cmk.profile.profile(enabled=opt_profile.get("status"), + profile_file=cmk.paths.omd_root + "/var/mkeventd/status.profile"): + self.serve() except Exception: self.logger.exception("Exception in status server") if opt_debug: @@ -4813,6 +4792,7 @@ def usage(): --snmptrap Enable builtin snmptrap server --snmptrap-fd FD Do not open UDP port 162, but inherit it via this FD --profile-status Create Python profile for status thread + --profile-event Create Python profile for event thread """) sys.stdout.write("""

6 years, 12 months

Updated werk

by Simon Betz

Module: check_mk Branch: master Commit: b341dc66fe10ef38554ea695cc8cdfeed45408c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b341dc66fe10ef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 29 11:17:15 2017 +0200 Updated werk Change-Id: I881c68211af1165140e514b1442710fda34ba576 --- .werks/5313 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5313 b/.werks/5313 index a3d04e0..03c8468 100644 --- a/.werks/5313 +++ b/.werks/5313 @@ -8,4 +8,4 @@ State: unknown Version: 1.5.0i1 Date: 1506597290 - +This bug was introduced with Check_MK version 1.4.0p12

6 years, 12 months

EC: Fixed exception in housekeeping with rule overflow events

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b9c874e9335b35515dfdfe3e90c42ccf02996ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b9c874e9335b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 07:53:18 2017 +0200 EC: Fixed exception in housekeeping with rule overflow events Change-Id: I924861aa692e5d4cc63e427a38dee59edc30aa15 --- bin/mkeventd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index 7bfebdf..4813de4 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1875,6 +1875,8 @@ class EventServer(threading.Thread): host_downtimes = {} for event in g_event_status.events(): + if "host_in_downtime" not in event: + self.logger.warning(repr(event)) if not event["host_in_downtime"]: continue # only care about events created in downtime @@ -3058,6 +3060,8 @@ class EventServer(threading.Thread): "match_groups": (), "state": 2, # crit "sl": event["sl"], + "core_host": "", + "host_in_downtime": False, } self._add_rule_contact_groups_to_event({}, new_event)

6 years, 12 months

Fixed access to not existing var in exception handler

by Lars Michelsen

Module: check_mk Branch: master Commit: 56b329c06c556f60437b7a1eefb8edec7e0d535a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56b329c06c556f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 08:30:07 2017 +0200 Fixed access to not existing var in exception handler Change-Id: I111ca523b3dfb49a7f59229efa52f23246467277 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index dbecbd1..059a73e 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3209,7 +3209,7 @@ class StatusServer(threading.Thread): else: self.serve() except Exception: - self.logger.exception("Exception in status server:\n%s" % e) + self.logger.exception("Exception in status server") if opt_debug: raise time.sleep(1)

6 years, 12 months

Removed old help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f2736a0fed299af6d2c5d8f25a3a579fd366acf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f2736a0fed299… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 07:58:37 2017 +0200 Removed old help text Change-Id: I2ba46bdfcc564731746d2e5af66f48e6290a1b5e --- bin/mkeventd | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 4813de4..dbecbd1 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4806,7 +4806,6 @@ def usage(): -v, --verbose Enable verbose output -g, --foreground Do not daemonize, run in foreground --debug Enable debug mode (let exceptions through) - --debug-locking Debug locking and unlocking (thread communication) --syslog Enable builtin UDP syslog server --syslog-fd FD Do not open UDP port 514, but inherit it via this FD --syslog-tcp Enable builtin TCP syslog server

6 years, 12 months

Apply python-modules patches in sorted order

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a9ec79db64be2d1257cbc26111894e4a66985b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a9ec79db64be2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 17:44:00 2017 +0200 Apply python-modules patches in sorted order Change-Id: I9ffa6a5bc7dfa23e19bda301f7c3bad6ffc9bedf --- omd/packages/python-modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 71ff844..97498dc 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -152,7 +152,7 @@ unpack: unzip -o ../src/$$M ; \ fi \ done - set -e ; for p in $(PATCHES) ; do \ + set -e ; for p in $$(echo $(PATCHES) | tr " " "\n" | sort); do \ echo "applying $$p..." ; \ patch -p1 -b -d dest < $$p ; \ done

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017