[checkmk-commits] refactor min max sum

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 &lt;on(a)mathias-kettner.de&gt; 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