Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6373 FIX Fixed UnicodeEncodeError when piping "cmk -M" to stream or file

by Lars Michelsen

Module: check_mk Branch: master Commit: a43e24cd82d6369754acf1ba2ff7e8c382e67523 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a43e24cd82d636… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 11:08:43 2018 +0200 6373 FIX Fixed UnicodeEncodeError when piping "cmk -M" to stream or file The output of e.g. "cmk -M" was not correctly encoded when the output was written to streams or files leading to a "UnicodeEncodeError: 'ascii' codec can't encode character" error. Change-Id: Iff3d9bc0a63ca78c4e7e24bf5f909ebfbcd616ca --- .werks/6373 | 12 ++++++++++++ cmk/tty.py | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/6373 b/.werks/6373 new file mode 100644 index 0000000..73c7352 --- /dev/null +++ b/.werks/6373 @@ -0,0 +1,12 @@ +Title: Fixed UnicodeEncodeError when piping "cmk -M" to stream or file +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532682455 + +The output of e.g. "cmk -M" was not correctly encoded when the output +was written to streams or files leading to a "UnicodeEncodeError: 'ascii' codec can't encode character" error. diff --git a/cmk/tty.py b/cmk/tty.py index 42ae84e..63e9be7 100644 --- a/cmk/tty.py +++ b/cmk/tty.py @@ -115,10 +115,10 @@ def print_table(headers, colors, rows, indent = ""): if type(x) == unicode: return x.encode('utf-8') else: - return x + return "%s" % x for row in rows: - lengths = [ max(len(str(make_utf8(c))), l) for c, l in zip(row, lengths) ] + lengths = [ max(len(make_utf8(c)), l) for c, l in zip(row, lengths) ] fmt = indent sep = "" @@ -129,7 +129,7 @@ def print_table(headers, colors, rows, indent = ""): first = True fmt += "\n" for row in [ headers ] + rows: - sys.stdout.write(fmt % tuple(row[:len(headers)])) + sys.stdout.write(fmt % tuple(make_utf8(c) for c in row[:len(headers)])) if first: first = False - sys.stdout.write(fmt % tuple([ "-" * l for l in lengths ])) + sys.stdout.write(fmt % tuple("-" * l for l in lengths))

6 years, 1 month

Fixed and enabled cell-var-from-loop warning.

by Sven Panne

