Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 11b89884d52461f629ef4453bdb1306e4aa13fe1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11b89884d52461… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jul 13 15:36:51 2018 +0200 job: Convert perfdata to int/float Change-Id: Ie87ff953d584f95370bcf09ced50f5a1dba5dcb7 --- checks/job | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/checks/job b/checks/job index d64e064..7af74cd 100644 --- a/checks/job +++ b/checks/job @@ -169,18 +169,22 @@ def check_job(item, params, parsed): ('vol_context_switches', 'Vol. Context Switches'), ('invol_context_switches', 'Invol. Context Switches'), ]: - value = job.get(key) - if value is None: + value_str = job.get(key) + if value_str is None: continue if key in [ 'max_res_bytes', 'avg_mem_bytes' ]: + value = int(value_str) display_value = get_bytes_human_readable(value, 1000) elif key in [ 'real_time', 'user_time', 'system_time' ]: + value = float(value_str) display_value = get_age_human_readable(value) elif key == 'start_time': + value = float(value_str) state, display_value = process_start_time(value, state, warn, crit) else: - display_value = value + display_value = value_str + value = float(value_str) output.append('%s: %s' % (title, display_value)) perfdata.append((key, value))

6 years, 1 month

cpu: discovery returns tuple now

by Moritz Kiemer

Module: check_mk Branch: master Commit: a25634d1c2161e044fa5816a4a387d67b492eb41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a25634d1c2161e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 23 08:22:16 2018 +0200 cpu: discovery returns tuple now Change-Id: Ia8b7467f4e3fbf6c144a866c353d4174e3710c1c --- checks/cpu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cpu b/checks/cpu index fbdd07b..6ca4f3a 100644 --- a/checks/cpu +++ b/checks/cpu @@ -47,7 +47,7 @@ def inventory_cpu_load(info): def check_cpu_load(item, params, info): if not info: - return + return None if len(info[0]) >= 6: # There have been broken AIX agents for a long time which produced data like follows. @@ -94,7 +94,7 @@ threads_default_levels = (2000, 4000) def inventory_cpu_threads(info): if len(info) == 1 and len(info[0]) >= 5: - return [(None, "", "threads_default_levels")] + return [(None, "threads_default_levels")] def check_cpu_threads(item, params, info): try:

6 years, 1 month

6317 FIX fileinfo, fileinfo.groups: Prevent crash of all fileinfo services if one line fails

by Simon Betz

Module: check_mk Branch: master Commit: 9ee8d6ff8c52325b884d533076cba667a24d5845 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee8d6ff8c5232… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 24 09:20:05 2018 +0200 6317 FIX fileinfo, fileinfo.groups: Prevent crash of all fileinfo services if one line fails Change-Id: Ifa6fa12886d055de78e6adb3a67e989096c02a59 --- .werks/6317 | 11 +++++++++++ checks/fileinfo | 24 +++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.werks/6317 b/.werks/6317 new file mode 100644 index 0000000..95e47a1 --- /dev/null +++ b/.werks/6317 @@ -0,0 +1,11 @@ +Title: fileinfo, fileinfo.groups: Prevent crash of all fileinfo services if one line fails +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532351797 + + diff --git a/checks/fileinfo b/checks/fileinfo index f30055f..030e0c9 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -169,14 +169,16 @@ def check_fileinfo(item, params, info): outof_range_txt = fileinfo_check_timeranges(params) in_timerange = outof_range_txt == "" - reftime = None check_definition = False state_missing = params.get("state_missing", 3) - for line in info: - if len(line) == 1: - reftime = int(line[0]) - continue + try: + reftime = int(info[0][0]) + except (IndexError, ValueError): + return 3, "Missing reference timestamp" + + # Start counting values on all files + for line in info[1:]: if item == line[0]: if line[1] == "missing": continue @@ -222,7 +224,6 @@ def check_fileinfo_groups(item, params, info): return outof_range_txt = fileinfo_check_timeranges(params) - reftime = None count_all = 0 age_oldest = None age_newest = 0 @@ -234,12 +235,13 @@ def check_fileinfo_groups(item, params, info): exclude_patterns = set() files_not_readable = set() - # Start counting values on all files - for line in info: - if len(line) == 1: - reftime = int(line[0]) - continue + try: + reftime = int(info[0][0]) + except (IndexError, ValueError): + return 3, "Missing reference timestamp" + # Start counting values on all files + for line in info[1:]: # Old format does not support '%s' in group name group_patterns = set(params.get('precompiled_patterns', [])) for entry in params.get('group_patterns', []):

6 years, 1 month

Be more verbose in assert

by Moritz Kiemer

