Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

5813 FIX mk_oracle.ps1: temporary files are no longer written to c: \windows\system32

by Andreas

Module: check_mk Branch: master Commit: 7072d94ae4ee45c4331ae45e436f4ef974eda7f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7072d94ae4ee45… Author: Andreas <ab(a)mathias-kettner.de> Date: Wed May 30 14:48:51 2018 +0200 5813 FIX mk_oracle.ps1: temporary files are no longer written to c:\windows\system32 Temporary files from this plugin are now generated in the official temp directory. Its usually specified through the environment variable MK_TEMPDIR, set by the windows agent. Change-Id: Ib7bb4e4530e0173e9d1f7aef421b4917e06fe72b --- .werks/5813 | 14 ++++++++++++++ agents/windows/plugins/mk_oracle.ps1 | 16 +++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.werks/5813 b/.werks/5813 new file mode 100644 index 0000000..3febba5 --- /dev/null +++ b/.werks/5813 @@ -0,0 +1,14 @@ +Title: mk_oracle.ps1: temporary files are no longer written to c:\windows\system32 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527684383 + +Temporary files from this plugin are now generated in the official temp directory. +Its usually specified through the environment variable MK_TEMPDIR, set by the windows agent. + + diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index f8ec0a2..64862ca 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -37,7 +37,7 @@ # usage ############################################################################### # copy this file to C:\Program Files (x86)\check_mk\plugins -# copy the config file to C:\Program Files (x86)\check_mk\ +# copy the config file to C:\Program Files (x86)\check_mk\config # cd C:\Program Files (x86)\check_mk # check_mk_agent test ############################################################################### @@ -146,6 +146,15 @@ if (!$MK_CONFDIR) { $MK_CONFDIR= "c:\Program Files (x86)\check_mk\config" } +# directory for tempfiles +$MK_TEMPDIR = $env:MK_TEMPDIR + +# Fallback if the (old) agent does not provide the MK_TEMPDIR +if (!$MK_TEMPDIR){ + $MK_TEMPDIR = "C:\Program Files (x86)\check_mk\temp" +} + + # Source the optional configuration file for this agent plugin $CONFIG_FILE="${MK_CONFDIR}\mk_oracle_cfg.ps1" if (test-path -path "${CONFIG_FILE}" ) { @@ -238,7 +247,7 @@ exit; $res=$res.trim() $res=[int]$res $res - } + } # now we set our action on error back to our normal value $ErrorActionPreference = $NORMAL_ACTION_PREFERENCE } @@ -466,7 +475,7 @@ Param( # The temporary file to store the output of the SQL # currently default path is used here. change this @TBR? - $fullpath="$sql_message.$sqlsid.txt" + $fullpath= $MK_TEMPDIR + "\" + "$sql_message.$sqlsid.txt" if ($delayed -gt 0) { @@ -1484,3 +1493,4 @@ if ($the_count -gt 0) { } debug_echo "got to the end" +

6 years, 1 month

Made pylintrc compatible with newer pylint versions.

by Sven Panne

Module: check_mk Branch: master Commit: 534b6dfcdf3fe576a5f2a29d7a3428dd59fa624b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=534b6dfcdf3fe5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 11:42:10 2018 +0200 Made pylintrc compatible with newer pylint versions. Sad story: https://github.com/PyCQA/pylint/commit/9397a5283 fixes https://github.com/PyCQA/pylint/issues/1024, but as a side effect, the characters '#' and ';' act now as inline comment prefixes (see https://docs.python.org/3/library/configparser.html#customizing-parser-beha…). Simple portable and even more readable solution: Just use continuation lines! Change-Id: Icf936a44657350f601d0285a607a10a97cfa32d6 --- tests/pylint/pylintrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index dadd73e..5ddd7d1 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -1,6 +1,10 @@ [MASTER] # Setup the python paths needed for our tests -init-hook='import sys, os; test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests"); sys.path.insert(0, test_path) ; import conftest' +init-hook= + import sys, os + test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests") + sys.path.insert(0, test_path) + import conftest #load-plugins=testlib.pylint_cmk,testlib.pylint_checker_wrong_i18n load-plugins=testlib.pylint_cmk,testlib.pylint_checker_localization persistent=yes

