Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fixed and enabled consider-iterating-dictionary warning.

by Sven Panne

Module: check_mk Branch: master Commit: 753e37640ce097f0e7a5f870926991a8791be8e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=753e37640ce097… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 26 10:24:59 2018 +0200 Fixed and enabled consider-iterating-dictionary warning. Change-Id: I4e4ea15fa78308d916d9631572cb85e48c68504f --- checks/aix_lvm | 7 +++---- checks/aix_multipath | 2 +- checks/apache_status | 7 ++----- checks/cbl_airlaser | 16 ++++++++-------- checks/checkpoint_packets | 4 ++-- checks/ddn_s2a_faultsbasic | 2 +- checks/ddn_s2a_stats | 2 +- checks/f5_bigip_pool | 4 ++-- checks/filerdisks.include | 2 +- checks/ibm_svc_license | 7 ++----- checks/ibm_svc_node | 10 ++++------ checks/ibm_svc_nodestats | 28 ++++++++-------------------- checks/ibm_svc_systemstats | 21 ++++++--------------- checks/ibm_xraid_pdisks | 6 ++---- checks/logwatch | 3 ++- checks/nginx_status | 7 ++----- checks/openhardwaremonitor | 2 +- checks/vxvm_objstatus | 3 +-- checks/wut_webio_io | 14 +++++--------- checks/zpool_status | 12 ++++++------ cmk/ec/main.py | 2 +- cmk/gui/background_job.py | 2 +- cmk/gui/http.py | 2 +- cmk/gui/plugins/sidebar/bookmarks.py | 2 +- cmk/gui/plugins/userdb/ldap_connector.py | 3 ++- cmk/gui/plugins/views/utils.py | 2 +- cmk/gui/plugins/visuals/filters.py | 2 +- cmk/gui/views.py | 5 +++-- cmk/gui/visuals.py | 4 ++-- cmk/gui/watolib.py | 21 +++++++++------------ cmk_base/compress_history.py | 2 +- cmk_base/config.py | 4 ++-- cmk_base/core_config.py | 2 +- cmk_base/notify.py | 12 +++++++----- tests/pylint/pylintrc | 1 - 35 files changed, 93 insertions(+), 132 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=753e37640c…

6 years, 1 month

6371 FIX Fixed broken Global Settings page when liveproxyd is disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: b99c6d75e2a66161caee98bf1e91eca90d7ad2c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b99c6d75e2a661… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 14:42:14 2018 +0200 6371 FIX Fixed broken Global Settings page when liveproxyd is disabled The global settings page could only be rendered partially and showed an error message like "KeyError: 'liveproxyd_log_levels'" when the livestatus proxy daemon was disabled for a site in all previous 1.5 releases. Change-Id: I3abcb2ccb9f86890a262cf88615a4252e724202d --- .werks/6371 | 13 +++++++++++++ cmk/gui/wato/pages/global_settings.py | 3 +++ 2 files changed, 16 insertions(+) diff --git a/.werks/6371 b/.werks/6371 new file mode 100644 index 0000000..89a4e0f --- /dev/null +++ b/.werks/6371 @@ -0,0 +1,13 @@ +Title: Fixed broken Global Settings page when liveproxyd is disabled +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1532607063 + +The global settings page could only be rendered partially and showed an error +message like "KeyError: 'liveproxyd_log_levels'" when the livestatus proxy +daemon was disabled for a site in all previous 1.5 releases. diff --git a/cmk/gui/wato/pages/global_settings.py b/cmk/gui/wato/pages/global_settings.py index e3811ef..be346d0 100644 --- a/cmk/gui/wato/pages/global_settings.py +++ b/cmk/gui/wato/pages/global_settings.py @@ -108,6 +108,9 @@ class GlobalSettingsMode(WatoMode): header_is_painted = False # needed for omitting empty groups for domain, varname, valuespec in watolib.configvar_groups()[group_name]: + if not domain.enabled(): + continue + if domain == watolib.ConfigDomainCore and varname not in self._default_values: if config.debug: raise MKGeneralException("The configuration variable <tt>%s</tt> is unknown to "

6 years, 1 month

Renamed previous to previous_tree

by Lars Michelsen

Module: check_mk Branch: master Commit: 1741d085378abceac439ebda17ba68e212958bd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1741d085378abc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 09:37:54 2018 +0200 Renamed previous to previous_tree Change-Id: I828e5a9aaa832fb95c353d2a5bbfaa41be34775f --- cmk/gui/inventory.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index b8464a3..da50b86 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -180,14 +180,13 @@ def get_history(hostname): else: history.append((timestamp, inventory_tree)) - comparable_trees = [] - previous = None + comparable_trees, previous_tree = [], None for this_timestamp, inventory_tree in sorted(history, key=lambda x: x[0]): - if previous is None: - previous = inventory_tree + if previous_tree is None: + previous_tree = inventory_tree else: - comparable_trees.append((this_timestamp, inventory_tree, previous)) - previous = inventory_tree + comparable_trees.append((this_timestamp, inventory_tree, previous_tree)) + previous_tree = inventory_tree return reversed(comparable_trees)