Module: check_mk Branch: master Commit: 40bdef352df8fb93a5d41828e23a7de2cd97afb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40bdef352df8fb… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 13:48:33 2018 +0200 Be more verbose in assert Change-Id: I0ce6c33ee55eb92d2e8e50d1f694428c24f02363 --- tests/testlib/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 7a29bce..80af2ee 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1810,7 +1810,9 @@ class BaseCheck(object): if set_service: description = self.info["service_description"] if item is not None: - assert "%s" in description + assert "%s" in description, \ + "Missing '%%s' formatter in service description of %r" \ + % self.name description = description % item self.set_service(self.name, description) self.set_hostname('non-existent-testhost')

6 years, 1 month

Now use the themed small logo

by Lars Michelsen

Module: check_mk Branch: master Commit: 36cf18be6da4e107ba35991d44c1e6f4c2c0f6f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36cf18be6da4e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 20:02:53 2018 +0200 Now use the themed small logo Change-Id: I0ccc20d8d663512eae5ffc6ae76b11d4b31c1025 --- cmk/gui/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 6365ae0..d5dcb45 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1912,7 +1912,7 @@ class html(HTMLGenerator): self.icon_button(None, _("Toggle context help texts"), "help", id="helpbutton", onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) self.open_a(href="https://mathias-kettner.com", class_="head_logo") - self.img(src="images/logo_cmk_small.png") + self.img(src=self._detect_themed_image_path("images/logo_cmk_small.png")) self.close_a() self.close_td() self.close_tr()

6 years, 1 month

Addition to werk 5088: add missing return in postgres_stats

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e03221fef5b87bef242c97eeddb83f862490e5bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e03221fef5b87b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 23 17:12:00 2018 +0200 Addition to werk 5088: add missing return in postgres_stats Change-Id: I4998a05a4bd2f529ccf1fd7527a61a9bf9f0a188 --- checks/postgres_stats | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/postgres_stats b/checks/postgres_stats index c4b5593..52f439c 100644 --- a/checks/postgres_stats +++ b/checks/postgres_stats @@ -107,6 +107,7 @@ def check_postgres_stats(item, params, parsed): if last_ts is None: set_item_state(key, now) yield 0, infotext + return age = now - last_ts warn, crit = params["never_analyze_vacuum"]

6 years, 1 month

Fixed a few unused-import warnings and classified the warning.

by Sven Panne

Module: check_mk Branch: master Commit: 96669cde6be8d87143965e7aa82373f51080524d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96669cde6be8d8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 23 15:41:12 2018 +0200 Fixed a few unused-import warnings and classified the warning. Change-Id: I4644104434b67631fc215dc1181a1f09239ff4c7 --- cmk_base/check_api.py | 4 ++-- tests/pylint/pylintrc | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 381849c..3164fcb 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -96,7 +96,6 @@ from cmk.exceptions import MKGeneralException # with an underscore. These names will be skipped when loading into the # check context. import cmk_base.utils as _utils -import cmk_base.console as _console import cmk_base.config as _config import cmk.defines as _defines import cmk_base.snmp_utils as _snmp_utils @@ -130,7 +129,8 @@ import socket import sys import os import time -import pprint +# NOTE: We do not use pprint in this module, but it is part of the check API. +import pprint # pylint: disable=unused-import from cmk.regex import regex import cmk.render as render diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 3fb6b4c..a3867ed 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -36,7 +36,6 @@ disable= unsubscriptable-object, unsupported-membership-test, unused-argument, - unused-import, unused-wildcard-import, wildcard-import, wrong-import-order, @@ -75,6 +74,10 @@ disable= # gigantic functions. too-many-branches, #--------------------------------------------------------------------------- + # We have tons of unused imports, it is just a matter of removing them and + # leave those which have a "magic" purpose. + unused-import, + #--------------------------------------------------------------------------- # Enabling these warnings would be nice, they are mostly a sign of sloppy # programming practice. In some cases, they can even hide bugs. bare-except,

6 years, 1 month

Classified a few more warnings.

by Sven Panne