Module: check_mk Branch: master Commit: 72a9877bf3cbdfd714364eebfbddf31bc0bd21f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72a9877bf3cbdf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 11:35:50 2018 +0200 Fixed and enabled cell-var-from-loop warning. Change-Id: Id1ae57594f46f4ee7d985a48b23133f8a724af4e --- checks/cmciii | 7 +++---- checks/emka_modules | 3 ++- checks/lgp_pdu_aux | 2 +- cmk/ec/main.py | 4 +++- cmk/gui/multitar.py | 4 +++- cmk/gui/watolib.py | 8 ++++++-- cmk_base/snmp_scan.py | 9 +++------ tests/pylint/pylintrc | 1 - 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/checks/cmciii b/checks/cmciii index db6adea..e9ea718 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -158,12 +158,11 @@ def parse_cmciii(info): # pos. scale: "X" => "* X" # else: => "* 1" if int(scale) < 0: - scale_f = lambda a: -1.0 * float(a) / float(scale) + value = float(value_int) * (-1.0 / float(scale)) elif int(scale) > 0: - scale_f = lambda a: float(a) * float(scale) + value = float(value_int) * float(scale) else: - scale_f = int - value = scale_f(value_int) + value = int(value_int) if "Power" in container or "Energy" in container: value = value * 1000 # kW, kWh diff --git a/checks/emka_modules b/checks/emka_modules index a43ae22..ae43720 100644 --- a/checks/emka_modules +++ b/checks/emka_modules @@ -133,8 +133,9 @@ def parse_emka_modules(info): m, a = map(float, equation) else: m, a = 1.0, 0.0 + def scale_f(x, m=m, a=a): + return float(x)*m+a - scale_f = lambda x: float(x)*m+a location = str(chr(oidend[0])) for sensor, attrs in parsed.get("sensor", {}).items(): if attrs["_location_"].endswith(".%s" % location): diff --git a/checks/lgp_pdu_aux b/checks/lgp_pdu_aux index 912669f..dac2b77 100644 --- a/checks/lgp_pdu_aux +++ b/checks/lgp_pdu_aux @@ -132,7 +132,7 @@ def check_lgp_pdu_aux(item, params, info): else: output.append('Label: ' + pdu['SystemLabel']) - def handle_type(ty, label, uom): + def handle_type(ty, label, uom, pdu=pdu): state = 0 perfdata = (ty.lower(), pdu[ty], '%0.2f:%0.2f' % (pdu[ty+'LowWarn'], pdu[ty+'HighWarn']), diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a79f877..10d39a3 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1055,7 +1055,9 @@ class EventServer(ECServerThread): line = scrub_and_decode(line.rstrip()) if line: try: - self.process_raw_data(lambda: self.process_line(line, address)) + def handler(line=line): + self.process_line(line, address) + self.process_raw_data(handler) except Exception as e: self._logger.exception('Exception handling a log line (skipping this one): %s' % e) diff --git a/cmk/gui/multitar.py b/cmk/gui/multitar.py index 05c760c..f7b2ced 100644 --- a/cmk/gui/multitar.py +++ b/cmk/gui/multitar.py @@ -381,8 +381,10 @@ def create(tar_filename, components): subtar_buffer = cStringIO.StringIO() with tarfile.TarFile(fileobj=subtar_buffer, mode="w") as subtar_obj: + def exclude_filter(x, excludes=excludes): + return filter_subtar_files(x, excludes) subtar_obj.add(os.path.join(basedir, filename), arcname=filename, - filter=lambda x: filter_subtar_files(x, excludes)) + filter=exclude_filter) subtar_size = len(subtar_buffer.getvalue()) subtar_buffer.seek(0) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 4a20203..d49152c 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -6235,7 +6235,9 @@ def get_snapshot_status(snapshot, validate_checksums = False): else: # new snapshots for entry in ["comment", "created_by", "type"]: if entry in status["files"]: - status[entry] = access_snapshot(lambda x: multitar.get_file_content(x, entry)) + def handler(x, entry=entry): + return multitar.get_file_content(x, entry) + status[entry] = access_snapshot(handler) else: raise MKGeneralException(_("Invalid snapshot (missing file: %s)") % entry) @@ -6296,7 +6298,9 @@ def get_snapshot_status(snapshot, validate_checksums = False): checksum, signed = checksums[filename] # Get hashes of file in question - subtar = access_snapshot(lambda x: multitar.get_file_content(x, filename)) + def handler(x, filename=filename): + return multitar.get_file_content(x, filename) + subtar = access_snapshot(handler) subtar_hash = sha256(subtar).hexdigest() subtar_signed = sha256(subtar_hash + snapshot_secret()).hexdigest() diff --git a/cmk_base/snmp_scan.py b/cmk_base/snmp_scan.py index 1ccfe8c..548b008 100644 --- a/cmk_base/snmp_scan.py +++ b/cmk_base/snmp_scan.py @@ -115,12 +115,9 @@ def _snmp_scan(access_data, on_error="ignore", for_inv=False, do_snmp_scan=True, if scan_function: try: - def oid_function(oid, default_value=None): - value = snmp.get_single_oid(access_data, oid, check_plugin_name, do_snmp_scan=do_snmp_scan) - if value == None: - return default_value - else: - return value + def oid_function(oid, default_value=None, cp_name=check_plugin_name): + value = snmp.get_single_oid(access_data, oid, cp_name, do_snmp_scan=do_snmp_scan) + return default_value if value is None else value result = scan_function(oid_function) if result is not None and type(result) not in [ str, bool ]: diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index f91b997..37bf8c1 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -12,7 +12,6 @@ extension-pkg-whitelist=rrdtool,_ldap,netifaces,pymssql [MESSAGES CONTROL] disable= - cell-var-from-loop, inconsistent-return-statements, missing-docstring, no-else-return,

6 years, 1 month

Classified the remaining warnings.

by Sven Panne

