Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: 0ea735edeb6a7087da17dea073374723063495ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ea735edeb6a70… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 12 11:05:27 2018 +0100 Manual fix typecheck idiom cmk/gui/ In modules availability, forms, metrics, userdb, valuespec CMK-837 Change-Id: I6bad6f78673e7e7221d954af2287662ddde5e613 --- cmk/gui/availability.py | 2 +- cmk/gui/forms.py | 9 ++++++++- cmk/gui/metrics.py | 9 ++++++++- cmk/gui/userdb.py | 9 ++++++++- cmk/gui/valuespec.py | 29 +++++++++++++++++++---------- cmk/gui/wato/__init__.py | 2 +- 6 files changed, 45 insertions(+), 15 deletions(-) diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py index 31bb9dd..59e4f41 100644 --- a/cmk/gui/availability.py +++ b/cmk/gui/availability.py @@ -508,7 +508,7 @@ def render_number_function(timeformat): def prepare_avo_timeformats(timeformat): this_timeformat = [("percentage_2", render_number_function("percentage_2"))] - if type(timeformat) in [list, tuple]: + if isinstance(timeformat, (list, tuple)): if timeformat[0] == "both": this_timeformat = [(x, render_number_function(x)) for x in timeformat[1:]] elif timeformat[0] == "perc": diff --git a/cmk/gui/forms.py b/cmk/gui/forms.py index f489be3..bb3cd97 100644 --- a/cmk/gui/forms.py +++ b/cmk/gui/forms.py @@ -24,6 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +try: + # does not exist in Py3, but is supper class of str & unicode in py2 + basestring +except NameError: + basestring = str # pylint: disable=redefined-builtin + unicode = str # pylint: disable=redefined-builtin + from cmk.gui.htmllib import HTML from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -308,7 +315,7 @@ def section(title=None, checkbox=None, section_id=None, simple=False, hide=False html.close_div() if checkbox: html.open_div(class_="checkbox") - if type(checkbox) in [str, unicode, HTML]: + if isinstance(checkbox, (basestring, HTML)): html.write(checkbox) else: name, active, attrname = checkbox diff --git a/cmk/gui/metrics.py b/cmk/gui/metrics.py index be0dc5b..f9c09a0 100644 --- a/cmk/gui/metrics.py +++ b/cmk/gui/metrics.py @@ -40,6 +40,13 @@ import string import json import traceback +try: + # does not exist in Py3, but is supper class of str & unicode in py2 + basestring +except NameError: + basestring = str # pylint: disable=redefined-builtin + unicode = str # pylint: disable=redefined-builtin + import cmk.utils import cmk.render import cmk.plugin_registry @@ -207,7 +214,7 @@ def _required_trivial_metric_names(required_expressions): allowed_chars = string.ascii_letters + string.digits + "_" for entry in required_expressions: - if type(entry) in [str, unicode]: + if isinstance(entry, basestring): if any(char not in allowed_chars for char in entry): # Found a non trivial metric expression. Totally skip this mechanism return None diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 434a5db..c23ae66 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -32,6 +32,13 @@ import traceback import copy import pathlib2 as pathlib +try: + # does not exist in Py3, but is supper class of str & unicode in py2 + basestring +except NameError: + basestring = str # pylint: disable=redefined-builtin + unicode = str # pylint: disable=redefined-builtin + import cmk.utils import cmk.paths import cmk.store as store @@ -1217,7 +1224,7 @@ def hook_login(username, password): # False -> failed if result not in [False, None]: username = result - if type(username) not in [str, unicode]: + if not isinstance(username, basestring): raise MKInternalError( _("The username returned by the %s " "connector is not of type string (%r).") % (connection_id, username)) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index d57b17d..8529162 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -45,7 +45,16 @@ import types import base64 import hashlib import socket +import numbers import ipaddress + +try: + # does not exist in Py3, but is supper class of str & unicode in py2 + basestring +except NameError: + basestring = str # pylint: disable=redefined-builtin + unicode = str # pylint: disable=redefined-builtin + from Cryptodome.PublicKey import RSA from UserDict import DictMixin from enum import Enum @@ -93,7 +102,7 @@ class ValueSpec(object): return self._title def help(self): - if type(self._help) in [types.FunctionType, types.MethodType]: + if isinstance(self._help, (types.FunctionType, types.MethodType)): return self._help() return self._help @@ -122,7 +131,7 @@ class ValueSpec(object): # for same cases where the default value is known. def default_value(self): try: - if type(self._default_value) in [types.FunctionType, types.MethodType]: + if isinstance(self._default_value, (types.FunctionType, types.MethodType)): return self._default_value() return self._default_value except: @@ -354,7 +363,7 @@ class Integer(ValueSpec): return text def validate_datatype(self, value, varprefix): - if type(value) not in [int, long]: + if isinstance(value, numbers.Integral): raise MKUserError( varprefix, _("The value %r has the wrong type %s, but must be of type int") % @@ -522,7 +531,7 @@ class TextUnicode(TextAscii): return html.get_unicode_input(varprefix, "").strip() def validate_datatype(self, value, varprefix): - if type(value) not in [str, unicode]: + if not isinstance(value, basestring): raise MKUserError( varprefix, _("The value must be of type str or unicode, but it has type %s") % @@ -766,7 +775,7 @@ class TextAsciiAutocomplete(TextAscii): # Check for correct result_data format assert isinstance(result_data, list) if result_data: - assert type(result_data[0]) in [list, tuple] + assert isinstance(result_data[0], (list, tuple)) assert len(result_data[0]) == 2 html.write(json.dumps(result_data)) @@ -1585,7 +1594,7 @@ class Float(Integer): if isinstance(value, float): return - if type(value) in [int, long] and self._allow_int: + if isinstance(value, numbers.Integral) and self._allow_int: return raise MKUserError( @@ -1613,7 +1622,7 @@ class Percentage(Float): def validate_datatype(self, value, varprefix): if self._allow_int: - if type(value) not in [int, float]: + if not isinstance(value, (int, float)): raise MKUserError( varprefix, _("The value %r has type %s, but must be either float or int") % @@ -2518,7 +2527,7 @@ class RelativeDate(OptionalDropdownChoice): return today() + reldays * seconds_per_day def validate_datatype(self, value, varprefix): - if type(value) not in [float, int]: + if not isinstance(value, (int, float)): raise MKUserError(varprefix, _("Date must be a number value")) def validate_value(self, value, varprefix): @@ -2669,7 +2678,7 @@ class AbsoluteDate(ValueSpec): def validate_datatype(self, value, varprefix): if value == None and self._allow_empty: return - if type(value) not in [int, float]: + if not isinstance(value, (int, float)): raise MKUserError( varprefix, _("The type of the timestamp must be int or float, but is %s") % type_name(value)) @@ -3828,7 +3837,7 @@ class AutoTimestamp(FixedValue): return time.strftime("%F %T", time.localtime(value)) def validate_datatype(self, value, varprefix): - if type(value) not in [int, float]: + if not isinstance(value, (int, float)): return MKUserError(varprefix, _("Invalid datatype of timestamp: must be int or float.")) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index b545f3c..a450982 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -272,7 +272,7 @@ wato_root_dir = watolib.wato_root_dir multisite_dir = watolib.multisite_dir # TODO: Kept for old plugin compatibility. Remove this one day -from cmk.gui.valuespec import * # pylint: disable=wildcard-import +from cmk.gui.valuespec import * # pylint: disable=wildcard-import,redefined-builtin syslog_facilities = cmk.gui.mkeventd.syslog_facilities ALL_HOSTS = watolib.ALL_HOSTS ALL_SERVICES = watolib.ALL_SERVICES