Module: check_mk Branch: master Commit: cb0a47620732be055f1a00dc28144c6fd1c07d9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0a47620732be… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 23 14:58:24 2018 +0200 Classified a few more warnings. Change-Id: I4fea02635adb02ad0c5708088bf640226fe2c957 --- tests/pylint/pylintrc | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 3b71e37..3fb6b4c 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -18,14 +18,8 @@ disable= consider-using-enumerate, consider-using-ternary, duplicate-code, - eval-used, - exec-used, - fixme, - global-statement, - global-variable-undefined, inconsistent-return-statements, len-as-condition, - line-too-long, logging-not-lazy, missing-docstring, multiple-imports, @@ -39,7 +33,6 @@ disable= reimported, relative-import, ungrouped-imports, - unidiomatic-typecheck, unsubscriptable-object, unsupported-membership-test, unused-argument, @@ -69,6 +62,15 @@ disable= # duplication (introduce new classes, combine methods, etc.) attribute-defined-outside-init, #--------------------------------------------------------------------------- + # Enabling this would be very desirable, using type() instead of + # isinstance() is a very bad idea most of the time, as it totally ignores + # class hierarchies, breaking things in subtle ways. + unidiomatic-typecheck, + #--------------------------------------------------------------------------- + # This should really be fixed: Global variables are already a bad idea, but + # depending on an implicit protocol to create them is an even worse one. + global-variable-undefined, + #--------------------------------------------------------------------------- # We should enable this, at the moment it just means splitting up two # gigantic functions. too-many-branches, @@ -87,6 +89,13 @@ disable= # a few violations, so we postpone fixing this. singleton-comparison, #--------------------------------------------------------------------------- + # Alas, these maintenance/security nightmares are still part of our base + # "technology"... :-/ Nevertheless, reducing their usage is a very worthy + # goal. + eval-used, + exec-used, + global-statement, + #--------------------------------------------------------------------------- # Enabling these would be nice, but given the current state of affairs # (gigantic modules with deeply nested humungous functions/methods), this # will be a non-trivial amount of work. @@ -101,10 +110,15 @@ disable= too-many-return-statements, too-many-statements, #--------------------------------------------------------------------------- + # Our code is still full of FIXMEs/XXXs/TODOs, perhaps fixing or removing + # them might be a good idea some day... + fixme, + #--------------------------------------------------------------------------- # The warnigns below will probably fixed by YAPF. bad-continuation, bad-indentation, bad-whitespace, + line-too-long, #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs.

6 years, 1 month

6363 FIX Fixed "host_inventory" exception when using "Has inventory data" filter

by Lars Michelsen

Module: check_mk Branch: master Commit: b1f4fff3f9c20bbb45ffa13629a51e6f507c72f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f4fff3f9c20b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 15:05:31 2018 +0200 6363 FIX Fixed "host_inventory" exception when using "Has inventory data" filter When using the filter "Has inventory data" in a host view an exception like this could occur: "Internal error: 'host_inventory'" Change-Id: I4ed0023993db4588b074d8f27bceb9b6c6e0b3cb --- .werks/6363 | 12 ++++++++++++ cmk/gui/plugins/visuals/inventory.py | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.werks/6363 b/.werks/6363 new file mode 100644 index 0000000..2dc5075 --- /dev/null +++ b/.werks/6363 @@ -0,0 +1,12 @@ +Title: Fixed "host_inventory" exception when using "Has inventory data" filter +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532351063 + +When using the filter "Has inventory data" in a host view an exception like +this could occur: "Internal error: 'host_inventory'" diff --git a/cmk/gui/plugins/visuals/inventory.py b/cmk/gui/plugins/visuals/inventory.py index 0beb3dd..ddadb0f 100644 --- a/cmk/gui/plugins/visuals/inventory.py +++ b/cmk/gui/plugins/visuals/inventory.py @@ -453,6 +453,9 @@ class FilterHasInventory(FilterTristate): def __init__(self): super(FilterHasInventory, self).__init__("has_inv", _("Has Inventory Data"), "host", "host_inventory") + def need_inventory(self): + return True + def filter(self, infoname): return "" # No Livestatus filtering right now

6 years, 1 month

Try to reduce problems with flaky test_unreachable_notifications test

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ea49eb8682554049ee4862822e6af0d8e4d9785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ea49eb8682554… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 12:38:08 2018 +0200 Try to reduce problems with flaky test_unreachable_notifications test Change-Id: I25008d03698d0c94df9529b449c85263020ee43d --- tests/integration/notifications/test_unreachable_notifications.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/notifications/test_unreachable_notifications.py b/tests/integration/notifications/test_unreachable_notifications.py index 13f4ff8..a153ee9 100644 --- a/tests/integration/notifications/test_unreachable_notifications.py +++ b/tests/integration/notifications/test_unreachable_notifications.py @@ -135,13 +135,13 @@ class HistoryLog(object): return fobj - def check_logged(self, match_for, timeout=5): + def check_logged(self, match_for, timeout=10): if not self._check_for_line(match_for, timeout): raise Exception("Did not find %r in %s after %d seconds" % (match_for, self._log_path(), timeout)) - def check_not_logged(self, match_for, timeout=5): + def check_not_logged(self, match_for, timeout=10): if self._check_for_line(match_for, timeout): raise Exception("Found %r in %s after %d seconds" % (match_for, self._log_path(), timeout))

6 years, 1 month

← Newer
1
...
12
13
14
15
16
17
18
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018