6 years, 1 month

Revert pylint test balloon.

by Sven Panne

Module: check_mk Branch: master Commit: 9ed2cfa8f61e201b1f0d1a589b56962ee518ef5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ed2cfa8f61e20… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 11:17:02 2018 +0200 Revert pylint test balloon. There is something strange going on with the init-hook, it doesn't seem to execute code after extending sys.path. o_O This reverts commit e51c1c345fdee586e4d4c863ce48c869132b77bb. Change-Id: Ib1dd8e99f432f2419bf09d63f9d41f00e58229ac --- Pipfile | 2 +- Pipfile.lock | 34 ++++++++-------------------------- tests/pylint/pylintrc | 2 +- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/Pipfile b/Pipfile index db16602..a9efb33 100644 --- a/Pipfile +++ b/Pipfile @@ -18,7 +18,7 @@ dill = "*" bandit = "*" lockfile = "*" lxml = "*" -pylint = "*" +pylint = "==1.6.4" # Newer version was broken - check again one day pyenchant = "*" [packages] diff --git a/Pipfile.lock b/Pipfile.lock index 272a4b5..fa97da2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "69f55b4a39564eb4adf6f821915689434aa70df52564e0c7edd131137352b92b" + "sha256": "79d10de9cd316fcb769f36d73ad634bf38cd24ce45d6bdd2714912468bbfdd9f" }, "pipfile-spec": 6, "requires": { @@ -595,10 +595,10 @@ "develop": { "astroid": { "hashes": [ - "sha256:032f6e09161e96f417ea7fad46d3fac7a9019c775f202182c22df0e4f714cb1c", - "sha256:dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09" + "sha256:944400d94e45865af150fb98700b27b788ddee5ad17c77d0725f67ac271f7a10", + "sha256:a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7" ], - "version": "==1.6.4" + "version": "==1.4.9" }, "atomicwrites": { "hashes": [ @@ -694,22 +694,12 @@ "index": "pypi", "version": "==0.2.7.1" }, - "enum34": { - "hashes": [ - "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", - "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", - "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", - "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" - ], - "index": "pypi", - "version": "==1.1.6" - }, "funcsigs": { "hashes": [ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -883,11 +873,11 @@ }, "pylint": { "hashes": [ - "sha256:aa519865f8890a5905fa34924fed0f3bfc7d84fc9f9142c16dac52ffecd25a39", - "sha256:c353d8225195b37cc3aef18248b8f3fe94c5a6a95affaf885ae21a24ca31d8eb" + "sha256:eeeeb81c8095586b417ea0602c01f53d1c87694fcf3c866f8681457f94875a8e", + "sha256:ef901a34b62ed7a734370ba5b162d890231ba8822abe88c6dda1268e2575f5f1" ], "index": "pypi", - "version": "==1.9.1" + "version": "==1.6.4" }, "pytest": { "hashes": [ @@ -941,14 +931,6 @@ ], "version": "==3.12" }, - "singledispatch": { - "hashes": [ - "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c", - "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8" - ], - "markers": "python_version < '3.4'", - "version": "==3.4.0.3" - }, "six": { "hashes": [ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 0c4eff1..dadd73e 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -1,6 +1,6 @@ [MASTER] # Setup the python paths needed for our tests -init-hook='import sys, os; test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests"); sys.path.insert(0, test_path) ; print("############## sys.path = %s" % sys.path); import conftest' +init-hook='import sys, os; test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests"); sys.path.insert(0, test_path) ; import conftest' #load-plugins=testlib.pylint_cmk,testlib.pylint_checker_wrong_i18n load-plugins=testlib.pylint_cmk,testlib.pylint_checker_localization persistent=yes

6 years, 1 month