Module: check_mk Branch: master Commit: f645915e8f69fe756031a98487638f61edd4ae2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f645915e8f69fe… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 13:28:39 2018 +0200 Classified the remaining warnings. Change-Id: Iccb49e3358b3d1ddb7da0a66af4180a5ad069fc7 --- tests/pylint/pylintrc | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 37bf8c1..afc75db 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -12,11 +12,6 @@ extension-pkg-whitelist=rrdtool,_ldap,netifaces,pymssql [MESSAGES CONTROL] disable= - inconsistent-return-statements, - missing-docstring, - no-else-return, - no-self-use, - protected-access, #--------------------------------------------------------------------------- # We should really enable this, there could be some real exceptions waiting # to be thrown. But some work is needed first to sprinkle abc annotations @@ -57,6 +52,14 @@ disable= 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. + inconsistent-return-statements, + #--------------------------------------------------------------------------- + # Enabling this warning would be nice, it is mostly a sign of sloppy + # programming practice. In some cases, they can even hide bugs. + no-else-return, + #--------------------------------------------------------------------------- + # 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, @@ -66,6 +69,15 @@ disable= # this. redefined-builtin, #--------------------------------------------------------------------------- + # Enabling this would be nice, but not crucial. Nevertheless, this would + # improve readability and involve some cleanups in our class hierarchy, so + # we should do this some day. + protected-access, + #--------------------------------------------------------------------------- + # Enabling this would be nice, but not crucial. At the moment, we have quite + # a few violations, so we postpone fixing this. + no-self-use, + #--------------------------------------------------------------------------- # 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 @@ -133,6 +145,9 @@ disable= bad-whitespace, line-too-long, #--------------------------------------------------------------------------- + # We are light years away from enabling this... + missing-docstring, + #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs. # wrong-spelling-in-comment,

6 years, 1 month

We actually want to disable spell checks for now.

by Sven Panne

Module: check_mk Branch: master Commit: b33da8e5ef313cd5df4589b810a6280651d7e291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b33da8e5ef313c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 13:34:11 2018 +0200 We actually want to disable spell checks for now. Change-Id: I7ef68af8bb5bf04524d9129ded3fc47843441219 --- tests/pylint/pylintrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index afc75db..6635642 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -150,8 +150,8 @@ disable= #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs. - # wrong-spelling-in-comment, - # wrong-spelling-in-docstring, + wrong-spelling-in-comment, + wrong-spelling-in-docstring, [REPORTS] output-format=cmk_colorized

6 years, 1 month

Fixed and enabled logging-not-lazy warning.

by Sven Panne

Module: check_mk Branch: master Commit: 9ee74c2992eff8659c474495d27ca466e6fdf7ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee74c2992eff8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 10:39:47 2018 +0200 Fixed and enabled logging-not-lazy warning. Change-Id: Ia38023013adb77e3aa62e084d98d795d0626d464 --- cmk/log.py | 2 +- cmk/profile.py | 4 ++-- tests/pylint/pylintrc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmk/log.py b/cmk/log.py index 3181a1d..bf5cd4e 100644 --- a/cmk/log.py +++ b/cmk/log.py @@ -155,7 +155,7 @@ def open_log(log_file_path, fallback_to=None): logfile = file(log_file_path, "a") logfile.flush() except Exception, e: - logger.exception("Cannot open log file '%s': %s" % (log_file_path , e)) + logger.exception("Cannot open log file '%s': %s", log_file_path , e) if fallback_to: logfile = fallback_to diff --git a/cmk/profile.py b/cmk/profile.py index 062a03b..ba57a11 100644 --- a/cmk/profile.py +++ b/cmk/profile.py @@ -61,7 +61,7 @@ class Profile(object): self._profile.print_stats() else: self._profile.dump_stats(self._profile_file) - cmk.log.logger.info("Created profile file: %s" % self._profile_file) + cmk.log.logger.info("Created profile file: %s", self._profile_file) file(self._profile_file + ".py", "w").write( "#!/usr/bin/env python\n" @@ -69,7 +69,7 @@ class Profile(object): "stats = pstats.Stats(%r)\n" "stats.sort_stats('time').print_stats()\n" % self._profile_file) os.chmod(self._profile_file + ".py", 0o755) - cmk.log.logger.info("Created profile dump script: %s.py" % self._profile_file) + cmk.log.logger.info("Created profile dump script: %s.py", self._profile_file) def profile_call(base_dir, enabled=True): diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 1df6709..f91b997 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -14,7 +14,6 @@ extension-pkg-whitelist=rrdtool,_ldap,netifaces,pymssql disable= cell-var-from-loop, inconsistent-return-statements, - logging-not-lazy, missing-docstring, no-else-return, no-self-use,

