Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Óscar Nájera

Module: check_mk Branch: master Commit: a810f718146f4e646b1927c69aeaca444458bc5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a810f718146f4e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 18:51:55 2018 +0200 refactor license Change-Id: I7cf21718f774005c9d1ecbfee3c89897c993ae26 --- agents/special/agent_netapp | 4 ++-- checks/esx_vsphere_licenses | 9 ++++----- checks/ibm_svc_license | 22 +++++++++++----------- checks/stormshield_cluster_node | 4 ++-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 055dc8f..6330a91 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -865,9 +865,9 @@ licenses = {"v1": {}, "v1_disabled": {}, "v2": {}, "v2_disabled": {}} license_info = query("license-list-info") if license_info: licenses["v1"] = create_dict(license_info, custom_key = ["service"], is_counter = False) - for license, values in licenses["v1"].items(): + for license_, values in licenses["v1"].items(): if values.get("is-licensed", "") == "false": - licenses["v1_disabled"][license] = values + licenses["v1_disabled"][license_] = values # The v2 license info is not used, yet licensev2_info = query("license-v2-list-info") diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses index b0399ad..7905205 100644 --- a/checks/esx_vsphere_licenses +++ b/checks/esx_vsphere_licenses @@ -46,12 +46,12 @@ def inventory_esx_vsphere_licenses(parsed): return [(key, None) for key in parsed.keys()] def check_esx_vsphere_licenses(item, params, parsed): - license = parsed.get(item) - if not license: + license_ = parsed.get(item) + if not license_: return 3, "License not found in agent output" - status, infotext, perfdata = license_check_levels(license["total"], license["used"], params) - infotext = "%s Key(s), " % license["keys"] + infotext + status, infotext, perfdata = license_check_levels(license_["total"], license_["used"], params) + infotext = "%s Key(s), " % license_["keys"] + infotext return status, infotext, perfdata @@ -64,4 +64,3 @@ check_info['esx_vsphere_licenses'] = { "group" : "esx_licenses", "includes" : [ "license.include" ] } - diff --git a/checks/ibm_svc_license b/checks/ibm_svc_license index 3454379..2860785 100644 --- a/checks/ibm_svc_license +++ b/checks/ibm_svc_license @@ -44,23 +44,23 @@ def parse_ibm_svc_license(info): licenses = {} for line in info: if line[0].startswith("license_"): - license = line[0].replace("license_", "") - if not license in licenses.keys(): - licenses[license] = [0.0, 0.0] + license_ = line[0].replace("license_", "") + if not license_ in licenses.keys(): + licenses[license_] = [0.0, 0.0] if line[1] == "off": - licenses[license][0] = 0.0 + licenses[license_][0] = 0.0 else: - licenses[license][0] = float(line[1]) + licenses[license_][0] = float(line[1]) if line[0].startswith("used_"): - license = line[0].replace("used_", "") - if not license in licenses.keys(): - licenses[license] = [0.0, 0.0] - licenses[license][1] = float(line[1]) + license_ = line[0].replace("used_", "") + if not license_ in licenses.keys(): + licenses[license_] = [0.0, 0.0] + licenses[license_][1] = float(line[1]) return licenses def inventory_ibm_svc_license(info): - return [ (license, None) - for license in parse_ibm_svc_license(info) ] + return [ (license_, None) + for license_ in parse_ibm_svc_license(info) ] def check_ibm_svc_license(item, params, info): licenses = parse_ibm_svc_license(info) diff --git a/checks/stormshield_cluster_node b/checks/stormshield_cluster_node index abdbde6..279b276 100644 --- a/checks/stormshield_cluster_node +++ b/checks/stormshield_cluster_node @@ -50,7 +50,7 @@ def inventory_stormshield_cluster_node(info): def check_stormshield_cluster_node(item, params, info): - for index, serial, online, model, version, license, quality, priority, \ + for index, serial, online, model, version, license_, quality, priority, \ statusforced, active, _uptime in info: if item == index: warn, crit = params['quality'] @@ -70,7 +70,7 @@ def check_stormshield_cluster_node(item, params, info): yield 0, 'Quality: %s' % quality infotext = 'Model: %s, Version: %s, Role: %s, Priority: %s, Serial: %s' \ - % ( model, version, license, priority, serial ) + % ( model, version, license_, priority, serial ) yield 0, infotext

5 years, 8 months

Refactor bytes

by Óscar Nájera

