Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Use the correct position for the arrow in the sidebar fold in both themes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ac71261a3be18d6b2311216708c12adc739e33d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac71261a3be18d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 30 16:37:31 2018 +0200 Use the correct position for the arrow in the sidebar fold in both themes Change-Id: Ic5d568983fabfa8ecc03195c714965b7e23c114a --- web/htdocs/sidebar.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index e686335..606ba75 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -90,14 +90,14 @@ body.side.screenshotmode { left: 0px; top: 0px; width: 10px; - height: 55px; + height: 100%; z-index: 15; cursor: pointer; } #side_fold:hover { background-repeat: no-repeat; - background-position: -3px 7px; + background-position: 5% 65%; background-image: url("images/side_fold.png"); }

6 years, 1 month

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 4c041ff3ce29f3fea1e66e537aedbd49c84f4745 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c041ff3ce29f3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 31 09:27:26 2018 +0200 Minor cleanup Change-Id: I99079da34cf95217752237b30bc48060a033f412 --- checks/mssql_instance | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/checks/mssql_instance b/checks/mssql_instance index ad9a6fc..78ae2a4 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -120,14 +120,7 @@ def check_mssql_instance(item, params, parsed): if instance["state"] == "0": yield state, "Failed to connect to database (%s)" % instance["error_msg"] - if "prod_version_info" in instance: - # Newer output of version info - version_info = instance["prod_version_info"] - else: - # Fallback, is always reported by agent plugin - version_info = instance["version_info"] - yield 0, "Version: %s" % version_info - + yield 0, "Version: %s" % instance.get("prod_version_info", instance["version_info"]) if instance["cluster_name"] != "": yield 0, "Clustered as %s" % instance["cluster_name"]

6 years, 1 month

Little improvment

by Simon Betz

Module: check_mk Branch: master Commit: e28c54a2a872ed49b8cd4dafdfb55a746b0591e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e28c54a2a872ed… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 31 09:24:23 2018 +0200 Little improvment Change-Id: I2b3930ec4c77b18a145e82251d6a152732119e5a --- checks/mssql_instance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mssql_instance b/checks/mssql_instance index 31feeb7..ad9a6fc 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -59,7 +59,7 @@ def _parse_prod_version(entry): elif entry.startswith("14."): version = "2017" else: - return "UNKNOWN" + return "unknown[%s]" % entry return "Microsoft SQL Server %s" % version

6 years, 1 month

hp_proliant_psu: add missing item matcher

by Moritz Kiemer

Module: check_mk Branch: master Commit: e7a2520a6b6a1738783b5aa91bb14ca07f54201e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7a2520a6b6a17… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 30 15:44:40 2018 +0200 hp_proliant_psu: add missing item matcher Change-Id: Idfae792eb83f7a4ca302116404291e1b976d516b --- cmk/gui/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index bbf48f8..812f699 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -5137,7 +5137,7 @@ register_check_parameters( )), ], ), - None, + TextAscii(title = _("PSU (Chassis/Bay)")), match_type = "dict" )

6 years, 1 month

Disable pthreads support for MinGW cross-compilation.

by Sven Panne

