Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Pylint no-else-return refactoring: seventh set of files

by Kenneth Okoh

Module: check_mk Branch: master Commit: 077301dad53d9ba58a75856dcc5f97ef71a0764c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077301dad53d9b… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Oct 1 17:21:30 2018 +0200 Pylint no-else-return refactoring: seventh set of files Change-Id: I472f5323cf7ecc9854ebc74a31ea07a2210231cf --- checks/3ware_disks | 3 +-- checks/3ware_units | 3 +-- checks/ad_replication | 11 +++++------ checks/cmciii.include | 3 +-- checks/df.include | 6 ++---- checks/diskstat.include | 3 +-- checks/elphase.include | 3 +-- checks/fan.include | 3 +-- checks/fireeye.include | 3 +-- checks/fjdarye.include | 6 ++---- checks/hr_fs.include | 3 +-- checks/if.include | 15 +++++---------- checks/ipmi_sensors.include | 3 +-- checks/mssql.include | 3 +-- checks/oracle.include | 3 +-- checks/ps.include | 8 +++----- checks/size_trend.include | 3 +-- checks/temperature.include | 27 +++++++++------------------ checks/ups_in_voltage.include | 3 +-- checks/ups_out_voltage.include | 3 +-- checks/uptime.include | 3 +-- checks/wmi.include | 6 ++---- 22 files changed, 43 insertions(+), 81 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=077301dad5…

5 years, 9 months

checktestlib.py: Always show multiline in repr of BasicCheckResult

by Moritz Kiemer

Module: check_mk Branch: master Commit: 79ca12623fb7be08f48f1520b9b01fc606ae2922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79ca12623fb7be… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Sep 25 08:32:07 2018 +0200 checktestlib.py: Always show multiline in repr of BasicCheckResult ... it's less confusing. Change-Id: Iff5c7f507809f06c7c062fcb4108e4aee0b816e1 --- tests/unit/checks/checktestlib.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 949d08a..adbc552 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -117,12 +117,7 @@ class BasicCheckResult(Tuploid): return (self.status, self.infotext, self.perfdata, self.multiline) def __repr__(self): - if self.multiline is not None: - return 'BasicCheckResult(%r, %r, %r)' % \ - (self.status, self.infotext, self.perfdata) - else: - return 'BasicCheckResult(%r, %r, %r, multiline=%r)' % \ - self.tuple + return 'BasicCheckResult(%r, %r, %r, multiline=%r)' % self.tuple class CheckResult(object):

5 years, 9 months

