Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 578aec53bc49ddbd6de1b145668728c9e9132eba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=578aec53bc49dd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 14:45:26 2018 +0100 Removed dead import. Change-Id: I309a0db05aaf8983a9e3023ee252d044625c23f2 --- web/htdocs/inventory.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 0eeb521..f52894f 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -39,7 +39,6 @@ import userdb import sites import cmk.paths import cmk.store as store -import cmk.profile from lib import MKException, MKGeneralException, MKAuthException, MKUserError, lqencode from cmk.structured_data import StructuredDataTree, Container, Numeration, Attributes

6 years, 7 months

Abstracted away the remaining paths, fixing some names on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 334195ceb6341e14793ae020c93164962a2a5eee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=334195ceb6341e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 14:14:13 2018 +0100 Abstracted away the remaining paths, fixing some names on the way. Change-Id: If2e56664f698d1f1898ba3bc65ba3b4b125e3125 --- bin/mkeventd | 66 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 25444ea..e021e64 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -79,19 +79,26 @@ logger = cmk.log.get_logger("mkeventd") def history_dir(settings): return settings.paths.state_dir.value / 'history' -def master_config_path(settings): +def messages_dir(settings): + return settings.paths.state_dir.value / 'messages' + +def master_config_file(settings): return settings.paths.state_dir.value / 'master_config' -def slave_status_path(settings): +def slave_status_file(settings): return settings.paths.state_dir.value / 'slave_status' -def spool_path(settings): +def spool_dir(settings): return settings.paths.state_dir.value / 'spool' -def status_path(settings): +def status_file(settings): return settings.paths.state_dir.value / 'status' -g_state_dir = os.path.join(cmk.paths.omd_root, "var/mkeventd") +def status_server_profile(settings): + return settings.paths.state_dir.value / 'StatusServer.profile'; + +def event_server_profile(settings): + return settings.paths.state_dir.value / 'EventServer.profile'; # Basic settings, can be changed with configuration file (at @@ -277,10 +284,11 @@ class ECLock(object): class ECServerThread(threading.Thread): - def __init__(self, name, settings, profiling_enabled): + def __init__(self, name, settings, profiling_enabled, profile_file): super(ECServerThread, self).__init__(name=name) self.settings = settings self._profiling_enabled = profiling_enabled + self._profile_file = profile_file self._terminate_event = threading.Event() self.logger = logger.getChild(name) @@ -290,7 +298,7 @@ class ECServerThread(threading.Thread): while not self._shal_terminate(): try: with cmk.profile.Profile(enabled=self._profiling_enabled, - profile_file=os.path.join(g_state_dir, "%s.profile" % self.name)): + profile_file=str(self._profile_file)): self.serve() except Exception: self.logger.exception("Exception in %s server" % self.name) @@ -321,12 +329,6 @@ def bail_out(reason): sys.exit(1) -def make_parentdirs(file_path): - dir_path = os.path.dirname(file_path) - if not os.path.exists(dir_path): - os.makedirs(dir_path) - - def process_exists(pid): try: os.kill(pid, 0) @@ -915,7 +917,7 @@ def log_event_history(settings, event, what, who="", addinfo=""): if g_config['archive_mode'] == 'mongodb': log_event_history_to_mongodb(settings, event, what, who, addinfo) else: - log_event_history_to_file(event, what, who, addinfo) + log_event_history_to_file(settings, event, what, who, addinfo) # Make a new entry in the event history. Each entry is tab-separated line @@ -925,7 +927,7 @@ def log_event_history(settings, event, what, who="", addinfo=""): # 2: user who initiated the action (for GUI actions) # 3: additional information about the action # 4-oo: StatusTableEvents.columns -def log_event_history_to_file(event, what, who, addinfo): +def log_event_history_to_file(settings, event, what, who, addinfo): with lock_logging: columns = [ str(time.time()), @@ -936,7 +938,7 @@ def log_event_history_to_file(event, what, who, addinfo): columns += [quote_tab(event.get(colname[6:], defval)) # drop "event_" for colname, defval in g_status_server.table_events.columns] - get_logfile("history").write("\t".join(map(to_utf8, columns)) + "\n") + get_logfile(history_dir(settings)).write("\t".join(map(to_utf8, columns)) + "\n") def to_utf8(x): @@ -967,11 +969,9 @@ active_history_period = None # Get file object to current log file, handle also # history and lifetime limit. -def get_logfile(basename): +def get_logfile(log_dir): global active_history_period - log_dir = g_state_dir + "/" + basename - make_parentdirs(log_dir + "/foo") - + log_dir.mkdir(parents=True, exist_ok=True) # Log into file starting at current history period, # but: if a newer logfile exists, use that one. This # can happen if you switch the period from daily to @@ -1266,7 +1266,8 @@ class EventServer(ECServerThread): def __init__(self, settings): super(EventServer, self).__init__(name="EventServer", settings=settings, - profiling_enabled=settings.options.profile_event) + profiling_enabled=settings.options.profile_event, + profile_file=event_server_profile(settings)) self._syslog = None self._syslog_tcp = None self._snmptrap = None @@ -1733,7 +1734,7 @@ class EventServer(ECServerThread): try: # process the first spool file we get - spool_file = next(spool_path(self.settings).glob('[!.]*')) + spool_file = next(spool_dir(self.settings).glob('[!.]*')) self.process_raw_lines(spool_file.read_bytes()) spool_file.unlink() select_timeout = 0 # enable fast processing to process further files @@ -2920,7 +2921,7 @@ class EventServer(ECServerThread): def log_message(self, event): try: - get_logfile("messages").write("%s %s %s%s: %s\n" % ( + get_logfile(messages_dir(self.settings)).write("%s %s %s%s: %s\n" % ( time.strftime("%b %d %H:%M:%S", time.localtime(event["time"])), event["host"], event["application"], @@ -3518,7 +3519,8 @@ class StatusServer(ECServerThread): def __init__(self, settings): super(StatusServer, self).__init__(name="StatusServer", settings=settings, - profiling_enabled=settings.options.profile_status) + profiling_enabled=settings.options.profile_status, + profile_file=status_server_profile(settings)) self._socket = None self._tcp_socket = None self._reopen_sockets = False @@ -3789,8 +3791,8 @@ class StatusServer(ECServerThread): g_event_status.save_status() if is_replication_slave(): try: - master_config_path(self.settings).unlink() - slave_status_path(self.settings).unlink() + master_config_file(self.settings).unlink() + slave_status_file(self.settings).unlink() load_slave_status(self.settings) except Exception: pass @@ -4012,7 +4014,7 @@ class EventStatus(object): def save_status(self): now = time.time() status = self.pack_status() - path = status_path(self.settings) + path = status_file(self.settings) path_new = path.parent / (path.name + '.new') # Believe it or not: cPickle is more than two times slower than repr() with path_new.open(mode='wb') as f: @@ -4032,7 +4034,7 @@ class EventStatus(object): self.save_status() def load_status(self): - path = status_path(self.settings) + path = status_file(self.settings) if path.exists(): try: status = ast.literal_eval(path.read_bytes()) @@ -4855,7 +4857,7 @@ def replication_update_state(settings, new_state): def save_master_config(settings, new_state): - path = master_config_path(settings) + path = master_config_file(settings) path_new = path.parent / (path.name + '.new') path_new.write_bytes(repr({ "rules": new_state["rules"], @@ -4866,7 +4868,7 @@ def save_master_config(settings, new_state): def load_master_config(settings): - path = master_config_path(settings) + path = master_config_file(settings) try: config = ast.literal_eval(path.read_bytes()) g_config["rules"] = config["rules"] @@ -4908,7 +4910,7 @@ def get_state_from_master(): def save_slave_status(settings): - slave_status_path(settings).write_bytes(repr(g_slave_status) + "\n") + slave_status_file(settings).write_bytes(repr(g_slave_status) + "\n") # Load the current replication slave status. If we are in @@ -4916,7 +4918,7 @@ def save_slave_status(settings): # if not, then this variable will be missing and also the file def load_slave_status(settings): global g_slave_status - path = slave_status_path(settings) + path = slave_status_file(settings) if is_replication_slave(): try: g_slave_status = ast.literal_eval(path.read_bytes())