Module: check_mk Branch: master Commit: e30fbd3e6f7e35cccdfdf82fe3c2b77742e7891e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30fbd3e6f7e35… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 30 17:11:28 2018 +0200 Disable pthreads support for MinGW cross-compilation. Change-Id: Ic9f2f65fd1df931be7663f830aa0ff181a76021e --- agents/windows/build.sh | 2 ++ agents/windows/chroot_version | 2 +- agents/windows/test/build-googletest | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/build.sh b/agents/windows/build.sh index 45136f0..14f33a2 100644 --- a/agents/windows/build.sh +++ b/agents/windows/build.sh @@ -55,6 +55,7 @@ function build { # during install step # --build : architecture of build machine (for cross-compilation) # --host : target architecture of cross-compilation + # --without-pthreads : MinGW's pthread implementation is not compatible with googletest # CC : C compiler (redundant but quiets a cross-compilation warning) # CXX : C++ compiler # WINDRES : program for manipulating Windows resource files @@ -63,6 +64,7 @@ function build { --program-transform-name=${transforms[$1]} \ --build i686-pc-linux-gnu \ --host ${archs[$1]}${common} \ + --without-pthreads \ CC=${archs[$1]}${common}-gcc-posix \ CXX=${archs[$1]}${common}-g++-posix \ WINDRES=${archs[$1]}${common}-windres \ diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index b1bd38b..8351c19 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -13 +14 diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index 84eb4b9..02ec830 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -1,6 +1,7 @@ #!/bin/bash # Build MinGW libraries for Google Test and Google Mock. +set -x set -e version=0048647619 [[ -z $CHROOT_BUILD_DIR ]] && exit 1

6 years, 1 month

Fix alignment issue with modified global settings

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4bc9b69bef0dd2ce32ce19c1f6333850f0de4ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bc9b69bef0dd2… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 30 15:24:54 2018 +0200 Fix alignment issue with modified global settings Fixes a problem where leading characters of modified global settings were truncatated. An example is the new option "User interface theme". Change-Id: I94a9539567b33d5aa5bb458e81e5a57d5423e578 --- web/htdocs/wato.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index a38726f..1088e34 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -841,7 +841,7 @@ div.varname { border-radius: 5px 5px 5px 5px; border: 1px solid #cdf; box-shadow: 3px 3px 5px #eee inset; - margin-left: -5px; + margin-left: -4px; padding-bottom: 18px; padding: 1px 4px 2px 4px; }

6 years, 1 month

Fixed background job standard FD handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c6485cc3a86ce6218bfc168b8f8924558c9d2b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c6485cc3a86ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 20:27:56 2018 +0200 Fixed background job standard FD handling After each background job start these messages could be found in the apache error log: [Tue Jul 24 20:06:01.490903 2018] [wsgi:error] [pid 16596] [client 127.0.0.1:40244] close failed in file object destructor: [Tue Jul 24 20:06:01.490960 2018] [wsgi:error] [pid 16596] [client 127.0.0.1:40244] IOError: [Errno 9] Bad file descriptor This problem was caused by the handling of the open file descriptors when starting background job. During start all FDs except the first 3 were closed. The sys.stdout object was replaced in python with a StringIO() wrapper which is then used to collect the job results. But the FDs 0, 1 and 2 were not closed. To have a clean initial state we are now closing all FDs without exception. We proceed without stdin and also replace stderr with a stream wrapper that sends the written data to the var/log/web.log. Change-Id: I3596a793ac37d406b0aeded15cb5f6df922cee0b --- cmk/gui/background_job.py | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/cmk/gui/background_job.py b/cmk/gui/background_job.py index 96ab9ac..2c6daf7 100644 --- a/cmk/gui/background_job.py +++ b/cmk/gui/background_job.py @@ -194,14 +194,17 @@ class BackgroundProcess(multiprocessing.Process): except: MAXFD = 256 - # Close all filedescriptors, except stdin/stdout - os.closerange(3, MAXFD) + # Close all file descriptors + os.closerange(0, MAXFD) def initialize_environment(self): if not self._logger: self._logger = cmk.log.logger + sys.stderr = StreamLogger(self._logger, cmk.log.ERROR) + sys.stdout = StringIO() + self._job_parameters["logger"] = self._logger # Solely used for process identification @@ -211,7 +214,6 @@ class BackgroundProcess(multiprocessing.Process): def _execute_function(self): # The specific function is called in a separate thread # The main thread collects the stdout from the function-thread and updates the status file accordingly - sys.stdout = StringIO() t = threading.Thread(target=self._call_function_with_exception_handling, args=[self._job_parameters]) t.start() @@ -260,6 +262,27 @@ class BackgroundProcess(multiprocessing.Process): +# TODO(ab): Wouldn't it be better to also write the stderr to the job results instead of just writing +# it to the web.log? +class StreamLogger(object): + """File like stream object to redirects writes to the given logger""" + def __init__(self, logger, level): + super(StreamLogger, self).__init__() + self._logger = logger + self._level = level + self._linebuf = '' + + + def write(self, buf): + for line in buf.rstrip().splitlines(): + self._logger.log(self._level, line.rstrip()) + + + def flush(self): + pass + + + class BackgroundJobDefines(object): base_dir = os.path.join(cmk.paths.var_dir, "background_jobs") process_name = "cmk-job" # NOTE: keep this name short! psutil.Process tends to truncate long names

6 years, 1 month

Change theme descriptions in the GUI to "Modern" and "Classic"

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 454f93fc73805413af1f9c48116e1167943335a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=454f93fc738054… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 30 12:29:49 2018 +0200 Change theme descriptions in the GUI to "Modern" and "Classic" Change-Id: If4fbf33cb121fc66a876d8154874485c324a7100 --- cmk/gui/config.py | 7 +++++++ cmk/gui/plugins/userdb/user_attributes.py | 6 ++---- cmk/gui/plugins/wato/check_mk_configuration.py | 5 +---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 99ef446..91f39cf 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -1046,3 +1046,10 @@ def load_plugins(force): # Make sure, builtin roles are present, even if not modified and saved with WATO. for br in builtin_role_ids: roles.setdefault(br, {}) + + +def theme_choices(): + return [ + ("classic", _("Classic")), + ("facelift", _("Modern")), + ] diff --git a/cmk/gui/plugins/userdb/user_attributes.py b/cmk/gui/plugins/userdb/user_attributes.py index bde8b0e..171ee5f 100644 --- a/cmk/gui/plugins/userdb/user_attributes.py +++ b/cmk/gui/plugins/userdb/user_attributes.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +from cmk.gui.config import theme_choices from cmk.gui.valuespec import * from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -193,10 +194,7 @@ class UIThemeUserAttribute(UserAttribute): ), DropdownChoice( title = _("Set custom theme"), - choices = [ - ("classic", _("Classic user interface")), - ("facelift", _("Face lifted")), - ], + choices = theme_choices(), ), ], ) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 487cc7d..64ef5ef 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -111,10 +111,7 @@ register_configvar( DropdownChoice( title = _("User interface theme"), help = _("Change the default user interface theme of your Check_MK installation"), - choices = [ - ("classic", _("Classic user interface")), - ("facelift", _("Face lifted")), - ], + choices = config.theme_choices(), ), domain = "multisite", )

6 years, 1 month

Added some tracing to figure out what's going on...

by Sven Panne

Module: check_mk Branch: master Commit: 6cbd990690d95c4822cc86df752041ce28ef4814 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cbd990690d95c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 30 15:34:21 2018 +0200 Added some tracing to figure out what's going on... Change-Id: I7c258de6ec13689ad09372a7a40fc7ac9499dbb7 --- agents/windows/chroot_version | 2 +- agents/windows/do-chroot | 2 ++ agents/windows/make-agent | 1 + agents/windows/make-chroot | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index 48082f7..b1bd38b 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -12 +13 diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index 400e18f..d077af7 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -1,5 +1,7 @@ #!/bin/bash +set -x + # $1: cmd(s) to be executed within chroot jail # if non-existent, enter chroot jail with 'bash -l' diff --git a/agents/windows/make-agent b/agents/windows/make-agent index f2f077d..4bab241 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -8,6 +8,7 @@ # Possible make targets. By default, a parallel build and # install-strip (non-debug) is done and an msi installer produced. +set -x set -e if [ -z $SUDO_USER ]; then diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 471f5a9..f62c36d 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -2,6 +2,7 @@ # The script creates a chroot based on a current ubuntu version # and installs all dependencies needed to build the windows agent. +set -x set -e DISTRO=bionic

6 years, 1 month

Give some variables a more significant name

by Simon Betz

Module: check_mk Branch: master Commit: 071d511a89c478b5cacd7c505c769ce147280eed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=071d511a89c478… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 30 12:17:44 2018 +0200 Give some variables a more significant name Change-Id: I3ce26b04f6d6897b0a6e587d9ed8eb2752169ec1 --- cmk_base/piggyback.py | 69 ++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index faac4df..1ab48c9 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -40,9 +40,9 @@ def get_piggyback_raw_data(piggyback_max_cachefile_age, hostname): if not hostname: return output - for sourcehost, file_path in _get_piggyback_files(piggyback_max_cachefile_age, hostname): - console.verbose("Using piggyback raw data from host %s.\n" % sourcehost) - output += file(file_path).read() + for source_host, piggyback_file_path in _get_piggyback_files(piggyback_max_cachefile_age, hostname): + console.verbose("Using piggyback raw data from host %s.\n" % source_host) + output += file(piggyback_file_path).read() return output @@ -74,51 +74,51 @@ def _get_piggyback_files(piggyback_max_cachefile_age, hostname): else: raise - for sourcehost in source_host_names: - if sourcehost.startswith("."): + for source_host in source_host_names: + if source_host.startswith("."): continue - file_path = os.path.join(piggyback_dir, sourcehost) + piggyback_file_path = os.path.join(piggyback_dir, source_host) try: - file_age = cmk_base.utils.cachefile_age(file_path) + file_age = cmk_base.utils.cachefile_age(piggyback_file_path) except MKGeneralException, e: continue # File might've been deleted. That's ok. # Skip piggyback files that are outdated at all if file_age > piggyback_max_cachefile_age: console.verbose("Piggyback file %s is outdated (%d seconds too old). Skip processing.\n" % - (file_path, file_age - piggyback_max_cachefile_age)) + (piggyback_file_path, file_age - piggyback_max_cachefile_age)) continue # Skip piggyback files that have not been updated in the last contact # with the source host that is currently being handled. try: - source_update_age = _piggyback_source_host_update_age(sourcehost) + source_update_age = _piggyback_source_host_update_age(source_host) except MKGeneralException, e: - console.verbose("Piggyback file %s is outdated (Source not sending piggyback). Skip processing.\n" % file_path) + console.verbose("Piggyback file %s is outdated (Source not sending piggyback). Skip processing.\n" % piggyback_file_path) continue # No source_status_file exists -> ignore data from this source if file_age > source_update_age: - console.verbose("Piggyback file %s is outdated (Not updated by source). Skip processing.\n" % file_path) + console.verbose("Piggyback file %s is outdated (Not updated by source). Skip processing.\n" % piggyback_file_path) continue - files.append((sourcehost, file_path)) + files.append((source_host, piggyback_file_path)) return files -def _piggyback_source_status_path(sourcehost): - return os.path.join(cmk.paths.tmp_dir, "piggyback_sources", sourcehost) +def _piggyback_source_status_path(source_host): + return os.path.join(cmk.paths.tmp_dir, "piggyback_sources", source_host) -def _piggyback_source_host_update_age(sourcehost): - return cmk_base.utils.cachefile_age(_piggyback_source_status_path(sourcehost)) +def _piggyback_source_host_update_age(source_host): + return cmk_base.utils.cachefile_age(_piggyback_source_status_path(source_host)) -def _remove_piggyback_file(file_path): +def _remove_piggyback_file(piggyback_file_path): try: - os.remove(file_path) + os.remove(piggyback_file_path) return True except OSError, e: if e.errno == 2: # No such file or directory @@ -127,27 +127,27 @@ def _remove_piggyback_file(file_path): raise -def remove_source_status_file(sourcehost): +def remove_source_status_file(source_host): """Remove the source_status_file of this piggyback host which will mark the piggyback data from this source as outdated.""" - source_status_path = _piggyback_source_status_path(sourcehost) + source_status_path = _piggyback_source_status_path(source_host) return _remove_piggyback_file(source_status_path) -def store_piggyback_raw_data(sourcehost, piggybacked_raw_data): +def store_piggyback_raw_data(source_host, piggybacked_raw_data): for backedhost, lines in piggybacked_raw_data.items(): console.verbose("Storing piggyback data for: %s\n" % backedhost) content = "\n".join(lines) + "\n" - store.save_file(os.path.join(cmk.paths.tmp_dir, "piggyback", backedhost, sourcehost), content) + store.save_file(os.path.join(cmk.paths.tmp_dir, "piggyback", backedhost, source_host), content) # Store the last contact with this piggyback source to be able to filter outdated data later # We use the mtime of this file later for comparision. # Only do this for hosts that sent piggyback data this turn, cleanup the status file when no # piggyback data was sent this turn. if piggybacked_raw_data: - store.save_file(_piggyback_source_status_path(sourcehost), "") + store.save_file(_piggyback_source_status_path(source_host), "") else: - remove_source_status_file(sourcehost) + remove_source_status_file(source_host) def cleanup_piggyback_files(piggyback_max_cachefile_age): @@ -177,16 +177,17 @@ def _cleanup_old_source_status_files(piggyback_max_cachefile_age): if entry[0] == ".": continue - file_path = os.path.join(base_dir, entry) + piggyback_file_path = os.path.join(base_dir, entry) try: - file_age = cmk_base.utils.cachefile_age(file_path) + file_age = cmk_base.utils.cachefile_age(piggyback_file_path) except MKGeneralException, e: continue # File might've been deleted. That's ok. if file_age > piggyback_max_cachefile_age: - console.verbose("Removing outdated piggyback source status file %s\n" % file_path) - _remove_piggyback_file(file_path) + console.verbose("Removing outdated piggyback source status file %s\n" % piggyback_file_path) + _remove_piggyback_file(piggyback_file_path) + def _cleanup_old_piggybacked_files(piggyback_max_cachefile_age): """Remove piggyback data that is not needed anymore @@ -211,12 +212,12 @@ def _cleanup_old_piggybacked_files(piggyback_max_cachefile_age): if source_host_name[0] == ".": continue - file_path = os.path.join(backed_host_dir_path, source_host_name) + piggyback_file_path = os.path.join(backed_host_dir_path, source_host_name) - delete_reason = _shall_cleanup_piggyback_file(piggyback_max_cachefile_age, file_path, source_host_name, keep_sources) + delete_reason = _shall_cleanup_piggyback_file(piggyback_max_cachefile_age, piggyback_file_path, source_host_name, keep_sources) if delete_reason: - console.verbose("Removing outdated piggyback file (%s) %s\n" % (delete_reason, file_path)) - _remove_piggyback_file(file_path) + console.verbose("Removing outdated piggyback file (%s) %s\n" % (delete_reason, piggyback_file_path)) + _remove_piggyback_file(piggyback_file_path) # Remove empty backed host directory try: @@ -228,12 +229,12 @@ def _cleanup_old_piggybacked_files(piggyback_max_cachefile_age): raise -def _shall_cleanup_piggyback_file(piggyback_max_cachefile_age, file_path, source_host_name, keep_sources): +def _shall_cleanup_piggyback_file(piggyback_max_cachefile_age, piggyback_file_path, source_host_name, keep_sources): if source_host_name not in keep_sources: return "Source not sending piggyback data" try: - file_age = cmk_base.utils.cachefile_age(file_path) + file_age = cmk_base.utils.cachefile_age(piggyback_file_path) except MKGeneralException, e: return None # File might've been deleted. That's ok.

6 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018