5 years, 10 months

added WK6683: Improved performance during activate changes

by Andreas Boesl

Module: check_mk Branch: master Commit: c040cb121ffe1c2989deaefbaafeeb3d75c7210b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c040cb121ffe1c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 14 09:56:50 2018 +0100 added WK6683: Improved performance during activate changes Change-Id: I7e2c748ddbaefff15704c3162b71a1abc78d8567 --- .werks/6683 | 12 ++++++++++++ cmk/gui/watolib.py | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/6683 b/.werks/6683 new file mode 100644 index 0000000..e05584f --- /dev/null +++ b/.werks/6683 @@ -0,0 +1,12 @@ +Title: Improved performance during activate changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542182491 + +The duration of the activate changes phase was highly influenced by the number of WATO snapshots on disk. +This has been fixed. diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 084ea7b..077a464 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -6221,7 +6221,7 @@ def do_snapshot_maintenance(): snapshots = [] for f in os.listdir(snapshot_dir): if f.startswith('wato-snapshot-'): - status = get_snapshot_status(f) + status = get_snapshot_status(f, check_correct_core=False) # only remove automatic and legacy snapshots if status.get("type") in ["automatic", "legacy"]: snapshots.append(f) @@ -6234,7 +6234,7 @@ def do_snapshot_maintenance(): # Returns status information for snapshots or snapshots in progress # TODO: Remove once new changes mechanism has been implemented -def get_snapshot_status(snapshot, validate_checksums=False): +def get_snapshot_status(snapshot, validate_checksums=False, check_correct_core=True): if isinstance(snapshot, tuple): name, file_stream = snapshot else: @@ -6408,7 +6408,8 @@ def get_snapshot_status(snapshot, validate_checksums=False): check_size() check_extension() check_content() - check_core() + if check_correct_core: + check_core() if validate_checksums: check_checksums()