6 years, 1 month

6369 FIX Fixed date shown for the first inventory history entry

by Lars Michelsen

Module: check_mk Branch: master Commit: 669376cf310e906aa4c15d994a2e973d7f1c1cf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=669376cf310e90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 09:36:36 2018 +0200 6369 FIX Fixed date shown for the first inventory history entry Instead of showing 01.01.1970 for the first inventory history entry the view now shows the correct inventory time again. This regression affects all previous 1.5 releases Change-Id: Iefb7fe9544c62348c92237886038bf14d1f99009 --- .werks/6369 | 13 +++++++++++++ cmk/gui/inventory.py | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/6369 b/.werks/6369 new file mode 100644 index 0000000..1c381c5 --- /dev/null +++ b/.werks/6369 @@ -0,0 +1,13 @@ +Title: Fixed date shown for the first inventory history entry +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532590520 + +Instead of showing 01.01.1970 for the first inventory history entry +the view now shows the correct inventory time again. This regression +affects all previous 1.5 releases diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index fe0e5de..b8464a3 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -182,13 +182,14 @@ def get_history(hostname): comparable_trees = [] previous = None - for this_timestamp, inventory_tree in sorted(history, key=lambda x: x[0], reverse=True): + for this_timestamp, inventory_tree in sorted(history, key=lambda x: x[0]): if previous is None: previous = inventory_tree else: comparable_trees.append((this_timestamp, inventory_tree, previous)) previous = inventory_tree - return comparable_trees + + return reversed(comparable_trees) def parent_path(invpath):

6 years, 1 month

Simplified inventory history processing a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: ec3f7a0d3f66a8015e7731004c2b538b4c996efa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec3f7a0d3f66a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 09:42:24 2018 +0200 Simplified inventory history processing a bit Change-Id: I1f06dd03a573559fcc4852b8da2875919efcd64c --- cmk/gui/inventory.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index da50b86..aaf6ac5 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -159,14 +159,17 @@ def get_history(hostname): if '/' in hostname: return None # just for security reasons + history = [] try: inventory_path = "%s/inventory/%s" % (cmk.paths.var_dir, hostname) timestamp = int(os.stat(inventory_path).st_mtime) inventory_tree = load_tree(hostname, merge_trees=False) + history.append((timestamp, inventory_tree)) except: + # TODO: We should really change this error handling. There is currently + # no chance to react on issues that occur during processing of + # inventory data. return [] # No inventory for this host - else: - history = [(0, StructuredDataTree()), (timestamp, inventory_tree)] inventory_archive_dir = "%s/inventory_archive/%s" % (cmk.paths.var_dir, hostname) if os.path.exists(inventory_archive_dir): @@ -176,17 +179,17 @@ def get_history(hostname): inventory_archive_path = "%s/%d" % (inventory_archive_dir, timestamp) inventory_tree = StructuredDataTree().load_from(inventory_archive_path) except: + # TODO: We should really change this error handling. There is currently + # no chance to react on issues that occur during processing of + # inventory data. pass else: history.append((timestamp, inventory_tree)) - comparable_trees, previous_tree = [], None + comparable_trees, previous_tree = [], StructuredDataTree() for this_timestamp, inventory_tree in sorted(history, key=lambda x: x[0]): - if previous_tree is None: - previous_tree = inventory_tree - else: - comparable_trees.append((this_timestamp, inventory_tree, previous_tree)) - previous_tree = inventory_tree + comparable_trees.append((this_timestamp, inventory_tree, previous_tree)) + previous_tree = inventory_tree return reversed(comparable_trees)

6 years, 1 month

suseconnect: add "days" as unit in levels text

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f1c4909485c8fead9c9d708d95821a400711e1af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c4909485c8fe… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jul 26 13:48:15 2018 +0200 suseconnect: add "days" as unit in levels text Change-Id: I8d9f39961685f9330e0019a3fde6608e75e2db2a --- checks/suseconnect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/suseconnect b/checks/suseconnect index dd180c5..4a42682 100644 --- a/checks/suseconnect +++ b/checks/suseconnect @@ -106,7 +106,7 @@ def check_suseconnect(_no_item, params, parsed): infotext = ', Expires in: %s' % get_age_human_readable(expiration_time) if state: - infotext += ' (warn/crit at %d/%d)' % (warn, crit) + infotext += ' (warn/crit at %d/%d days)' % (warn, crit) yield state, infotext else:

6 years, 1 month

6386 FIX esx_vsphere_hostsystem: Fixed crash if no hardware system information is available

by Simon Betz

Module: check_mk Branch: master Commit: 982df473e64b57aae4ee950faf56d59a0a7cdcff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=982df473e64b57… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 26 11:29:18 2018 +0200 6386 FIX esx_vsphere_hostsystem: Fixed crash if no hardware system information is available Change-Id: Ife0a6d25d465ffce220254136ba5dc80efc7b24e --- .werks/6386 | 11 +++++++++++ inventory/esx_vsphere_hostsystem | 9 +++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/6386 b/.werks/6386 new file mode 100644 index 0000000..941568b --- /dev/null +++ b/.werks/6386 @@ -0,0 +1,11 @@ +Title: esx_vsphere_hostsystem: Fixed crash if no hardware system information is available +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532597254 + + diff --git a/inventory/esx_vsphere_hostsystem b/inventory/esx_vsphere_hostsystem index b738617..566bf12 100644 --- a/inventory/esx_vsphere_hostsystem +++ b/inventory/esx_vsphere_hostsystem @@ -108,10 +108,11 @@ def inv_esx_vsphere_hostsystem(info): if node["vendor"] == "HP": node["serial"] = data["hardware.systemInfo.otherIdentifyingInfo.ServiceTag"]["0"] - if "uuid" in data["hardware.systemInfo"]: - node["uuid"] = data["hardware.systemInfo"]["uuid"] - if "0" in data["hardware.systemInfo"]: - node["serial"] = data["hardware.systemInfo"]["0"]["ServiceTag"] + hardware_systeminfo = data.get("hardware.systemInfo", {}) + if "uuid" in hardware_systeminfo: + node["uuid"] = hardware_systeminfo["uuid"] + if "0" in hardware_systeminfo: + node["serial"] = hardware_systeminfo["0"]["ServiceTag"] if "memorySize" in data["hardware"]: node = inv_tree("hardware.memory.") node["total_ram_usable"] = int(data["hardware"]["memorySize"])

6 years, 1 month

6385 FIX Check_MK service: Fixed 'missing agent sections'

by Simon Betz

warning if the time period of a service is active Message-ID: <5b59b334.24DGgBwKj6kmuJYL%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 686dfc015e4afa1634fd11cbcf4ec00370e36c81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=686dfc015e4afa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 26 11:22:27 2018 +0200 6385 FIX Check_MK service: Fixed 'missing agent sections' warning if the time period of a service is active Change-Id: I8d53566cb107abd25b1bc7f7198e0a92a9fd4d4c --- .werks/6385 | 11 +++++++++++ cmk_base/checking.py | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6385 b/.werks/6385 new file mode 100644 index 0000000..e722555 --- /dev/null +++ b/.werks/6385 @@ -0,0 +1,11 @@ +Title: Check_MK service: Fixed 'missing agent sections' warning if the time period of a service is active +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532596851 + + diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 8598ca8..6e36211 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -203,6 +203,11 @@ def _do_all_checks_on_host(sources, hostname, ipaddress, only_check_plugin_names success = execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, item, params, description) if success: num_success += 1 + elif success is None: + # If the service is in any timeperiod we do not want to + # - increase num_success or + # - add to missing sections + continue else: missing_sections.add(cmk_base.check_utils.section_name_of(check_plugin_name)) @@ -224,7 +229,7 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i period = config.check_period_of(hostname, description) if period and not cmk_base.core.check_timeperiod(period): console.verbose("Skipping service %s: currently not in timeperiod %s.\n" % (description, period)) - return False + return None elif period: console.vverbose("Service %s: timeperiod %s is currently active.\n" % (description, period))

6 years, 1 month

Fixed integration tests for available werks

by Lars Michelsen

