Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: a6f78366615eb7b1a01d8fd2429c301d3b4f3353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6f78366615eb7… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 31 08:06:35 2018 +0200 Check_SQL: Major Makeover FIX: Never worked if --procedure was set. Refactored. The python DB-APIs are not as consistent as one would want. Tried to isolate DB dependent code. Change-Id: Ida5a1a1ba545f93e37cd128ac88786bd24c91181 --- active_checks/check_sql | 562 ++++++++++++++++++++++++++++-------------------- 1 file changed, 323 insertions(+), 239 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a6f7836661…

5 years, 12 months

Reserved 20 Werk IDS

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d546087a605ee41b495685ef5332de63ac6327e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d546087a605ee4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jul 31 15:06:43 2018 +0200 Reserved 20 Werk IDS Change-Id: I38701f5ff2e285571cc5045c81b388e00fba67f4 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 29b84ae..46c2326 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6399 +6419

5 years, 12 months

Removed useless alias

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f891eba5d3486c61a78c75bb61949d8718f6af3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f891eba5d3486… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 11:10:52 2018 +0200 Removed useless alias Change-Id: Id8ae549f4f0351a3abd48d9de6da5b079d528647 --- cmk/gui/wato/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index c8354ee..067a220 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4493,7 +4493,6 @@ class ModeBulkDiscovery(WatoMode): def __init__(self): super(ModeBulkDiscovery, self).__init__() self._from_html_vars() - self._vs = cmk.gui.plugins.wato.vs_bulk_discovery self._get_bulk_discovery_params() @@ -4507,7 +4506,7 @@ class ModeBulkDiscovery(WatoMode): self._bulk_discovery_params = config.bulk_discovery_default_settings if self._start: - bulk_discover_params = self._vs().from_html_vars("bulkinventory") + bulk_discover_params = cmk.gui.plugins.wato.vs_bulk_discovery.from_html_vars("bulkinventory") self._bulk_discovery_params.update(bulk_discover_params) self._recurse, self._only_failed, self._only_failed_invcheck, \ @@ -4637,7 +4636,7 @@ class ModeBulkDiscovery(WatoMode): html.begin_form("bulkinventory", method="POST") html.hidden_fields() - vs = self._vs(render_form=True) + vs = cmk.gui.plugins.wato.vs_bulk_discovery(render_form=True) msgs = [] if not self._all:

5 years, 12 months

Use standard _from_vars() which is called automatically by the WatoMode __init__

by Lars Michelsen

Module: check_mk Branch: master Commit: 9efdf766d6bc58a9f1f7915da726430391c82513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9efdf766d6bc58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 11:11:54 2018 +0200 Use standard _from_vars() which is called automatically by the WatoMode __init__ Change-Id: Iddc4d69d0f1c4cd1d7ad2c2bc953a1bb1fe48850 --- cmk/gui/wato/__init__.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 067a220..8227a56 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4490,17 +4490,13 @@ class ModeBulkDiscovery(WatoMode): return ["hosts", "services"] - def __init__(self): - super(ModeBulkDiscovery, self).__init__() - self._from_html_vars() - self._get_bulk_discovery_params() - - - def _from_html_vars(self): + def _from_vars(self): self._start = bool(html.var("_start")) self._all = bool(html.var("all")) self._item = html.var("_item") if html.var("_item") else None + self._get_bulk_discovery_params() + def _get_bulk_discovery_params(self): self._bulk_discovery_params = config.bulk_discovery_default_settings

5 years, 12 months

Add missing validation of valuespec vars

by Lars Michelsen

Module: check_mk Branch: master Commit: 6092d1a388b60d6510ad9a2dd229cef2457a06a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6092d1a388b60d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 11:13:03 2018 +0200 Add missing validation of valuespec vars Change-Id: I9e39a6273186127a31b62daa6839f89fae93c56b --- cmk/gui/wato/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 8227a56..1402dc1 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4503,6 +4503,7 @@ class ModeBulkDiscovery(WatoMode): if self._start: bulk_discover_params = cmk.gui.plugins.wato.vs_bulk_discovery.from_html_vars("bulkinventory") + cmk.gui.plugins.wato.vs_bulk_discovery.validate_value(bulk_discover_params, "bulkinventory") self._bulk_discovery_params.update(bulk_discover_params) self._recurse, self._only_failed, self._only_failed_invcheck, \

5 years, 12 months

Fixed accidental modification of global configuration setting

by Lars Michelsen

