Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 66b2c2b79e8090d0fdade7f8ea33048bb9a83159 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66b2c2b79e8090… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 09:24:30 2018 +0200 Classify redefined-builtin warning. Change-Id: I29117e5bfa5bca7adef76f0531d9b7d44c456f0f --- tests/pylint/pylintrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 8e8f59f..0809cc2 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -25,7 +25,6 @@ disable= no-self-use, protected-access, redefined-argument-from-local, - redefined-builtin, reimported, relative-import, ungrouped-imports, @@ -81,6 +80,11 @@ disable= redefined-outer-name, #--------------------------------------------------------------------------- # Enabling this would be nice, but not crucial. At the moment, we have quite + # a few violations (about 200 in roughly 50 modules), so we postpone fixing + # this. + redefined-builtin, + #--------------------------------------------------------------------------- + # Enabling this would be nice, but not crucial. At the moment, we have quite # a few violations, so we postpone fixing this. When we do it eventually, we # probably want to use "include-naming-hint=yes" in the BASIC section. invalid-name,

6 years, 1 month

Classify redefined-outer-name warning.

by Sven Panne

Module: check_mk Branch: master Commit: c20f26fe72665a81b1504ba9e53311a11bf3fa28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c20f26fe72665a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 09:19:06 2018 +0200 Classify redefined-outer-name warning. Change-Id: If61637fd9864b5b51828a47d51887f11053ab63c --- tests/pylint/pylintrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 9e1154e..8e8f59f 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -26,7 +26,6 @@ disable= protected-access, redefined-argument-from-local, redefined-builtin, - redefined-outer-name, reimported, relative-import, ungrouped-imports, @@ -76,6 +75,11 @@ disable= bare-except, broad-except, #--------------------------------------------------------------------------- + # Enabling this would enhance readability quite a bit and it might even + # uncover bugs. Fixing this is not rocket science, just some work: Roughly + # 400 warnings in about 60 modules, but this can be fixed step by step. + redefined-outer-name, + #--------------------------------------------------------------------------- # Enabling this would be nice, but not crucial. At the moment, we have quite # a few violations, so we postpone fixing this. When we do it eventually, we # probably want to use "include-naming-hint=yes" in the BASIC section.

6 years, 1 month

Fixed and enabled redefine-in-handler warning.

by Sven Panne

Module: check_mk Branch: master Commit: 198ddb9b62d07125557d77f4a0ac286b2c7a7080 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=198ddb9b62d071… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 08:32:40 2018 +0200 Fixed and enabled redefine-in-handler warning. Change-Id: Ic03993f7ebc1b805724e514466c2d60795c2d24f --- tests/pylint/pylintrc | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index f018401..9e1154e 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -24,7 +24,6 @@ disable= no-else-return, no-self-use, protected-access, - redefine-in-handler, redefined-argument-from-local, redefined-builtin, redefined-outer-name,

6 years, 1 month

Add rrdtool to Pipenv and regenerate Pipenv.lock.

by Sven Panne

