Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Disable pylints unused-import warnings for all imports of the "typing" module

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3d8d2d89baa7546c4d0ea37384d7300f9989bcfb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d8d2d89baa754… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Sep 20 11:21:02 2018 +0200 Disable pylints unused-import warnings for all imports of the "typing" module When we enable the unused-import warning of pylint in the future these imports will no longer generate false positives. Change-Id: I802171733e8fcf04ebdcbb0e5a723287f1771ed4 --- cmk/gui/i18n.py | 2 +- cmk/gui/sidebar.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/i18n.py b/cmk/gui/i18n.py index bda2d99..e1277a3 100644 --- a/cmk/gui/i18n.py +++ b/cmk/gui/i18n.py @@ -27,7 +27,7 @@ import __builtin__ import os import gettext as gettext_module -from typing import NamedTuple, Optional, List, Tuple +from typing import NamedTuple, Optional, List, Tuple # pylint: disable=unused-import import cmk.paths diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 4eec8f1..a52566c 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -34,7 +34,7 @@ import traceback import json import time from enum import Enum -from typing import Type, Union, List +from typing import Type, Union, List # pylint: disable=unused-import import cmk import cmk.paths

5 years, 12 months

6600 FIX inv_win_wmi_updates: Fixed parsing install date;

by Simon Betz

regard all possible formats Message-ID: <5ba35849.c9LZZRkRyGuLGxRd%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8b12b14494264a501c656f625fa38e9f042ad6fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b12b14494264a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 19 13:27:32 2018 +0200 6600 FIX inv_win_wmi_updates: Fixed parsing install date; regard all possible formats Change-Id: I24dc6ade5122d0d7daa5e6dad497eecc139c57f8 --- .werks/6600 | 11 +++++++++++ inventory/win_wmi_updates | 33 +++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.werks/6600 b/.werks/6600 new file mode 100644 index 0000000..ecdf7bc --- /dev/null +++ b/.werks/6600 @@ -0,0 +1,11 @@ +Title: inv_win_wmi_updates: Fixed parsing install date; regard all possible formats +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537356416 + + diff --git a/inventory/win_wmi_updates b/inventory/win_wmi_updates index d6451b8..496c673 100644 --- a/inventory/win_wmi_updates +++ b/inventory/win_wmi_updates @@ -24,7 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - # Example output #<<<win_wmi_updates:sep(44):cached(1494868004,3600)>>> #Node,Description,HotFixID,InstalledOn^M @@ -35,6 +34,31 @@ #S050MWSIZ001,Update,KB2841134,5/10/2017^M # Microsoft Office Professional Plus 2010|Microsoft Corporation|14.0.7015.1000 +# InstalledOn may have different formats, see +# https://docs.microsoft.com/de-de/windows/desktop/CIMWin32Prov/win32-quickfi… +# Examples: +# - 20170523 +# - 23-10-2013 +# - 5/23/2017 +# - 01ce83596afd20a7 + + +def _parse_install_date(install_date_str): + for format_ in ["%Y%m%d", "%m/%d/%Y", "%d-%m-%Y"]: + try: + return time.mktime(time.strptime(install_date_str, format_)) + except ValueError: + pass + # However, some systems may return a 64-bit hexidecimal value in the Win32 + # FILETIME format: + # Contains a 64-bit value representing the number of 100-nanosecond intervals + # since January 1, 1601 (UTC). + try: + return float(install_date_str, 16) / 10**7 + except ValueError: + pass + return + def inv_win_wmi_updates(info): paclist = inv_tree_list("software.packages:") @@ -42,15 +66,12 @@ def inv_win_wmi_updates(info): if len(line) <> 4: continue - _, description, knowledge_base, install_date = line - date_number = None - if re.match(".*20.", install_date): - date_number = int(time.mktime(time.strptime(install_date, "%m/%d/%Y"))) + _, description, knowledge_base, install_date_str = line paclist.append({ "name" : "Windows Update " + knowledge_base, "version" : knowledge_base, "vendor" : "Micorosoft " + description, - "install_date" : date_number, + "install_date" : _parse_install_date(install_date_str), "package_type" : "wmi", })

5 years, 12 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 4c70a2b601b5beff18d528e0bf6ea49c2c80ebd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c70a2b601b5be… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 20 09:55:36 2018 +0200 Reserved 50 Werk IDS Change-Id: I443ffb250e6a42048519e5590cbacf7d18f3c324 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 031d72d..0d1dacb 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6659 +6709

5 years, 12 months

Fixed mypy annotations.

by Sven Panne