6 years, 1 month

Fixed and enabled relative-import warning.

by Sven Panne

Module: check_mk Branch: master Commit: 227f88d159438485527796684b46e8957822fff0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=227f88d1594384… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 09:52:31 2018 +0200 Fixed and enabled relative-import warning. Change-Id: I436f308c3b589e248f56f00ad0cbbb7578cc8811 --- cmk_base/data_sources/__init__.py | 2 +- tests/pylint/pylintrc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 37f39e5..0269225 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -275,7 +275,7 @@ class DataSources(object): hosts.append((self._hostname, self._ipaddress, self, config.check_max_cachefile_age)) if nodes: - import abstract + import cmk_base.data_sources.abstract as abstract abstract.DataSource.set_may_use_cache_file() # Special agents can produce data for the same check_plugin_name on the same host, in this case diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 682b1cf..1df6709 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -19,7 +19,6 @@ disable= no-else-return, no-self-use, protected-access, - relative-import, #--------------------------------------------------------------------------- # We should really enable this, there could be some real exceptions waiting # to be thrown. But some work is needed first to sprinkle abc annotations

6 years, 1 month

Fixed and enabled reimported warning.

by Sven Panne

Module: check_mk Branch: master Commit: 4b76e95534947ffe7f0aaf2ab82078ab6a0f1618 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b76e95534947f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 09:21:17 2018 +0200 Fixed and enabled reimported warning. Change-Id: Idc06f4543e0515caea5c059194b769dd4b855cd9 --- cmk/gui/key_mgmt.py | 1 - cmk/gui/plugins/sidebar/shipped.py | 1 - cmk/gui/plugins/views/inventory.py | 1 - cmk/gui/plugins/views/layouts.py | 1 - cmk/gui/plugins/wato/builtin_attributes.py | 3 +-- cmk_base/config.py | 1 - cmk_base/discovery.py | 1 - cmk_base/modes/check_mk.py | 1 - cmk_base/notify.py | 1 - tests/pylint/pylintrc | 1 - tests/pylint/test_pylint.py | 6 ++++-- 11 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cmk/gui/key_mgmt.py b/cmk/gui/key_mgmt.py index d796a75..d8db8f9 100644 --- a/cmk/gui/key_mgmt.py +++ b/cmk/gui/key_mgmt.py @@ -507,7 +507,6 @@ def create_self_signed_cert(pkey): def decrypt_private_key(encrypted_private_key, passphrase): - from OpenSSL import crypto try: return crypto.load_privatekey(crypto.FILETYPE_PEM, encrypted_private_key, passphrase) except crypto.Error, e: diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index b09d7b4..0110c19 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -922,7 +922,6 @@ table.performance td.right { # '----------------------------------------------------------------------' def render_current_time(): - import time html.div(time.strftime("%H:%M"), class_="time") sidebar_snapins["time"] = { diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 0c84cc9..f2839c6 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -51,7 +51,6 @@ from cmk.gui.plugins.visuals.inventory import ( FilterInvtableInterfaceType, FilterInvtableTimestampAsAge, FilterInvtableText, - FilterInvtableIDRange, ) from . import ( diff --git a/cmk/gui/plugins/views/layouts.py b/cmk/gui/plugins/views/layouts.py index af2ee71..d071da4 100644 --- a/cmk/gui/plugins/views/layouts.py +++ b/cmk/gui/plugins/views/layouts.py @@ -43,7 +43,6 @@ from . import ( group_value, EmptyCell, output_csv_headers, - group_value, ) def init_rowselect(view): diff --git a/cmk/gui/plugins/wato/builtin_attributes.py b/cmk/gui/plugins/wato/builtin_attributes.py index 8b78291..fc38201 100644 --- a/cmk/gui/plugins/wato/builtin_attributes.py +++ b/cmk/gui/plugins/wato/builtin_attributes.py @@ -33,8 +33,7 @@ from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.valuespec import HostAddress, ListOf, ListOfStrings, Dictionary, Age, \ TimeofdayRange, Checkbox, DropdownChoice, Integer, CascadingDropdown, Tuple, \ - IPv4Address, RegExp, Alternative, FixedValue, AbsoluteDate, FixedValue, TextUnicode, \ - SiteChoice + IPv4Address, RegExp, Alternative, FixedValue, AbsoluteDate, TextUnicode, SiteChoice from cmk.gui.exceptions import MKUserError from . import \ diff --git a/cmk_base/config.py b/cmk_base/config.py index a946a5e..9bc15b6 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -564,7 +564,6 @@ class PackedConfig(object): store.save_file(self._path + ".orig", helper_config + "\n") - import marshal code = compile(helper_config, '<string>', 'exec') with open(self._path + ".compiled", "w") as compiled_file: marshal.dump(code, compiled_file) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 37f0201..c7e731b 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -625,7 +625,6 @@ def _discovery_filter_by_lists(hostname, check_plugin_name, item, whitelist, bla # TODO: Move to livestatus module! def schedule_discovery_check(hostname): try: - import socket s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s.connect(cmk.paths.livestatus_unix_socket) now = int(time.time()) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 7ee1ecd..99c970e 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1342,7 +1342,6 @@ modes.register(Mode( # '----------------------------------------------------------------------' def mode_notify(options, *args): - import cmk_base.config as config import cmk_base.notify as notify config.load(with_conf_d=True, validate_hosts=False) # TODO: Fix the code and remove the pragma below! diff --git a/cmk_base/notify.py b/cmk_base/notify.py index df8acbf..d33fa9b 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1869,7 +1869,6 @@ def substitute_context(template, context): def format_exception(): import traceback import StringIO - import sys txt = StringIO.StringIO() t, v, tb = sys.exc_info() diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 23a90f2..682b1cf 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -19,7 +19,6 @@ disable= no-else-return, no-self-use, protected-access, - reimported, relative-import, #--------------------------------------------------------------------------- # We should really enable this, there could be some real exceptions waiting diff --git a/tests/pylint/test_pylint.py b/tests/pylint/test_pylint.py index cd76122..27349b6 100755 --- a/tests/pylint/test_pylint.py +++ b/tests/pylint/test_pylint.py @@ -121,9 +121,9 @@ def inv_tree(path, default_value=None): """) # add the modules + # These pylint warnings are incompatible with our "concatenation technology". + f.write("# pylint: disable=reimported,ungrouped-imports\n") pylint_cmk.add_file(f, repo_path() + "/cmk_base/check_api.py") - # This pylint warning is incompatible with our "concatenation technology". - f.write("# pylint: disable=ungrouped-imports\n") pylint_cmk.add_file(f, repo_path() + "/cmk_base/inventory_plugins.py") # Now add the checks @@ -139,6 +139,8 @@ def _compile_bakery_plugins(pylint_test_dir): with open(pylint_test_dir + "/cmk_bakery_plugins.py", "w") as f: pylint_cmk.add_file(f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py"))) + # This pylint warning is incompatible with our "concatenation technology". + f.write("# pylint: disable=reimported\n") # Also add bakery plugins for path in pylint_cmk.check_files(os.path.join(cmc_path(), "agents/bakery")):

6 years, 1 month

6120 FIX cisco_nexus_cpu: use the ruleset " CPU utilization for simple devices"

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c09eaffd169861ccf4aff91ef04ab5de10ac4acc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c09eaffd169861… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jul 5 15:49:46 2018 +0200 6120 FIX cisco_nexus_cpu: use the ruleset "CPU utilization for simple devices" Since Werk 5748 cisco_nexus_cpu is preferred over cisco_cpu on all Nexus devices. As a result short peaks in CPU utilization might result in a WARN or CRIT on devices that used cisco_cpu before, since the cisco_nexus_cpu check does not deliver averaged values. To add the possibility of averaging to the cisco_nexus_cpu check the ruleset "CPU utilization for simple devices" is now used. With this ruleset it is possible to define arbitrary averaging periods. The old ruleset "CPU utilization for Appliances" is not supported anymore for the cisco_nexus_cpu check. To accommodate for this change affected hosts have to be rediscovered and all rules for devices that use the cisco_nexus_cpu checks have to be moved to the new ruleset. Change-Id: I4c97f3b81459086c32d40f9f049a04361e3a3bcd --- .werks/6120 | 21 +++++++++++++++++++++ checkman/cisco_nexus_cpu | 3 +-- checks/cisco_nexus_cpu | 9 ++++++--- cmk/gui/plugins/wato/check_parameters.py | 22 +++++++++++----------- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.werks/6120 b/.werks/6120 new file mode 100644 index 0000000..169141b --- /dev/null +++ b/.werks/6120 @@ -0,0 +1,21 @@ +Title: cisco_nexus_cpu: use the ruleset "CPU utilization for simple devices" +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1530797354 +Class: fix + +Since Werk 5748 cisco_nexus_cpu is preferred over cisco_cpu on all Nexus +devices. As a result short peaks in CPU utilization might result in a WARN or +CRIT on devices that used cisco_cpu before, since the cisco_nexus_cpu check +does not deliver averaged values. To add the possibility of averaging to the +cisco_nexus_cpu check the ruleset "CPU utilization for simple devices" is now +used. With this ruleset it is possible to define arbitrary averaging periods. +The old ruleset "CPU utilization for Appliances" is not supported anymore for +the cisco_nexus_cpu check. + +To accommodate for this change affected hosts have to be rediscovered and all +rules for devices that use the cisco_nexus_cpu checks have to be moved to the +new ruleset. diff --git a/checkman/cisco_nexus_cpu b/checkman/cisco_nexus_cpu index 97ceba5..9bc6087 100644 --- a/checkman/cisco_nexus_cpu +++ b/checkman/cisco_nexus_cpu @@ -4,8 +4,7 @@ catalog: hw/network/cisco license: GPL distribution: check_mk description: - This check monitors the CPU utilization of Cisco Nexus devices - which do not support CPU information from CISCO-PROCESS-MIB. + This check monitors the CPU utilization of Cisco Nexus devices. Default levels are 80, 90 percent. These are configurable. diff --git a/checks/cisco_nexus_cpu b/checks/cisco_nexus_cpu index 06822f2..957619d 100644 --- a/checks/cisco_nexus_cpu +++ b/checks/cisco_nexus_cpu @@ -28,12 +28,14 @@ # .1.3.6.1.4.1.9.9.305.1.1.1.0 1 --> CISCO-SYSTEM-EXT-MIB::cseSysCPUUtilization.0 -cisco_nexus_cpu_default_levels = (80.0, 90.0) +factory_settings["cisco_nexus_cpu_default_levels"] = { + 'levels': (80.0, 90.0), +} def inventory_cisco_nexus_cpu(info): if info[0][0]: - return [ (None, "cisco_nexus_cpu_default_levels") ] + return [ (None, {}) ] def check_cisco_nexus_cpu(_no_item, params, info): @@ -49,6 +51,7 @@ check_info['cisco_nexus_cpu'] = { 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ and "nx-os" in oid(".1.3.6.1.2.1.1.1.0").lower() \ and oid(".1.3.6.1.4.1.9.9.305.1.1.1.0"), - 'group' : "cpu_utilization", + 'group' : "cpu_utilization_os", 'includes' : [ "cpu_util.include" ], + 'default_levels_variable' : "cisco_nexus_cpu_default_levels", } diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 8cd86ac..55778f0 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -9831,19 +9831,19 @@ register_check_parameters( _("CPU utilization for simple devices"), Dictionary( help = _("This rule configures levels for the CPU utilization (not load) for " - "the operating systems Windows and VMWare ESX host systems, as well as devices " - "implementing the Host Resources MIB. The utilization " - "ranges from 0 to 100 - regardless of the number of CPUs."), + "the operating systems Windows and VMWare ESX host systems, as well as devices " + "implementing the Host Resources MIB. The utilization " + "ranges from 0 to 100 - regardless of the number of CPUs."), elements = [ ( "average", - Integer( - title = _("Averaging"), - help = _("When this option is activated then the CPU utilization is being " - "averaged <b>before</b> the levels are being applied."), - unit = _("minutes"), - minvalue = 1, - default_value = 15, - label = _("Compute average over last "), + Integer( + title = _("Averaging"), + help = _("When this option is activated then the CPU utilization is being " + "averaged <b>before</b> the levels are being applied."), + unit = _("minutes"), + minvalue = 1, + default_value = 15, + label = _("Compute average over last "), )), ( "levels", Levels(

6 years, 1 month

6126 FIX cpu_util.include: use correct metric with a better visible colour for averaged CPU utilization

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 21a7caf87bfeeb2ac830aa8609aa534288d7c36c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a7caf87bfeeb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 23 17:48:21 2018 +0200 6126 FIX cpu_util.include: use correct metric with a better visible colour for averaged CPU utilization Change-Id: I2b836dadfe569a64492e26c52312e3880961c087 --- .werks/6126 | 9 +++++++++ checks/cpu_util.include | 2 +- cmk/gui/plugins/metrics/check_mk.py | 9 +++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/6126 b/.werks/6126 new file mode 100644 index 0000000..cbe3504 --- /dev/null +++ b/.werks/6126 @@ -0,0 +1,9 @@ +Title: use correct metric with a better visible colour for averaged CPU utilization +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532360464 +Class: fix + diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 1ecba2a..c5557cc 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -87,7 +87,7 @@ def check_cpu_util(util, params, this_time=None, cores=None): perfdata = [ ("util", util, warn, crit, 0, 100) ] if "average" in params: - perfdata.append( ("avg", util_avg, warn, crit, 0, 100) ) + perfdata.append( ("util_average", util_avg, warn, crit, 0, 100) ) perfdata += extraperf # reference curve for predictive levels yield state, infotext, perfdata diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 134efda..bcdaff3 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -1439,7 +1439,7 @@ metric_info["util"] = { metric_info["util_average"] = { "title" : _("CPU utilization (average)"), "unit" : "%", - "color" : "26/b", + "color" : "44/a", } metric_info["util1s"] = { @@ -4463,9 +4463,10 @@ check_metrics["check-mk-host-tcp"] = { "time" : { "name": "response_time" } } - - - +for check in ['winperf_processor', 'docker_container_cpu', 'hr_cpu', 'bintec_cpu', 'esx_vsphere_hostsystem']: + check_metrics["check_mk-%s" % check] = { + "avg": { "name": "util_average" } + } check_metrics["check_mk-citrix_serverload"] = { "perf" : { "name" : "citrix_load", "scale" : 0.01 }

6 years, 1 month

Fixed and enabled multiple-imports warning.

by Sven Panne

Module: check_mk Branch: master Commit: 39aa2b1a8d6fa0bf44f16470e50ffa5a863531ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39aa2b1a8d6fa0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 27 09:02:42 2018 +0200 Fixed and enabled multiple-imports warning. Change-Id: I1c39b41bea0b33a818a2c847cadb6ac938ae71b7 --- cmk/cpu_tracking.py | 3 ++- cmk/gui/hooks.py | 3 ++- cmk_base/localize.py | 5 ++++- tests/pylint/pylintrc | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmk/cpu_tracking.py b/cmk/cpu_tracking.py index 740351c..a839d42 100644 --- a/cmk/cpu_tracking.py +++ b/cmk/cpu_tracking.py @@ -24,7 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os, time +import os +import time try: _ diff --git a/cmk/gui/hooks.py b/cmk/gui/hooks.py index 521d175..9c346e5 100644 --- a/cmk/gui/hooks.py +++ b/cmk/gui/hooks.py @@ -73,7 +73,8 @@ def call(name, *args): hk(*args) except Exception, e: if config.debug: - import traceback, StringIO + import StringIO + import traceback txt = StringIO.StringIO() t, v, tb = sys.exc_info() traceback.print_exception(t, v, tb, None, txt) diff --git a/cmk_base/localize.py b/cmk_base/localize.py index 0f61cb7..5c49b82 100644 --- a/cmk_base/localize.py +++ b/cmk_base/localize.py @@ -24,8 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import sys, getopt, os, datetime +import datetime +import getopt +import os import subprocess +import sys import cmk.tty as tty import cmk.paths diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 0429ab7..23a90f2 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -16,7 +16,6 @@ disable= inconsistent-return-statements, logging-not-lazy, missing-docstring, - multiple-imports, no-else-return, no-self-use, protected-access,

6 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
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