Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

3586 FIX Fixed file locking issues ( rare and random errors that settings file could not be loaded)

by Lars Michelsen

Module: check_mk Branch: master Commit: fcc50323ced6708a9b388e5c09b6f57923c4390f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcc50323ced670… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 10:58:37 2016 +0200 3586 FIX Fixed file locking issues (rare and random errors that settings file could not be loaded) --- .werks/3586 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 28 +++++++++++++++------------- web/htdocs/lib.py | 17 +++++++++++++++-- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.werks/3586 b/.werks/3586 new file mode 100644 index 0000000..0df176d --- /dev/null +++ b/.werks/3586 @@ -0,0 +1,10 @@ +Title: Fixed file locking issues (rare and random errors that settings file could not be loaded) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464857879 + + diff --git a/ChangeLog b/ChangeLog index bb495a6..968ceb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -331,6 +331,7 @@ * 3537 FIX: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping, check_mk-active-icmp and check-mk-host-ping... * 3576 FIX: LDAP: Fixed "Internal error" when using the "Filter Group" option in an LDAP connection... * 3627 FIX: fixed double graphs of database size + * 3586 FIX: Fixed file locking issues (rare and random errors that settings file could not be loaded) WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 205c664..eb1c666 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -453,12 +453,14 @@ def load_user_file(name, deflt, lock = False): return deflt # No user known at this point of time path = user_confdir + "/" + name + ".mk" - try: - if lock: - aquire_lock(path) + if lock: + aquire_lock(path) + + try: return eval(file(path).read()) except: + # TODO: Really "throw user data away" and start over? return deflt def save_user_file(name, content, unlock=False, user=None): @@ -467,19 +469,19 @@ def save_user_file(name, content, unlock=False, user=None): dirname = config_dir + "/" + user make_nagios_directory(dirname) path = dirname + "/" + name + ".mk" - try: - write_settings_file(path + ".new", content) - os.rename(path + ".new", path) + try: + try: + write_settings_file(path + ".new", content) + os.rename(path + ".new", path) + except Exception, e: + if debug: + raise + raise MKConfigError(_("Cannot save %s options for user %s into %s: %s") % \ + (name, user, path, e)) + finally: if unlock: release_lock(path) - except Exception, e: - # Error while writing file -> release lock - release_lock(path) - if debug: - raise - raise MKConfigError(_("Cannot save %s options for user %s into %s: %s") % \ - (name, user, path, e)) #. # .--Sites---------------------------------------------------------------. diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index dbb9447..9d1b847 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -389,8 +389,21 @@ g_locked_paths = [] def aquire_lock(path): if path in g_locked_paths: return # No recursive locking - fd = os.open(path, os.O_RDONLY) - fcntl.flock(fd, fcntl.LOCK_EX) + + # Create file for locking if not existant yet + fd = os.open(path, os.O_RDONLY | os.O_CREAT) + + # Handle the case where the file has been renamed in the meantime + while True: + fcntl.flock(fd, fcntl.LOCK_EX) + fd_new = os.open(path, os.O_RDONLY | os.O_CREAT) + if os.path.sameopenfile(fd, fd_new): + os.close(fd_new) + break + else: + os.close(fd) + fd = fd_new + g_aquired_locks.append((path, fd)) g_locked_paths.append(path)

8 years, 4 months

windows agent: further bugfix regarding rotated logs

by Sebastian Herbord