systemd_units: list failed services + new test (CMK-982)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 52f1f3e5ea38c66f56b7d9f0231566715454db86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52f1f3e5ea38c6… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Tue Oct 2 13:16:39 2018 +0200 systemd_units: list failed services + new test (CMK-982) Change-Id: Ib48bbc2aeb332fc86d1ae68cdd844d79037dffa3 --- checks/systemd_units | 7 ++- .../systemd_units_services_1_regression.py | 56 ++++++++-------------- .../systemd_units_services_2_failed_regression.py | 30 ++++++++++++ 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/checks/systemd_units b/checks/systemd_units index db6c3d0..beb5397 100644 --- a/checks/systemd_units +++ b/checks/systemd_units @@ -188,8 +188,11 @@ def check_systemd_units_services_summary(_no_item, params, parsed): state = params["states"].get(active_state, params["states_default"]) if state == 0: continue - count = sum(s.active == active_state for s in services) - yield state, "%d services %s" % (count, active_state) + + service_names = [s.name for s in services if s.active == active_state] + cnt = len(service_names) + service_names = ", ".join(service_names) + yield state, "%d service%s %s: %s" % (cnt, '' if cnt == 1 else 's', active_state, service_names) check_info['systemd_units.services_summary'] = { diff --git a/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py b/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py index d580acb..8798fec 100644 --- a/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py +++ b/tests/unit/checks/generictests/datasets/systemd_units_services_1_regression.py @@ -4,28 +4,12 @@ checkname = 'systemd_units' info = [['UNIT', 'LOAD', 'ACTIVE', 'SUB', 'DESCRIPTION'], - ['proc-sys-fs-binfmt_misc.automount', - 'loaded', - 'active', - 'running', - 'Arbitrary', - 'Executable', - 'File', - 'Formats', - 'File', - 'System', - 'Automount', - 'Point'], + ['proc-sys-fs-binfmt_misc.automount', 'loaded', 'active', 'running', 'Arbitrary', + 'Executable', 'File', 'Formats', 'File', 'System', 'Automount', 'Point'], ['dev-disk-by\\x2did-ata\\x2dAPPLE_SSD_SM0256G_S29CNYDG865465.device', - 'loaded', - 'active', - 'plugged', - 'APPLE_SSD_SM0256G'], + 'loaded', 'active', 'plugged', 'APPLE_SSD_SM0256G'], ['dev-mapper-cryptswap1.device', - 'loaded', - 'inactive', - 'dead', - 'dev-mapper-cryptswap1.device'], + 'loaded', 'inactive', 'dead', 'dev-mapper-cryptswap1.device'], ['cups.path', 'loaded', 'active', 'running', 'CUPS', 'Scheduler'], ['systemd-ask-password-console.path', 'loaded', @@ -431,20 +415,20 @@ info = [['UNIT', 'LOAD', 'ACTIVE', 'SUB', 'DESCRIPTION'], discovery = {'services': [], 'services_summary': [('Summary', {})]} -checks = {'services': [('virtualbox', 'default', - [(0, "Status: active", []), - (0, "LSB: VirtualBox Linux kernel module", []), - ] - ), - ('jamesthebutler', 'default', - [(2, "Service not found", []), - ] - ), - ], - 'services_summary': [('Summary', 'default', - [(0, '32 services in total', []), - (2, '1 services failed', []), - ] - ), - ] +checks = { + 'services': [ + ('virtualbox', 'default', + [(0, "Status: active", []), + (0, "LSB: VirtualBox Linux kernel module", []), + ]), + ('jamesthebutler', 'default', + [(2, "Service not found", []), + ]), + ], + 'services_summary': [ + ('Summary', 'default', + [(0, '32 services in total', []), + (2, '1 service failed: systemd-cryptsetup@cryptswap1', []), + ]), + ] } diff --git a/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py b/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py new file mode 100644 index 0000000..05b35ad --- /dev/null +++ b/tests/unit/checks/generictests/datasets/systemd_units_services_2_failed_regression.py @@ -0,0 +1,30 @@ + + +checkname = 'systemd_units' + + +info = [['UNIT', 'LOAD', 'ACTIVE', 'SUB', 'DESCRIPTION'], + ['foo.service', + 'loaded', + 'failed', + 'failed', + 'Arbitrary', + 'Executable', + 'File', + 'Formats', + 'File', + 'System', + 'Automount', + 'Point'], + ['bar.service', 'loaded', 'failed', 'failed', 'a', 'bar', 'service'], + ['2'], + []] + + +discovery = {'services': [], 'services_summary': [('Summary', {})]} + + +checks = {'services_summary': [('Summary', + 'default', + [(0, '2 services in total', []), + (2, '2 services failed: foo, bar', [])])]}

5 years, 9 months

sorted -> ordered

by Óscar Nájera

Module: check_mk Branch: master Commit: 4a5f86385e586471180365e322561fb2881fbcaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a5f86385e5864… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 09:43:43 2018 +0200 sorted -> ordered and a missing id -> id_, that somehow test have not yet complained as bug. Change-Id: Ie36da78576e3a8e6dfab96f3ff9b08bde0677338 --- cmk/gui/htmllib.py | 10 +++++----- cmk/gui/plugins/visuals/filters.py | 14 +++++++------- cmk/gui/valuespec.py | 10 +++++----- cmk/gui/wato/__init__.py | 4 ++-- cmk/gui/wato/pages/sites.py | 2 +- cmk_base/check_table.py | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a5f86385e…

5 years, 9 months

Refactor all map bin input hex next buffer list

by Óscar Nájera

Module: check_mk Branch: master Commit: 83c92349010e79f9e7a15698b2894ce13a54606b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83c92349010e79… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 12:50:33 2018 +0200 Refactor all map bin input hex next buffer list Change-Id: Iad618c408dfd8bad1488cf85e13832cdea2e0715 --- checks/drbd | 4 ++-- checks/hp_proliant_da_cntlr | 6 +++--- checks/hp_sts_drvbox | 6 +++--- checks/mcdata_fcport | 4 ++-- checks/openhardwaremonitor | 4 ++-- checks/saprouter_cert | 4 ++-- cmk/ec/main.py | 6 +++--- cmk/gui/multitar.py | 4 ++-- cmk_base/packaging.py | 6 ++---- inventory/cisco_vlans | 4 ++-- 10 files changed, 23 insertions(+), 25 deletions(-) diff --git a/checks/drbd b/checks/drbd index 92fcf74..a9b6564 100644 --- a/checks/drbd +++ b/checks/drbd @@ -343,11 +343,11 @@ check_info["drbd"] = { 'service_description' : 'DRBD %s status', } -def drbd_get_rates(list): +def drbd_get_rates(list_): now = time.time() output = '' perfdata = [] - for type_, name, item, value, uom in list: + for type_, name, item, value, uom in list_: rate = get_rate("%s.%s.%s" % (type_, name, item), now, value) perfdata.append((name, rate)) output += ' %s/sec: %s%s' % (name, rate, uom) diff --git a/checks/hp_proliant_da_cntlr b/checks/hp_proliant_da_cntlr index 5edd7f8..187230d 100644 --- a/checks/hp_proliant_da_cntlr +++ b/checks/hp_proliant_da_cntlr @@ -59,17 +59,17 @@ def check_hp_proliant_da_cntlr(item, params, info): sum_state = 0 output = [] - for val, label, map in [ (cond, 'Condition', hp_proliant_da_cntlr_cond_map), + for val, label, map_ in [(cond, 'Condition', hp_proliant_da_cntlr_cond_map), (b_cond, 'Board-Condition', hp_proliant_da_cntlr_cond_map), (b_status, 'Board-Status', hp_proliant_da_cntlr_state_map) ]: - this_state = map[val][0] + this_state = map_[val][0] state_txt = '' if this_state == 1: state_txt = ' (!)' elif this_state == 2: state_txt = ' (!!)' sum_state = max(sum_state, this_state) - output.append('%s: %s%s' % (label, map[val][1], state_txt)) + output.append('%s: %s%s' % (label, map_[val][1], state_txt)) output.append('(Role: %s, Model: %s, Slot: %s, Serial: %s)' % (hp_proliant_da_cntlr_role_map.get(role, 'unknown'), model, slot, serial)) diff --git a/checks/hp_sts_drvbox b/checks/hp_sts_drvbox index d170a95..ecfb846 100644 --- a/checks/hp_sts_drvbox +++ b/checks/hp_sts_drvbox @@ -90,12 +90,12 @@ def check_hp_sts_drvbox(item, _no_params, info): sum_state = 0 output = [] - for val, label, map in [ (fan_status, 'Fan-Status', hp_sts_drvbox_fan_map), + for val, label, map_ in [(fan_status, 'Fan-Status', hp_sts_drvbox_fan_map), (cond, 'Condition', hp_sts_drvbox_cond_map), (temp_status, 'Temp-Status', hp_sts_drvbox_temp_map), (sp_status, 'Sidepanel-Status', hp_sts_drvbox_sp_map), (pwr_status, 'Power-Status', hp_sts_drvbox_power_map), ]: - this_state = map[val][0] + this_state = map_[val][0] if this_state is None: continue # skip unsupported checks state_txt = '' @@ -104,7 +104,7 @@ def check_hp_sts_drvbox(item, _no_params, info): elif this_state == 2: state_txt = ' (!!)' sum_state = max(sum_state, this_state) - output.append('%s: %s%s' % (label, map[val][1], state_txt)) + output.append('%s: %s%s' % (label, map_[val][1], state_txt)) output.append('(Type: %s, Model: %s, Serial: %s, Location: %s)' % (hp_sts_drvbox_type_map.get(ty, 'unknown'), model, serial, loc)) diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index 5c0c1fe..7adbc69 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -27,8 +27,8 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } -def mcdata_bin_to_64(bin): - return str(binstring_to_int(bin)) +def mcdata_bin_to_64(bin_): + return str(binstring_to_int(bin_)) def mcdata_fcport_convert_to_if64(info): return map(mcdata_fcport_convert_line_to_if64, info) diff --git a/checks/openhardwaremonitor b/checks/openhardwaremonitor index c373fa8..69fff8a 100644 --- a/checks/openhardwaremonitor +++ b/checks/openhardwaremonitor @@ -63,9 +63,9 @@ factory_settings['openhardwaremonitor_temperature_default_levels'] = { def parse_openhardwaremonitor(info): - def dict_replace(input, replacements): + def dict_replace(input_, replacements): pattern = regex(r'\b(' + '|'.join(replacements.keys()) + r')\b') - return pattern.sub(lambda x: replacements[x.group()], input) + return pattern.sub(lambda x: replacements[x.group()], input_) result = {} diff --git a/checks/saprouter_cert b/checks/saprouter_cert index e6d36a0..9780988 100644 --- a/checks/saprouter_cert +++ b/checks/saprouter_cert @@ -52,8 +52,8 @@ factory_settings["saprouter_cert_default_levels"] = { def parse_saprouter_cert(info): - def parse_date(list): - time_struct = time.strptime(" ".join(list), "%b %d %H:%M:%S %Y") + def parse_date(list_): + time_struct = time.strptime(" ".join(list_), "%b %d %H:%M:%S %Y") return time.mktime(time_struct), "%s-%s-%s" % time_struct[:3] parsed = {} diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 801eb25..2e13bb1 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3311,9 +3311,9 @@ class EventStatus(object): # Make sure that if the user switches from day to hour and we # are still waiting for the first interval to begin, that we # do not wait for the next day. - next = self.next_interval_start(interval, time.time()) - if start > next: - start = next + next_interval = self.next_interval_start(interval, time.time()) + if start > next_interval: + start = next_interval self._interval_starts[rule_id] = start return start diff --git a/cmk/gui/multitar.py b/cmk/gui/multitar.py index 4497b3c..b558605 100644 --- a/cmk/gui/multitar.py +++ b/cmk/gui/multitar.py @@ -413,9 +413,9 @@ def filter_subtar_files(tarinfo, excludes): return tarinfo -def extract_from_buffer(buffer, elements): +def extract_from_buffer(buffer_, elements): stream = cStringIO.StringIO() - stream.write(buffer) + stream.write(buffer_) stream.seek(0) if type(elements) == list: extract(tarfile.open(None, "r", stream), elements) diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 7a909eb..357322c 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -726,13 +726,11 @@ def write_package_info(package): def remove_package_info(pacname): - os.remove(pac_dir + pacname) + os.remove(pac_dir + pacname) def all_package_names(): - all = [ p for p in os.listdir(pac_dir) if p not in [ '.', '..' ] ] - all.sort() - return all + return sorted([p for p in os.listdir(pac_dir) if p not in ['.', '..']]) def parse_package_info(python_string): diff --git a/inventory/cisco_vlans b/inventory/cisco_vlans index 9584403..f73b322 100644 --- a/inventory/cisco_vlans +++ b/inventory/cisco_vlans @@ -64,8 +64,8 @@ def parse_multi_vlan(vlan_multi): return "-".join(map(str, subinfo)) vlans = [] - for k, hex in enumerate(vlan_multi): - for l, bit in enumerate(bin(ord(hex))[2:]): + for k, hex_ in enumerate(vlan_multi): + for l, bit in enumerate(bin(ord(hex_))[2:]): if bit == '1': vlans.append(k*8 + l+1)

5 years, 9 months

Refactoring id

by Óscar Nájera

Module: check_mk Branch: master Commit: 00156f546838b6beb9808806e4f6220df255c1c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00156f546838b6… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 13:40:36 2018 +0200 Refactoring id Change-Id: I369954e362f68f85b1e32ade79647fb140a1d325 --- bin/mkbench | 20 +++--- checks/brocade_mlx | 6 +- checks/brocade_mlx_fan | 6 +- checks/cisco_temp_sensor | 14 ++-- checks/h3c_lanswitch_sensors | 6 +- checks/hitachi_hnas_cpu | 8 +-- checks/hitachi_hnas_fpga | 10 +-- checks/hitachi_hnas_pnode | 12 ++-- checks/hitachi_hnas_psu | 12 ++-- checks/hitachi_hnas_span | 8 +-- checks/hitachi_hnas_temp | 8 +-- checks/hitachi_hnas_vnode | 12 ++-- checks/lgp_info | 6 +- checks/lgp_pdu_aux | 2 +- checks/lsi | 6 +- checks/scaleio_mdm | 26 ++++---- checks/vmstat_aix | 6 +- cmk/ec/main.py | 4 +- cmk/gui/forms.py | 5 +- cmk/gui/htmllib.py | 76 ++++++++++------------ cmk/gui/mobile.py | 20 +++--- cmk/gui/plugins/sidebar/shipped.py | 4 +- cmk/gui/plugins/userdb/htpasswd.py | 4 +- cmk/gui/plugins/views/commands.py | 6 +- cmk/gui/plugins/views/icons/__init__.py | 4 +- cmk/gui/plugins/views/painters.py | 10 +-- cmk/gui/plugins/wato/check_mk_configuration.py | 2 +- cmk/gui/userdb.py | 70 ++++++++++---------- cmk/gui/valuespec.py | 8 +-- cmk/gui/views.py | 6 +- cmk/gui/wato/__init__.py | 36 +++++----- cmk/gui/watolib.py | 38 +++++------ cmk_base/packaging.py | 2 +- omd/packages/omd/omd | 8 +-- tests/unit/cmk/gui/old/classes.py | 4 +- .../unit/cmk/gui/old/unittest_files/icon.unittest | 2 +- .../gui/old/unittest_files/icon_button.unittest | 2 +- .../gui/old/unittest_files/render_icon.unittest | 2 +- .../old/unittest_files/render_icon_button.unittest | 2 +- 39 files changed, 237 insertions(+), 246 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=00156f5468…

5 years, 9 months

Refactor type

by Óscar Nájera

Module: check_mk Branch: master Commit: 3387ec231635ec5266974f068c042d2dbe373563 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3387ec231635ec… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 18:48:36 2018 +0200 Refactor type Change-Id: Ida4c77fddd1681ddd009da718b469c42278ba20c --- checks/drbd | 4 ++-- checks/hp_procurve_sensors | 12 ++++++------ checks/hp_proliant_mem | 6 +++--- checks/lgp_pdu_aux | 10 +++++----- checks/ra32e_sensors | 14 +++++++------- cmk/gui/bi.py | 2 +- cmk/gui/multitar.py | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/checks/drbd b/checks/drbd index ef14463..92fcf74 100644 --- a/checks/drbd +++ b/checks/drbd @@ -347,8 +347,8 @@ def drbd_get_rates(list): now = time.time() output = '' perfdata = [] - for type, name, item, value, uom in list: - rate = get_rate("%s.%s.%s" % (type, name, item), now, value) + for type_, name, item, value, uom in list: + rate = get_rate("%s.%s.%s" % (type_, name, item), now, value) perfdata.append((name, rate)) output += ' %s/sec: %s%s' % (name, rate, uom) return (output, perfdata) diff --git a/checks/hp_procurve_sensors b/checks/hp_procurve_sensors index 5b61f6e..c08b849 100644 --- a/checks/hp_procurve_sensors +++ b/checks/hp_procurve_sensors @@ -69,16 +69,16 @@ hp_procurve_status_map = { '1': 'unknown', '2': 'bad', '3': 'warning', '4': 'goo hp_procurve_status2nagios_map = { 'unknown': 3, 'bad': 2, 'warning': 1, 'good': 0, 'notPresent': 1 } def get_hp_procurve_sensor_type(type_input): - type = '' + type_ = '' if type_input.endswith('11.2.3.7.8.3.1'): - type = 'PSU' + type_ = 'PSU' elif type_input.endswith('11.2.3.7.8.3.2'): - type = 'FAN' + type_ = 'FAN' elif type_input.endswith('11.2.3.7.8.3.3'): - type = 'Temp' + type_ = 'Temp' elif type_input.endswith('11.2.3.7.8.3.4'): - type = 'FutureSlot' - return type + type_ = 'FutureSlot' + return type_ def inventory_hp_procurve_sensors(info): inventory = [] diff --git a/checks/hp_proliant_mem b/checks/hp_proliant_mem index 091b3b9..e9fa74c 100644 --- a/checks/hp_proliant_mem +++ b/checks/hp_proliant_mem @@ -111,9 +111,9 @@ def check_hp_proliant_mem(item, params, info): module_size_mb = int(module_size) / 1024 - type = 'n/a' + type_ = 'n/a' if int(module_type) in hp_proliant_mem_type_map: - type = hp_proliant_mem_type_map[int(module_type)] + type_ = hp_proliant_mem_type_map[int(module_type)] snmp_status = 'n/a' if int(module_status) in hp_proliant_mem_status_map: @@ -149,7 +149,7 @@ def check_hp_proliant_mem(item, params, info): return (status, 'Board: %s, Num: %s, Type: %s, Size: %s MB%s' % (board_index, module_index, - type, module_size_mb, detail_output)) + type_, module_size_mb, detail_output)) return (3, "item not found in snmp data") diff --git a/checks/lgp_pdu_aux b/checks/lgp_pdu_aux index 2731b82..a2bea42 100644 --- a/checks/lgp_pdu_aux +++ b/checks/lgp_pdu_aux @@ -92,12 +92,12 @@ _lgp_pdu_aux_fields = { def lgp_pdu_aux_fmt(info): new_info = {} for oid, value in info: - type, id = oid.split('.', 1) - if not id in new_info: - new_info[id] = {'TypeIndex': id.split('.')[-1]} + type_, id_ = oid.split('.', 1) + if not id_ in new_info: + new_info[id_] = {'TypeIndex': id_.split('.')[-1]} # Skip not handled rows - if type in _lgp_pdu_aux_fields: - ty, factor, key = _lgp_pdu_aux_fields[type] + if type_ in _lgp_pdu_aux_fields: + ty, factor, key = _lgp_pdu_aux_fields[type_] if key == 'Type': value = lgp_pdu_aux_types.get(value, 'UNHANDLED') diff --git a/checks/ra32e_sensors b/checks/ra32e_sensors index 4c740e6..eec8b1f 100644 --- a/checks/ra32e_sensors +++ b/checks/ra32e_sensors @@ -50,23 +50,23 @@ def parse_ra32e_sensors(info): internal, sensors = info - for type, item, value in zip(['temperature', 'humidity', 'temperature'], + for type_, item, value in zip(['temperature', 'humidity', 'temperature'], ['Internal', 'Internal', 'Heat Index'], internal[0]): if value: - parsed[type][item] = float(value) / 100.0 + parsed[type_][item] = float(value) / 100.0 for sensor in sensors: oid_end, sensor_data = sensor[0], sensor[1:] name = 'Sensor %d' % int(oid_end.split('.')[0]) - type = type_of(sensor_data) + type_ = type_of(sensor_data) # uses the format of elphase.include for power and voltage - if type == 'temp': + if type_ == 'temp': temperature, _, _, _, _ = sensor_data parsed['temperature'][name] = float(temperature) / 100.0 - elif type == 'temp/active': + elif type_ == 'temp/active': temperature, _, power_state, _, _ = sensor_data parsed['temperature'][name] = float(temperature) / 100.0 @@ -75,11 +75,11 @@ def parse_ra32e_sensors(info): '0': (2, 'no power detected') } parsed['power'][name] = {'device_state': power_status_map.get(power_state)} - elif type == 'temp/analog': + elif type_ == 'temp/analog': temperature, _, voltage, _, _ = sensor_data parsed['temperature'][name] = float(temperature) / 100.0 parsed['voltage'][name] = {'voltage': (int(voltage), None)} - elif type == 'temp/humidity': + elif type_ == 'temp/humidity': temperature, _, humidity, _, heatindex = sensor_data parsed['temperature'][name] = float(temperature) / 100.0 parsed['humidity'][name] = float(humidity) / 100.0 diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 0b4c388..93026e4 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -510,7 +510,7 @@ class BILock(object): return self - def __exit__(self, type, value, traceback): + def __exit__(self, exception_type, exception_value, traceback): if self._fd: log('BI: BILock %-2s %30s <<<%s>>>' % ( self._fd, "RELEASE", os.path.basename(self._filepath))) fcntl.flock(self._fd, fcntl.LOCK_UN) diff --git a/cmk/gui/multitar.py b/cmk/gui/multitar.py index a5cfb6b..4497b3c 100644 --- a/cmk/gui/multitar.py +++ b/cmk/gui/multitar.py @@ -327,7 +327,7 @@ class SnapshotCreator(SnapshotCreationBase): return self - def __exit__(self, type, value, traceback): + def __exit__(self, exception_type, exception_value, traceback): for worker in self._worker_subprocesses: worker.join() self.output_statistics()

5 years, 9 months

Pylint no-else-return refactoring: sixth set of files

by Kenneth Okoh

Module: check_mk Branch: master Commit: 864812b2fdc4b2c6d7659fcb47ee2603fafcd208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=864812b2fdc4b2… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Oct 1 16:53:15 2018 +0200 Pylint no-else-return refactoring: sixth set of files Change-Id: I0bc03254fd5b92530b4eaddf902b25cb75065804 --- active_checks/check_mailboxes | 3 +- agents/plugins/mk_logwatch | 6 +- agents/plugins/mk_sap | 3 +- agents/special/agent_vsphere | 3 +- agents/special/agent_vsphere.pysphere | 3 +- bin/mkbackup | 15 +-- bin/mkbench | 3 +- cmk/ec/actions.py | 6 +- cmk/ec/history.py | 15 +-- cmk/ec/main.py | 12 +- cmk/gui/plugins/wato/check_parameters.py | 34 +++-- cmk/gui/wato/__init__.py | 207 ++++++++++++------------------- cmk/gui/wato/mkeventd.py | 28 ++--- cmk/gui/wato/pages/custom_attributes.py | 6 +- cmk/notification_plugins/mail.py | 9 +- notifications/sms | 3 +- omd/packages/omd/omd | 23 ++-- 17 files changed, 142 insertions(+), 237 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=864812b2fd…

5 years, 9 months

range

by Óscar Nájera

Module: check_mk Branch: master Commit: a9614ca57e7f58d3e6f1d33cb6e6ad8557d04795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9614ca57e7f58… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 12:41:13 2018 +0200 range Change-Id: I28acc7d0a87e93d629822a4f864e155c6e5ca614 --- cmk/gui/plugins/views/availability.py | 6 +++--- cmk/gui/prediction.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index 6150a03..e9bc785 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -99,9 +99,9 @@ def render_availability_options(what): range_vs = vs try: - range, range_title = range_vs.compute_range(avoptions["rangespec"]) - avoptions["range"] = range, range_title - except MKUserError, e: + range_, range_title = range_vs.compute_range(avoptions["rangespec"]) + avoptions["range"] = range_, range_title + except MKUserError as e: html.add_user_error(e.varname, e) if html.has_user_errors(): diff --git a/cmk/gui/prediction.py b/cmk/gui/prediction.py index 027a74c..843e373 100644 --- a/cmk/gui/prediction.py +++ b/cmk/gui/prediction.py @@ -327,7 +327,7 @@ def compute_vertical_range(swapped): mmin = min(mmin, min(points)) or 0.0 return mmin, mmax -def create_graph(name, size, range, v_range, legend): +def create_graph(name, size, bounds, v_range, legend): html.write('<table class=prediction><tr><td>') html.write('<canvas class=prediction id="content_%s" style="width: %dpx; height: %dpx;" width=%d height=%d></canvas>' % ( name, size[0]/2, size[1]/2, size[0], size[1])) @@ -337,7 +337,7 @@ def create_graph(name, size, range, v_range, legend): color, title)) html.write('</div></td></tr></table>') html.javascript('create_graph("content_%s", %.4f, %.4f, %.4f, %.4f);' % ( - name, range[0], range[1], v_range[0], v_range[1])) + name, bounds[0], bounds[1], v_range[0], v_range[1])) def render_coordinates(v_scala, t_scala): html.javascript('render_coordinates(%s, %s);' % (json.dumps(v_scala), json.dumps(t_scala)))

5 years, 9 months

5513 FIX cmk-update-agent: Fix crash on more than two passed "-v" flags

by Andreas Umbreit

Module: check_mk Branch: master Commit: 88fefaf81a5ccc57ad6e14a23969f51b3055d996 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88fefaf81a5ccc… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Oct 1 11:31:22 2018 +0200 5513 FIX cmk-update-agent: Fix crash on more than two passed "-v" flags Change-Id: I69a405cfab729e77dd9c11c58b9e0d6e5b77f17b --- .werks/5513 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5513 b/.werks/5513 new file mode 100644 index 0000000..c2bc6c7 --- /dev/null +++ b/.werks/5513 @@ -0,0 +1,11 @@ +Title: cmk-update-agent: Fix crash on more than two passed "-v" flags +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1538386230 + +

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