Module: check_mk Branch: master Commit: d6617c09c30f69c2b2440cf395e753e54e62def5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6617c09c30f69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 30 12:05:53 2018 +0200 Fixed accidental modification of global configuration setting Change-Id: I1d02e0bdd297e7a7bcc738e6b65ee04b042a5905 --- cmk/gui/wato/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 1402dc1..3032a82 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -93,6 +93,7 @@ import subprocess import sys import time import traceback +import copy from hashlib import sha256 import cmk @@ -4499,7 +4500,7 @@ class ModeBulkDiscovery(WatoMode): def _get_bulk_discovery_params(self): - self._bulk_discovery_params = config.bulk_discovery_default_settings + self._bulk_discovery_params = copy.deepcopy(config.bulk_discovery_default_settings) if self._start: bulk_discover_params = cmk.gui.plugins.wato.vs_bulk_discovery.from_html_vars("bulkinventory")

5 years, 12 months

Provide a generic test framework

by Moritz Kiemer

Module: check_mk Branch: master Commit: c50a3e74cd26027cec6117d34a109d11b8b8091a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c50a3e74cd2602… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jun 15 11:09:00 2018 +0200 Provide a generic test framework Add basic unit tests for checks by simply adding a dataset in generictest/datasets/ and provide a script to easily create regression tests. generictests/__init__.py, generictests/checkhandler.py, generictests/run.py: Code implementing the framework. generictests/conftest.py, generictests/regression.py: Code for creating regression test datasets.py test_generic_datasets.py: Actually run the tests corresponding to the datasets checktestlib.py: add simplified represetation of check result generictests/datasets/__init__.py: provide all datasets as submodules generictests/datasets/nfsmounts_1.py, generictests/datasets/uptime_1.py, generictests/datasets/veritas_vcs_1.py, generictests/datasets/veritas_vcs_2.py, generictests/datasets/veritas_vcs_3.py: Some examples to start with Change-Id: I3b75de2bbeba1c870ba518905b2fb2a829c9c936 --- tests/unit/checks/checktestlib.py | 16 +- tests/unit/checks/generictests/__init__.py | 55 ++++++ tests/unit/checks/generictests/checkhandler.py | 20 ++ tests/unit/checks/generictests/conftest.py | 15 ++ .../unit/checks/generictests/datasets/__init__.py | 23 +++ .../checks/generictests/datasets/nfsmounts_1.py | 18 ++ .../unit/checks/generictests/datasets/uptime_1.py | 8 + .../checks/generictests/datasets/veritas_vcs_1.py | 164 +++++++++++++++ .../checks/generictests/datasets/veritas_vcs_2.py | 165 ++++++++++++++++ .../checks/generictests/datasets/veritas_vcs_3.py | 109 ++++++++++ tests/unit/checks/generictests/regression.py | 98 +++++++++ tests/unit/checks/generictests/run.py | 219 +++++++++++++++++++++ tests/unit/checks/test_generic_datasets.py | 31 +++ 13 files changed, 938 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c50a3e74cd…

5 years, 12 months

6387 FIX Fixed staleness of services on piggybacked hosts

by Simon Betz