Module: check_mk Branch: master Commit: 39a62083bd593a078cbfe7d2e85b778ad1d4a556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39a62083bd593a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 20 08:44:15 2018 +0200 Fixed mypy annotations. The typing of RuleMatcher._check_match_outcome is still not correct, because it is highly unclear what it should be: The whole typing of the matchers is a complete chaos... Change-Id: I59e9a54c09ef60733aacb2b20680e1e52b3b3514 --- cmk/ec/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 8ce0ba0..464152f 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -46,6 +46,7 @@ import sys import threading import time import traceback +from typing import Any, Dict, List, Optional, Tuple # pylint: disable=unused-import import cmk import cmk.daemon @@ -2255,7 +2256,7 @@ class RuleMatcher(object): def _check_match_outcome(self, rule, match_groups, match_priority): - # type: (dict, dict, dict) -> (bool, dict) + # type: (Dict[str, Any], Dict[str, Any], Dict[str, Any]) -> Tuple[bool, Dict[str, Any]] """Decide or not a event is created, canceled or nothing is done""" # Check canceling-event @@ -2678,8 +2679,8 @@ class QueryCOMMAND(Query): class StatusTable(object): - prefix = None - columns = [] + prefix = None # type: Optional[str] + columns = [] # type: List[Tuple[str, Any]] # Must return a enumerable type containing fully populated lists (rows) matching the # columns of the table

5 years, 12 months

Regenerate Pipfile.lock.

by Sven Panne