Update to #6186

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b24271c0772febadc5313b4db4bd1ffc29356dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b24271c0772fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 10:54:03 2018 +0200 Update to #6186 Change-Id: Ideabfe117b26fb0d8937f6b4c7e9c53c17dfb5ee --- cmk_base/checking.py | 1 + cmk_base/discovery.py | 60 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 40eac9c..c1c9fb1 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -268,6 +268,7 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i dont_submit = False try: + # TODO: There is duplicate code with discovery._execute_discovery(). Find a common place! try: section_content = multi_host_sections.get_section_content(hostname, ipaddress, section_name, for_discovery=False) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 8daf98f..8c5fd8f 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -872,33 +872,38 @@ def _execute_discovery(multi_host_sections, hostname, ipaddress, check_plugin_na except KeyError: raise MKGeneralException("No such check type '%s'" % check_plugin_name) + # Now do the actual discovery try: - section_content = multi_host_sections.get_section_content(hostname, ipaddress, - check_plugin_name, for_discovery=True) - except MKParseFunctionError, e: - if cmk.debug.enabled(): - x = e.exc_info() - raise x[0], x[1], x[2] # re-raise the original exception to not destory the trace + # TODO: There is duplicate code with checking.execute_check(). Find a common place! + try: + section_content = multi_host_sections.get_section_content(hostname, ipaddress, + check_plugin_name, for_discovery=True) + except MKParseFunctionError, e: + if cmk.debug.enabled() or on_error == "raise": + x = e.exc_info() + if x[0] == item_state.MKCounterWrapped: + return [] + else: + # re-raise the original exception to not destory the trace. This may raise a MKCounterWrapped + # exception which need to lead to a skipped check instead of a crash + raise x[0], x[1], x[2] - if on_error == "warn": - section_name = checks.section_name_of(check_plugin_name) - console.warning("Exception while parsing agent section '%s': %s\n" % (section_name, e)) - elif on_error == "raise": - raise - return [] + elif on_error == "warn": + section_name = checks.section_name_of(check_plugin_name) + console.warning("Exception while parsing agent section '%s': %s\n" % (section_name, e)) - if section_content is None: # No data for this check type - return [] + return [] - # In case of SNMP checks but missing agent response, skip this check. - # Special checks which still need to be called even with empty data - # may declare this. - if not section_content and checks.is_snmp_check(check_plugin_name) \ - and not checks.check_info[check_plugin_name]["handle_empty_info"]: - return [] + if section_content is None: # No data for this check type + return [] + + # In case of SNMP checks but missing agent response, skip this check. + # Special checks which still need to be called even with empty data + # may declare this. + if not section_content and checks.is_snmp_check(check_plugin_name) \ + and not checks.check_info[check_plugin_name]["handle_empty_info"]: + return [] - # Now do the actual discovery - try: # Check number of arguments of discovery function. Note: This # check for the legacy API will be removed after 1.2.6. if len(inspect.getargspec(discovery_function).args) == 2: @@ -1185,7 +1190,16 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): continue # Skip not existing check silently try: - section_content = multi_host_sections.get_section_content(hostname, ipaddress, section_name, for_discovery=True) + try: + section_content = multi_host_sections.get_section_content(hostname, ipaddress, section_name, for_discovery=True) + except MKParseFunctionError, e: + if cmk.debug.enabled() or on_error == "raise": + x = e.exc_info() + # re-raise the original exception to not destory the trace. This may raise a MKCounterWrapped + # exception which need to lead to a skipped check instead of a crash + raise x[0], x[1], x[2] + else: + raise except Exception, e: if cmk.debug.enabled(): raise

6 years, 1 month

