Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Windows agent: fix ListenSocket const correctness

by Jukka Aro

Module: check_mk Branch: master Commit: efa1663f24edf87720feaba9bc89c80e4cc82a22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efa1663f24edf8… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 26 10:04:31 2018 +0100 Windows agent: fix ListenSocket const correctness --- agents/windows/ListenSocket.cc | 6 +++--- agents/windows/ListenSocket.h | 6 +++--- agents/windows/build_version | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 34b024b..ea27ad9 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -63,7 +63,7 @@ SOCKET ListenSocket::RemoveSocketInheritance(SOCKET oldsocket) const { return (SOCKET)newhandle; } -bool ListenSocket::check_only_from(sockaddr *ip) { +bool ListenSocket::check_only_from(sockaddr *ip) const { if (_source_whitelist.size() == 0) return true; // no restriction set for (only_from_t::const_iterator it_from = _source_whitelist.begin(); @@ -189,7 +189,7 @@ std::string ListenSocket::readableIP(const sockaddr_storage *addr) { return ip_hr; } -sockaddr *ListenSocket::create_sockaddr(int *addr_len) { +sockaddr *ListenSocket::create_sockaddr(int *addr_len) const { assert(addr_len != NULL); sockaddr *result = NULL; @@ -206,7 +206,7 @@ sockaddr *ListenSocket::create_sockaddr(int *addr_len) { return result; } -SOCKET ListenSocket::acceptConnection() { +SOCKET ListenSocket::acceptConnection() const { SOCKET connection; // Loop forever. diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index 0f96ad8..e9c34f5 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -40,7 +40,7 @@ public: bool supportsIPV4() const; bool supportsIPV6() const; - SOCKET acceptConnection(); + SOCKET acceptConnection() const; sockaddr_storage address(SOCKET connection) const; @@ -49,8 +49,8 @@ public: private: SOCKET init_listen_socket(int port); - bool check_only_from(sockaddr *ip); - sockaddr *create_sockaddr(int *addr_len); + 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 5c5bfcd..ea0965b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3118 +3120

6 years, 4 months

Windows agent: remove redundant IPv6->IPv4 fallback

by Jukka Aro

Module: check_mk Branch: master Commit: dfa113b102485fbdbcd82ecf78b44a4c7734d821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfa113b102485f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 26 09:30:12 2018 +0100 Windows agent: remove redundant IPv6->IPv4 fallback Since #5704 fix, the supported IP family (v6/v4) is checked before initializing the socket. Falling back to IPv4 in case IPv6 is not supported will never take place any more as we use the supported IP family straight away. Also fix the const correctness of two member variables and use logging instead of stderr prints. Using stderr is not exactly so smart when running as service ;-) --- agents/windows/ListenSocket.cc | 24 ++++++++---------------- agents/windows/ListenSocket.h | 4 ++-- agents/windows/build_version | 2 +- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 51a3144..34b024b 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -113,19 +113,10 @@ SOCKET ListenSocket::init_listen_socket(int port) { _winapi.socket(_use_ipv6 ? AF_INET6 : AF_INET, SOCK_STREAM, 0); if (tmp_s == INVALID_SOCKET) { int error_id = _winapi.WSAGetLastError(); - if (error_id == WSAEAFNOSUPPORT) { - // this will happen on Win2k and WinXP without the ipv6 patch - Notice(_logger) << "IPV6 not supported"; - _use_ipv6 = false; - tmp_s = _winapi.socket(AF_INET, SOCK_STREAM, 0); - } - if (tmp_s == INVALID_SOCKET) { - error_id = _winapi.WSAGetLastError(); - fprintf(stderr, "Cannot create socket: %s (%d)\n", - get_win_error_as_string(_winapi, error_id).c_str(), - error_id); - exit(1); - } + Error(_logger) << "Cannot create socket: " + << get_win_error_as_string(_winapi, error_id) << " (" + << error_id << ")"; + exit(1); } SOCKET s = RemoveSocketInheritance(tmp_s); @@ -151,13 +142,14 @@ SOCKET ListenSocket::init_listen_socket(int port) { if (SOCKET_ERROR == _winapi.bind(s, addr.get(), addr_size)) { int error_id = _winapi.WSAGetLastError(); - fprintf(stderr, "Cannot bind socket to port %d: %s (%d)\n", port, - get_win_error_as_string(_winapi, error_id).c_str(), error_id); + Error(_logger) << "Cannot bind socket to port " << port << ": " + << get_win_error_as_string(_winapi, error_id) << " (" + << error_id << ")"; exit(1); } if (SOCKET_ERROR == _winapi.listen(s, 5)) { - fprintf(stderr, "Cannot listen to socket\n"); + Error(_logger) << "Cannot listen to socket"; exit(1); } diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index 7991444..0f96ad8 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -55,9 +55,9 @@ private: Logger *_logger; const WinApiAdaptor &_winapi; - bool _use_ipv6; + const bool _use_ipv6; SOCKET _socket; - only_from_t _source_whitelist; + const only_from_t _source_whitelist; bool _supports_ipv4; }; diff --git a/agents/windows/build_version b/agents/windows/build_version index 63e4f98..5c5bfcd 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3116 +3118

6 years, 4 months

Improved WATO automation logging

by Lars Michelsen

Module: check_mk Branch: master Commit: bfa3d841ee4ed6b0cbabb7b8fce9889533e3fa5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa3d841ee4ed6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 08:12:33 2018 +0100 Improved WATO automation logging Change-Id: I8f8ca4e2c2a3771a9d7ee70679a81008e0cece52 --- web/htdocs/watolib.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 8199394..c10f4be 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6933,6 +6933,8 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti if args is None: args = [] + auto_logger = logger.getChild("config.automations") + if timeout: args = [ "--timeout", "%d" % timeout ] + args @@ -6946,28 +6948,34 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti # it garbles the non-HTML response output # if config.debug: # html.write("<div class=message>Running <tt>%s</tt></div>\n" % " ".join(cmd)) + auto_logger.info("RUN: %s" % subprocess.list2cmdline(cmd)) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) except Exception, e: raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (" ".join(cmd), e)) if stdin_data != None: + auto_logger.info("STDIN: %r" % stdin_data) p.stdin.write(stdin_data) else: + auto_logger.info("STDIN: %r" % indata) p.stdin.write(repr(indata)) p.stdin.close() outdata = p.stdout.read() exitcode = p.wait() + auto_logger.info("FINISHED: %d" % exitcode) + auto_logger.debug("OUTPUT: %r" % outdata) if exitcode != 0: - logger.error("Error running %r (exit code %d)" % (" ".join(cmd), exitcode)) + auto_logger.error("Error running %r (exit code %d)" % + (subprocess.list2cmdline(cmd), exitcode)) + if config.debug: raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>" % (" ".join(cmd), exitcode, hilite_errors(outdata))) else: raise MKGeneralException(hilite_errors(outdata)) - # On successful "restart" command execute the activate changes hook if command in [ 'restart', 'reload' ]: call_hook_activate_changes()

6 years, 4 months

Minor styling cleanups on WATO host list page

by Lars Michelsen

Module: check_mk Branch: master Commit: fa1eee915434465b086f1b1c6a0c34d0ea96fa79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa1eee91543446… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 08:18:03 2018 +0100 Minor styling cleanups on WATO host list page Change-Id: Ib166270b48bc2059c7d42310fde2f94971be8a66 --- web/htdocs/wato.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 13a0cd9..a2a6858 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -948,7 +948,8 @@ def show_host_actions(host): html.icon_button(host.services_url(), msg, image) if not host.locked(): - if config.user.may("wato.edit_hosts") and config.user.may("wato.move_hosts"): + if config.user.may("wato.edit_hosts") and config.user.may("wato.move_hosts") \ + and host.folder().choices_for_moving_host(): show_move_to_folder_action(host) if config.user.may("wato.manage_hosts"): @@ -1069,7 +1070,8 @@ def host_bulk_move_to_folder_combo(folder, top): choices = folder.choices_for_moving_host() if len(choices): choices = [("@", _("(select target folder)"))] + choices - html.button("_bulk_move", _("Move:")) + html.button("_bulk_move", _("Move to:")) + html.write(" ") field_name = 'bulk_moveto' if top: field_name = '_top_bulk_moveto' @@ -1078,8 +1080,6 @@ def host_bulk_move_to_folder_combo(folder, top): html.dropdown(field_name, choices, deflt="@", onchange = "update_bulk_moveto(this.value)", class_ = 'bulk_moveto') - else: - html.write_text(_("No valid target folder.")) def move_to_imported_folders(host_names_to_move):

6 years, 4 months

Refactoring: Use store.* functions for loading roles and groups now

by Lars Michelsen

Module: check_mk Branch: master Commit: a7ad2d7fb48615226f47914504a7c09e5c5d48b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7ad2d7fb48615… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 09:13:19 2018 +0100 Refactoring: Use store.* functions for loading roles and groups now Change-Id: I21d4a743994b165c7078503a4940c2fd11687e9e --- web/htdocs/userdb.py | 138 +++++++++++++++++++++++---------------------------- 1 file changed, 62 insertions(+), 76 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 4b122e9..ce3fca9 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -925,51 +925,42 @@ def convert_idle_timeout(value): # | | # +----------------------------------------------------------------------+ -# TODO: Use store. methods. Don't initialize strucutres on corrupted files. def load_roles(): - # Fake builtin roles into user roles. - builtin_role_names = { # Default names for builtin roles + roles = store.load_from_mk_file(multisite_dir + "roles.mk", "roles", + default=_get_builtin_roles()) + + # Make sure that "general." is prefixed to the general permissions + # (due to a code change that converted "use" into "general.use", etc. + # TODO: Can't we drop this? This seems to be from very early days of the GUI + for role in roles.values(): + for pname, pvalue in role["permissions"].items(): + if "." not in pname: + del role["permissions"][pname] + role["permissions"]["general." + pname] = pvalue + + # Reflect the data in the roles dict kept in the config module needed + # for instant changes in current page while saving modified roles. + # Otherwise the hooks would work with old data when using helper + # functions from the config module + # TODO: load_roles() should not update global structures + config.roles.update(roles) + + return roles + + +def _get_builtin_roles(): + """Returns a role dictionary containing the bultin default roles""" + builtin_role_names = { "admin" : _("Administrator"), "user" : _("Normal monitoring user"), "guest" : _("Guest user"), } - roles = dict([(id, { + return dict([(id, { "alias" : builtin_role_names.get(id, id), "permissions" : {}, # use default everywhere "builtin": True}) for id in config.builtin_role_ids ]) - filename = multisite_dir + "roles.mk" - try: - vars = { "roles" : roles } - execfile(filename, vars, vars) - # Make sure that "general." is prefixed to the general permissions - # (due to a code change that converted "use" into "general.use", etc. - for role in roles.values(): - for pname, pvalue in role["permissions"].items(): - if "." not in pname: - del role["permissions"][pname] - role["permissions"]["general." + pname] = pvalue - - # Reflect the data in the roles dict kept in the config module needed - # for instant changes in current page while saving modified roles. - # Otherwise the hooks would work with old data when using helper - # functions from the config module - config.roles.update(vars['roles']) - - return vars["roles"] - - except IOError: - return roles # Use empty structure, not existing file is ok! - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - else: - auth_logger.error('load_roles: Problem while loading roles (%s - %s). ' - 'Initializing structure...' % (filename, e)) - return roles - #. # .-Groups---------------------------------------------------------------. # | ____ | @@ -981,52 +972,47 @@ def load_roles(): # +----------------------------------------------------------------------+ # TODO: Contact groups are fine here, but service / host groups? -# TODO: Use store. methods. Don't initialize strucutres on corrupted files. def load_group_information(): - try: - # Load group information from Check_MK world - vars = {} - for what in ["host", "service", "contact" ]: - vars["define_%sgroups" % what] = {} - - filename = root_dir + "groups.mk" - try: - execfile(filename, vars, vars) - except IOError: - return {} # skip on not existing file + cmk_base_groups = _load_cmk_base_groups() + gui_groups = _load_gui_groups() + + # Merge information from Check_MK and Multisite worlds together + groups = {} + for what in ["host", "service", "contact" ]: + groups[what] = {} + for id, alias in cmk_base_groups['define_%sgroups' % what].items(): + groups[what][id] = { + 'alias': alias + } + + if id in gui_groups['multisite_%sgroups' % what]: + groups[what][id].update(gui_groups['multisite_%sgroups' % what][id]) + + return groups + + +def _load_cmk_base_groups(): + """Load group information from Check_MK world""" + group_specs = { + "define_hostgroups": {}, + "define_servicegroups": {}, + "define_contactgroups": {}, + } + for what in ["host", "service", "contact" ]: + group_specs["define_%sgroups" % what] = {} - # Now load information from the Web world - multisite_vars = {} - for what in ["host", "service", "contact" ]: - multisite_vars["multisite_%sgroups" % what] = {} + return store.load_mk_file(root_dir + "groups.mk", default=group_specs) - filename = multisite_dir + "groups.mk" - try: - execfile(filename, multisite_vars, multisite_vars) - except IOError: - pass - - # Merge information from Check_MK and Multisite worlds together - groups = {} - for what in ["host", "service", "contact" ]: - groups[what] = {} - for id, alias in vars['define_%sgroups' % what].items(): - groups[what][id] = { - 'alias': alias - } - if id in multisite_vars['multisite_%sgroups' % what]: - groups[what][id].update(multisite_vars['multisite_%sgroups' % what][id]) - return groups +def _load_gui_groups(): + # Now load information from the Web world + group_specs = { + "multisite_hostgroups": {}, + "multisite_servicegroups": {}, + "multisite_contactgroups": {}, + } - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - else: - auth_logger.error('load_group_information: Problem while loading groups (%s - %s). ' - 'Initializing structure...' % (filename, e)) - return {} + return store.load_mk_file(multisite_dir + "groups.mk", default=group_specs) class GroupChoice(DualListChoice):

6 years, 4 months

Fixed bug in #5853

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b3eecec91e9a27f9c634f4c367872aa31771199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b3eecec91e9a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 08:13:20 2018 +0100 Fixed bug in #5853 Change-Id: Ie1a59479a90ef9b9b291e9dd7938767b4d2506e9 --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index cf1e5da..4cd9f23 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -805,7 +805,7 @@ class Cell(object): else: txt = img_filename - txt = html.unescape_attributes(txt) + txt = html.escaper.unescape_attributes(txt) txt = html.strip_tags(txt) return css_classes, txt

6 years, 4 months

5865 FIX omd rm --kill now kills all processes of the site user

by Lars Michelsen

Module: check_mk Branch: master Commit: fedccd95e72acd01e12f00df58855907a77d87d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fedccd95e72acd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 07:20:13 2018 +0100 5865 FIX omd rm --kill now kills all processes of the site user Instead of just killing the processes that are currently accessing the tmpfs of the site, the "omd rm" command together with the --kill option now also kills all processes of the site user. This includes open shells or similar that would otherwise make the site removal fail in case such processes are open. Change-Id: I88ec7cfdbf00f5f4950405d58138638c20480e64 --- .werks/5865 | 14 ++++++++++++++ omd/packages/omd/omd | 7 +++++-- omd/packages/omd/omd.8 | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/5865 b/.werks/5865 new file mode 100644 index 0000000..1d9959f --- /dev/null +++ b/.werks/5865 @@ -0,0 +1,14 @@ +Title: omd rm --kill now kills all processes of the site user +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519626013 +Class: fix + +Instead of just killing the processes that are currently accessing +the tmpfs of the site, the "omd rm" command together with the --kill +option now also kills all processes of the site user. This includes +open shells or similar that would otherwise make the site removal +fail in case such processes are open. diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 05b81b8..8d9c7d3 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -2816,8 +2816,11 @@ def main_rm(args, options={}): reuse = "reuse" in options kill = "kill" in options - if not kill and user_logged_in(g_sitename): - bail_out("User '%s' still logged in or running processes." % g_sitename) + if user_logged_in(g_sitename): + if not kill: + bail_out("User '%s' still logged in or running processes." % g_sitename) + else: + kill_site_user_processes(exclude_current_and_parents=True) if tmpfs_mounted(g_sitename): unmount_tmpfs(g_sitename, kill=kill) diff --git a/omd/packages/omd/omd.8 b/omd/packages/omd/omd.8 index 30c5272..c5e4d30 100644 --- a/omd/packages/omd/omd.8 +++ b/omd/packages/omd/omd.8 @@ -150,8 +150,8 @@ and group of that site. This - of course - needs root permissions. The following options can be used: The option \fB--kill\fP will automatically kill all processes that -use the temporary filesystem of the site before unmounting it. -Otherwise the unmount and the removal of the site will fail. +either use the temporary filesystem of the site or are running as site +user. Otherwise the unmount and the removal of the site will fail. \fB--apache-reload\fP Issue a reaload of the apache process instead of the default restart

6 years, 4 months

4867 F5 BIG-IP: new checks for vCMP guest monitoring

by Marcel Schulte

Module: check_mk Branch: master Commit: db2085a1f4be135cfc243c8905487c74b8735dc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db2085a1f4be13… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:07:59 2018 +0100 4867 F5 BIG-IP: new checks for vCMP guest monitoring New checks for vCMP guest monitoring have been added: <ul> <li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> <li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> </ul> Change-Id: I4b22f9926894b0fdee612d6c80bb56f687474702 --- .werks/4867 | 16 +++++++++++ checkman/f5_bigip_vcmpfailover | 14 +++++++++ checkman/f5_bigip_vcmpguests | 13 +++++++++ checks/f5_bigip_vcmpfailover | 64 ++++++++++++++++++++++++++++++++++++++++++ checks/f5_bigip_vcmpguests | 64 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 171 insertions(+) diff --git a/.werks/4867 b/.werks/4867 new file mode 100644 index 0000000..dbce881 --- /dev/null +++ b/.werks/4867 @@ -0,0 +1,16 @@ +Title: F5 BIG-IP: new checks for vCMP guest monitoring +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1518790004 +Class: feature + +New checks for vCMP guest monitoring have been added: + +<ul> +<li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> +<li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> +</ul> + diff --git a/checkman/f5_bigip_vcmpfailover b/checkman/f5_bigip_vcmpfailover new file mode 100644 index 0000000..fb6f158 --- /dev/null +++ b/checkman/f5_bigip_vcmpfailover @@ -0,0 +1,14 @@ +title: F5 Big-IP: active/active or passive/active vCMP guest failover status +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + if the vCMP guest correctly runs in an {active/active} or an {active/passive} setup. + You can configure the expected behaviour via a WATO rule. + It will issue a warning if the cluster setup differs from the expected setup. + +inventory: + Creates one service + diff --git a/checkman/f5_bigip_vcmpguests b/checkman/f5_bigip_vcmpguests new file mode 100644 index 0000000..33ff8ed --- /dev/null +++ b/checkman/f5_bigip_vcmpguests @@ -0,0 +1,13 @@ +title: F5 Big-IP: show failover states of all vCMP guests running on a vCMP host +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + the failover status of every vCMP guest running on a vCMP host. + The service is informational, no parameters are used or configurable. + +inventory: + Creates one service + diff --git a/checks/f5_bigip_vcmpfailover b/checks/f5_bigip_vcmpfailover new file mode 100644 index 0000000..ac27285 --- /dev/null +++ b/checks/f5_bigip_vcmpfailover @@ -0,0 +1,64 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + +# Example SNMP output: +# +# .1.3.6.1.4.1.3375.2.1.13.1.1.0 0 # sysVcmpNumber +# .1.3.6.1.4.1.3375.2.1.14.1.1.0 3 # sysCmFailoverStatusId + + +def parse_f5_bigip_vcmpfailover(info): + return { + node: status for node, count, status in info + if int(count) == 0 # do nothing if we're at a vCMP-/Host/ + } + + +def inventory_f5_bigip_vcmpfailover(parsed): + if parsed: + return [ ( None, None ) ] + + +def check_f5_bigip_vcmpfailover(_no_item, params, parsed): + if parsed: + return check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = True) + + +check_info["f5_bigip_vcmpfailover"] = { + "parse_function" : parse_f5_bigip_vcmpfailover, + "check_function" : check_f5_bigip_vcmpfailover, + "inventory_function" : inventory_f5_bigip_vcmpfailover, + "group" : "cluster_status", + "default_levels_variable" : "f5_bigip_cluster_default_levels", + "service_description" : "BIG-IP vCMP Guest Failover Status", + "node_info" : True, + "snmp_info" : (".1.3.6.1.4.1.3375.2.1", [ + "13.1.1.0", # sysVcmpNumber + "14.3.1.0", # sysCmFailoverStatusId + ]), + "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2=True), + "includes" : ["f5_bigip.include"], +} diff --git a/checks/f5_bigip_vcmpguests b/checks/f5_bigip_vcmpguests new file mode 100644 index 0000000..b49a65b --- /dev/null +++ b/checks/f5_bigip_vcmpguests @@ -0,0 +1,64 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + +# Example SNMP output: +# +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.101.97.115.108.50.48.48.49.0 easl2001 # sysVcmpStatVcmpName +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.112.97.115.108.50.48.48.49.0 pasl2001 +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.116.97.115.108.50.48.48.49.0 tasl2001 +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.101.97.115.108.50.48.48.49.0 Standby # sysVcmpStatPrompt +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.112.97.115.108.50.48.48.49.0 Standby +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.116.97.115.108.50.48.48.49.0 Standby + + +def parse_f5_bigip_vcmpguests(info): + return { + guest: status.lower() for node, guest, status in info + } + +def inventory_f5_bigip_vcmpguests(parsed): + if parsed: + return [ ( None, None ) ] + + +def check_f5_bigip_vcmpguests(_no_item, _no_params, parsed): + for guest in sorted(parsed): + yield 0, "Guest [%s] is %s" % (guest, parsed[guest]) + + +check_info["f5_bigip_vcmpguests"] = { + "parse_function" : parse_f5_bigip_vcmpguests, + "check_function" : check_f5_bigip_vcmpguests, + "inventory_function" : inventory_f5_bigip_vcmpguests, + "service_description" : "BIG-IP vCMP Guests", + "node_info" : True, + "snmp_info" : (".1.3.6.1.4.1.3375.2.1.13.4.2.1", [ + "1", # sysVcmpStatVcmpName + "17", # sysVcmpStatPrompt + ]), + "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2=True), + "includes" : ["f5_bigip.include"], +}

6 years, 4 months

5704 FIX Windows agent: prevent crash without IPv6 support

by Jukka Aro

Module: check_mk Branch: master Commit: 657228ef6f9af32b06fa9e86bb790eb586f1de37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=657228ef6f9af3… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 22 15:15:07 2018 +0100 5704 FIX Windows agent: prevent crash without IPv6 support Windows agent crashed on older systems (at least Windows Server 2003 and Windows XP) that only supported IPv4. The bug was introduced in 1.4.0p25. Releases prior to that and as well as systems that support IPv6 should not have had the bug. --- .werks/5704 | 18 ++++++++++++++++++ agents/windows/ListenSocket.cc | 4 ++-- agents/windows/ListenSocket.h | 2 +- agents/windows/WinApi.cc | 8 ++++++++ agents/windows/WinApi.h | 6 ++++++ agents/windows/WinApiAdaptor.h | 7 +++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 35 ++++++++++++++++++++++++++++++++--- agents/windows/test/MockWinApi.h | 6 ++++++ 9 files changed, 81 insertions(+), 7 deletions(-) diff --git a/.werks/5704 b/.werks/5704 new file mode 100644 index 0000000..0b49368 --- /dev/null +++ b/.werks/5704 @@ -0,0 +1,18 @@ +Title: Windows agent: prevent crash without IPv6 support +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519310458 +Class: fix + +Windows agent crashed on older systems (at least Windows Server 2003 and +Windows XP) that only supported IPv4. + +The bug was introduced in 1.4.0p25. Older releases and systems that +support IPv6 should have remained unaffected. + +The configuration option ipv6 was not obeyed. Now this option can be +set to 'no' in order to only listen IPv4 connections on a IPv6 capable +system. diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 0ff2678..51a3144 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -39,10 +39,10 @@ ListenSocket::ListenSocket(int port, const only_from_t &source_whitelist, const WinApiAdaptor &winapi) : _logger(logger) , _winapi(winapi) + , _use_ipv6(supportIPV6) , _socket(init_listen_socket(port)) , _source_whitelist(source_whitelist) - , _supports_ipv4(true) - , _use_ipv6(supportIPV6) {} + , _supports_ipv4(true) {} ListenSocket::~ListenSocket() { _winapi.closesocket(_socket); } diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index 0429f9b..7991444 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -55,10 +55,10 @@ private: Logger *_logger; const WinApiAdaptor &_winapi; + bool _use_ipv6; SOCKET _socket; only_from_t _source_whitelist; bool _supports_ipv4; - bool _use_ipv6; }; #endif // ListenSocket_h diff --git a/agents/windows/WinApi.cc b/agents/windows/WinApi.cc index 72e9139..86a9309 100644 --- a/agents/windows/WinApi.cc +++ b/agents/windows/WinApi.cc @@ -831,6 +831,14 @@ LPSTR WinApi::PathCombine(LPSTR pszDest, LPCSTR pszDir, LPCSTR pszFile) const { return ::PathCombineA(pszDest, pszDir, pszFile); } +// WSPAPI: +int WinApi::WSCEnumProtocols(LPINT lpiProtocols, + LPWSAPROTOCOL_INFOW lpProtocolBuffer, + LPDWORD lpdwBufferLength, LPINT lpErrno) const { + return ::WSCEnumProtocols(lpiProtocols, lpProtocolBuffer, lpdwBufferLength, + lpErrno); +} + // MISC: LPWSTR *WinApi::CommandLineToArgvW(LPCWSTR lpCmdLine, int *pNumArgs) const { return ::CommandLineToArgvW(lpCmdLine, pNumArgs); diff --git a/agents/windows/WinApi.h b/agents/windows/WinApi.h index d49bc43..ab7f153 100644 --- a/agents/windows/WinApi.h +++ b/agents/windows/WinApi.h @@ -408,6 +408,12 @@ public: virtual LPSTR PathCombine(LPSTR pszDest, LPCSTR pszDir, LPCSTR pszFile) const override; + // WSPAPI: + virtual int WSCEnumProtocols(LPINT lpiProtocols, + LPWSAPROTOCOL_INFOW lpProtocolBuffer, + LPDWORD lpdwBufferLength, + LPINT lpErrno) const override; + // MISC: virtual LPWSTR *CommandLineToArgvW(LPCWSTR lpCmdLine, int *pNumArgs) const override; diff --git a/agents/windows/WinApiAdaptor.h b/agents/windows/WinApiAdaptor.h index 0d6d9bc..b9b9305 100644 --- a/agents/windows/WinApiAdaptor.h +++ b/agents/windows/WinApiAdaptor.h @@ -10,6 +10,7 @@ #include <windows.h> #include <winnt.h> #include <winsvc.h> +#include <ws2spi.h> #include <cstdarg> #include <cstddef> #include <cstring> @@ -442,6 +443,12 @@ public: virtual LPSTR PathCombine(LPSTR pszDest, LPCSTR pszDir, LPCSTR pszFile) const = 0; + // WSPAPI: + virtual int WSCEnumProtocols(LPINT lpiProtocols, + LPWSAPROTOCOL_INFOW lpProtocolBuffer, + LPDWORD lpdwBufferLength, + LPINT lpErrno) const = 0; + // MISC: virtual LPWSTR *CommandLineToArgvW(LPCWSTR lpCmdLine, int *pNumArgs) const = 0; diff --git a/agents/windows/build_version b/agents/windows/build_version index 5fd68c5..63e4f98 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3114 +3116 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 152f1f8..7349668 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -147,6 +147,8 @@ void RunImmediate(const char *mode, int argc, char **argv); // '----------------------------------------------------------------------' namespace { +const DWORD DEFAULT_BUFFER_SIZE = 16384L; + class UnpackError : public std::runtime_error { public: UnpackError(const std::string &what) : std::runtime_error(what) {} @@ -164,10 +166,38 @@ class MillisecondsFormatter : public Formatter { }; // Ugly but there is no (?) way to pass these as parameters to the Windows -// service stuff. At least, let us *not* make these yet another global variables +// service stuff. At least, let us *not* make this yet another global variable // and access them from other compilation units... const WinApi s_winapi; +bool supportIPv6() { + INT iNuminfo = 0; + DWORD bufferSize = DEFAULT_BUFFER_SIZE; + std::vector<BYTE> protocolInfo(bufferSize, 0); + int iErrno = 0; + auto lpProtocolInfo = + reinterpret_cast<LPWSAPROTOCOL_INFOW>(protocolInfo.data()); + + while ((iNuminfo = s_winapi.WSCEnumProtocols(nullptr, lpProtocolInfo, + &bufferSize, &iErrno)) == + SOCKET_ERROR) { + if (iErrno == WSAENOBUFS) { + protocolInfo.resize(bufferSize, 0); + } else { + std::cerr << "WSCEnumProtocols failed with error: " << iErrno + << std::endl; + WSACleanup(); + exit(1); + } + } + + for (INT i = 0; i < iNuminfo; ++i) { + if (lpProtocolInfo[i].iAddressFamily == AF_INET6) return true; + } + + return false; +} + struct GlobalConfig { Configuration parser; @@ -191,7 +221,7 @@ struct GlobalConfig { , section_flush(parser, "global", "section_flush", true, s_winapi) , encrypted(parser, "global", "encrypted", false, s_winapi) , encrypted_rt(parser, "global", "encrypted_rt", true, s_winapi) - , support_ipv6(parser, "global", "ipv6", true, s_winapi) + , support_ipv6(parser, "global", "ipv6", supportIPv6(), s_winapi) , passphrase(parser, "global", "passphrase", "", s_winapi) , only_from(parser, "global", "only_from", s_winapi) {} } * s_config; @@ -671,7 +701,6 @@ DWORD WINAPI realtime_check_func(void *data_in) { void do_adhoc(const Environment &env) { g_should_terminate = false; Logger *logger = Logger::getLogger("winagent"); - ListenSocket sock(*s_config->port, *s_config->only_from, *s_config->support_ipv6, logger, s_winapi); diff --git a/agents/windows/test/MockWinApi.h b/agents/windows/test/MockWinApi.h index ffc8e2d..91bdea5 100644 --- a/agents/windows/test/MockWinApi.h +++ b/agents/windows/test/MockWinApi.h @@ -442,6 +442,12 @@ public: MOCK_CONST_METHOD3(PathCombine, LPSTR(LPSTR pszDest, LPCSTR pszDir, LPCSTR pszFile)); + // WSPAPI: + MOCK_CONST_METHOD4(WSCEnumProtocols, + int(LPINT lpiProtocols, + LPWSAPROTOCOL_INFOW lpProtocolBuffer, + LPDWORD lpdwBufferLength, LPINT lpErrno)); + // MISC: MOCK_CONST_METHOD2(CommandLineToArgvW, LPWSTR *(LPCWSTR lpCmdLine, int *pNumArgs));

6 years, 4 months

Use state directory path from Settings.

by Sven Panne

Module: check_mk Branch: master Commit: 3b908d88aba648313b8ddcaf99767f6993984dc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b908d88aba648… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 23 14:19:49 2018 +0100 Use state directory path from Settings. Change-Id: I7138e14f3380fcab56f37bc3d5e8f954e8735045 --- bin/mkeventd | 77 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 280f295..ed89191 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -75,7 +75,22 @@ logger = cmk.log.get_logger("mkeventd") # | Global declarations and defaults settings | # '----------------------------------------------------------------------' -# TODO(sp) Use cmk.ec.settings +# TODO(sp) Turn these helper functions into Paths fields where they belong. +def history_path(settings): + return settings.paths.state_dir.value / 'history' + +def master_config_path(settings): + return settings.paths.state_dir.value / 'master_config' + +def slave_status_path(settings): + return settings.paths.state_dir.value / 'slave_status' + +def spool_path(settings): + return settings.paths.state_dir.value / 'spool' + +def status_path(settings): + return settings.paths.state_dir.value / 'status' + g_state_dir = os.path.join(cmk.paths.omd_root, "var/mkeventd") @@ -992,7 +1007,8 @@ def current_history_period(): # Delete old log files def expire_logfiles(flush=False): - log_dir = g_state_dir + "/history" + # TODO(sp) Use pathlib facilities below + log_dir = str(history_path(g_settings)) if not os.path.exists(log_dir): return # No historic files to delete yet. @@ -1040,7 +1056,8 @@ def flush_event_history_files(): def get_event_history_from_file(query): filters, limit = query.filters, query.limit history_entries = [] - log_dir = g_state_dir + "/history" + # TODO(sp) Use pathlib facilities below + log_dir = str(history_path(g_settings)) if not os.path.exists(log_dir): return [] @@ -1737,7 +1754,8 @@ class EventServer(ECServerThread): (data[1][0])) # check whether or not spool files are available - spool_dir = g_state_dir + "/spool" + # TODO(sp) Use pathlib facilities below + spool_dir = str(spool_path(g_settings)) if os.path.exists(spool_dir): spool_files = [f for f in os.listdir(spool_dir) if f[0] != '.'] if spool_files: @@ -3795,8 +3813,8 @@ class StatusServer(ECServerThread): g_event_status.save_status() if is_replication_slave(): try: - os.remove(g_state_dir + "/master_config") - os.remove(g_state_dir + "/slave_status") + master_config_path(self.settings).unlink() + slave_status_path(self.settings).unlink() load_slave_status() except Exception: pass @@ -4017,14 +4035,14 @@ class EventStatus(object): def save_status(self): now = time.time() status = self.pack_status() - path = g_state_dir + "/status" - # Belive it or not: cPickle is more than two times slower than repr() - with file(path + ".new", "w") as f: + path = status_path(g_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: f.write(repr(status) + "\n") - fd = f.fileno() f.flush() - os.fsync(fd) - os.rename(path + ".new", path) + os.fsync(f.fileno()) + path_new.rename(path) elapsed = time.time() - now self.logger.verbose("Saved event state to %s in %.3fms." % (path, elapsed * 1000)) @@ -4037,10 +4055,10 @@ class EventStatus(object): self.save_status() def load_status(self): - path = g_state_dir + "/status" - if os.path.exists(path): + path = status_path(g_settings) + if path.exists(): try: - status = ast.literal_eval(file(path).read()) + status = ast.literal_eval(path.read_bytes()) self._next_event_id = status["next_event_id"] self._events = status["events"] self._rule_stats = status["rule_stats"] @@ -4860,19 +4878,20 @@ def replication_update_state(new_state): def save_master_config(new_state): - path = g_state_dir + "/master_config" - file(path + ".new", "w").write(repr({ + path = master_config_path(g_settings) + path_new = path.parent / (path.name + '.new') + path_new.write_bytes(repr({ "rules": new_state["rules"], "rule_packs": new_state["rule_packs"], "actions": new_state["actions"], - }) + "\n") - os.rename(path + ".new", path) + }) + "\n") + path_new.rename(path) def load_master_config(): - path = g_state_dir + "/master_config" + path = master_config_path(g_settings) try: - config = ast.literal_eval(file(path).read()) + config = ast.literal_eval(path.read_bytes()) g_config["rules"] = config["rules"] g_config["rule_packs"] = config.get("rule_packs", []) g_config["actions"] = config["actions"] @@ -4912,8 +4931,7 @@ def get_state_from_master(): def save_slave_status(): - path = g_state_dir + "/slave_status" - file(path, "w").write(repr(g_slave_status) + "\n") + slave_status_path(g_settings).write_bytes(repr(g_slave_status) + "\n") # Load the current replication slave status. If we are in @@ -4921,10 +4939,10 @@ def save_slave_status(): # if not, then this variable will be missing and also the file def load_slave_status(): global g_slave_status - path = g_state_dir + "/slave_status" + path = slave_status_path(g_settings) if is_replication_slave(): try: - g_slave_status = ast.literal_eval(file(path).read()) + g_slave_status = ast.literal_eval(path.read_bytes()) except Exception: g_slave_status = { "last_sync": 0, # Time of last successful sync @@ -4936,8 +4954,8 @@ def load_slave_status(): # Remove slave status if we are (no longer) a slave else: - if os.path.exists(path): - os.remove(path) + if path.exists(): + path.unlink() try: del g_slave_status except Exception: @@ -5091,8 +5109,7 @@ if __name__ == "__main__": pid_path = g_settings.paths.pid_file.value if pid_path.exists(): - with pid_path.open(encoding='utf-8') as f: - old_pid = int(f.read()) + old_pid = int(pid_path.read_text(encoding='utf-8')) if process_exists(old_pid): bail_out("Old PID file %s still existing and mkeventd still running with PID %d." % (pid_path, old_pid)) pid_path.unlink() @@ -5100,7 +5117,7 @@ if __name__ == "__main__": # Make sure paths exist g_settings.paths.event_pipe.value.parent.mkdir(parents=True, exist_ok=True) - make_parentdirs(g_state_dir + "/state") + g_settings.paths.state_dir.value.mkdir(parents=True, exist_ok=True) # First do all things that might fail, before daemonizing g_perfcounters = Perfcounters()

6 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
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