Module: check_mk Branch: master Commit: c4369905e1f7a372d632ebb18d30f59f7521e66a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4369905e1f7a3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 31 13:17:39 2018 +0200 6387 FIX Fixed staleness of services on piggybacked hosts Change-Id: Ib8691b07ff601567b8977475a71e8fecd7e9c342 --- .werks/6387 | 21 +++++++++++++ cmk/store.py | 2 -- cmk_base/piggyback.py | 81 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 78 insertions(+), 26 deletions(-) diff --git a/.werks/6387 b/.werks/6387 new file mode 100644 index 0000000..8b742af --- /dev/null +++ b/.werks/6387 @@ -0,0 +1,21 @@ +Title: Fixed staleness of services on piggybacked hosts +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532692225 + +The VSphere special agent may provide piggyback data for other hosts. +Sometimes all piggybacked services on these hosts became stale because +the piggyback files were incorrectly detected as outdated. +Other piggyback hosts may also be affected. + +Internal notes: +A piggyback host writes piggyback files and an additional status file. +The age of each piggyback file is compared to the age of the status file +in order to detect the validity of the piggyback file. +Wihtin the cachefile_age function the timestamp of 'now' is initialized +every time for every file. This may result in disregarded time deltas. diff --git a/cmk/store.py b/cmk/store.py index 88f1e3a..e55b67e 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -206,8 +206,6 @@ def save_data_to_file(path, data, pretty=True): def save_file(path, content, mode=0660): tmp_path = None try: - tmp_path = None - # Normally the file is already locked (when data has been loaded before with lock=True), # but lock it just to be sure we have the lock on the file. # diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index 1ab48c9..8f72fcd 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import os +import tempfile import cmk.paths import cmk.translations @@ -41,8 +42,12 @@ def get_piggyback_raw_data(piggyback_max_cachefile_age, hostname): return output 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() + try: + output += file(piggyback_file_path).read() + console.verbose("Using piggyback raw data from host %s.\n" % source_host) + except IOError, e: + console.verbose("Cannot read piggyback raw data from host %s: %s\n" % (source_host, e)) + continue return output @@ -88,18 +93,15 @@ def _get_piggyback_files(piggyback_max_cachefile_age, hostname): # 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" % - (piggyback_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(source_host) - except MKGeneralException, e: + status_file_path = _piggyback_source_status_path(source_host) + if not os.path.exists(status_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 + continue - if file_age > source_update_age: + if _is_piggyback_file_outdated(status_file_path, piggyback_file_path): console.verbose("Piggyback file %s is outdated (Not updated by source). Skip processing.\n" % piggyback_file_path) continue @@ -108,12 +110,21 @@ def _get_piggyback_files(piggyback_max_cachefile_age, hostname): return files -def _piggyback_source_status_path(source_host): - return os.path.join(cmk.paths.tmp_dir, "piggyback_sources", source_host) +def _is_piggyback_file_outdated(status_file_path, piggyback_file_path): + try: + # On POSIX platforms Python reads atime and mtime at nanosecond resolution + # but only writes them at microsecond resolution. + # (We're using os.utime() in _store_status_file_of()) + return os.stat(status_file_path)[8] > os.stat(piggyback_file_path)[8] + except OSError, e: + if e.errno == 2: # No such file or directory + return True + else: + raise -def _piggyback_source_host_update_age(source_host): - return cmk_base.utils.cachefile_age(_piggyback_source_status_path(source_host)) +def _piggyback_source_status_path(source_host): + return os.path.join(cmk.paths.tmp_dir, "piggyback_sources", source_host) def _remove_piggyback_file(piggyback_file_path): @@ -135,21 +146,46 @@ def remove_source_status_file(source_host): 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) + piggyback_file_paths = [] + for piggybacked_host, lines in piggybacked_raw_data.items(): + piggyback_file_path = os.path.join(cmk.paths.tmp_dir, "piggyback", piggybacked_host, source_host) + console.verbose("Storing piggyback data for: %s\n" % piggybacked_host) content = "\n".join(lines) + "\n" - store.save_file(os.path.join(cmk.paths.tmp_dir, "piggyback", backedhost, source_host), content) + store.save_file(piggyback_file_path, content) + piggyback_file_paths.append(piggyback_file_path) # 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(source_host), "") + status_file_path = _piggyback_source_status_path(source_host) + _store_status_file_of(status_file_path, piggyback_file_paths) else: remove_source_status_file(source_host) +def _store_status_file_of(status_file_path, piggyback_file_paths): + with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(status_file_path), + prefix=".%s.new" % os.path.basename(status_file_path), + delete=False) as tmp: + tmp_path = tmp.name + os.chmod(tmp_path, 0660) + tmp.write("") + + tmp_stats = os.stat(tmp_path) + status_file_times = (tmp_stats.st_atime, tmp_stats.st_mtime) + for piggyback_file_path in piggyback_file_paths: + try: + os.utime(piggyback_file_path, status_file_times) + except OSError, e: + if e.errno == 2: # No such file or directory + continue + else: + raise + os.rename(tmp_path, status_file_path) + + def cleanup_piggyback_files(piggyback_max_cachefile_age): """This is a housekeeping job to clean up different old files from the piggyback directories. @@ -242,14 +278,11 @@ def _shall_cleanup_piggyback_file(piggyback_max_cachefile_age, piggyback_file_pa if file_age > piggyback_max_cachefile_age: return "%d seconds too old" % (file_age - piggyback_max_cachefile_age) - # 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(source_host_name) - except MKGeneralException, e: + status_file_path = _piggyback_source_status_path(source_host_name) + if not os.path.exists(status_file_path): return "Source not sending piggyback" - if file_age > source_update_age: + if _is_piggyback_file_outdated(status_file_path, piggyback_file_path): return "Not updated by source" return None

5 years, 12 months

6377 FIX Bulk discovery was not taking selected options into account

by Lars Michelsen