Module: check_mk Branch: master Commit: c39878ef1b299a875c442e52a72f2caa9e061a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c39878ef1b299a… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 18:44:30 2018 +0200 Refactor bytes - The cmk.render.bytes is now cmk.render.fmt_bytes. Repetitions of this function are now deleted from the codebase and imported once. A test for this function is included. - Isolate new function scale_factor_prefix This will generate the human readable prefixes for large numbers - When bytes is used as a variable change the variable name Change-Id: I903bfe9405d7472883dea96e4debe02bcda59bdb --- bin/mkbackup | 8 +-- bin/mkbench | 25 +-------- checks/arcserve_backup | 1 - checks/cisco_ucs_lun | 1 - checks/db2_mem | 1 - checks/dell_om_disks | 1 - checks/dell_om_mem | 1 - checks/filerdisks.include | 1 - checks/juniper_mem.include | 1 - checks/juniper_trpz_flash | 1 - checks/mem.include | 12 ++-- checks/mssql.include | 1 - checks/netapp_api_snapshots | 1 - checks/netapp_fcpio | 1 - checks/oracle_recovery_area | 1 - checks/postgres_stat_database | 1 - checks/rmon_stats | 4 +- checks/size_trend.include | 1 - checks/tsm_storagepools | 1 - checks/veeam_client | 1 - cmk/gui/backup.py | 6 +- cmk/gui/plugins/metrics/check_mk.py | 74 +++++-------------------- cmk/gui/plugins/views/inventory.py | 2 +- cmk/gui/plugins/views/perfometers/check_mk.py | 12 ++-- cmk/gui/plugins/wato/ac_tests.py | 6 +- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/mkeventd.py | 2 +- cmk/render.py | 79 ++++++++++++++------------- cmk_base/backup.py | 2 +- cmk_base/check_api.py | 2 +- doc/treasures/msexchange/winperf_msx_dumpster | 3 +- omd/packages/maintenance/diskspace | 16 +----- tests/unit/cmk/test_render.py | 17 ++++++ 33 files changed, 105 insertions(+), 183 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c39878ef1b…

5 years, 8 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 4d867a0f424444199ff36ab24459aa193698dd2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d867a0f424444… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 1 14:40:42 2018 +0200 Reserved 10 Werk IDS Change-Id: I977920339a0f2682c1ec69b536b786f647f2d424 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ed90fa0..9c6100d8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6799 +6809

5 years, 8 months

Adapted werk 6735

by Simon Betz