6186 FIX Fixed crash of Check_MK service on counter wraps in parse functions (e.g. MKCounterWrapped: WMI query timed out)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c14e4a2d3b56206d4a6d01faa18d9472e804ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c14e4a2d3b562… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 30 10:15:09 2018 +0200 6186 FIX Fixed crash of Check_MK service on counter wraps in parse functions (e.g. MKCounterWrapped: WMI query timed out) When a check raises a MKCounterWrapped exception in the parse function, this check result should be ignored. In all 1.5 releases this lead to a crash with an error message like "MKCounterWrapped (WMI query timed out)" in case of the WMI checks. Change-Id: If394764507bbe1056ea59a4be1d9f3e957bc2c48 --- .werks/6186 | 13 +++++++++++++ cmk_base/checking.py | 46 ++++++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/.werks/6186 b/.werks/6186 new file mode 100644 index 0000000..712f2f8 --- /dev/null +++ b/.werks/6186 @@ -0,0 +1,13 @@ +Title: Fixed crash of Check_MK service on counter wraps in parse functions (e.g. MKCounterWrapped: WMI query timed out) +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527667964 + +When a check raises a MKCounterWrapped exception in the parse function, this check result should be ignored. +In all 1.5 releases this lead to a crash with an error message like "MKCounterWrapped (WMI query timed out)" +in case of the WMI checks. diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 9982ee7..40eac9c 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -260,36 +260,38 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i section_name = checks.section_name_of(check_plugin_name) - try: - section_content = multi_host_sections.get_section_content(hostname, - ipaddress, section_name, for_discovery=False) - except MKParseFunctionError, e: - x = e.exc_info() - raise x[0], x[1], x[2] # re-raise the original exception to not destory the trace - # We need to set this again, because get_section_content has the side effect of setting this with # item None if there is a parse function. This would break the entire set_item/get_rate logic # for checks with items that rely on this being handled by the API. # TODO: Write a regression test for this. item_state.set_item_state_prefix(check_plugin_name, item) - # TODO: Move this to a helper function - if section_content is None: # No data for this check type - return False - - # In case of SNMP checks but missing agent response, skip this check. - # Special checks which still need to be called even with empty data - # may declare this. - if not section_content and checks.is_snmp_check(check_plugin_name) \ - and not checks.check_info[check_plugin_name]["handle_empty_info"]: - return False - - check_function = checks.check_info[check_plugin_name].get("check_function") - if check_function is None: - check_function = lambda item, params, section_content: (3, 'UNKNOWN - Check not implemented') - dont_submit = False try: + try: + section_content = multi_host_sections.get_section_content(hostname, + ipaddress, section_name, for_discovery=False) + except MKParseFunctionError, e: + x = e.exc_info() + # re-raise the original exception to not destory the trace. This may raise a MKCounterWrapped + # exception which need to lead to a skipped check instead of a crash + raise x[0], x[1], x[2] + + # TODO: Move this to a helper function + if section_content is None: # No data for this check type + return False + + # In case of SNMP checks but missing agent response, skip this check. + # Special checks which still need to be called even with empty data + # may declare this. + if not section_content and checks.is_snmp_check(check_plugin_name) \ + and not checks.check_info[check_plugin_name]["handle_empty_info"]: + return False + + check_function = checks.check_info[check_plugin_name].get("check_function") + if check_function is None: + check_function = lambda item, params, section_content: (3, 'UNKNOWN - Check not implemented') + # Call the actual check function item_state.reset_wrapped_counters()

6 years, 1 month

Handle OS and device info in HW/SW inventory

by Moritz Kiemer

Module: check_mk Branch: master Commit: 615684631a64cfdec17b33c20140087492e0d7ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615684631a64cf… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 25 07:59:16 2018 +0200 Handle OS and device info in HW/SW inventory Change-Id: I4e8c824b7d7df9252230ea67d925ca53b0d4750d --- agents/special/agent_fritzbox | 6 ++---- inventory/fritz | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_fritzbox b/agents/special/agent_fritzbox index fc26ac0..7e3f0a5 100755 --- a/agents/special/agent_fritzbox +++ b/agents/special/agent_fritzbox @@ -197,11 +197,9 @@ try: if opt_debug: raise - sys.stdout.write('<<<check_mk>>>\n') - sys.stdout.write('Version: %s\n' % g_version) - sys.stdout.write('AgentOS: %s\n' % g_device) - sys.stdout.write('<<<fritz>>>\n') + sys.stdout.write('VersionOS %s\n' % g_version) + sys.stdout.write('VersionDevice %s\n' % g_device) for key, value in status.items(): sys.stdout.write('%s %s\n' % (key, value)) diff --git a/inventory/fritz b/inventory/fritz new file mode 100644 index 0000000..b7bd1b1 --- /dev/null +++ b/inventory/fritz @@ -0,0 +1,46 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +#<<<fritz>>> +#VersionOS 74.06.05 +#VersionDevice AVM FRITZ!Box Fon WLAN 7270 v3 +# + + +def inv_fritz(info): + + parsed = {line[0]: ' '.join(line[1:]) + for line in info} + + node_hw = inv_tree('hardware.system.') + node_hw['model'] = parsed.get('VersionDevice') + node_sw = inv_tree('software.os.') + node_sw['version'] = parsed.get('VersionOS') + +inv_info['fritz'] = { + "inv_function" : inv_fritz, +} +