5 years, 10 months

6904 FIX mk_jolokia: No longer crash with IndexError if MBean is missing

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7d50c802cbbfc1bc2d5c9fbd3afb3990153528b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d50c802cbbfc1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Nov 14 07:47:23 2018 +0100 6904 FIX mk_jolokia: No longer crash with IndexError if MBean is missing CMK-1209 Change-Id: I003f001c9f6be68a07ebc49c0876f2317ff7b214 --- .werks/6904 | 10 ++++++++++ agents/plugins/mk_jolokia | 25 ++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.werks/6904 b/.werks/6904 new file mode 100644 index 0000000..65574a8 --- /dev/null +++ b/.werks/6904 @@ -0,0 +1,10 @@ +Title: mk_jolokia: No longer crash with IndexError if MBean is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542177988 +Class: fix + + diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index bb980b5..babc6df 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -305,17 +305,20 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] - paths = fetch_var( - inst["protocol"], - inst["server"], - inst["port"], - mbean, - inst["suburi"], - "", - None, - None, - None, - function="search")[0][1] + try: + paths = fetch_var( + inst["protocol"], + inst["server"], + inst["port"], + mbean, + inst["suburi"], + "", + None, + None, + None, + function="search")[0][1] + except IndexError: + return [] return [("%s/%s" % (urllib2.quote(mbean_exp), path), path, itemspec, mbean_exp) for mbean_exp in paths]

5 years, 10 months

6681 FIX check_bi_aggr: Fixed check exception when an aggregation was assigned to multiple groups

by Andreas Boesl

Module: check_mk Branch: master Commit: c61c0a1785c6dee87d10ab7fdc7f4830b69d4ec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c61c0a1785c6de… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 13 11:07:56 2018 +0100 6681 FIX check_bi_aggr: Fixed check exception when an aggregation was assigned to multiple groups Change-Id: Ide5815144bca33407a8f07284e60afee610f2ddc --- .werks/6681 | 11 +++++++++++ active_checks/check_bi_aggr | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6681 b/.werks/6681 new file mode 100644 index 0000000..8010479 --- /dev/null +++ b/.werks/6681 @@ -0,0 +1,11 @@ +Title: check_bi_aggr: Fixed check exception when an aggregation was assigned to multiple groups +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542103644 + + diff --git a/active_checks/check_bi_aggr b/active_checks/check_bi_aggr index c0ff3a9..a3ce96a 100755 --- a/active_checks/check_bi_aggr +++ b/active_checks/check_bi_aggr @@ -210,7 +210,7 @@ if len(obj) == 1: 'ERROR: Aggregation "%s" does not exist or user is not permitted\n' % aggr_name) sys.exit(3) -if type(obj) != list or len(obj) != 2: +if not isinstance(obj, list): sys.stdout.write('ERROR: Invalid response: %s\n' % (json.replace("\n", ""))) sys.exit(3)