6 years, 7 months

Windows agent: allocate sockaddr_in* from stack

by Jukka Aro

Module: check_mk Branch: master Commit: 0818642b26b50965c3c079c082386995c48720ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0818642b26b509… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 26 14:36:02 2018 +0100 Windows agent: allocate sockaddr_in* from stack Heap allocation is totally unnecessary. Using std::unique_ptr is potentially dangerous as sockaddr_in and sockaddr_in6 are not inherited from sockaddr and default-deleting will not work by default. --- agents/windows/ListenSocket.cc | 62 ++++++++++++++++++++++-------------------- agents/windows/ListenSocket.h | 1 - agents/windows/build_version | 2 +- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 122a484..d52bb49 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -119,26 +119,33 @@ SOCKET ListenSocket::init_listen_socket(int port) { SOCKET s = RemoveSocketInheritance(tmp_s); int addr_size = 0; - std::unique_ptr<SOCKADDR> addr(create_sockaddr(&addr_size)); + SOCKADDR *addr = nullptr; + SOCKADDR_IN6 addr6{0}; + SOCKADDR_IN addr4{0}; int optval = 1; - _winapi.setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, - sizeof(optval)); + _winapi.setsockopt(s, SOL_SOCKET, SO_REUSEADDR, + reinterpret_cast<const char *>(&optval), sizeof(optval)); if (_use_ipv6) { - ((SOCKADDR_IN6 *)addr.get())->sin6_port = _winapi.htons(port); - + addr6.sin6_port = _winapi.htons(port); int v6only = 0; if (_winapi.setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&v6only, sizeof(int)) != 0) { Notice(_logger) << "failed to disable ipv6 only flag"; _supports_ipv4 = false; } + addr = reinterpret_cast<SOCKADDR *>(&addr6); + addr->sa_family = AF_INET6; + addr_size = sizeof(SOCKADDR_IN6); } else { - ((SOCKADDR_IN *)addr.get())->sin_port = _winapi.htons(port); - ((SOCKADDR_IN *)addr.get())->sin_addr.S_un.S_addr = ADDR_ANY; + addr4.sin_port = _winapi.htons(port); + addr4.sin_addr.S_un.S_addr = ADDR_ANY; + addr = reinterpret_cast<SOCKADDR *>(&addr4); + addr->sa_family = AF_INET; + addr_size = sizeof(SOCKADDR_IN); } - if (SOCKET_ERROR == _winapi.bind(s, addr.get(), addr_size)) { + if (SOCKET_ERROR == _winapi.bind(s, addr, addr_size)) { int error_id = _winapi.WSAGetLastError(); Error(_logger) << "Cannot bind socket to port " << port << ": " << get_win_error_as_string(_winapi, error_id) << " (" @@ -187,29 +194,12 @@ std::string ListenSocket::readableIP(const sockaddr_storage *addr) { return ip_hr; } -sockaddr *ListenSocket::create_sockaddr(int *addr_len) const { - assert(addr_len != NULL); - - sockaddr *result = NULL; - if (_use_ipv6) { - result = (sockaddr *)new sockaddr_in6(); - *addr_len = sizeof(sockaddr_in6); - } else { - result = (sockaddr *)new sockaddr_in(); - *addr_len = sizeof(sockaddr_in); - } - memset((void *)result, 0, *addr_len); - result->sa_family = _use_ipv6 ? AF_INET6 : AF_INET; - - return result; -} - SocketHandle ListenSocket::acceptConnection() const { // Loop forever. fd_set fds; FD_ZERO(&fds); FD_SET(_socket.get(), &fds); - struct timeval timeout; + struct timeval timeout{0}; timeout.tv_sec = 0; timeout.tv_usec = 500000; @@ -217,11 +207,23 @@ SocketHandle ListenSocket::acceptConnection() const { // never return while (1 == _winapi.select(1, &fds, NULL, NULL, &timeout)) { int addr_len = 0; - std::unique_ptr<sockaddr> remote_addr(create_sockaddr(&addr_len)); - SOCKET rawSocket = - _winapi.accept(_socket.get(), remote_addr.get(), &addr_len); + SOCKADDR *remoteAddr = nullptr; + SOCKADDR_IN6 addr6{0}; + SOCKADDR_IN addr4{0}; + + if (_use_ipv6) { + remoteAddr = reinterpret_cast<SOCKADDR *>(&addr6); + remoteAddr->sa_family = AF_INET6; + addr_len = sizeof(SOCKADDR_IN6); + } else { + remoteAddr = reinterpret_cast<SOCKADDR *>(&addr4); + remoteAddr->sa_family = AF_INET; + addr_len = sizeof(SOCKADDR_IN); + } + + SOCKET rawSocket = _winapi.accept(_socket.get(), remoteAddr, &addr_len); SocketHandle connection(RemoveSocketInheritance(rawSocket), _winapi); - if (connection && check_only_from(remote_addr.get())) { + if (connection && check_only_from(remoteAddr)) { return connection; } } diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index af30004..7801728 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -60,7 +60,6 @@ public: private: SOCKET init_listen_socket(int port); bool check_only_from(sockaddr *ip) const; - sockaddr *create_sockaddr(int *addr_len) const; SOCKET RemoveSocketInheritance(SOCKET oldsocket) const; Logger *_logger; diff --git a/agents/windows/build_version b/agents/windows/build_version index fc9dc43..96d3ba4 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3121 +3122

6 years, 7 months

Use pathlib facilities instead of home-grown code.

by Sven Panne

Module: check_mk Branch: master Commit: 4f10ce01798a94862ea86709d2e6313256ffda5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f10ce01798a94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 10:39:46 2018 +0100 Use pathlib facilities instead of home-grown code. Change-Id: I974c735a265bc1ad5451827084bfb0c08f42a21a --- bin/mkeventd | 78 +++++++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index ebae80e..25444ea 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -76,7 +76,7 @@ logger = cmk.log.get_logger("mkeventd") # '----------------------------------------------------------------------' # TODO(sp) Turn these helper functions into Paths fields where they belong. -def history_path(settings): +def history_dir(settings): return settings.paths.state_dir.value / 'history' def master_config_path(settings): @@ -1007,34 +1007,16 @@ def current_history_period(): # Delete old log files def expire_logfiles(settings, flush=False): - # TODO(sp) Use pathlib facilities below - log_dir = str(history_path(settings)) - if not os.path.exists(log_dir): - return # No historic files to delete yet. - try: - now = time.time() - min_mtime = now - g_config["history_lifetime"] * 86400 - + days = g_config["history_lifetime"] + min_mtime = time.time() - days * 86400 logger.verbose("Expiring logfiles (Horizon: %d days -> %s)" % - (g_config["history_lifetime"], cmk.render.date_and_time(min_mtime))) - - for fn in os.listdir(log_dir): - if fn.endswith(".log"): - path = log_dir + "/" + fn - - if flush: - logger.info("Flushed log file %s" % path) - os.remove(path) - - else: - file_mtime = os.stat(path).st_mtime - - if file_mtime < min_mtime: - logger.info("Deleting log file %s (age %s)" % - (path, cmk.render.date_and_time(file_mtime))) - os.remove(path) - + (days, cmk.render.date_and_time(min_mtime))) + for path in history_dir(settings).glob('*.log'): + if flush or path.stat().st_mtime < min_mtime: + logger.info("Deleting log file %s (age %s)" % + (path, cmk.render.date_and_time(path.stat().st_mtime))) + path.unlink() except Exception as e: if settings.options.debug: raise @@ -1056,9 +1038,7 @@ def flush_event_history_files(settings): def get_event_history_from_file(settings, query): filters, limit = query.filters, query.limit history_entries = [] - # TODO(sp) Use pathlib facilities below - log_dir = str(history_path(settings)) - if not os.path.exists(log_dir): + if not history_dir(settings).exists(): return [] # Optimization: use grep in order to reduce amount @@ -1093,14 +1073,11 @@ def get_event_history_from_file(settings, query): # already be done by the GUI, so we don't do that twice. Skipping # this # will lead into some lines of a single file to be limited in # wrong order. But this should be better than before. - timestamps = sorted((int(fn[:-4]) - for fn in os.listdir(log_dir) - if fn.endswith(".log")), - reverse=True) - for ts in timestamps: + for ts, path in sorted(((int(str(path.name)[:-4]), path) + for path in history_dir(settings).glob('*.log')), + reverse=True): if limit is not None and limit <= 0: break - path = log_dir + "/%d.log" % ts first_entry, last_entry = get_logfile_timespan(path) for _unused_name, opfunc, argument in time_filters: if opfunc(first_entry, argument): @@ -1130,7 +1107,7 @@ def parse_history_file(path, query, greptexts, limit): # If we have greptexts we pre-filter the file using the extremely # fast GNU Grep # Revert lines from the log file to have the newer lines processed first - cmd = 'tac %s' % quote_shell_string(path) + cmd = 'tac %s' % quote_shell_string(str(path)) if greptexts: cmd += " | egrep -i -e %s" % quote_shell_string(".*".join(greptexts)) grep = subprocess.Popen(cmd, shell=True, close_fds=True, stdout=subprocess.PIPE) # nosec @@ -1158,8 +1135,9 @@ def parse_history_file(path, query, greptexts, limit): def get_logfile_timespan(path): try: - first_entry = float(file(path).readline().split('\t', 1)[0]) - last_entry = os.stat(path).st_mtime + with path.open() as f: + first_entry = float(f.readline().split('\t', 1)[0]) + last_entry = path.stat().st_mtime return first_entry, last_entry except Exception: return 0.0, 0.0 @@ -1753,20 +1731,14 @@ class EventServer(ECServerThread): self.logger.exception('Exception handling a SNMP trap from "%s". Skipping this one' % (data[1][0])) - # check whether or not spool files are available - # TODO(sp) Use pathlib facilities below - spool_dir = str(spool_path(self.settings)) - if os.path.exists(spool_dir): - spool_files = [f for f in os.listdir(spool_dir) if f[0] != '.'] - if spool_files: - # progress the first spool file we get - this_path = spool_dir + '/' + spool_files.pop() - self.process_raw_lines(file(this_path).read()) - os.remove(this_path) - if spool_files: - select_timeout = 0 # enable fast processing to process further files - else: - select_timeout = 1 # restore default select timeout + try: + # process the first spool file we get + spool_file = next(spool_path(self.settings).glob('[!.]*')) + self.process_raw_lines(spool_file.read_bytes()) + spool_file.unlink() + select_timeout = 0 # enable fast processing to process further files + except StopIteration: + select_timeout = 1 # restore default select timeout # Processes incoming data, just a wrapper between the real data and the # handler function to record some statistics etc.

6 years, 7 months

Windows agent: use RAII for socket handles

by Jukka Aro

Module: check_mk Branch: master Commit: 6837286c3a58d87740d07650ade155bee58168fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6837286c3a58d8… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 26 13:07:39 2018 +0100 Windows agent: use RAII for socket handles --- agents/windows/ListenSocket.cc | 28 ++++++++++------------------ agents/windows/ListenSocket.h | 16 +++++++++++++--- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 35 ++++++++++++++++------------------- 4 files changed, 40 insertions(+), 41 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index ea27ad9..122a484 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -40,12 +40,10 @@ ListenSocket::ListenSocket(int port, const only_from_t &source_whitelist, : _logger(logger) , _winapi(winapi) , _use_ipv6(supportIPV6) - , _socket(init_listen_socket(port)) + , _socket(init_listen_socket(port), winapi) , _source_whitelist(source_whitelist) , _supports_ipv4(true) {} -ListenSocket::~ListenSocket() { _winapi.closesocket(_socket); } - bool ListenSocket::supportsIPV4() const { return _supports_ipv4; } bool ListenSocket::supportsIPV6() const { return _use_ipv6; } @@ -206,13 +204,11 @@ sockaddr *ListenSocket::create_sockaddr(int *addr_len) const { return result; } -SOCKET ListenSocket::acceptConnection() const { - SOCKET connection; +SocketHandle ListenSocket::acceptConnection() const { // Loop forever. - fd_set fds; FD_ZERO(&fds); - FD_SET(_socket, &fds); + FD_SET(_socket.get(), &fds); struct timeval timeout; timeout.tv_sec = 0; timeout.tv_usec = 500000; @@ -222,17 +218,13 @@ SOCKET ListenSocket::acceptConnection() const { while (1 == _winapi.select(1, &fds, NULL, NULL, &timeout)) { int addr_len = 0; std::unique_ptr<sockaddr> remote_addr(create_sockaddr(&addr_len)); - connection = _winapi.accept(_socket, remote_addr.get(), &addr_len); - connection = RemoveSocketInheritance(connection); - if (connection != INVALID_SOCKET) { - bool allowed = check_only_from(remote_addr.get()); - - if (allowed) { - return connection; - } else { - _winapi.closesocket(connection); - } + SOCKET rawSocket = + _winapi.accept(_socket.get(), remote_addr.get(), &addr_len); + SocketHandle connection(RemoveSocketInheritance(rawSocket), _winapi); + if (connection && check_only_from(remote_addr.get())) { + return connection; } } - return 0; + + return SocketHandle(_winapi); } diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index e9c34f5..af30004 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -31,16 +31,26 @@ class Logger; class WinApiAdaptor; +struct SocketHandleTraits { + using HandleT = SOCKET; + static HandleT invalidValue() { return INVALID_SOCKET; } + + static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { + winapi.closesocket(value); + } +}; + +using SocketHandle = WrappedHandle<SocketHandleTraits>; + class ListenSocket { public: ListenSocket(int port, const only_from_t &source_whitelist, bool supportIPV6, Logger *logger, const WinApiAdaptor &winapi); - ~ListenSocket(); bool supportsIPV4() const; bool supportsIPV6() const; - SOCKET acceptConnection() const; + SocketHandle acceptConnection() const; sockaddr_storage address(SOCKET connection) const; @@ -56,7 +66,7 @@ private: Logger *_logger; const WinApiAdaptor &_winapi; const bool _use_ipv6; - SOCKET _socket; + SocketHandle _socket; const only_from_t _source_whitelist; bool _supports_ipv4; }; diff --git a/agents/windows/build_version b/agents/windows/build_version index ea0965b..fc9dc43 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3120 +3121 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7349668..86096bb 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -566,7 +566,7 @@ DWORD WINAPI realtime_check_func(void *data_in) { try { sockaddr_storage current_address; std::string current_ip; - SOCKET current_socket = INVALID_SOCKET; + SocketHandle current_socket(s_winapi); std::unique_ptr<BufferedSocketProxy> out; if (*s_config->encrypted_rt) { @@ -596,10 +596,9 @@ DWORD WINAPI realtime_check_func(void *data_in) { if (data->new_request) { data->new_request = false; // (re-)establish connection if necessary - if (current_socket != INVALID_SOCKET) { - s_winapi.closesocket(current_socket); - out->setSocket(INVALID_SOCKET); - } + current_socket.reset(); + out->setSocket(INVALID_SOCKET); + current_address = data->last_address; if (current_address.ss_family != 0) { int sockaddr_size = 0; @@ -651,27 +650,27 @@ DWORD WINAPI realtime_check_func(void *data_in) { } current_ip = ListenSocket::readableIP(&current_address); - current_socket = s_winapi.socket( - current_address.ss_family, SOCK_DGRAM, IPPROTO_UDP); - if (current_socket == INVALID_SOCKET) { + current_socket.reset( + s_winapi.socket(current_address.ss_family, + SOCK_DGRAM, IPPROTO_UDP)); + if (!current_socket) { Emergency(logger) << "failed to establish socket: " << s_winapi.WSAGetLastError(); return 1; } - if (s_winapi.connect(current_socket, + if (s_winapi.connect(current_socket.get(), (const sockaddr *)&current_address, sockaddr_size) == SOCKET_ERROR) { Emergency(logger) << "failed to connect: " << s_winapi.WSAGetLastError(); - s_winapi.closesocket(current_socket); - current_socket = INVALID_SOCKET; + current_socket.reset(); } - out->setSocket(current_socket); + out->setSocket(current_socket.get()); } } // send data - if (current_socket != INVALID_SOCKET) { + if (current_socket) { // send data s_winapi.SetEnvironmentVariable("REMOTE_HOST", current_ip.c_str()); @@ -689,7 +688,6 @@ DWORD WINAPI realtime_check_func(void *data_in) { } } } - s_winapi.closesocket(current_socket); return 0; } catch (const std::exception &e) { @@ -744,20 +742,20 @@ void do_adhoc(const Environment &env) { } while (!g_should_terminate) { - SOCKET connection = sock.acceptConnection(); + SocketHandle connection = std::move(sock.acceptConnection()); if (connection) { - out->setSocket(connection); + out->setSocket(connection.get()); if (*s_config->encrypted) { out->writeBinary(RT_PROTOCOL_VERSION, 2); } - std::string ip_hr = sock.readableIP(connection); + std::string ip_hr = sock.readableIP(connection.get()); Debug(logger) << "Accepted client connection from " << ip_hr << "."; { // limit lifetime of mutex lock lock_guard<mutex>(thread_data.mutex); thread_data.new_request = true; - thread_data.last_address = sock.address(connection); + thread_data.last_address = sock.address(connection.get()); thread_data.push_until = time(NULL) + *s_config->realtime_timeout; } @@ -770,7 +768,6 @@ void do_adhoc(const Environment &env) { Alert(Logger::getLogger("winagent")) << "unhandled exception: " << e.what(); } - s_winapi.closesocket(connection); } }

6 years, 7 months

5866 FIX Fixed performance issue on ruleset search and discovery page with a large number of rules

by Lars Michelsen

Module: check_mk Branch: master Commit: acbdf576d8af190a59b202aa3588a4e299369eaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acbdf576d8af19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 11:14:33 2018 +0100 5866 FIX Fixed performance issue on ruleset search and discovery page with a large number of rules When rule matching was analyzed in WATO, which is done for example on the ruleset rule listing page, on the analyze rulset page of hosts or on the service discovery page, a time consuming match function needs to be called. This function has now been optimizied which should result in a more performant processing of these pages with a larger number of rules. Change-Id: Ib6dc8fcf9b26a573f6aa8aacb260d97322383070 --- .werks/5866 | 13 +++++++++++++ web/htdocs/wato.py | 42 +++++++++++++++++++++--------------------- web/htdocs/watolib.py | 31 ++++++++++++++++--------------- 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/.werks/5866 b/.werks/5866 new file mode 100644 index 0000000..459fd67 --- /dev/null +++ b/.werks/5866 @@ -0,0 +1,13 @@ +Title: Fixed performance issue on ruleset search and discovery page with a large number of rules +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519639736 +Class: fix + +When rule matching was analyzed in WATO, which is done for example on the ruleset rule listing +page, on the analyze rulset page of hosts or on the service discovery page, a time consuming +match function needs to be called. This function has now been optimizied which should result in +a more performant processing of these pages with a larger number of rules. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a2a6858..d41233c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13158,12 +13158,14 @@ class ModeEditRuleset(WatoMode): if self._hostname: table.cell(_("Ma.")) if rule.is_disabled(): - reason = _("This rule is disabled") + reasons = [ _("This rule is disabled") ] else: - reason = rule.matches_host_and_item(watolib.Folder.current(), self._hostname, self._item) + reasons = list(rule.get_mismatch_reasons(watolib.Folder.current(), self._hostname, self._item)) + + matches_rule = not reasons # Handle case where dict is constructed from rules - if reason == True and ruleset.match_type() == "dict": + if matches_rule and ruleset.match_type() == "dict": if not rule.value: title = _("This rule matches, but does not define any parameters.") img = 'imatch' @@ -13180,7 +13182,7 @@ class ModeEditRuleset(WatoMode): img = 'pmatch' match_keys.update(new_keys) - elif reason == True and (not alread_matched or ruleset.match_type() == "all"): + elif matches_rule and (not alread_matched or ruleset.match_type() == "all"): title = _("This rule matches for the host '%s'") % self._hostname if ruleset.item_type(): title += _(" and the %s '%s'.") % (ruleset.item_name(), self._item) @@ -13188,12 +13190,12 @@ class ModeEditRuleset(WatoMode): title += "." img = 'match' alread_matched = True - elif reason == True: + elif matches_rule: title = _("This rule matches, but is overridden by a previous rule.") img = 'imatch' alread_matched = True else: - title = _("This rule does not match: %s") % reason + title = _("This rule does not match: %s") % " ".join(reasons) img = 'nmatch' html.img("images/icon_rule%s.png" % img, align="absmiddle", title=title, class_="icon") @@ -15194,24 +15196,13 @@ class ModePatternEditor(WatoMode): # Check if this rule applies to the given host/service if self._hostname: # If hostname (and maybe filename) try match it - reason = rule.matches_host_and_item(watolib.Folder.current(), self._hostname, self._item) + rule_matches = rule.matches_host_and_item(watolib.Folder.current(), self._hostname, self._item) elif self._item: # If only a filename is given - reason = rule.matches_item() + rule_matches = rule.matches_item() else: # If no host/file given match all rules - reason = True - - match_img = '' - if reason == True: - # Applies to the given host/service - reason_class = 'reason' - # match_title/match_img are set below per pattern - else: - # not matching - reason_class = 'noreason' - match_img = 'nmatch' - match_title = reason + rule_matches = True html.begin_foldable_container("rule", "%s" % abs_rulenr, True, HTML("<b>Rule #%d</b>" % (abs_rulenr + 1)), indent = False) @@ -15228,7 +15219,11 @@ class ModePatternEditor(WatoMode): for state, pattern, comment in pattern_list: match_class = '' disp_match_txt = '' - if reason == True: + match_img = '' + if rule_matches: + # Applies to the given host/service + reason_class = 'reason' + matched = re.search(pattern, self._match_txt) if matched: @@ -15254,6 +15249,11 @@ class ModePatternEditor(WatoMode): else: match_img = 'nmatch' match_title = _('This logfile pattern does not match the given string.') + else: + # rule does not match + reason_class = 'noreason' + match_img = 'nmatch' + match_title = _('The rule conditions do not match.') table.row(css=reason_class) table.cell(_('Match')) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c10f4be..da1f52e 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8005,7 +8005,7 @@ class Ruleset(object): if rule.is_disabled(): continue - if rule.matches_host_and_item(Folder.current(), hostname, service) != True: + if not rule.matches_host_and_item(Folder.current(), hostname, service): continue if self.match_type() == "all": @@ -8266,37 +8266,38 @@ class Rule(object): def is_ineffective(self): hosts = Host.all() for host_name, host in hosts.items(): - reason = self.matches_host_and_item(host.folder(), host_name, NO_ITEM) - if reason == True: + if self.matches_host_and_item(host.folder(), host_name, NO_ITEM): return False return True def matches_host_and_item(self, host_folder, hostname, item): - reasons = [] + """Whether or not the given folder/host/item matches this rule""" + for reason in self.get_mismatch_reasons(host_folder, hostname, item): + return False + return True + + + def get_mismatch_reasons(self, host_folder, hostname, item): + """A generator that provides the reasons why a given folder/host/item not matches this rule""" host = host_folder.host(hostname) if not self._matches_hostname(hostname): - reasons.append(_("The host name does not match.")) + yield _("The host name does not match.") for tag in self.tag_specs: if tag[0] != '/' and tag[0] != '!' and tag not in host.tags(): - reasons.append(_("The host is missing the tag %s") % tag) + yield _("The host is missing the tag %s") % tag elif tag[0] == '!' and tag[1:] in host.tags(): - reasons.append(_("The host has the tag %s") % tag) + yield _("The host has the tag %s") % tag if not self.folder.is_transitive_parent_of(host_folder): - reasons.append(_("The rule does not apply to the folder of the host.")) + yield _("The rule does not apply to the folder of the host.") if item != NO_ITEM and self.ruleset.item_type(): if not self.matches_item(item): - reasons.append(_("The %s \"%s\" does not match this rule.") % - (self.ruleset.item_name(), item)) - - if not reasons: - return True - else: - return " ".join(reasons) + yield _("The %s \"%s\" does not match this rule.") % \ + (self.ruleset.item_name(), item) def _matches_hostname(self, hostname):

6 years, 7 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: 21e3d7349bce53807b952ebc75e3b8a4def88953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21e3d7349bce53… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 10:31:12 2018 +0100 Fixed typo. Change-Id: I9ac0c930f76fd2f6b71e475cb9a0be9df8aba753 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 9abccc5..ebae80e 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -826,7 +826,7 @@ def log_event_history_to_mongodb(settings, event, what, who, addinfo): }) -def get_event_history_from_mongodb(settings query): +def get_event_history_from_mongodb(settings, query): filters, limit = query.filters, query.limit history_entries = []

6 years, 7 months

5627 hp_hh3c_ext, hp_hh3c_ext.states, hp_hh3c_ext.cpu, hp_hh3c_ext.mem: New check plugins for HP switches which support the HH3C-ENTITY-EXT-MIB

by Simon Betz

Module: check_mk Branch: master Commit: c98e956ebe29c8abd680bc141225a6842e6de978 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c98e956ebe29c8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 31 14:30:31 2018 +0100 5627 hp_hh3c_ext, hp_hh3c_ext.states, hp_hh3c_ext.cpu, hp_hh3c_ext.mem: New check plugins for HP switches which support the HH3C-ENTITY-EXT-MIB Change-Id: Id91a20874b262abdc90dda20be0ec21ac1ef258f --- .werks/5627 | 10 ++ checkman/hp_hh3c_ext | 17 +++ checkman/hp_hh3c_ext.cpu | 17 +++ checkman/hp_hh3c_ext.mem | 17 +++ checkman/hp_hh3c_ext.states | 20 +++ checks/arris_cmts_mem | 86 ++++++------- checks/brocade_mlx | 73 +++++------ checks/casa_cpu_mem | 79 ++++-------- checks/hp_hh3c_ext | 234 +++++++++++++++++++++++++++++++++++ checks/memory.include | 47 ++++++- web/plugins/wato/check_parameters.py | 33 +++++ 11 files changed, 490 insertions(+), 143 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c98e956ebe…

6 years, 7 months

Thread settings through, so they are now local to the places where they are used.

by Sven Panne

Module: check_mk Branch: master Commit: 8586f74ce52b3d70d65e7160186dc65fa800b531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8586f74ce52b3d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 10:09:10 2018 +0100 Thread settings through, so they are now local to the places where they are used. There is quite some ugly threading going on here, but this is only a consequence of the absence of various classes: When we have the right abstractions in place, the threading will basically vanish... In a nutshell: Even if the code might look a bit more ugly than before, it is much more honest about its dependencies than before, which is a good thing. Change-Id: I66efdff69ed4d25f8c2983168a3aa7ec44cafc72 --- bin/mkeventd | 189 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 97 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8586f74ce5…

6 years, 7 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: 56fb28335376da6c013e93cb4465fb3b52e7aada URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56fb28335376da… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 10:03:35 2018 +0100 Fixed typo. Change-Id: I94e5683b921445cda21f1bd1699ce3be3ace961e --- tests/mkeventd/test_mkeventd_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index cc35571..b00ad52 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -51,7 +51,7 @@ def settings(): mkeventd.g_settings = cmk.ec.settings.settings( '1.2.3i45', pathlib.Path(cmk.paths.omd_root), - pathlib.Path(cmk.paths.default_config_dir) + pathlib.Path(cmk.paths.default_config_dir), ['mkeventd']) return mkeventd.g_settings

6 years, 7 months

← Newer
1
2
3
4
5
6
7
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018