Module: check_mk Branch: master Commit: 82f46a0dbe5d8adbfbff4a1735ce9b3b697d9f99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82f46a0dbe5d8a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 2 09:15:25 2016 +0200 windows agent: further bugfix regarding rotated logs --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1268224 -> 1269760 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1268224 -> 1269760 bytes agents/windows/check_mk_agent.cc | 9 +++++++-- agents/windows/check_mk_agent.exe | Bin 1362432 -> 1238016 bytes agents/windows/check_mk_agent.msi | Bin 2900480 -> 2776576 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1362432 -> 1238016 bytes agents/windows/install_agent-64.exe | Bin 565492 -> 565681 bytes agents/windows/install_agent.exe | Bin 576150 -> 560119 bytes agents/windows/stringutil.cc | 18 ++++++++++++++++++ agents/windows/stringutil.h | 2 ++ 11 files changed, 28 insertions(+), 3 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index e6a6560..a8c5937 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1739 +1745 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index c880535..eb60a6f 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 5e2d4cb..2ac67b7 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 935b8e9..20c880b 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1468,7 +1468,8 @@ void process_textfile(OutputProxy &out, logwatch_textfile *textfile) { } OnScopeExit auto_close([file]() { fclose(file); }); - out.output("[[[%s]]]\n", textfile->name.c_str()); + out.output("[[[%s]]]\n", + replaceAll(textfile->name, "*", "__all__").c_str()); if (textfile->offset == textfile->file_size) { // no new data return; @@ -1504,7 +1505,11 @@ void section_logfiles(OutputProxy &out, const Environment &env) { // found files for (logwatch_textfile *textfile : g_config->logwatchTextfiles()) { - process_textfile(out, textfile); + // for rotated log, this list may contain entries where the pattern + // currently matches nothing + if (!textfile->paths.empty()) { + process_textfile(out, textfile); + } } cleanup_logwatch_textfiles(); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 8a7ec03..672839f 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 2129407..acc5b23 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index d8833ad..724a0da 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index c1dd3f4..f58f46b 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index c0f0c52..4e2b324 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index f5679d6..f87ee09 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -252,6 +252,24 @@ bool globmatch(const wchar_t *pattern, const wchar_t *astring) { return *p == 0; } + +std::string replaceAll(const std::string &str, const std::string &from, + const std::string &to) { + if (from.empty()) { + return str; + } + + std::string result(str); + size_t pos = 0; + + while ((pos = result.find(from, pos)) != std::string::npos) { + result.replace(pos, from.length(), to); + pos += to.length(); + } + return result; +} + + #ifdef _WIN32 std::string get_win_error_as_string(DWORD error_id) { // Get the error message, if any. diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 91cb884..fbe0449 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -64,6 +64,8 @@ bool ci_equal(const std::string &lhs, const std::string &rhs); bool globmatch(const char *pattern, const char *astring); bool globmatch(const wchar_t *pattern, const wchar_t *astring); +std::string replaceAll(const std::string &str, const std::string &from, + const std::string &to); template <typename T> std::basic_string<T> join(const std::vector<std::basic_string<T>> &input, const T *sep) {

8 years, 4 months

Use sendall instead of send to handle partial writes.

by Sven Panne

Module: check_mk Branch: master Commit: 89c46c91b85931ade5ef782b519bc49236781448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89c46c91b85931… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 2 08:45:39 2016 +0200 Use sendall instead of send to handle partial writes. --- bin/mkeventd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 7ff0b8d..c5722b6 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -497,7 +497,7 @@ def livestatus_query(query): try: livesock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) livesock.connect(g_livestatus_socket) - livesock.send(query) + livesock.sendall(query) livesock.shutdown(socket.SHUT_WR) return livesock.recv(10000000) except Exception, e: @@ -2660,7 +2660,7 @@ class StatusServer: log("Error handling client %s: %s" % (addr_info, e)) if client_socket: try: - client_socket.send("ERROR: %s\n" % e) + client_socket.sendall("ERROR: %s\n" % e) except: pass # avoid next exception because of broken pipe! @@ -2699,11 +2699,11 @@ class StatusServer: if output_format == "plain": for line in response: - socket.send("\t".join([to_utf8(quote_tab(c)) for c in line])) - socket.send("\n") + socket.sendall("\t".join([to_utf8(quote_tab(c)) for c in line])) + socket.sendall("\n") else: - socket.send(repr(response)) - socket.send("\n") + socket.sendall(repr(response)) + socket.sendall("\n") socket.close() @@ -3740,7 +3740,7 @@ def get_state_from_master(): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.settimeout(repl_settings["connect_timeout"]) sock.connect(repl_settings["master"]) - sock.send("REPLICATE %d\n" % (g_slave_status["last_sync"] and g_slave_status["last_sync"] or 0)) + sock.sendall("REPLICATE %d\n" % (g_slave_status["last_sync"] and g_slave_status["last_sync"] or 0)) response_text = "" while True:

8 years, 4 months

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: b12aff1107485a01ef35d7cf93ef345f455611d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b12aff1107485a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 1 12:54:54 2016 +0200 fixed typo --- doc/treasures/sidebar_tactical_overview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/sidebar_tactical_overview.py b/doc/treasures/sidebar_tactical_overview.py index dcaeb7d..b61fb23 100644 --- a/doc/treasures/sidebar_tactical_overview.py +++ b/doc/treasures/sidebar_tactical_overview.py @@ -24,6 +24,6 @@ def create_tactical_overview_snapin(title, tag_group, tag_name): "styles" : snapin_tactical_overview_styles, } -# Here you declare which copies of the snapin you wnat: +# Here you declare which copies of the snapin you want: create_tactical_overview_snapin(u"München", "stadt", "muc") create_tactical_overview_snapin(u"Göttingen", "stadt", "got")

8 years, 4 months

better rule handling

by Simon Betz

Module: check_mk Branch: master Commit: fd836b6422aa88b6ad5b60fcab3bc66cf5e06fae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd836b6422aa88… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 1 17:17:02 2016 +0200 better rule handling --- web/plugins/wato/check_parameters.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 118c82b..6a43aa3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6479,11 +6479,16 @@ register_check_parameters( default_value = 2, )), ( "defaultincrement", - Checkbox( - title = _("Default Increment"), - label = _("State is WARNING in case the next extent has the default size."), - help = "")), - ]), + DropdownChoice( + title = _("Default Increment"), + choices = [ + ( True, _("State is WARNING in case the next extent has the default size.")), + ( False, _("Ignore default increment")), + ] + ) + ), + ], + ), TextAscii( title = _("Explicit tablespaces"), help = _("Here you can set explicit tablespaces by defining them via SID and the tablespace name, separated by a dot, for example pengt.TEMP"),

8 years, 4 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: e2688aed165e341d5074ce688e20ea374c6a8105 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2688aed165e34… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 1 15:31:20 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/TableEventConsole.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index b1cfc04..3087161 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -52,10 +52,14 @@ #include "Logger.h" #include "Query.h" #ifdef CMC +#include "Config.h" #include "Core.h" #include "World.h" #else #include "store_c.h" +extern "C" { +extern char g_mkeventd_socket_path[4096]; +} #endif // using boost::asio::local::stream_protocol; @@ -87,8 +91,12 @@ TableEventConsole::TableEventConsole() {} #endif void TableEventConsole::answerQuery(Query *query) { +#ifdef CMC + string path = _core->_world->_config->_mkeventd_socket_path; +#else + string path = g_mkeventd_socket_path; +#endif #if 0 - string path = "/omd/sites/heute/tmp/run/mkeventd/status"; stream_protocol::endpoint ep(path); stream_protocol::iostream ios(ep); if (!ios) { @@ -96,7 +104,6 @@ void TableEventConsole::answerQuery(Query *query) { return; } #else - string path = "/omd/sites/heute/tmp/run/mkeventd/status"; int sock = socket(PF_LOCAL, SOCK_STREAM, 0); if (sock == -1) { Alert() << "Cannot create socket for " << MkEventD(path, errno);

8 years, 4 months

3618 Better layout for role & permission matrix, also allow sorting and searching

by Mathias Kettner

Module: check_mk Branch: master Commit: 48a16c9eb3ad583d79ae2886f5b62a8a2510ec47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48a16c9eb3ad58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 14:53:31 2016 +0200 3618 Better layout for role & permission matrix, also allow sorting and searching --- .werks/3618 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 33 +++++++++++---------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.werks/3618 b/.werks/3618 new file mode 100644 index 0000000..54c13b6 --- /dev/null +++ b/.werks/3618 @@ -0,0 +1,10 @@ +Title: Better layout for role & permission matrix, also allow sorting and searching +Level: 2 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464785582 + + diff --git a/ChangeLog b/ChangeLog index 6c15638..bb495a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -343,6 +343,7 @@ * 3130 periodic service discovery can now be configured to not activate specific service changes... * 3472 Service list of a host: Move section of vanished services to top of the page... * 3538 Now hiding the activate changes button as long as another activation process is running + * 3618 Better layout for role & permission matrix, also allow sorting and searching * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 069afdc..279fdbb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10990,22 +10990,13 @@ def mode_role_matrix(phase): role_list = roles.items() role_list.sort(cmp = lambda a,b: cmp((a[1]["alias"],a[0]), (b[1]["alias"],b[0]))) - html.write("<table class=data>") - html.write("<tr class=dualheader><th></th>") - num_roles = 1 - for role_id, role in role_list: - html.write('<th>%s</th>' % role_id) - num_roles += 1 - html.write("</tr>\n") - # Loop all permission sections, but sorted plz - odd = "even" for section, (prio, section_title, do_sort) in sorted(config.permission_sections.iteritems(), key = lambda x: x[1][0], reverse = True): - html.write('<tr>') - html.write('<th colspan=%d>%s</th>' % (num_roles, section_title)) - html.write('</tr>') + html.begin_foldable_container("perm_matrix", section, section == "general", section_title, indent = True) + + table.begin(section) # Loop all permissions permlist = config.permissions_by_order[:] @@ -11018,13 +11009,11 @@ def mode_role_matrix(phase): if section != this_section: continue # Skip permissions of other sections - odd = odd == "odd" and "even" or "odd" - - html.write('<tr class="data %s0">' % odd) - html.write('<td class=title>%s</td>' % perm["title"]) - - for id, role in role_list: - base_on_id = role.get('basedon', id) + table.row() + table.cell(_("Permission"), perm["title"], css="wide") + html.help(perm["description"]) + for role_id, role in role_list: + base_on_id = role.get('basedon', role_id) pvalue = role["permissions"].get(pname) if pvalue is None: if base_on_id in perm["defaults"]: @@ -11034,12 +11023,12 @@ def mode_role_matrix(phase): else: icon_name = "perm_%s" % (pvalue and "yes" or "no") - html.write('<td align=center>') + table.cell(role_id, css="center") if icon_name: html.icon(None, icon_name) - html.write('</td>') - html.write('</tr>') + table.end() + html.end_foldable_container() html.write("</table>")

8 years, 4 months

Added mkeventd_socket_path broker option. Fixed our hooks into the broker lifecycle.

by Sven Panne

Module: check_mk Branch: master Commit: c1e462925b708e2618c7fce79cffdb5e9b17d540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1e462925b708e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 1 14:49:27 2016 +0200 Added mkeventd_socket_path broker option. Fixed our hooks into the broker lifecycle. If the mkeventd_socket_path is not given, we derive it from the livestatus socket path. We need to initialize our store earlier to avoid receiving other callbacks before we are ready. The NEB documentation is... interesting... :-/ --- livestatus/src/module.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index d58b5bc..47575ab 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -98,6 +98,7 @@ char *g_pnp_path = pnp_path_storage; char g_mk_inventory_path[4096]; // base path of Check_MK inventory files char g_mk_logwatch_path[4096]; // base path of Check_MK logwatch files char g_logfile_path[4096]; +char g_mkeventd_socket_path[4096]; int g_debug_level = 0; int g_should_terminate = false; pthread_t g_mainthread_id; @@ -514,10 +515,16 @@ int broker_event(int event_type __attribute__((__unused__)), void *data) { int broker_process(int event_type __attribute__((__unused__)), void *data) { struct nebstruct_process_struct *ps = (struct nebstruct_process_struct *)data; - if (ps->type == NEBTYPE_PROCESS_EVENTLOOPSTART) { - store_init(); - update_timeperiods_cache(time(0)); - start_threads(); + switch (ps->type) { + case NEBTYPE_PROCESS_START: + store_init(); + break; + case NEBTYPE_PROCESS_EVENTLOOPSTART: + update_timeperiods_cache(time(0)); + start_threads(); + break; + default: + break; } return 0; } @@ -672,6 +679,8 @@ void livestatus_parse_arguments(const char *args_orig) { strncpy(slash + 1, "livestatus.log", 15); } + g_mkeventd_socket_path[0] = 0; + /* there is no default PNP path */ g_pnp_path[0] = 0; @@ -694,6 +703,9 @@ void livestatus_parse_arguments(const char *args_orig) { logger(LG_INFO, "Setting debug level to %d", g_debug_level); } else if (!strcmp(left, "log_file")) { strncpy(g_logfile_path, right, sizeof(g_logfile_path)); + } else if (!strcmp(left, "mkeventd_socket_path")) { + strncpy(g_mkeventd_socket_path, right, + sizeof(g_mkeventd_socket_path)); } else if (!strcmp(left, "max_cached_messages")) { g_max_cached_messages = strtoul(right, 0, 10); logger(LG_INFO, @@ -822,6 +834,20 @@ void livestatus_parse_arguments(const char *args_orig) { } } } + + if (g_mkeventd_socket_path[0] == 0) { + strncpy(g_mkeventd_socket_path, g_socket_path, + sizeof(g_mkeventd_socket_path)); + char *slash = strrchr(g_mkeventd_socket_path, '/'); + char *pos = slash == NULL ? g_mkeventd_socket_path : (slash + 1); + strncpy( + pos, "mkeventd/status", + &g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path)] - slash); + g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path) - 1] = 0; + } + logger(LG_WARN, "g_socket_path=[%s], g_mkeventd_socket_path=[%s]", + g_socket_path, g_mkeventd_socket_path); + // free(args); won't free, since we use pointers? }

8 years, 4 months

Better matching for hosts while joining the EC tables, Livestatus part.

by Sven Panne

Module: check_mk Branch: master Commit: 0062ed33e50a248b54abb338709481d7ba753b71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0062ed33e50a24… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 1 13:22:00 2016 +0200 Better matching for hosts while joining the EC tables, Livestatus part. This is basically handled like it is in CMC, but note one detail: The initialization of some parts had to be moved to a later point in time in the broker module lifecycle, because only then we know the hosts. We should really introduce a kind of "resolver" object for stuff like this and make it accessible to the parts which need it. Currently this is all global stuff :-P in Livestatus, while in CMC it is part of the World. Passing the World (or even the whole Core to which it belongs) around just to access a tiny bit of it needlessly increases coupling, so this is a bit ugly. --- livestatus/src/TableEventConsole.cc | 5 +++-- livestatus/src/module.c | 2 +- livestatus/src/store_c.cc | 27 +++++++++++++++++++++++++++ livestatus/src/store_c.h | 1 + 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index e9dd5dc..b1cfc04 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -54,6 +54,8 @@ #ifdef CMC #include "Core.h" #include "World.h" +#else +#include "store_c.h" #endif // using boost::asio::local::stream_protocol; @@ -268,10 +270,9 @@ bool TableEventConsole::receiveReply(int sock, Query *query) { ? nullptr : _core->_world->getHostByDesignation(it->second); #else - // Older Nagios headers are not const-correct... :-P row._host = it == row._map.end() ? nullptr - : find_host(const_cast<char *>(it->second.c_str())); + : getHostByDesignation(it->second.c_str()); #endif query->processDataset(&row); } diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 1f61045..d58b5bc 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -515,6 +515,7 @@ int broker_process(int event_type __attribute__((__unused__)), void *data) { struct nebstruct_process_struct *ps = (struct nebstruct_process_struct *)data; if (ps->type == NEBTYPE_PROCESS_EVENTLOOPSTART) { + store_init(); update_timeperiods_cache(time(0)); start_threads(); } @@ -874,7 +875,6 @@ int nebmodule_init(int flags __attribute__((__unused__)), char *args, "the overall nagios performance"); } - store_init(); register_callbacks(); /* Unfortunately, we cannot start our socket thread right now. diff --git a/livestatus/src/store_c.cc b/livestatus/src/store_c.cc index c5b8148..c9bc395 100644 --- a/livestatus/src/store_c.cc +++ b/livestatus/src/store_c.cc @@ -23,17 +23,39 @@ // Boston, MA 02110-1301 USA. #include "store_c.h" +#include <string> +#include <unordered_map> +#include <utility> #include "ClientQueue.h" #include "InputBuffer.h" #include "OutputBuffer.h" #include "Store.h" +#include "StringUtils.h" #include "TimeperiodsCache.h" +extern host *host_list; + +using mk::unsafe_tolower; +using std::string; +using std::unordered_map; + +// Map to speed up access via name/alias/address +unordered_map<string, host *> fl_hosts_by_designation; + static Store *fl_store = nullptr; static ClientQueue *fl_client_queue = nullptr; TimeperiodsCache *g_timeperiods_cache = nullptr; void store_init() { + for (host *hst = host_list; hst != nullptr; hst = hst->next) { + if (const char *address = hst->address) { + fl_hosts_by_designation[unsafe_tolower(address)] = hst; + } + if (const char *alias = hst->alias) { + fl_hosts_by_designation[unsafe_tolower(alias)] = hst; + } + fl_hosts_by_designation[unsafe_tolower(hst->name)] = hst; + } fl_store = new Store(); fl_client_queue = new ClientQueue(); g_timeperiods_cache = new TimeperiodsCache(); @@ -86,3 +108,8 @@ void delete_inputbuffer(void *ib) { delete static_cast<InputBuffer *>(ib); } void update_timeperiods_cache(time_t now) { g_timeperiods_cache->update(now); } void log_timeperiods_cache() { g_timeperiods_cache->logCurrentTimeperiods(); } + +host *getHostByDesignation(const char *designation) { + auto it = fl_hosts_by_designation.find(unsafe_tolower(designation)); + return it == fl_hosts_by_designation.end() ? nullptr : it->second; +} diff --git a/livestatus/src/store_c.h b/livestatus/src/store_c.h index 7b18ed5..c3ac4c5 100644 --- a/livestatus/src/store_c.h +++ b/livestatus/src/store_c.h @@ -48,6 +48,7 @@ int queue_pop_connection(); void queue_terminate(); void update_timeperiods_cache(time_t); void log_timeperiods_cache(); +host *getHostByDesignation(const char *designation); #ifdef __cplusplus }

8 years, 4 months

3617 FIX cmk -I without host specification now (again) always uses cache files

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c6393cb10090195ad26eafb0ccec48301de12b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c6393cb100901… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 12:21:41 2016 +0200 3617 FIX cmk -I without host specification now (again) always uses cache files If you do a discovery of all hosts then <tt>cmk -I</tt> always defaulted to using cache files (like an implicit <tt>--cache</tt>). This behaviour has gone lost recently and is no revived. You always can use <tt>--no-cache</tt> if you want fresh data. --- .werks/3617 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 ++ 3 files changed, 16 insertions(+) diff --git a/.werks/3617 b/.werks/3617 new file mode 100644 index 0000000..dd12b5f --- /dev/null +++ b/.werks/3617 @@ -0,0 +1,13 @@ +Title: cmk -I without host specification now (again) always uses cache files +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464776419 + +If you do a discovery of all hosts then <tt>cmk -I</tt> always defaulted to +using cache files (like an implicit <tt>--cache</tt>). This behaviour has +gone lost recently and is no revived. You always can use <tt>--no-cache</tt> +if you want fresh data. diff --git a/ChangeLog b/ChangeLog index 2eb7e44..6c15638 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 3437 FIX: Improved performance of "activate changes", especially in distributed environments * 3471 FIX: Repair ignoring discovery errors when bogus %s is contained in service description... * 3616 FIX: Fix cmk -I ignoring the option --cache... + * 3617 FIX: cmk -I without host specification now (again) always uses cache files... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index c5c1de1..3303019 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5255,6 +5255,8 @@ try: # handle -I / -II if not done and seen_I > 0: hostnames = parse_hostname_list(args) + if not hostnames: + opt_use_cachefile = not opt_no_cache do_discovery(hostnames, check_types, seen_I == 1) done = True

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016