6 years, 1 month

Temporary printf-style debugging of pylintrc paths.

by Sven Panne

Module: check_mk Branch: master Commit: e51c1c345fdee586e4d4c863ce48c869132b77bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e51c1c345fdee5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 10:47:34 2018 +0200 Temporary printf-style debugging of pylintrc paths. Change-Id: Iad0c7d7abb283f0fc5f5d2219c9545164dd70edb --- tests/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index dadd73e..0c4eff1 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -1,6 +1,6 @@ [MASTER] # Setup the python paths needed for our tests -init-hook='import sys, os; test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests"); sys.path.insert(0, test_path) ; import conftest' +init-hook='import sys, os; test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests"); sys.path.insert(0, test_path) ; print("############## sys.path = %s" % sys.path); import conftest' #load-plugins=testlib.pylint_cmk,testlib.pylint_checker_wrong_i18n load-plugins=testlib.pylint_cmk,testlib.pylint_checker_localization persistent=yes

6 years, 1 month

Test balloon: Use latest version of pylint.

by Sven Panne

Module: check_mk Branch: master Commit: 59591f3295eeb7b55e65af624c001dbe8e7f556a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59591f3295eeb7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 10:23:02 2018 +0200 Test balloon: Use latest version of pylint. Change-Id: I7ae6574d32a90a3a1a1200918afc462e9ffec222 --- Pipfile | 2 +- Pipfile.lock | 34 ++++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Pipfile b/Pipfile index a9efb33..db16602 100644 --- a/Pipfile +++ b/Pipfile @@ -18,7 +18,7 @@ dill = "*" bandit = "*" lockfile = "*" lxml = "*" -pylint = "==1.6.4" # Newer version was broken - check again one day +pylint = "*" pyenchant = "*" [packages] diff --git a/Pipfile.lock b/Pipfile.lock index fa97da2..272a4b5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "79d10de9cd316fcb769f36d73ad634bf38cd24ce45d6bdd2714912468bbfdd9f" + "sha256": "69f55b4a39564eb4adf6f821915689434aa70df52564e0c7edd131137352b92b" }, "pipfile-spec": 6, "requires": { @@ -595,10 +595,10 @@ "develop": { "astroid": { "hashes": [ - "sha256:944400d94e45865af150fb98700b27b788ddee5ad17c77d0725f67ac271f7a10", - "sha256:a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7" + "sha256:032f6e09161e96f417ea7fad46d3fac7a9019c775f202182c22df0e4f714cb1c", + "sha256:dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09" ], - "version": "==1.4.9" + "version": "==1.6.4" }, "atomicwrites": { "hashes": [ @@ -694,12 +694,22 @@ "index": "pypi", "version": "==0.2.7.1" }, + "enum34": { + "hashes": [ + "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", + "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", + "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", + "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" + ], + "index": "pypi", + "version": "==1.1.6" + }, "funcsigs": { "hashes": [ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -873,11 +883,11 @@ }, "pylint": { "hashes": [ - "sha256:eeeeb81c8095586b417ea0602c01f53d1c87694fcf3c866f8681457f94875a8e", - "sha256:ef901a34b62ed7a734370ba5b162d890231ba8822abe88c6dda1268e2575f5f1" + "sha256:aa519865f8890a5905fa34924fed0f3bfc7d84fc9f9142c16dac52ffecd25a39", + "sha256:c353d8225195b37cc3aef18248b8f3fe94c5a6a95affaf885ae21a24ca31d8eb" ], "index": "pypi", - "version": "==1.6.4" + "version": "==1.9.1" }, "pytest": { "hashes": [ @@ -931,6 +941,14 @@ ], "version": "==3.12" }, + "singledispatch": { + "hashes": [ + "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c", + "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8" + ], + "markers": "python_version < '3.4'", + "version": "==3.4.0.3" + }, "six": { "hashes": [ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",