Module: check_mk Branch: master Commit: adcf184e8bb5363cb20007509bd97652207009b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adcf184e8bb536… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 20 08:23:29 2018 +0200 Regenerate Pipfile.lock. Change-Id: I57ef37bda326473ead12dd40ab40cd51fcd194bc --- tests/static/Pipfile.lock | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/static/Pipfile.lock b/tests/static/Pipfile.lock index 21bd779..136da2e 100644 --- a/tests/static/Pipfile.lock +++ b/tests/static/Pipfile.lock @@ -18,11 +18,18 @@ "default": { "mypy": { "hashes": [ - "sha256:673ea75fb750289b7d1da1331c125dc62fc1c3a8db9129bb372ae7b7d5bf300a", - "sha256:c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c" + "sha256:00b95bfdc0d5b9aa53c906e56fb91937743f2121d66684db5f947ec5d75f565d", + "sha256:6704586b4c2bf7dfa5e87a422be9ca57db622bab65008245759f3d4baeb219dd" ], "index": "pypi", - "version": "==0.620" + "version": "==0.630" + }, + "mypy-extensions": { + "hashes": [ + "sha256:37e0e956f41369209a3d5f34580150bcacfabaa57b33a15c0b25f4b5725e0812", + "sha256:b16cabe759f55e3409a7d231ebd2841378fb0c27a5d1994719e340e4f429ac3e" + ], + "version": "==0.4.1" }, "typed-ast": { "hashes": [ @@ -54,11 +61,11 @@ }, "yapf": { "hashes": [ - "sha256:6567745f0b6656f9c33a73c56a393071c699e6284a70d793798ab6e3769d25ec", - "sha256:a98a6eacca64d2b920558f4a2f78150db9474de821227e60deaa29f186121c63" + "sha256:b96815bd0bbd2ab290f2ae9e610756940b17a0523ef2f6b2d31da749fc395137", + "sha256:cebb6faf35c9027c08996c07831b8971f3d67c0eb615269f66dfd7e6815fdc2a" ], "index": "pypi", - "version": "==0.22.0" + "version": "==0.24.0" } }, "develop": {}

5 years, 12 months

Regenerate Pipfile.lock.

by Sven Panne

Module: check_mk Branch: master Commit: 60db3c7f8562bb1d14c4b6b81cec36e1ecab847d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60db3c7f8562bb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 20 08:13:14 2018 +0200 Regenerate Pipfile.lock. Change-Id: Ie4c31c1b0af8f5dc5502f54e4a374d19ae097ea6 --- Pipfile.lock | 170 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 131 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=60db3c7f85…

5 years, 12 months

6626 FIX Timeperiod deletion was not possible when using time specific parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: ffad1d6b4bdf543c02e9a36cc34d562920119cdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffad1d6b4bdf54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 14:02:41 2018 +0200 6626 FIX Timeperiod deletion was not possible when using time specific parameters When trying to delete a timeperiod while a check parameter ruleset uses time specific parameters, it was not possible to delete this timeperiod. Regardless of which timeperiod was used in the time specific parameters. Change-Id: Ib27b55ffee312fee9304844c251a50524da913a1 --- .werks/6626 | 13 +++++++++++++ cmk/gui/wato/pages/timeperiods.py | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/6626 b/.werks/6626 new file mode 100644 index 0000000..46fedcd --- /dev/null +++ b/.werks/6626 @@ -0,0 +1,13 @@ +Title: Timeperiod deletion was not possible when using time specific parameters +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537347738 + +When trying to delete a timeperiod while a check parameter ruleset uses time specific +parameters, it was not possible to delete this timeperiod. Regardless of which timeperiod +was used in the time specific parameters. diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index 6d15238..e469f08 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -254,8 +254,10 @@ class ModeTimeperiods(WatoMode): if not vs.is_active(rule.value): continue - # TODO: This method looks wrong: The tpname parameter is unused and this loop is obscure... - for _rule_tp_name, _value in rule.value["tp_values"]: + for index, (rule_tp_name, _value) in enumerate(rule.value["tp_values"]): + if rule_tp_name != tpname: + continue + edit_url = watolib.folder_preserving_link([ ("mode", "edit_rule"), ("back_mode", "timeperiods"), @@ -263,7 +265,7 @@ class ModeTimeperiods(WatoMode): ("rulenr", rule_index), ("rule_folder", rule_folder.path()), ]) - used_in.append((_("Timespecific check parameter"), edit_url)) + used_in.append((_("Time specific check parameter #%d") % (index + 1), edit_url)) return used_in

6 years

6595 FIX if.include: Recognize duplicate interface items correctly

by Simon Betz

Module: check_mk Branch: master Commit: 0aa06ba3a16818fcccceea6918ad7152f5fbd5ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aa06ba3a16818… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 18 09:16:52 2018 +0200 6595 FIX if.include: Recognize duplicate interface items correctly The recognition works correct but not in the following situation where the wrong network interface data is checked. <ul> <li><tt>Use desciption</tt> or <tt>use alias</tt> is configured in the ruleset <tt>Network Interface and Switch Port Discovery</tt>.</li> <li>Two or more network interfaces exist with same description or alias.</li> <li>Only one network interface with this description or alias is discovered.</li> <li>The discovered network interface does not rank first.</li> </ul> Now the index is attached if an alias or description exists at least twice. Change-Id: I996a820796234ad6e571f8bcffc51a024af647c1 --- .werks/6595 | 21 +++++++++++++++++++ checks/if.include | 23 +++++++++++++++------ tests/unit/checks/test_if_check.py | 41 ++++++++++++++++++++++++-------------- 3 files changed, 64 insertions(+), 21 deletions(-) diff --git a/.werks/6595 b/.werks/6595 new file mode 100644 index 0000000..302570c --- /dev/null +++ b/.werks/6595 @@ -0,0 +1,21 @@ +Title: if.include: Recognize duplicate interface items correctly +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537254518 + +The recognition works correct but not in the following situation +where the wrong network interface data is checked. +<ul> +<li><tt>Use desciption</tt> or <tt>use alias</tt> is configured in the +ruleset <tt>Network Interface and Switch Port Discovery</tt>.</li> +<li>Two or more network interfaces exist with same description or alias.</li> +<li>Only one network interface with this description or alias is discovered.</li> +<li>The discovered network interface does not rank first.</li> +</ul> + +Now the index is attached if an alias or description exists at least twice. diff --git a/checks/if.include b/checks/if.include index 84ada9c..abb3834 100644 --- a/checks/if.include +++ b/checks/if.include @@ -290,6 +290,8 @@ def inventory_if_common(info, has_nodeinfo = False): settings_sets = host_extra_conf(host_name(), inventory_if_rules) seen_indicies = set() pre_inventory = [] + global_seen_items = set() + duplicates = set() if not settings_sets: # if there are no settings, use defaults @@ -315,6 +317,7 @@ def inventory_if_common(info, has_nodeinfo = False): match_desc = settings.get('match_desc') pad_portnumbers = settings.get('pad_portnumbers', if_inventory_pad_portnumbers) + # Allow main check to set no port type (e.g. hitachi_hnas_fc_if) porttypes.append("") have_groups = {} @@ -356,6 +359,11 @@ def inventory_if_common(info, has_nodeinfo = False): else: item = if_pad_with_zeroes(info, ifIndex, has_nodeinfo, pad_portnumbers) + if item not in global_seen_items: + global_seen_items.add(item) + else: + duplicates.add(item) + current_host_name = host_name() # Prepare grouped interfaces @@ -420,7 +428,12 @@ def inventory_if_common(info, has_nodeinfo = False): if ifSpeed != "" and if_inventory_monitor_speed: params["speed"] = int(ifSpeed) seen_indicies.add(ifIndex) - pre_inventory.append((item, "%r" % params, int(ifIndex))) + + try: + index_as_item = int(item) == int(ifIndex) + except (TypeError, ValueError): + index_as_item = False + pre_inventory.append((item, "%r" % params, int(ifIndex), index_as_item)) # Create pseudo interfaces out of groups # On cluster groups we have no 'interfaces' key @@ -458,14 +471,12 @@ def inventory_if_common(info, has_nodeinfo = False): params["speed"] = total_speed # Note: the group interface index is always set to 1 - pre_inventory.append((group_name, "%r" % params, 1)) + pre_inventory.append((group_name, "%r" % params, 1, False)) inventory = [] - s = set() - duplicates = set(x[0] for x in pre_inventory if x[0] in s or s.add(x[0])) # Check for duplicate items (e.g. when using Alias as item and the alias is not unique) - for item, params, index in pre_inventory: - if item in duplicates: + for item, params, index, index_as_item in pre_inventory: + if not index_as_item and item in duplicates: new_item = "%s %d" % (item, index) else: new_item = item diff --git a/tests/unit/checks/test_if_check.py b/tests/unit/checks/test_if_check.py index 90ffd8d..f9223c6 100644 --- a/tests/unit/checks/test_if_check.py +++ b/tests/unit/checks/test_if_check.py @@ -30,20 +30,31 @@ pytestmark = pytest.mark.checks # ifPhysAddress -(a)pytest.mark.parametrize("info,inventory_if_rules,result", [ - ([], [], 0), - ([20*[""]], [], 0), - ([20*["0"]], [], 0), - ([21*[""]], [], 0), - ([21*["0"]], [], 0), - ([["1", "EINS", "6", "10", "1"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"]], [], 1), - ([["1", "EINS", "6", "10", "2"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"]], [], 0), - ([["1", "EINS", "00000", "10", "1"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"]], [], 0), - ([["1", "EINS", "6", "10", "1"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"], - ["1", "EINS-DUPLICATE", "6", "10", "1"] + 13*["0",] + ["EINS-ALIAS-DUPLICATE", "00:00:00:00:00:00"]], [], 1), +(a)pytest.mark.parametrize("info,settings,items", [ + ([], [], []), + ([20*[""]], [], []), + ([20*["0"]], [], []), + ([21*[""]], [], []), + ([21*["0"]], [], []), + ([["1", "FOO", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"], + ["1", "FOO-DUPLICATE", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS-DUPLICATE", "00:00:00:00:00:00"]], + [], ["1"]), + ([["1", "FOO", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"], + ["2", "BAR", "6", "10", "1"] + 13*["0"] + ["BAR-ALIAS", "00:00:00:00:00:00"]], + [], ["1", "2"]), + ([["1", "FOO", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"], + ["2", "BAR", "6", "10", "1"] + 13*["0"] + ["BAR-ALIAS", "00:00:00:00:00:00"]], + [{"use_desc": True}], ["FOO", "BAR"]), + ([["1", "FOO", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"], + ["2", "FOO", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"]], + [{"use_desc": True}], ["FOO 1", "FOO 2"]), + ([["1", "FOO", "6", "10", "2"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"], + ["2", "FOO", "6", "10", "1"] + 13*["0"] + ["FOO-ALIAS", "00:00:00:00:00:00"]], + [{"use_desc": True}], ["FOO 2"]), ]) -def test_if_inventory_if_common_count_interfaces(check_manager, monkeypatch, info, inventory_if_rules, result): +def test_if_inventory_if_common_discovered_items(check_manager, monkeypatch, info, settings, items): check = check_manager.get_check("if") - #TODO How to handle several "host_extra_conf"s? - #monkeypatch.setitem(check.context, "host_extra_conf", lambda _, __: inventory_if_rules) - assert len(check.run_discovery(info)) == result + monkeypatch.setitem(check.context, "host_extra_conf", lambda _, __: settings) + monkeypatch.setitem(check.context, "_prepare_if_group_patterns_from_conf", lambda: {}) + discovered_items = [e[0] for e in check.run_discovery(info)] + assert discovered_items == items

6 years

Reserved 20 Werk IDS

by Óscar Nájera

Module: check_mk Branch: master Commit: 0e5f897d67fc4fc65a73582dcd96166697e26966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e5f897d67fc4f… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Sep 19 13:28:41 2018 +0200 Reserved 20 Werk IDS Change-Id: I4325b4a1de8f87601eeb1d001f63599cea99e39e --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2575065..031d72d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6639 +6659

6 years

fileinfo: Fixed SyntaxError: 'return' with argument inside generator

by Simon Betz

Module: check_mk Branch: master Commit: 035631855843906ec25c7824dccc1b6e649adb9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03563185584390… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 19 10:55:17 2018 +0200 fileinfo: Fixed SyntaxError: 'return' with argument inside generator Change-Id: I0f30d3be667b6f7ab60effa2a5b0e3957630cd3f --- checks/fileinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/fileinfo b/checks/fileinfo index 5c7b2a8..2e1d3b3 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -335,7 +335,8 @@ def check_fileinfo_groups(_item, params, parsed): reftime = parsed.get('reftime') if reftime is None: - return 3, "Missing reference timestamp" + yield 3, "Missing reference timestamp" + return # Old format does not support '%s' in group name group_patterns = set(params.get('precompiled_patterns', []))

6 years

← Newer
1
...
14
15
16
17
18
19
20
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018