5 years, 10 months

Hide sed line, it confuses the console log parser in our CI.

by Sven Panne

Module: check_mk Branch: master Commit: 8f1b23a91950ced9785d122af017f2d6d9097fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f1b23a91950ce… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 14 09:21:16 2018 +0100 Hide sed line, it confuses the console log parser in our CI. Change-Id: I68fbbebb7213b41f1f1e017243783b21f2e69b4e --- tests/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 4719433..d1e2f66 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -54,10 +54,10 @@ test-format-python: $(VENV) ../.style.yapf # There are some mixed up lines on stdout caused by the --parallel option. # Nevertheless, we keep that option to get a big performance boost. GitHub issue # opened for this problem: https://github.com/google/yapf/issues/644. - PYTHON_FILES=$${PYTHON_FILES-$$(./find-python-files)} ; \ + @PYTHON_FILES=$${PYTHON_FILES-$$(./find-python-files)} ; \ $(YAPF) --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES | \ - grep '^+++ .*(reformatted)$$' | \ - sed -e 's/^+++ //' -e 's/[[:blank:]]*(reformatted)$$/:1:1: error: file needs formatting/' + grep '^+++ .*(reformatted)$$' | \ + sed -e 's/^+++ //' -e 's/[[:blank:]]*(reformatted)$$/:1:1: error: file needs formatting/' test-gui-crawl: $(VENV) $(PYTEST) -T gui_crawl

5 years, 10 months

Make output predictable.

by Sven Panne

Module: check_mk Branch: master Commit: a2bd1d5cc13f74616191453b183cca1b9e5b3f43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2bd1d5cc13f74… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 14 09:10:08 2018 +0100 Make output predictable. Change-Id: I073374061f141dbc679eaa7be53346ff31417f98 --- tests/find-python-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/find-python-files b/tests/find-python-files index 7a9498b..d15325f 100755 --- a/tests/find-python-files +++ b/tests/find-python-files @@ -35,7 +35,7 @@ SEARCH+=" werk" REAL_SEARCH=$(realpath $SEARCH) # while read F is used to deal with files containing whitespaces -find $REAL_SEARCH -name .venv -prune -o -type f -print | while read F; do +find $REAL_SEARCH -name .venv -prune -o -type f -print | sort | while read F; do if [[ "$F" == *.py ]] || head -n 1 "$F" | grep -q '^#!.*python$' >/dev/null 2>&1; then echo "$F" fi

5 years, 10 months

Do not fail if something needs formatting, CI parses the log.

by Sven Panne

Module: check_mk Branch: master Commit: ecb5d6aa9306a6288f083daa7da1fbd434c1830b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb5d6aa9306a6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 14 09:10:50 2018 +0100 Do not fail if something needs formatting, CI parses the log. Change-Id: I499ce1ef7c80b37e466b8650f036c7f98c9fe625 --- tests/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index cd905de..4719433 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -57,8 +57,7 @@ test-format-python: $(VENV) ../.style.yapf PYTHON_FILES=$${PYTHON_FILES-$$(./find-python-files)} ; \ $(YAPF) --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES | \ grep '^+++ .*(reformatted)$$' | \ - sed -e 's/^+++ //' -e 's/[[:blank:]]*(reformatted)$$/:1:1: error: file needs formatting/' ; \ - exit $${PIPESTATUS[0]} + sed -e 's/^+++ //' -e 's/[[:blank:]]*(reformatted)$$/:1:1: error: file needs formatting/' test-gui-crawl: $(VENV) $(PYTEST) -T gui_crawl

