Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Only require manpage if check generates a service

by Moritz Kiemer

Module: check_mk Branch: master Commit: b1ffcbe88e21902272da6b78885e45fa53f61f90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1ffcbe88e2190… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 25 11:29:29 2018 +0200 Only require manpage if check generates a service Change-Id: Iaffe10947d71ea783d868e53c8e334dff0100d0c --- tests/unit/cmk/test_man_pages.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/unit/cmk/test_man_pages.py b/tests/unit/cmk/test_man_pages.py index d82043b..0261974 100644 --- a/tests/unit/cmk/test_man_pages.py +++ b/tests/unit/cmk/test_man_pages.py @@ -130,11 +130,18 @@ def test_manpage_files(): assert len(manuals) > 1000 +def _is_pure_section_declaration(check): + '''return true if and only if the check never generates a service''' + return (check.get('inventory_function') is None and + check.get('check_function') is None) + + def test_find_missing_manpages(): all_check_manuals = man_pages.all_man_pages() checks.load() - checks_sorted = checks.check_info.items() + \ + checks_sorted = [ (name, entry) for (name, entry) in checks.check_info.items() + if not _is_pure_section_declaration(entry) ] + \ [ ("check_" + name, entry) for (name, entry) in checks.active_check_info.items() ] checks_sorted.sort() assert len(checks_sorted) > 1000

6 years, 4 months

Fix never matching fail condition

by Moritz Kiemer

Module: check_mk Branch: master Commit: 99966b025d8147ca226c5bca0af8e268c544e92c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99966b025d8147… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu May 24 15:58:23 2018 +0200 Fix never matching fail condition Change-Id: Ie4bbde784479eb9feb7ab803695cb83c0022ebc2 --- checks/emcvnx_mirrorview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/emcvnx_mirrorview b/checks/emcvnx_mirrorview index 35fad6e..89feea9 100644 --- a/checks/emcvnx_mirrorview +++ b/checks/emcvnx_mirrorview @@ -96,7 +96,7 @@ def parse_emcvnx_mirrorview(info): parsed = {} for line in info: - if line[0] == "Request failed. Management Server - Sync Mirror Feature software is not installed or unavailable.": + if ' '.join(line).startswith("Unable to validate the identity of the server."): break elif line[0] == "MirrorView Name":

6 years, 4 months

Work around pipenv timestamp oddity. Cleaned up a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 44abc7447a849d1064f8945887348a1f6385ccb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44abc7447a849d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 29 12:59:37 2018 +0200 Work around pipenv timestamp oddity. Cleaned up a bit. Change-Id: I7405f91c1d959c5528b4ddc1e2217144d6d01229 --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6b2958c..10c47ea 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ SCAN_BUILD := scan-build-$(CLANG_VERSION) export CPPCHECK := cppcheck export DOXYGEN := doxygen export IWYU_TOOL := iwyu_tool +PIPENV := PIPENV_NO_INHERIT=true PIPENV_VENV_IN_PROJECT=true pipenv # The Bear versions have a slightly tragic history: Due to the clang bug # https://llvm.org/bugs/show_bug.cgi?id=24710 we need absolute paths in our @@ -540,11 +541,19 @@ ifeq ($(ENTERPRISE),yes) endif Pipfile.lock: Pipfile - PIPENV_VENV_IN_PROJECT=true pipenv lock + $(PIPENV) lock +# TODO: pipenv and make don't really cooperate nicely: Locking alone already +# creates a virtual environment with setuptools/pip/wheel. This could lead to a +# wrong up-to-date status of it later, so let's remove it here. What we really +# want is a check if the contents of .venv match the contents of Pipfile.lock. +# We should do this via some move-if-change Kung Fu, but for now rm suffices. + rm -rf .venv .venv: Pipfile.lock - PIPENV_VENV_IN_PROJECT=true pipenv install --dev - pipenv clean + $(PIPENV) install --dev + $(PIPENV) clean +# TODO: Part 2 of the hack for the Pipfile.lock target. + touch .venv # This dummy rule is called from subdirectories whenever one of the # top-level Makefile's dependencies must be updated. It does not

6 years, 4 months