Module: check_mk Branch: master Commit: dca1ee673060372c2595feab37c8bb2c29614499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dca1ee67306037… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 11:13:50 2018 +0200 6377 FIX Bulk discovery was not taking selected options into account The options selected to be performed during bulk discovery were not used correctly. For example the operation mode was always "Add unmonitored services", even when other options were selected. Change-Id: Ide87377138fefef0eb21743adf21a782e75b9dec --- .werks/6377 | 13 +++++++++++++ cmk/gui/wato/__init__.py | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6377 b/.werks/6377 new file mode 100644 index 0000000..0026c92 --- /dev/null +++ b/.werks/6377 @@ -0,0 +1,13 @@ +Title: Bulk discovery was not taking selected options into account +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532945549 + +The options selected to be performed during bulk discovery were not +used correctly. For example the operation mode was always "Add unmonitored services", +even when other options were selected. diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 3032a82..e21d4c8 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4502,7 +4502,9 @@ class ModeBulkDiscovery(WatoMode): def _get_bulk_discovery_params(self): self._bulk_discovery_params = copy.deepcopy(config.bulk_discovery_default_settings) - if self._start: + # start : Rendering of the progress dialog + # transaction : Single step processing + if self._start or html.is_transaction(): bulk_discover_params = cmk.gui.plugins.wato.vs_bulk_discovery.from_html_vars("bulkinventory") cmk.gui.plugins.wato.vs_bulk_discovery.validate_value(bulk_discover_params, "bulkinventory") self._bulk_discovery_params.update(bulk_discover_params)

5 years, 12 months

Make timespecific parameters look more pleasant

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e33b49670dd309e83fbc8c703f84a031a7588b7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e33b49670dd309… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 30 12:20:31 2018 +0200 Make timespecific parameters look more pleasant Timespecific parameters are now shown after the default parameters and the corresponding button now renders as a block so that it cannot not cover other elements (like e.g. labels) on small window sizes. Change-Id: I04c9dc30ffc72dbeb9827f58d03d0ab4d1cc6708 --- cmk/gui/plugins/wato/utils/__init__.py | 19 ++++++++++--------- web/htdocs/themes/facelift/theme.css | 4 +--- web/htdocs/wato.css | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 3e6b159..59f5f79 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -685,16 +685,17 @@ class TimeperiodValuespec(ValueSpec): mode = _("Disable") if is_active else _("Enable") vars_copy[self.tp_toggle_var] = "%d" % (not is_active) - toggle_url = html.makeuri(vars_copy.items()) - html.buttonlink(toggle_url, _("%s timespecific parameters") % mode, class_=["toggle_timespecific_parameter"]) if is_active: value = self._get_timeperiod_value(value) self._get_timeperiod_valuespec().render_input(varprefix, value) + html.buttonlink(toggle_url, _("%s timespecific parameters") % mode, class_=["toggle_timespecific_parameter"]) else: value = self._get_timeless_value(value) - return self._enclosed_valuespec.render_input(varprefix, value) + r = self._enclosed_valuespec.render_input(varprefix, value) + html.buttonlink(toggle_url, _("%s timespecific parameters") % mode, class_=["toggle_timespecific_parameter"]) + return r def value_to_text(self, value): @@ -742,6 +743,12 @@ class TimeperiodValuespec(ValueSpec): def _get_timeperiod_valuespec(self): return Dictionary( elements = [ + (self.tp_default_value_key, + Transform( + self._enclosed_valuespec, + title = _("Default parameters when no timeperiod matches") + ) + ), (self.tp_values_key, ListOf( Tuple( @@ -758,12 +765,6 @@ class TimeperiodValuespec(ValueSpec): title = _("Configured timeperiod parameters"), ) ), - (self.tp_default_value_key, - Transform( - self._enclosed_valuespec, - title = _("Default parameters when no timeperiod matches") - ) - ), ], optional_keys = False, ) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 9aae213..4079105 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -100,9 +100,7 @@ input, input[type=text], input[type=password], select, textarea, div.snapin sele width: auto; margin-bottom: 0px; } input.toggle_timespecific_parameter, select.toggle_timespecific_parameter, textarea.toggle_timespecific_parameter, div.snapin select.toggle_timespecific_parameter, div.snapin textarea.toggle_timespecific_parameter, .toggle_timespecific_parameter#mk_side_search_field { - margin: 0px; - position: absolute; - right: 110px; } + display: block; } select[multiple=multiple] { resize: none !important; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 1088e34..3ecc6ed 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -816,8 +816,8 @@ div.rulesets table.nform tr.bottom td { } input.toggle_timespecific_parameter { - position: absolute; - right: 18px; + margin-top: 5px; + display: block; } /* Page edit_ruleset */

5 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018