Module: check_mk Branch: master Commit: 403affddb6625b4df96216278ab5d70ec9201f18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403affddb6625b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 1 14:49:21 2018 +0200 Adapted werk 6735 Change-Id: I6fcdeca6289afc95e3a04a74fa543c460b364a9f --- .werks/6735 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/6735 b/.werks/6735 index 4b5ed95..8f53823 100644 --- a/.werks/6735 +++ b/.werks/6735 @@ -13,7 +13,7 @@ cpu_time_user: See https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/kerne… for more information: -<code> +<pre><code> /* * Account guest CPU time to a process. * @p: the process that the CPU time gets accounted to @@ -37,4 +37,4 @@ void account_guest_time(struct task_struct *p, u64 cputime) cpustat[CPUTIME_GUEST] += cputime; } } -</code> +</code></pre>

5 years, 8 months

refactor min max sum

by Óscar Nájera

Module: check_mk Branch: master Commit: 473629c0cf7bd9be95d5040abd5937afa5abc0cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473629c0cf7bd9… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 18:42:14 2018 +0200 refactor min max sum Change-Id: I43106b0171d704f00610d18c589c5d06d087b0fc --- checks/oracle_dataguard_stats | 4 ++-- cmk/gui/plugins/metrics/utils.py | 4 ++-- cmk/gui/plugins/views/perfometers/check_mk.py | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index 6242cce..399797f 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -45,10 +45,10 @@ def check_oracle_dataguard_stats(item, params, info): if str(timestamp)[0:1] == '+': days = int(timestamp[1:3]) h = int(timestamp[4:6]) - min = int(timestamp[7:9]) + min_ = int(timestamp[7:9]) sec = int(timestamp[10:12]) - seconds = int(sec + min*60 + h*3600 + days*24*3600) + seconds = int(sec + min_*60 + h*3600 + days*24*3600) return seconds return int(-1) diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py index 0b17da9..259c1ce 100644 --- a/cmk/gui/plugins/metrics/utils.py +++ b/cmk/gui/plugins/metrics/utils.py @@ -160,7 +160,7 @@ def parse_perf_data(perf_data_string, check_command=None): value_parts = values.split(";") while len(value_parts) < 5: value_parts.append(None) - value_text, warn, crit, min, max = value_parts[0:5] + value_text, warn, crit, min_, max_ = value_parts[0:5] if value_text.strip() == "": continue # ignore useless empty variable @@ -176,7 +176,7 @@ def parse_perf_data(perf_data_string, check_command=None): value = _float_or_int(value_text[:i]) perf_data_tuple = (varname, value, unit_name) - for val in [ warn, crit, min, max ]: + for val in [ warn, crit, min_, max_ ]: if val is not None: try: val = _float_or_int(val) diff --git a/cmk/gui/plugins/views/perfometers/check_mk.py b/cmk/gui/plugins/views/perfometers/check_mk.py index aa9292b..4e6bb94 100644 --- a/cmk/gui/plugins/views/perfometers/check_mk.py +++ b/cmk/gui/plugins/views/perfometers/check_mk.py @@ -171,10 +171,10 @@ def perfometer_check_mk_ntp(row, check_command, perf_data, unit = "ms"): offset = float(perf_data[0][1]) absoffset = abs(offset) crit = float(perf_data[0][4]) - max = crit * 2 - if absoffset > max: - absoffset = max - rel = 50 * (absoffset / max) + max_ = crit * 2 + if absoffset > max_: + absoffset = max_ + rel = 50 * (absoffset / max_) color = { 0: "#0f8", 1: "#ff2", 2: "#f22", 3: "#fa2" }[row["service_state"]] if offset > 0: @@ -429,9 +429,9 @@ perfometers["check_mk-cisco_qos"] = perfometer_check_mk_cisco_qos def perfometer_oracle_tablespaces(row, check_command, perf_data): current = float(perf_data[0][1]) used = float(perf_data[1][1]) - max = float(perf_data[2][1]) - used_perc = used / max * 100 - curr_perc = (current / max * 100) - used_perc + max_ = float(perf_data[2][1]) + used_perc = used / max_ * 100 + curr_perc = (current / max_ * 100) - used_perc data = [(used_perc, "#f0b000"), (curr_perc, "#00ff80"), (100 - used_perc - curr_perc, "#80c0ff")] @@ -519,8 +519,8 @@ def perfometer_hpux_snmp_cs_cpu(row, check_command, perf_data): (float(perf_data[1][1]), "#ff6000"), (float(perf_data[2][1]), "#00d080"), (float(perf_data[3][1]), "#ffffff")] - sum = float(perf_data[0][1]) + float(perf_data[1][1]) + float(perf_data[2][1]) - return "%.0f%%" % sum, render_perfometer(data) + total = float(perf_data[0][1]) + float(perf_data[1][1]) + float(perf_data[2][1]) + return "%.0f%%" % total, render_perfometer(data) perfometers["check_mk-hpux_snmp_cs.cpu"] = perfometer_hpux_snmp_cs_cpu

5 years, 9 months

refactor vars

by Óscar Nájera

Module: check_mk Branch: master Commit: efddf33e990ee426b4d1bd2fb01dc8ab567962f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efddf33e990ee4… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 18:38:23 2018 +0200 refactor vars Change-Id: I0fa3b94248f682568f4d8033c1f5ec244846daa0 --- cmk/gui/bi.py | 8 +++---- cmk/gui/htmllib.py | 26 ++++++++++----------- cmk/gui/plugins/visuals/filters.py | 6 ++--- cmk/gui/plugins/wato/bi.py | 22 +++++++++--------- cmk/gui/visuals.py | 12 +++++----- cmk/gui/wato/__init__.py | 10 ++++----- cmk/gui/wato/pages/custom_attributes.py | 4 ++-- cmk/gui/watolib.py | 40 ++++++++++++++++----------------- 8 files changed, 64 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=efddf33e99…

5 years, 9 months

Format -> format_str

by Óscar Nájera

Module: check_mk Branch: master Commit: 4d84ff8b95d0640ce50a9d55f01bff7f1e2241b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d84ff8b95d064… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 12:47:01 2018 +0200 Format -> format_str Change-Id: I4b53adb7de225852cfa9df8e879a7f460ee19790 --- checks/jolokia_metrics | 8 ++++---- checks/mysql | 4 ++-- cmk/gui/plugins/sidebar/shipped.py | 4 ++-- cmk/log.py | 4 ++-- cmk_base/core_nagios.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index c3ff118..dec049a 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -989,7 +989,7 @@ def check_jolokia_metrics_cache(metrics, totals, item, params, info): break for metric in metrics: - type_, scale, format = type_map.get(metric, (int, 1,"%d")) + type_, scale, format_str = type_map.get(metric, (int, 1,"%d")) val = type_(parsed[inst]["CacheStatistics"][cache][metric]) * scale if isinstance(val, float) and val == 0.0: @@ -997,12 +997,12 @@ def check_jolokia_metrics_cache(metrics, totals, item, params, info): # were all 0, so this float is 0/0, we want to display it as 1 as to not cause # an alert val = 1.0 * scale - yield 0, ("%s: " + format) % (metric, val), [(metric, val)] + yield 0, ("%s: " + format_str) % (metric, val), [(metric, val)] for total in totals: - type_, scale, format = type_map.get(total, (int, 1,"%d")) + type_, scale, format_str = type_map.get(total, (int, 1,"%d")) val = type_(parsed[inst]["CacheStatistics"][cache][total]) * scale - yield 0, ("%s: " + format) % (total, val), [] + yield 0, ("%s: " + format_str) % (total, val), [] except KeyError: # some element of the item was missing pass diff --git a/checks/mysql b/checks/mysql index 906efad..81b9752 100644 --- a/checks/mysql +++ b/checks/mysql @@ -135,11 +135,11 @@ def check_mysql_sessions(item, params, parsed): perfdata = [] status = 0 - for value, perfvar, what, format, unit in [ + for value, perfvar, what, format_str, unit in [ ( total_sessions, "total_sessions", "total", "%d", "" ), ( running_sessions, "running_sessions", "running", "%d", "" ), ( connects, "connect_rate", "connections", "%.2f", "/s")]: - infos.append((format + " %s%s") % (value, what, unit)) + infos.append((format_str + " %s%s") % (value, what, unit)) if what in params: warn, crit = params[what] if value >= crit: diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index cc30456..896c365 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -356,7 +356,7 @@ def render_performance(): finally: sites.live().set_only_sites(None) - for what, col, format in \ + for what, col, format_str in \ [("Service checks", 0, "%.2f/s"), ("Host checks", 1, "%.2f/s"), ("External commands", 2, "%.2f/s"), @@ -364,7 +364,7 @@ def render_performance(): ("Process creations", 4, "%.2f/s"), ("New log messages", 5, "%.2f/s"), ("Cached log messages", 6, "%d")]: - write_line(what + ":", format % sum(row[col] for row in data)) + write_line(what + ":", format_str % sum(row[col] for row in data)) if only_sites is None and len(config.allsites()) == 1: try: diff --git a/cmk/log.py b/cmk/log.py index bf5cd4e..50436eb 100644 --- a/cmk/log.py +++ b/cmk/log.py @@ -119,11 +119,11 @@ def get_logger(name): return logger.getChild(name) -def get_formatter(format="%(asctime)s [%(levelno)s] [%(name)s %(process)d] %(message)s"): +def get_formatter(format_str="%(asctime)s [%(levelno)s] [%(name)s %(process)d] %(message)s"): """Returns a new message formater instance that uses the standard Check_MK log format by default. You can also set another format if you like.""" - return _logging.Formatter(format) + return _logging.Formatter(format_str) def setup_console_logging(): diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 5229298..3f260bd 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -873,8 +873,8 @@ def _extra_conf_of(confdict, hostname, service, exclude=None): continue if values: - format = " %-29s %s\n" - result += format % (key, values[0]) + result += " %-29s %s\n" % (key, values[0]) + return result

5 years, 9 months

5512 FIX cmk-update-agent: Make executable-Format-rule relevant for Linux only

by Andreas Umbreit

Module: check_mk Branch: master Commit: 012d8ff08b95a6bc3c68e3cbc6dabf9c68ef12f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=012d8ff08b95a6… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Sep 28 14:01:10 2018 +0200 5512 FIX cmk-update-agent: Make executable-Format-rule relevant for Linux only After introducing the binary Format for the agent updater, we added a rule to the agent updater ruleset that enables the user to choose the format of the cmk-update-agent executable. Hence the packaged binary format is only runnable on Linux, this rule now gets ignored for all other OSes. Please note: If you want to enable automatic updates on Linux hosts that run on an architecture other than x86-64 or x86, you have to explicitibly choose to deploy the python script format, since the binary formats are not runnable on these architectures. (Jira CMK-1051) Change-Id: Ia81c1fe383bf32fd1252c225e940dfd5190a17c9 --- .werks/5512 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/5512 b/.werks/5512 new file mode 100644 index 0000000..b0d55e3 --- /dev/null +++ b/.werks/5512 @@ -0,0 +1,20 @@ +Title: cmk-update-agent: Make executable-Format-rule relevant for Linux only +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1538135641 + +After introducing the binary Format for the agent updater, we added a rule to the +agent updater ruleset that enables the user to choose the format of +the cmk-update-agent executable. + +Hence the packaged binary format is only runnable on Linux, this rule now gets ignored +for all other OSes. + +Please note: If you want to enable automatic updates on Linux hosts that run on an +architecture other than x86-64 or x86, you have to explicitibly choose to deploy the +python script format, since the binary formats are not runnable on these architectures.

5 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018