Module: check_mk Branch: master Commit: 107950162cf28f95ee8f14d5cd93b4fa8f455336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=107950162cf28f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 11:08:30 2018 +0200 Fixed integration tests for available werks Change-Id: I7afb8d4794a0bca3b3d8a1868be5ae7ecbb6d706 --- tests/integration/cmk/test_site_werks.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/integration/cmk/test_site_werks.py b/tests/integration/cmk/test_site_werks.py index 05b5688..6514d23 100644 --- a/tests/integration/cmk/test_site_werks.py +++ b/tests/integration/cmk/test_site_werks.py @@ -10,14 +10,17 @@ def test_load(site): def test_regular_werks(site): werks = cmk.werks.load() - regular_werks = [ id for id in werks.keys() if id < 7500 ] + regular_werks = [ werk for werk in werks.values() + if werk["edition"] == "cre" ] + assert len(regular_werks) > 1000 def test_enterprise_werks(site): werks = cmk.werks.load() - enterprise_werks = [ id for id in werks.keys() if id >= 8000 ] + enterprise_werks = [ werk for werk in werks.values() + if werk["edition"] == "cee" ] if site.version.edition() == "raw": assert not enterprise_werks @@ -25,8 +28,13 @@ def test_enterprise_werks(site): assert enterprise_werks -def test_cmk_omd_werks(site): +def test_managed_werks(site): werks = cmk.werks.load() - cmk_omd_werks = [ id for id in werks.keys() if id >= 7500 and id < 8000 ] - assert cmk_omd_werks + managed_werks = [ werk for werk in werks.values() + if werk["edition"] == "cme" ] + + if site.version.edition() != "managed": + assert not managed_werks + else: + assert managed_werks

6 years, 1 month

Fixed and enabled consider-using-enumerate warning.

by Sven Panne

Module: check_mk Branch: master Commit: 410750a0b0990a22c22bc5b0ed41b811e96d6196 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=410750a0b0990a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 26 09:35:00 2018 +0200 Fixed and enabled consider-using-enumerate warning. Change-Id: I0ab5ef4dd7a56e5dadef41ded5dcebbe93a326ec --- checks/alcatel_temp | 11 ++++------- checks/etherbox2_temp | 4 ++-- checks/genua_state_correlation | 6 +++--- cmk/gui/bi.py | 4 ++-- tests/pylint/pylintrc | 1 - 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/checks/alcatel_temp b/checks/alcatel_temp index 3bb02c3..1b1f176 100644 --- a/checks/alcatel_temp +++ b/checks/alcatel_temp @@ -29,15 +29,12 @@ factory_settings['alcatel_temp'] = { } def inventory_alcatel_temp(info): - with_slot = True - if len(info) == 1: - with_slot = False - for index in range(len(info)): - slot = index + 1 + with_slot = len(info) != 1 + for index, row in enumerate(info): for oid, name in enumerate(["Board", "CPU"]): - if info[index][oid] != '0': + if row[oid] != '0': if with_slot: - yield "Slot %s %s" % (slot, name), {} + yield "Slot %s %s" % (index + 1, name), {} else: yield name, {} diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp index 92a8817..01b94ce 100644 --- a/checks/etherbox2_temp +++ b/checks/etherbox2_temp @@ -56,11 +56,11 @@ def parse_etherbox2_temp(info): # because the temperature can drop below 0. parsed = {} sensor_indicators, sensors = info - for sensor_index in range(0, len(sensors)): + for sensor_index, sensor in enumerate(sensors): indicator_index = 2 * sensor_index if float((sensor_indicators[indicator_index][0].split("Volt")[0]).strip()) > 4 and \ float((sensor_indicators[indicator_index + 1][0].split("Volt")[0]).strip()) > 1: - parsed["Sensor %s" % sensors[sensor_index][0]] = float(sensors[sensor_index][1]) / 10 + parsed["Sensor %s" % sensor[0]] = float(sensor[1]) / 10 return parsed diff --git a/checks/genua_state_correlation b/checks/genua_state_correlation index 5a03836..8feb3f9 100644 --- a/checks/genua_state_correlation +++ b/checks/genua_state_correlation @@ -76,9 +76,9 @@ def check_genua_state(item, _no_params, info): # critical if the carp interfaces dont have the same state carp_states = [ 0, 0, 0 ] - for i in range (0, len(carp_info)): - carp_states[int(carp_info[i][4])] += 1 - if carp_info[0][4] != carp_info[i][4]: + for i, elem in enumerate(carp_info): + carp_states[int(elem[4])] += 1 + if carp_info[0][4] != elem[4]: state = 2 output = "Number of carp IFs in states " diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index fd6f45f..680ae8c 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -1924,8 +1924,8 @@ def remove_empty_nodes(node): else: subnodes = node["nodes"] # loop all subnodes recursing down to the lowest level - for i in range(0, len(subnodes)): - remove_empty_nodes(subnodes[i]) + for subnode in subnodes: + remove_empty_nodes(subnode) # remove all subnode rules which have no subnodes for i in range(0, len(subnodes))[::-1]: if node_is_empty(subnodes[i]): diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index afae56e..3f9ff2d 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, consider-iterating-dictionary, - consider-using-enumerate, inconsistent-return-statements, logging-not-lazy, missing-docstring,

6 years, 1 month

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