6185 FIX docker_node_images: Improved performance of agent section creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 666cca35e605b6cfd14b668f17c4893ba024eec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=666cca35e605b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 21:20:55 2018 +0200 6185 FIX docker_node_images: Improved performance of agent section creation The agent section generating code has been reworked for better performance. You will have to update the agent to get this improvement. In case you use the old agent with the new check, you will get no image label information. Change-Id: Ia5c3c6b8d7d34729b8961273c08cc09b193ec343 --- .werks/6185 | 13 +++++++++++++ agents/check_mk_agent.linux | 12 ++++++------ inventory/docker_node_images | 30 ++++++++++++++---------------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/.werks/6185 b/.werks/6185 new file mode 100644 index 0000000..168bcd3 --- /dev/null +++ b/.werks/6185 @@ -0,0 +1,13 @@ +Title: docker_node_images: Improved performance of agent section creation +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527535164 + +The agent section generating code has been reworked for better performance. +You will have to update the agent to get this improvement. In case you use +the old agent with the new check, you will get no image label information. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 14696be..506e198 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1003,12 +1003,12 @@ if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then echo "<<<docker_node_images>>>" echo "[[[images]]]" - docker images --all --format "{{json .}}" - for image in $(docker images --all --format "{{.Repository}}:{{.Tag}}"); - do - echo "[[[images_labels:$image]]]" - docker image inspect --format "{{json .Config.Labels}}" "$image" - done + docker images --format "{{json .}}" + + echo "[[[image_labels]]]" + IMAGE_IDS=$(docker images --format '{{.ID}}') + docker image inspect --format "[ {{json .Id}}, {{json .Config.Labels}} ]" "$IMAGE_IDS" + echo "[[[containers]]]" docker container ls --all --format "{{json .}}" diff --git a/inventory/docker_node_images b/inventory/docker_node_images index a260e55..fcb99b7 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -37,15 +37,14 @@ def _parse_docker_node_images(info): data = json.loads(" ".join(line)) if section_name == "images" and data: - parsed.setdefault((data["Repository"], data["Tag"]), data) + parsed.setdefault(data["ID"], data) - elif section_name.startswith("images_labels"): - parts = section_name.split(":", 2) - if len(parts) == 3: - repository, tag = parts[1:] - image = parsed.get((repository, tag)) - if image is not None and data: - image.setdefault("__labels__", data) + elif section_name == "images_labels": + if len(data) == 2: + image_id, labels = data + image = parsed.get(image_id) + if image is not None and labels: + image.setdefault("__labels__", labels) elif section_name == "containers": image_name = data["Image"] @@ -66,21 +65,20 @@ def inv_docker_node_images(info, inventory_tree, status_data_tree): inv_node = inventory_tree.get_list(path) status_node = status_data_tree.get_list(path) - for (repo, tag), image in sorted(parsed.iteritems()): - id_ = image["ID"] + for image_id, image in sorted(parsed.iteritems()): inv_node.append({ - "repository" : repo, - "tag" : tag, - "id" : id_, + "repository" : image["Repository"], + "tag" : image["Tag"], + "id" : image_id, "creation" : image["CreatedAt"], "size" : image["VirtualSize"], "labels" : _format_labels(image.get("__labels__", {}).items()), }) status_node.append({ - "repository" : repo, - "tag" : tag, - "id" : id_, + "repository" : image["Repository"], + "tag" : image["Tag"], + "id" : image_id, "amount_containers" : len(image.get("__containers__", [])), })

6 years, 4 months

docker node image list: Sort ID of images first

by Lars Michelsen