Module: check_mk Branch: master Commit: 49e335b6c15665d787a92c9491b23ff53e1d041a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e335b6c15665… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 11:09:34 2018 +0200 Add rrdtool to Pipenv and regenerate Pipenv.lock. Change-Id: I5a26e6c77b1105a3cb0a0a277827d0671d43114b --- Pipfile | 1 + Pipfile.lock | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Pipfile b/Pipfile index f7ac946..77da083 100644 --- a/Pipfile +++ b/Pipfile @@ -66,6 +66,7 @@ scandir = "==1.7" pathlib2 = "==2.3.2" python-dateutil = "==2.7.3" python-snap7 = "==0.9" +rrdtool = "==0.1.14" # Actually we ship the binding which comes with rrdtool itself... [requires] python_version = "2.7" diff --git a/Pipfile.lock b/Pipfile.lock index 9967e43..6efab71 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "57b0d66b9c7ccea9a4d35946335eb67299e7c7c8da1d41da2f4be9dd9e456af2" + "sha256": "ac3d6d03c9258c284a6a8034d6f2ec372409d623d4c3109ab8308f1d773a59c1" }, "pipfile-spec": 6, "requires": { @@ -488,6 +488,13 @@ "index": "pypi", "version": "==0.11.0" }, + "rrdtool": { + "hashes": [ + "sha256:32c8f0a6b2622052564387a7eb5228be8eb45753bb51695cbf7a36338a63c36d" + ], + "index": "pypi", + "version": "==0.1.14" + }, "scandir": { "hashes": [ "sha256:24f32112c483ac6c4a40b62f1282e61ecca7977153b66a0d26a9583a716dcb64", @@ -591,7 +598,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version == '2.7'", + "markers": "python_version < '3.4'", "version": "==1.5" }, "bandit": { @@ -622,8 +629,11 @@ "hashes": [ "sha256:03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba", "sha256:0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed", + "sha256:10a46017fef60e16694a30627319f38a2b9b52e90182dddb6e37dcdab0f4bf95", "sha256:198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640", + "sha256:23d341cdd4a0371820eb2b0bd6b88f5003a7438bbedb33688cd33b8eae59affd", "sha256:28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162", + "sha256:2a5b73210bad5279ddb558d9a2bfedc7f4bf6ad7f3c988641d83c40293deaec1", "sha256:2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508", "sha256:337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249", "sha256:3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694", @@ -849,11 +859,11 @@ }, "pylint": { "hashes": [ - "sha256:a48070545c12430cfc4e865bf62f5ad367784765681b3db442d8230f0960aa3c", - "sha256:fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3" + "sha256:09bc539f85706f2cca720a7ddf28f5c6cf8185708d6cb5bbf7a90a32c3b3b0aa", + "sha256:b8471105f12c73a1b9eee2bb2474080370e062a7290addd215eb34bc4dfe9fd8" ], "index": "pypi", - "version": "==1.9.2" + "version": "==1.9.3" }, "pytest": { "hashes": [ @@ -928,10 +938,10 @@ }, "stevedore": { "hashes": [ - "sha256:e3d96b2c4e882ec0c1ff95eaebf7b575a779fd0ccb4c741b9832bed410d58b3d", - "sha256:f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b" + "sha256:1e153545aca7a6a49d8337acca4f41c212fbfa60bf864ecd056df0cafb9627e8", + "sha256:c7eac1c0d95824c88b655273da5c17cdde6482b2739f47c30bf851dcc9d3c2c0" ], - "version": "==1.28.0" + "version": "==1.29.0" }, "webencodings": { "hashes": [

6 years, 1 month

Classify unsubscriptable-object and unsupported-membership warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 853dc81b47a266815aba50c73166b0aeb81cd19e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=853dc81b47a266… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 10:42:14 2018 +0200 Classify unsubscriptable-object and unsupported-membership warnings. Change-Id: Id5cfaed50e9767778400d5519e28507a23e466f4 --- tests/pylint/pylintrc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 4f75d2b..ca3f8cc 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -27,8 +27,6 @@ disable= reimported, relative-import, ungrouped-imports, - unsubscriptable-object, - unsupported-membership-test, unused-argument, unused-wildcard-import, wildcard-import, @@ -119,6 +117,13 @@ disable= too-many-return-statements, too-many-statements, #--------------------------------------------------------------------------- + # Enabling these would be nice, but at the moment pylint is a bit too dumb, + # so it stumbles over e.g. initialization with None. It ignores control + # flow, so even adding e.g. isinstance() guards wouldn't help, see: + # https://github.com/PyCQA/pylint/issues/1498. + unsubscriptable-object, + unsupported-membership-test, + #--------------------------------------------------------------------------- # Our code is still full of FIXMEs/XXXs/TODOs, perhaps fixing or removing # them might be a good idea some day... fixme,

6 years, 1 month

Classify len-as-condition warning.

by Sven Panne

Module: check_mk Branch: master Commit: 16b58a584d25a7f4632eb0caa9a6118545c56897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16b58a584d25a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 09:50:56 2018 +0200 Classify len-as-condition warning. Change-Id: Ibfade615a8e25d3ca57a524a1e2e537a8436e8ce --- tests/pylint/pylintrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 0809cc2..4f75d2b 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -17,7 +17,6 @@ disable= consider-using-enumerate, consider-using-ternary, inconsistent-return-statements, - len-as-condition, logging-not-lazy, missing-docstring, multiple-imports, @@ -85,6 +84,12 @@ disable= redefined-builtin, #--------------------------------------------------------------------------- # Enabling this would be nice, but not crucial. At the moment, we have quite + # a few violations (about 220 in roughly 40 modules), so we postpone fixing + # this. Note that due to our arcane use of types, we need to be very careful + # when fixing these warnings! + len-as-condition, + #--------------------------------------------------------------------------- + # Enabling this would be nice, but not crucial. At the moment, we have quite # a few violations, so we postpone fixing this. When we do it eventually, we # probably want to use "include-naming-hint=yes" in the BASIC section. invalid-name,