6 years, 1 month

Improve formatting by extracting an SNMP credential.

by Sven Panne

Module: check_mk Branch: master Commit: afe4abc948113977e948bf1ea700bed9b2ef99d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afe4abc9481139… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 09:36:44 2018 +0200 Improve formatting by extracting an SNMP credential. Change-Id: Id0ba66dfc544cefbb98483cbb6207f4f21b99c24 --- cmk/ec/defaults.py | 59 ++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/cmk/ec/defaults.py b/cmk/ec/defaults.py index 5be8940..784154b 100644 --- a/cmk/ec/defaults.py +++ b/cmk/ec/defaults.py @@ -54,15 +54,17 @@ def default_rule_pack(rules): def default_config(): # type: () -> Dict[str, Any] """Returns the default configuration""" + v1_v2_credential = { + "description": '"public" default for receiving SNMPv1/v2 traps', + "credentials": "public", + } return { "rules": [], # old pre 1.2.7i1 format. Only used if rule_packs is empty "rule_packs": [], # new format with rule packages "mkp_rule_packs": {}, # rule packs provided by MKPs and referenced in rule_packs "actions": [], - "debug_rules": - False, - "rule_optimizer": - True, + "debug_rules": False, + "rule_optimizer": True, "log_level": { "cmk.mkeventd": cmk.log.INFO, "cmk.mkeventd.EventServer": cmk.log.INFO, @@ -70,39 +72,22 @@ def default_config(): "cmk.mkeventd.StatusServer": cmk.log.INFO, "cmk.mkeventd.lock": cmk.log.INFO, }, - "log_rulehits": - False, - "log_messages": - False, - "retention_interval": - 60, - "housekeeping_interval": - 60, - "statistics_interval": - 5, - "history_lifetime": - 365, # days - "history_rotation": - "daily", - "replication": - None, - "remote_status": - None, - "socket_queue_len": - 10, - "eventsocket_queue_len": - 10, + "log_rulehits": False, + "log_messages": False, + "retention_interval": 60, + "housekeeping_interval": 60, + "statistics_interval": 5, + "history_lifetime": 365, # days + "history_rotation": "daily", + "replication": None, + "remote_status": None, + "socket_queue_len": 10, + "eventsocket_queue_len": 10, "hostname_translation": {}, - "archive_orphans": - False, - "archive_mode": - "file", - "translate_snmptraps": - False, - "snmp_credentials": [{ - "description": "\"public\" default for receiving SNMPv1/v2 traps", - "credentials": "public", - },], + "archive_orphans": False, + "archive_mode": "file", + "translate_snmptraps": False, + "snmp_credentials": [v1_v2_credential], "event_limit": { 'by_host': { 'action': 'stop_overflow_notify', @@ -115,6 +100,6 @@ def default_config(): 'overall': { 'action': 'stop_overflow_notify', 'limit': 10000 - } + }, }, }

6 years, 1 month

Improved formatting by using trailing commas.

by Sven Panne