5 years, 10 months

Add Clang-style output to improve our CI.

by Sven Panne

Module: check_mk Branch: master Commit: 481f75988b5093ecad67c5d62317880e645a65ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=481f75988b5093… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 14 09:02:04 2018 +0100 Add Clang-style output to improve our CI. Change-Id: I89c3024c3fc7c8990aca12e7a2297d31cc01b364 --- tests/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 13c6e6f..cd905de 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -51,12 +51,14 @@ test-format-python: $(VENV) ../.style.yapf # Explicitly specify --style [FILE] to prevent costly searching in parent directories # for each file specified via command line # -# Saw some mixed up lines on stdout after adding the --parallel option. Leaving it on -# for the moment to get the performance boost this option brings. +# There are some mixed up lines on stdout caused by the --parallel option. +# Nevertheless, we keep that option to get a big performance boost. GitHub issue +# opened for this problem: https://github.com/google/yapf/issues/644. PYTHON_FILES=$${PYTHON_FILES-$$(./find-python-files)} ; \ - $(YAPF) --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES \ - | grep -e "^Reformatting " -e "(reformatted)$$" \ - | awk '{if ($$1 == "+++") { print "Unformatted: "$$2 } else {print "Checking "$$2"..."}}' ; exit $${PIPESTATUS[0]} + $(YAPF) --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES | \ + grep '^+++ .*(reformatted)$$' | \ + sed -e 's/^+++ //' -e 's/[[:blank:]]*(reformatted)$$/:1:1: error: file needs formatting/' ; \ + exit $${PIPESTATUS[0]} test-gui-crawl: $(VENV) $(PYTEST) -T gui_crawl

5 years, 10 months

YAPFed various files

by Lars Michelsen