6 years, 1 month

CMK-600: Add Werk 5507

by Andreas Umbreit

Module: check_mk Branch: master Commit: a7fd419c0bef49f85bf2effd4b5474f9c3a878d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7fd419c0bef49… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Jul 25 07:11:28 2018 +0200 CMK-600: Add Werk 5507 5507 FIX Prevent cmk-update-agent from being prelinked on Linux Since Check_MK 1.5, the Agent Updater gets packaged via the tool "PyInstaller" to ensure a better compatibility. Unfortunately, PyInstaller-packaged binaries will break when tthey get prelinked. You would experience this by getting an error message like <pre> Cannot open self /usr/lib/check_mk_agent/plugins/3600/cmk-update-agent or archive /usr/lib/check_mk_agent/plugins/3600/cmk-update-agent.pkg </pre> when cmk-update-agent gets executed after a prelink. To mitigate this problem, and because there may be some systems that run a prelink-job frequently on all executables, the Check_MK agent package now blacklists the cmk-update-agent binary from being prelinked. It does this by writing to the prelink-config (if it finds one on the system) on installation. The corresponding config entries will be removed on uninstallation. Change-Id: Ia0a83b76da4bedafa27e8513812a258ea37ef871 --- .werks/5507 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/5507 b/.werks/5507 new file mode 100644 index 0000000..18eaa55 --- /dev/null +++ b/.werks/5507 @@ -0,0 +1,19 @@ +Title: Prevent cmk-update-agent from being prelinked on Linux +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1532494783 + +Since Check_MK 1.5, the Agent Updater gets packaged via the tool "PyInstaller" to ensure a better compatibility. Unfortunately, PyInstaller-packaged binaries will break when tthey get prelinked. You would experience this by getting an error message like + +<pre> +Cannot open self /usr/lib/check_mk_agent/plugins/3600/cmk-update-agent or archive /usr/lib/check_mk_agent/plugins/3600/cmk-update-agent.pkg +</pre> + +when cmk-update-agent gets executed after a prelink. + +To mitigate this problem, and because there may be some systems that run a prelink-job frequently on all executables, the Check_MK agent package now blacklists the cmk-update-agent binary from being prelinked. It does this by writing to the prelink-config (if it finds one on the system) on installation. The corresponding config entries will be removed on uninstallation.

6 years, 1 month

6206 Check Aggregator ID in case of LACP bonding

by Moritz Kiemer

Module: check_mk Branch: master Commit: 76a63f089c5fe58fa7a823aa474093fb78e57e73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76a63f089c5fe5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jun 15 15:07:35 2018 +0200 6206 Check Aggregator ID in case of LACP bonding lnx_bonding: For LACP the aggregator IDs are compared. By default the check returns WARN if they don't match. Change-Id: I4ef3b1346411ab101b2eb95cd7732c84b0990008 --- .werks/6206 | 14 +++++ checkman/lnx_bonding | 4 ++ checks/bonding.include | 96 ++++++++++++++++++++------------ checks/lnx_bonding | 96 ++++++++++++++++---------------- checks/ovs_bonding | 6 +- checks/windows_intel_bonding | 7 ++- checks/windows_os_bonding | 7 ++- cmk/gui/plugins/wato/check_parameters.py | 9 ++- 8 files changed, 149 insertions(+), 90 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=76a63f089c…

6 years, 1 month

Update comment in ucd_hr.include

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c967f497736746cec34f6e5b11341575e4974e66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c967f497736746… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jul 25 12:23:53 2018 +0200 Update comment in ucd_hr.include Change-Id: I5d1f8433c34790c64e51ee7baa5d779ae260bc04 --- checks/ucd_hr.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ucd_hr.include b/checks/ucd_hr.include index a29d43b..9f39f31 100644 --- a/checks/ucd_hr.include +++ b/checks/ucd_hr.include @@ -97,7 +97,7 @@ def _is_ucd_mem(oid): if name in sys_descr and not oid(".1.3.6.1.2.1.25.1.1.0"): return True - # Astaro Firewall is Linux but should use hr_mem + # Astaro and Synology are Linux but should use hr_mem # Otherwise Cache/Buffers are included in used memory # generating critical state if oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072."):

6 years, 1 month