Module: check_mk Branch: master Commit: 4ac67a5b26d6d75995af29f1c128fedf09d8f185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ac67a5b26d6d7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 09:26:29 2018 +0200 Improved formatting by using trailing commas. Change-Id: I1eb5ce48d7a132f79f2641a995c7752167db5815 --- cmk/ec/settings.py | 88 +++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 48 deletions(-) diff --git a/cmk/ec/settings.py b/cmk/ec/settings.py index 137e014..e7a659d 100644 --- a/cmk/ec/settings.py +++ b/cmk/ec/settings.py @@ -44,29 +44,27 @@ from typing import List, NamedTuple, Optional, Union # pylint: disable=unused-i AnnotatedPath = NamedTuple('AnnotatedPath', [('description', str), ('value', Path)]) # filesystem paths related to the event console -Paths = NamedTuple( - 'Paths', - [ - ('main_config_file', AnnotatedPath), # - ('config_dir', AnnotatedPath), - ('rule_pack_dir', AnnotatedPath), - ('mkp_rule_pack_dir', AnnotatedPath), - ('unix_socket', AnnotatedPath), - ('event_socket', AnnotatedPath), - ('event_pipe', AnnotatedPath), - ('pid_file', AnnotatedPath), - ('log_file', AnnotatedPath), - ('history_dir', AnnotatedPath), - ('messages_dir', AnnotatedPath), - ('master_config_file', AnnotatedPath), - ('slave_status_file', AnnotatedPath), - ('spool_dir', AnnotatedPath), - ('status_file', AnnotatedPath), - ('status_server_profile', AnnotatedPath), - ('event_server_profile', AnnotatedPath), - ('compiled_mibs_dir', AnnotatedPath), - ('mongodb_config_file', AnnotatedPath) - ]) +Paths = NamedTuple('Paths', [ + ('main_config_file', AnnotatedPath), + ('config_dir', AnnotatedPath), + ('rule_pack_dir', AnnotatedPath), + ('mkp_rule_pack_dir', AnnotatedPath), + ('unix_socket', AnnotatedPath), + ('event_socket', AnnotatedPath), + ('event_pipe', AnnotatedPath), + ('pid_file', AnnotatedPath), + ('log_file', AnnotatedPath), + ('history_dir', AnnotatedPath), + ('messages_dir', AnnotatedPath), + ('master_config_file', AnnotatedPath), + ('slave_status_file', AnnotatedPath), + ('spool_dir', AnnotatedPath), + ('status_file', AnnotatedPath), + ('status_server_profile', AnnotatedPath), + ('event_server_profile', AnnotatedPath), + ('compiled_mibs_dir', AnnotatedPath), + ('mongodb_config_file', AnnotatedPath), +]) def _default_paths(omd_root, default_config_dir): @@ -105,13 +103,11 @@ def _default_paths(omd_root, default_config_dir): PortNumber = NamedTuple('PortNumber', [('value', int)]) # network port numbers related to the event console -PortNumbers = NamedTuple( - 'PortNumbers', - [ - ('syslog_udp', PortNumber), # - ('syslog_tcp', PortNumber), - ('snmptrap_udp', PortNumber) - ]) +PortNumbers = NamedTuple('PortNumbers', [ + ('syslog_udp', PortNumber), + ('syslog_tcp', PortNumber), + ('snmptrap_udp', PortNumber), +]) def _default_port_numbers(): @@ -218,26 +214,22 @@ def _endpoint(enabled, file_descriptor, default_port_number): # various post-processed commandline options -Options = NamedTuple( - 'Options', - [ - ('verbosity', int), # - ('syslog_udp', Optional[EndPoint]), - ('syslog_tcp', Optional[EndPoint]), - ('snmptrap_udp', Optional[EndPoint]), - ('foreground', bool), - ('debug', bool), - ('profile_status', bool), - ('profile_event', bool) - ]) +Options = NamedTuple('Options', [ + ('verbosity', int), + ('syslog_udp', Optional[EndPoint]), + ('syslog_tcp', Optional[EndPoint]), + ('snmptrap_udp', Optional[EndPoint]), + ('foreground', bool), + ('debug', bool), + ('profile_status', bool), + ('profile_event', bool), +]) # all settings of the event console -Settings = NamedTuple( - 'Settings', - [ - ('paths', Paths), # - ('options', Options) - ]) +Settings = NamedTuple('Settings', [ + ('paths', Paths), + ('options', Options), +]) def settings(version, omd_root, default_config_dir, argv):

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 May 2018