Module: check_mk Branch: master Commit: f33385e98b958a955f31d5890d8c055f0ae0be5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f33385e98b958a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 07:37:02 2018 +0100 YAPFed various files Change-Id: I9f432736db09e376f4c6eb577d206966b2bac4f1 --- bin/check_mk | 11 +- bin/livedump | 88 +-- bin/mkbackup | 314 +++++----- bin/mkbench | 634 ++++++++------------- doc/bi-example-oracle.mk | 112 ++-- doc/bi-example.mk | 159 ++---- doc/helpers/add-icon-category | 4 +- doc/helpers/df_magic_number.py | 25 +- doc/helpers/figheader | 34 +- doc/helpers/fix_newlines_before_def | 3 +- doc/helpers/guitest | 141 +++-- doc/helpers/mkcheck | 23 +- doc/helpers/reindent.py | 52 +- doc/helpers/validate_checks | 207 ++++--- doc/mkeventd/query_events | 1 - doc/predictive/foo.check | 15 +- doc/predictive/foo.wato | 17 +- doc/skeleton_check | 12 +- .../Event_Console/Eventconsole-Performance.py | 19 +- doc/treasures/Event_Console/get_event_status | 21 +- doc/treasures/Event_Console/mail_mkevent.py | 10 +- doc/treasures/Event_Console/message_to_syslog.py | 11 +- .../Event_Console/nsca2mkeventd/nsca2mkeventd | 61 +- doc/treasures/Event_Console/read_from_mkeventd.py | 5 +- doc/treasures/Event_Console/sl_notify_to_eventd.py | 12 +- doc/treasures/Event_Console/snmptd_mkevent.py | 6 +- doc/treasures/azure/agent_azure | 18 +- .../azure/azuremonitor/publishsettings.py | 8 +- doc/treasures/azure/checks/azure_deployments | 12 +- doc/treasures/azure/checks/azure_servicecount | 9 +- doc/treasures/check_cluster_nodes | 38 +- doc/treasures/check_flapping/check_flapping | 38 +- doc/treasures/check_flapping/cmk_check | 13 +- doc/treasures/check_flapping/wato_plugin.py | 71 +-- doc/treasures/check_imap_folder | 72 ++- doc/treasures/checks/winperf_processor.single | 19 +- doc/treasures/cmk-delete-host | 13 +- doc/treasures/colorgrep | 40 +- .../deprecated/agents/plugins/j4p_performance | 33 +- doc/treasures/downtime | 78 +-- doc/treasures/get_rrd_cache_stats | 6 +- doc/treasures/inventory/extract_inventory.py | 138 ++--- doc/treasures/jolokia_mockup.py | 11 +- doc/treasures/livedump/livedump-mail-fetch | 28 +- doc/treasures/livedump/livedump-ssh-recv | 9 +- doc/treasures/localchecks/check_bi_local.py | 19 +- doc/treasures/localchecks/check_fstab_mounts | 2 +- .../memcached/agents/plugins/mk_memcached | 3 +- doc/treasures/memcached/checks/memcached | 264 ++++++--- .../memcached/web/plugins/metrics/memcached.py | 201 ++----- .../memcached/web/plugins/wato/memcached.py | 153 ++--- doc/treasures/migrate_oldcmk2wato.py | 132 +++-- doc/treasures/mod_contacts_mk.py | 5 +- doc/treasures/modbus/checks/agent_modbus | 6 +- doc/treasures/modbus/modbus_value | 25 +- doc/treasures/modbus/perfometer/modbus.py | 6 +- doc/treasures/modbus/wato/modbus.py | 74 +-- doc/treasures/multisite_to_mrpe | 54 +- doc/treasures/nagvis_icon/nagvis_icon.py | 4 +- doc/treasures/notifications/braintower | 18 +- doc/treasures/notifications/glpi.py | 232 ++++---- doc/treasures/notifications/mobilant | 42 +- doc/treasures/notifications/multitech | 24 +- doc/treasures/notifications/opcmsg | 20 +- doc/treasures/open_ticket.py | 9 +- doc/treasures/sidebar_tactical_overview.py | 14 +- doc/treasures/wato_geo_fields.py | 32 +- doc/treasures/wato_hook_check_duplicate_hosts.py | 3 +- doc/treasures/wato_hook_cleanup_folders.py | 4 +- doc/treasures/wato_host_svc_groups.py | 32 +- doc/treasures/wato_import.py | 37 +- doc/treasures/wato_remove_nonsite_folders.py | 25 +- doc/treasures/wiki_painter.py | 27 +- omd/packages/cma/webconf_snapin.py | 10 +- omd/packages/maintenance/diskspace | 54 +- omd/packages/maintenance/merge-crontabs | 7 +- omd/packages/omd/index.py | 18 +- web/app/index.wsgi | 20 +- werk | 250 ++++---- 79 files changed, 2165 insertions(+), 2312 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f33385e98b…

5 years, 10 months

Disable YAPF for OMD for the moment

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a3bb56aa55edf336f742ba0764d357f05f69236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a3bb56aa55edf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 08:51:08 2018 +0100 Disable YAPF for OMD for the moment Change-Id: I845c29c84ba62eb7a517161ddc894e2666b6bc52 --- omd/packages/omd/omd | 5 +++++ tests/find-python-files | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 21926d0..829c925 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -28,6 +28,11 @@ isort:skip_file""" +# Disable YAPF for the moment. There is a larger commit pending that +# needs to be merged before YAPFing this file. + +# yapf: disable + import os import sys diff --git a/tests/find-python-files b/tests/find-python-files index d846fb8..7a9498b 100755 --- a/tests/find-python-files +++ b/tests/find-python-files @@ -21,7 +21,8 @@ SEARCH+=" notifications" # Do not search whole omd/ because it may contain unpacked sub-packages SEARCH+=" omd/packages/cma" SEARCH+=" omd/packages/maintenance" -SEARCH+=" omd/packages/omd" +# Temporarily disable YAPF for omd +#SEARCH+=" omd/packages/omd" SEARCH+=" scripts" # Tests contain some very large data structures (e.g. # tests/unit/checks/test_docker_parse_node_images.py). Skip them for the

5 years, 10 months

← Newer
1
...
27
28
29
30
31
32
33
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018