6379 check_icmp: Ping additional IPv4/ 6 address which refers to its numbering in the host attributes

by Simon Betz

Module: check_mk Branch: master Commit: 887a99382f28eba10b1de8478c957bb410c1888e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=887a99382f28eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 24 15:14:05 2018 +0200 6379 check_icmp: Ping additional IPv4/6 address which refers to its numbering in the host attributes Change-Id: Ia9b759552f31603be606445d54800af71f7f40f4 --- .werks/6379 | 14 ++++++++++++++ checks/check_icmp | 24 +++++++++++++++++++++++- cmk/gui/plugins/wato/active_checks.py | 2 ++ cmk_base/core_config.py | 7 +++++++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/.werks/6379 b/.werks/6379 new file mode 100644 index 0000000..5043763 --- /dev/null +++ b/.werks/6379 @@ -0,0 +1,14 @@ +Title: check_icmp: Ping additional IPv4/6 address which refers to its index in the host properties +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532437758 +Class: feature + +Below the host properties you can set additional IPv4/6 addresses +which are numbered. In the ruleset {{Check hosts with PING (ICMP Echo Request)}} +you can choose {{Additional IPv4/6 address identified by its index in the host properties}} +below {{Alternative address to ping}}. There you can give the index of the +IPv4/6 address which you want to ping. diff --git a/checks/check_icmp b/checks/check_icmp index 2dbd55a..d0f7afa 100644 --- a/checks/check_icmp +++ b/checks/check_icmp @@ -44,25 +44,47 @@ def check_icmp_arguments(params): target = params.get("address", "address") if target == "address": args.append("'$HOSTADDRESS$'") + elif target == "alias": args.append("'$HOSTALIAS$'") + elif target == "all_ipv4addresses": args += ["$HOST_ADDRESSES_4$", "$HOST_ADDRESS_4$"] + elif target == "all_ipv6addresses": args += ["-6", "$HOST_ADDRESSES_6$", "$HOST_ADDRESS_6$"] + elif target == "additional_ipv4addresses": args.append("$HOST_ADDRESSES_4$") + elif target == "additional_ipv6addresses": args += ["-6", "$HOST_ADDRESSES_6$"] + + elif target[0] == "indexed_ipv4address": + args.append("$HOST_ADDRESS_4_%s$" % target[1]) + + elif target[0] == "indexed_ipv6address": + args.append("$HOST_ADDRESS_6_%s$" % target[1]) + else: # custom args.append(quote_shell_string(target[1])) return " ".join(args) +def check_icmp_description(params): + description = "PING" + target = params.get("address", "address") + if target[0] == "indexed_ipv4address": + description += " IPv4/%s" % target[1] + elif target[0] == "indexed_ipv6address": + description += " IPv6/%s" % target[1] + return description + + active_check_info['icmp'] = { "command_line" : '$USER1$/check_icmp $ARG1$', "argument_function" : check_icmp_arguments, - "service_description" : lambda args: args.get("description", "PING"), + "service_description" : check_icmp_description, "has_perfdata" : True, } diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 872affc..9b791f2 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -259,6 +259,8 @@ register_rule(group, ("all_ipv6addresses", _("Ping all IPv6 addresses")), ("additional_ipv4addresses", _("Ping additional IPv4 addresses")), ("additional_ipv6addresses", _("Ping additional IPv6 addresses")), + ("indexed_ipv4address", _("Ping IPv4 address identified by its index"), Integer(default_value=1)), + ("indexed_ipv6address", _("Ping IPv6 address identified by its index"), Integer(default_value=1)), ] )), ] + check_icmp_params, diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index c06c768..84c3741 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -391,8 +391,15 @@ def get_host_attributes(hostname, tags): add_ipv4addrs, add_ipv6addrs = config.get_additional_ipaddresses_of(hostname) if add_ipv4addrs: attrs["_ADDRESSES_4"] = " ".join(add_ipv4addrs) + for nr, ipv4_address in enumerate(add_ipv4addrs): + key = "_ADDRESS_4_%s" % (nr+1) + attrs[key] = ipv4_address + if add_ipv6addrs: attrs["_ADDRESSES_6"] = " ".join(add_ipv6addrs) + for nr, ipv6_address in enumerate(add_ipv6addrs): + key = "_ADDRESS_6_%s" % (nr+1) + attrs[key] = ipv6_address # Add the optional WATO folder path path = config.host_paths.get(hostname)

6 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
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