Module: check_mk Branch: master Commit: c5feb0b3b3bcc364168da011831170da9a39ac2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5feb0b3b3bcc3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 21:42:21 2018 +0200 docker node image list: Sort ID of images first Change-Id: Ia5173398831d728bda07b6067a6680c8e58df408 --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index a54f556..bc11e02 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -796,7 +796,7 @@ inventory_displayhints.update({ ".software.applications.docker.images:": { "title" : _("Images"), - "keyorder": ["repository", "tag", "id", "creation", "size", "labels", "amount_containers"], + "keyorder": ["id", "repository", "tag", "creation", "size", "labels", "amount_containers"], "view" : "invdockerimages_of_host", }, ".software.applications.docker.images:*.id": {

6 years, 4 months

Improved performance of gathering docker container specific information from the node

by Lars Michelsen

Module: check_mk Branch: master Commit: dcd718a8cab3905bd3d54f3bd77a24b00db895ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcd718a8cab390… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 21:38:18 2018 +0200 Improved performance of gathering docker container specific information from the node Change-Id: I8aa9ae619f2f6e3693e379dcc0abdc7a6a1a1bdf --- agents/check_mk_agent.linux | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 506e198..530ecfb 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1019,18 +1019,8 @@ if type docker > /dev/null 2>&1 && [ -z "$MK_IS_PIGGYBACKED" ]; then # For the container status, we want information about *all* containers for CONTAINER_ID in $(docker container ls -q --all); do echo "<<<<${CONTAINER_ID}>>>>" - echo "<<<docker_container_status>>>" - docker inspect "$CONTAINER_ID" --format='{{json .State}}' - - echo "<<<docker_container_node_name>>>" - echo "$NODE_NAME" - - echo "<<<docker_container_labels>>>" - docker inspect "$CONTAINER_ID" --format='{{json .Config.Labels}}' - - echo "<<<docker_container_network>>>" - docker inspect "$CONTAINER_ID" --format='{{json .NetworkSettings}}' - + docker inspect "$CONTAINER_ID" \ + --format='{{println "<<<docker_container_status>>>"}}{{json .State}}{{println}}{{println "<<<docker_container_node_name>>>"}}{{println '"$NODE_NAME"'}}{{println "<<<docker_container_labels>>>"}}{{json .Config.Labels}}{{println}}{{println "<<<docker_container_network>>>"}}{{json .NetworkSettings}}{{println}}' echo "<<<<>>>>" done

6 years, 4 months

Updated text

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fd97dcd36ef6d6524025ece1018af263d731c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fd97dcd36ef6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 21:22:32 2018 +0200 Updated text Change-Id: I6870fba6b41769c27938d2d857bca3598c9f8db7 --- .werks/6185 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.werks/6185 b/.werks/6185 index 168bcd3..c2901ad 100644 --- a/.werks/6185 +++ b/.werks/6185 @@ -11,3 +11,6 @@ Date: 1527535164 The agent section generating code has been reworked for better performance. You will have to update the agent to get this improvement. In case you use the old agent with the new check, you will get no image label information. + +The agent is not processing all images anymore. It skips the intermediate +images (were shown as "<none>:<none>" before).

6 years, 4 months

Removed c buffer flushing of stderr redurector

by Lars Michelsen

Module: check_mk Branch: master Commit: cf2b593b8666d4d3a992cc88c81e4555ae6d613a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf2b593b8666d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 17:29:43 2018 +0200 Removed c buffer flushing of stderr redurector Change-Id: Ie5e1fde150aa56c6eac74ef274e4eeef537a94ae --- web/plugins/userdb/ldap.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 0aa505b..c9b6ce9 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -47,7 +47,6 @@ import time import copy from contextlib import contextmanager -import ctypes import io import sys import tempfile @@ -1227,9 +1226,6 @@ multisite_user_connectors['ldap'] = LDAPUserConnector # | the help of this wrapper in case the LDAP logging debug level is on | # '----------------------------------------------------------------------' -libc = ctypes.CDLL(None) -c_stderr = ctypes.c_void_p.in_dll(libc, 'stderr') - @contextmanager def stderr_redirector(stream): # The original fd stderr points to. Usually 1 on POSIX systems. @@ -1237,8 +1233,6 @@ def stderr_redirector(stream): def _redirect_stderr(to_fd): """Redirect stderr to the given file descriptor.""" - # Flush the C-level buffer stderr - libc.fflush(c_stderr) # Flush and close sys.stderr - also closes the file descriptor (fd) sys.stderr.close() # Make original_stderr_fd point to the same file as to_fd

6 years, 4 months

LDAP: Also enable GNUTLS debugging in case of ldap debug logging is active

by Lars Michelsen

Module: check_mk Branch: master Commit: 0efabc32c374ceb9182eaa45fdf92714f6a0260a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0efabc32c374ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 11:58:58 2018 +0200 LDAP: Also enable GNUTLS debugging in case of ldap debug logging is active Change-Id: Iddb1804b48d78ed611da4e7a75a892e66499272a --- web/plugins/userdb/ldap.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index b189735..f58d2ca 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -213,6 +213,7 @@ class LDAPUserConnector(UserConnector): try: trace_args = {} if self._logger.isEnabledFor(cmk.log.DEBUG): + os.environ["GNUTLS_DEBUG_LEVEL"] = "99" ldap.set_option(ldap.OPT_DEBUG_LEVEL, 4095) trace_args["trace_level"] = 2 trace_args["trace_file"] = sys.stderr

6 years, 4 months

6183 FIX LDAP: Improved debug logging during connect

by Lars Michelsen

Module: check_mk Branch: master Commit: 44becb544db7f5936a552e1ab83fe92a167fc2b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44becb544db7f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 10:43:02 2018 +0200 6183 FIX LDAP: Improved debug logging during connect When the LDAP logging of the GUI is set to debug the web.log will now get the debug outputs of the lower level python-ldap and libldap components added. This will show up detailed information about why connection attempts fail. Change-Id: Ia3a7a5b23058d3f93c8e2b2e81ef566a7618413d --- .werks/6183 | 14 +++++++++ web/plugins/userdb/ldap.py | 71 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/.werks/6183 b/.werks/6183 new file mode 100644 index 0000000..6f51e61 --- /dev/null +++ b/.werks/6183 @@ -0,0 +1,14 @@ +Title: LDAP: Improved debug logging during connect +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527496871 + +When the LDAP logging of the GUI is set to debug the web.log will now get the +debug outputs of the lower level python-ldap and libldap components added. + +This will show up detailed information about why connection attempts fail. diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3c8033d..b189735 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -46,6 +46,12 @@ import os import time import copy +from contextlib import contextmanager +import ctypes +import io +import sys +import tempfile + # docs: http://www.python-ldap.org/doc/html/index.html import ldap import ldap.filter @@ -56,6 +62,7 @@ import cmk.paths import config import watolib import log +import cmk.log # LDAP attributes are case insensitive, we only use lower case! # Please note: This are only default values. The user might override this @@ -204,8 +211,14 @@ class LDAPUserConnector(UserConnector): def connect_server(self, server): try: + trace_args = {} + if self._logger.isEnabledFor(cmk.log.DEBUG): + ldap.set_option(ldap.OPT_DEBUG_LEVEL, 4095) + trace_args["trace_level"] = 2 + trace_args["trace_file"] = sys.stderr + uri = self.format_ldap_uri(server) - conn = ldap.ldapobject.ReconnectLDAPObject(uri) + conn = ldap.ldapobject.ReconnectLDAPObject(uri, **trace_args) conn.protocol_version = self._config.get('version', 3) conn.network_timeout = self._config.get('connect_timeout', 2.0) conn.retry_delay = 0.5 @@ -276,10 +289,14 @@ class LDAPUserConnector(UserConnector): servers = self.servers() for server in servers: - ldap_obj, error_msg = self.connect_server(server) + debug_buffer = io.BytesIO() + with stderr_redirector(debug_buffer): + ldap_obj, error_msg = self.connect_server(server) + if ldap_obj: self._ldap_obj = ldap_obj else: + self._logger.debug("libldap debug output: %s" % debug_buffer.getvalue()) errors.append(error_msg) continue # In case of an error, try the (optional) fallback servers @@ -1193,6 +1210,56 @@ class LDAPUserConnector(UserConnector): multisite_user_connectors['ldap'] = LDAPUserConnector +#. +# .--Debugging-----------------------------------------------------------. +# | ____ _ _ | +# | | _ \ ___| |__ _ _ __ _ __ _(_)_ __ __ _ | +# | | | | |/ _ \ '_ \| | | |/ _` |/ _` | | '_ \ / _` | | +# | | |_| | __/ |_) | |_| | (_| | (_| | | | | | (_| | | +# | |____/ \___|_.__/ \__,_|\__, |\__, |_|_| |_|\__, | | +# | |___/ |___/ |___/ | +# +----------------------------------------------------------------------+ +# | A context manuer to catch the debug output for libldap that is sent | +# | to stderr. We need all information in the web.log. This is done with | +# | the help of this wrapper in case the LDAP logging debug level is on | +# '----------------------------------------------------------------------' + +libc = ctypes.CDLL(None) +c_stderr = ctypes.c_void_p.in_dll(libc, 'stderr') + +@contextmanager +def stderr_redirector(stream): + # The original fd stderr points to. Usually 1 on POSIX systems. + original_stderr_fd = sys.stderr.fileno() + + def _redirect_stderr(to_fd): + """Redirect stderr to the given file descriptor.""" + # Flush the C-level buffer stderr + libc.fflush(c_stderr) + # Flush and close sys.stderr - also closes the file descriptor (fd) + sys.stderr.close() + # Make original_stderr_fd point to the same file as to_fd + os.dup2(to_fd, original_stderr_fd) + # Create a new sys.stderr that points to the redirected fd + sys.stderr = os.fdopen(original_stderr_fd, 'wb') + + # Save a copy of the original stderr fd in saved_stderr_fd + saved_stderr_fd = os.dup(original_stderr_fd) + try: + # Create a temporary file and redirect stderr to it + tfile = tempfile.TemporaryFile(mode='w+b') + _redirect_stderr(tfile.fileno()) + # Yield to caller, then redirect stderr back to the saved fd + yield + _redirect_stderr(saved_stderr_fd) + # Copy contents of temporary file to the given stream + tfile.flush() + tfile.seek(0, io.SEEK_SET) + stream.write(tfile.read()) + finally: + tfile.close() + os.close(saved_stderr_fd) + #. # .--Attributes----------------------------------------------------------.

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018