Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

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

by Kenneth Okoh

Module: check_mk Branch: master Commit: 2b7f8d9d907e7a0872ab7b4c866d7afda86e80b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b7f8d9d907e7a… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Sep 27 16:28:21 2018 +0200 Pylint no-else-return refactoring: second set of files Change-Id: Iec466b41d14e2c119d0e20bd3d90ad14fb8cdbc7 --- cmk/gui/config.py | 26 +++++++++++--------------- cmk/gui/crash_reporting.py | 6 ++---- cmk/gui/forms.py | 6 ++---- cmk/gui/http.py | 6 ++---- cmk/gui/i18n.py | 12 ++++-------- cmk/gui/key_mgmt.py | 3 +-- cmk/gui/logwatch.py | 9 +++------ cmk/gui/multitar.py | 10 +++++----- cmk/gui/pagetypes.py | 12 ++++-------- cmk/gui/plugins/views/mkeventd.py | 18 ++++++------------ cmk/gui/sidebar.py | 6 ++---- cmk/gui/views.py | 15 ++++++--------- cmk/gui/werks.py | 14 ++++++-------- 13 files changed, 54 insertions(+), 89 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2b7f8d9d90…

6 years, 2 months

6730 FIX winperf_processor.util: Fixed displaying average values in graphs

by Simon Betz

Module: check_mk Branch: master Commit: 8237cce1a9910b0121c84624cc5a4807a99135a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8237cce1a9910b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 26 13:41:16 2018 +0200 6730 FIX winperf_processor.util: Fixed displaying average values in graphs Change-Id: I86ec0f6bb17e2dcae53c9a777e186a8a1a57adad --- .werks/6730 | 10 ++++++++++ cmk/gui/plugins/metrics/check_mk.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6730 b/.werks/6730 new file mode 100644 index 0000000..923c168 --- /dev/null +++ b/.werks/6730 @@ -0,0 +1,10 @@ +Title: winperf_processor.util: Fixed displaying average values in graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537962035 +Class: fix + + diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index b7c039a..7deb7fc 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4521,7 +4521,7 @@ 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']: +for check in ['winperf_processor.util', 'docker_container_cpu', 'hr_cpu', 'bintec_cpu', 'esx_vsphere_hostsystem']: check_metrics["check_mk-%s" % check] = { "avg": { "name": "util_average" } }

6 years, 2 months

Fixed issue in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a3d21a51b29de626b6322803a80dacd1bec9373 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a3d21a51b29de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 17:17:09 2018 +0200 Fixed issue in last commit Change-Id: I4a3e0876d9fedcdb5f6f96bec4aed5e14d121d4f --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 96cfca3..935613c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -932,7 +932,7 @@ class Site(object): def get_free_port_from(self, port): used_ports = set([]) for cfg_path in glob.glob("/omd/sites/*/etc/omd/site.conf"): - for line in cfg_path: + for line in open(cfg_path): if line.startswith("CONFIG_LIVESTATUS_TCP_PORT="): port = int(line.strip().split("=", 1)[1].strip("'")) used_ports.add(port)

6 years, 2 months

Fixed unstable integration tests because of port conflicts

by Lars Michelsen

Module: check_mk Branch: master Commit: 84cbab1c0ce0bde95c9010ed5577393696861067 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84cbab1c0ce0bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 16:33:51 2018 +0200 Fixed unstable integration tests because of port conflicts The previous "free port" detection was not sufficient because the site is not always running and listenting on that port during tests. This could lead to conflicts when different branch test jobs run. Change-Id: Ic689330d17d18c2363774551d83bc0212ebc4ec6 --- tests/testlib/__init__.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 8e54bc7..96cfca3 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -2,6 +2,7 @@ # encoding: utf-8 import os +import glob import pwd import time import pytest @@ -916,6 +917,8 @@ class Site(object): if start_again: self.start() + sys.stdout.write("After livestatus port lock\n") + def _gather_livestatus_port(self): if self.reuse and self.exists(): @@ -927,21 +930,17 @@ class Site(object): def get_free_port_from(self, port): - while True: - try: - print "Trying port %d" % port - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - sock.bind(("127.0.0.1", port)) - sock.listen(1) - sock.close() - - break # found a bindable port - except socket.error, e: - print "Failed to bind 127.0.0.1:%d: %s" % (port, e) - port += 1 - - print "Using port %d" % port + used_ports = set([]) + for cfg_path in glob.glob("/omd/sites/*/etc/omd/site.conf"): + for line in cfg_path: + if line.startswith("CONFIG_LIVESTATUS_TCP_PORT="): + port = int(line.strip().split("=", 1)[1].strip("'")) + used_ports.add(port) + + while port in used_ports: + port += 1 + + print "Livestatus ports already in use: %r, using port: %d" % (used_ports, port) return port # Problem: The group change only affects new sessions of the test_user

6 years, 2 months

Fixed picking issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 894cde56743fdc322cbf7675ca8a45962e8d8464 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894cde56743fdc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 16:12:39 2018 +0200 Fixed picking issue Change-Id: I837754a255b7d1d96afda6f43edff3b49761e7f3 --- cmk/gui/plugins/views/icons/inventory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk/gui/plugins/views/icons/inventory.py b/cmk/gui/plugins/views/icons/inventory.py index 96669be..d22311c 100644 --- a/cmk/gui/plugins/views/icons/inventory.py +++ b/cmk/gui/plugins/views/icons/inventory.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import cmk.gui.inventory as inventory +import cmk.gui.config as config from cmk.gui.i18n import _ from cmk.gui.globals import html from . import multisite_icons_and_actions

6 years, 2 months

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

by Kenneth Okoh

Module: check_mk Branch: master Commit: aeed08896067a75176c7c7fb5b051b92309e5f19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeed08896067a7… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Sep 27 11:00:49 2018 +0200 Pylint no-else-return refactoring: first set of files Change-Id: I363ca0e1bfc4f17cfdfcc9a1264ff6588d62fe15 --- cmk/gui/bi.py | 55 +++++++++++++++++-------------------------- cmk/gui/dashboard.py | 3 +-- cmk/gui/gui_background_job.py | 6 ++--- cmk/gui/htmllib.py | 24 +++++++------------ cmk/gui/login.py | 7 ++---- cmk/gui/main.py | 3 +-- cmk/gui/metrics.py | 10 ++++---- cmk/gui/mkeventd.py | 9 +++---- cmk/gui/sites.py | 3 +-- cmk/gui/userdb.py | 12 ++++------ cmk/gui/visuals.py | 3 +-- cmk/gui/weblib.py | 17 +++++++------ 12 files changed, 59 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aeed088960…

6 years, 2 months

6605 FIX winperf_if: Fixed discovery of network interface alias

by Simon Betz

Module: check_mk Branch: master Commit: 73abf667b85e09c2e86623dd4e19141cc560957e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73abf667b85e09… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 27 15:22:31 2018 +0200 6605 FIX winperf_if: Fixed discovery of network interface alias Change-Id: Iaee373b2edf23218f6390a36b866b3ce100a0438 --- .werks/6605 | 21 ++++++++++++++++ checks/winperf_if | 7 +++--- tests/unit/checks/test_if_winperf_if.py | 43 +++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/.werks/6605 b/.werks/6605 new file mode 100644 index 0000000..b5736c3 --- /dev/null +++ b/.werks/6605 @@ -0,0 +1,21 @@ +Title: winperf_if: Fixed discovery of network interface alias +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1537876236 +Class: fix + +While parsing the winperf interface section only trailing spaces were stripped +off. There may also be leading spaces. Without cutting them off additional +information like NetConnectionID, GUID or MAC address of the interfaces were +not found. In this case the instance name of the interace was used as alias +(fallback) instead of the NetConnectionID. + +Now if one has configured <tt>Use alias</tt> in the +<tt>Network Interface and Switch Port Discovery</tt> ruleset new services +may be discovered and old ones will be vanished. +In order to obtained the already used iterface names please use +<tt>Use description</tt> in the <tt>Network Interface and Switch Port Discovery</tt> +ruleset. diff --git a/checks/winperf_if b/checks/winperf_if index 4f9d7d1..a906493 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -92,8 +92,8 @@ def winperf_if_normalize_nic_name(name, nic_names): def parse_winperf_if(info): try: timestamp_info, names_info, data = info[0], info[1], info[2:] - except ValueError: - return [] + except (IndexError, ValueError): + return None, [], [], [], {} try: agent_timestamp = float(timestamp_info[0]) @@ -155,7 +155,7 @@ def parse_winperf_if(info): teaming_headers = lines.next() break - as_dict = dict(zip(headers, [x.rstrip() for x in line])) + as_dict = dict(zip(headers, [x.strip() for x in line])) # Unfortunately teamed interfaces lose their #x index and are no longer # distinguishable with the data from the Win32_NetworkAdapter. @@ -212,7 +212,6 @@ def parse_winperf_if(info): except StopIteration: pass - # Now convert the dicts into the format that is needed by if.include converted = [] diff --git a/tests/unit/checks/test_if_winperf_if.py b/tests/unit/checks/test_if_winperf_if.py new file mode 100644 index 0000000..ce9843d --- /dev/null +++ b/tests/unit/checks/test_if_winperf_if.py @@ -0,0 +1,43 @@ +import pytest +import ast +from testlib import cmk_path + +# Mark all tests in this file as check related tests +pytestmark = pytest.mark.checks + +(a)pytest.mark.parametrize("info,settings,items", [ + ([], [{}], []), + ([['123', '456', '789'], ['1', 'instances:', 'A_B-C_1'], + [u'-122', u'29370873405', u'5887351577', u'0', u'0', u'bulk_count'], + [u'-110', u'5692885', u'5153077', u'0', u'0', u'bulk_count'], + [u'-244', u'5018312', u'4921974', u'0', u'0', u'bulk_count'], + [u'-58', u'674573', u'231103', u'0', u'0', u'bulk_count'], + [u'10', u'10000000000', u'10000000000', u'100000', u'100000', u'large_rawcount'], + [u'-246', u'20569013293', u'5685847946', u'0', u'0', u'bulk_count'], + [u'14', u'4961765', u'4425455', u'0', u'0', u'bulk_count'], + [u'16', u'4447', u'490897', u'0', u'0', u'bulk_count'], + [u'18', u'52100', u'5622', u'0', u'0', u'large_rawcount'], + [u'20', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'22', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'-4', u'8801860112', u'201503631', u'0', u'0', u'bulk_count'], + [u'26', u'673929', u'230448', u'0', u'0', u'bulk_count'], + [u'28', u'644', u'655', u'0', u'0', u'bulk_count'], + [u'30', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'32', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'34', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'1086', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'1088', u'1', u'0', u'0', u'0', u'large_rawcount'], + [u'1090', u'3734320', u'4166703', u'0', u'0', u'bulk_count'], + [u'1092', u'0', u'0', u'0', u'0', u'bulk_count'], + [u'1094', u'22618', u'22618', u'22618', u'22618', u'large_rawcount'], + [u'Node', u'MACAddress', u'Name', u'NetConnectionID', u'NetConnectionStatus', u'Speed', u'GUID'], + [u'NODE1 ', u' 00:00:00:00:00:00 ', u' A_B-C_1 ', u' Ethernet1-XYZ ', u' 2 ', u' 10000000000 ', u' {FOO-123-BAR}']], + [{"use_alias": True}], ['Ethernet1-XYZ']), +]) +def test_winperf_if_netconnection_id(check_manager, monkeypatch, info, settings, items): + check = check_manager.get_check("winperf_if") + monkeypatch.setitem(check.context, "host_extra_conf", lambda _, __: settings) + monkeypatch.setitem(check.context, "_prepare_if_group_patterns_from_conf", lambda: {}) + parsed = check.run_parse(info) + discovered_items = [e[0] for e in check.run_discovery(parsed)] + assert discovered_items == items

6 years, 2 months

6728 FIX Hide links to not permitted views from host context menu

by Lars Michelsen

Module: check_mk Branch: master Commit: d18d9419281d28d8e935573f78d26559b4fe1a3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d18d9419281d28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 14:21:14 2018 +0200 6728 FIX Hide links to not permitted views from host context menu The entries for linking to BI aggregations of a host and HW/SW inventory of a host are now hidden from the host context menu when a user is not permitted to see the target views. Change-Id: I483d1ba885b1ac7a44f6f363fd58765d42a2d806 --- .werks/6728 | 13 +++++++++++++ cmk/gui/plugins/views/icons/builtin.py | 7 ++++++- cmk/gui/plugins/views/icons/inventory.py | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/6728 b/.werks/6728 new file mode 100644 index 0000000..12e7268 --- /dev/null +++ b/.werks/6728 @@ -0,0 +1,13 @@ +Title: Hide links to not permitted views from host context menu +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538050817 + +The entries for linking to BI aggregations of a host and HW/SW inventory of +a host are now hidden from the host context menu when a user is not permitted +to see the target views. diff --git a/cmk/gui/plugins/views/icons/builtin.py b/cmk/gui/plugins/views/icons/builtin.py index bd6032b..433adf4 100644 --- a/cmk/gui/plugins/views/icons/builtin.py +++ b/cmk/gui/plugins/views/icons/builtin.py @@ -740,8 +740,13 @@ def paint_aggregations(what, row, tags, host_custom_vars): if config.bi_precompile_on_demand \ or bi.is_part_of_aggregation(what, row["site"], row["host_name"], row.get("service_description")): + view_name = "aggr_%s" % what + + if not config.user.may("view.%s" % view_name): + return + urivars = [ - ("view_name", "aggr_" + what), + ("view_name", view_name), ("aggr_%s_site" % what, row["site"]), ("aggr_%s_host" % what, row["host_name"]), ] diff --git a/cmk/gui/plugins/views/icons/inventory.py b/cmk/gui/plugins/views/icons/inventory.py index 580ba78..96669be 100644 --- a/cmk/gui/plugins/views/icons/inventory.py +++ b/cmk/gui/plugins/views/icons/inventory.py @@ -34,6 +34,10 @@ def paint_icon_inventory(what, row, tags, customer_vars): from cmk.gui.plugins.views import url_to_view if (what == "host" or row.get("service_check_command","").startswith("check_mk_active-cmk_inv!")) \ and inventory.has_inventory(row["host_name"]): + + if not config.user.may("view.inv_host"): + return + return 'inv', _("Show Hardware/Software Inventory of this host"), url_to_view(row, 'inv_host') multisite_icons_and_actions['inventory'] = {

6 years, 2 months

fileinfo: Fix bug in agents and make parse_function more robust

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4d1e5f097fafaa6790c0e83b09670726925d029a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d1e5f097fafaa… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 26 07:46:06 2018 +0200 fileinfo: Fix bug in agents and make parse_function more robust Change-Id: I558e0da2db7694f24421118f1713965807640788 --- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.openwrt | 2 +- agents/check_mk_agent.solaris | 2 +- checks/fileinfo | 61 +++++++++------------- .../generictests/datasets/fileinfo_new_empty.py | 15 ++++++ .../datasets/fileinfo_old_empty_regression.py | 13 +++++ 9 files changed, 59 insertions(+), 42 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 084ec1e..810060f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -304,7 +304,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then done | perl -e ' print time."\n"; print "[[[header]]]\n"; - print "name|status|size|date\n"; + print "name|status|size|time\n"; print "[[[content]]]\n"; while (<>) { chomp $_; diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 95ea306..33e3d8d 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -396,7 +396,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then done | perl -e ' print time."\n"; print "[[[header]]]\n"; - print "name|status|size|date\n"; + print "name|status|size|time\n"; print "[[[content]]]\n"; while (<>) { chomp $_; diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 3dd5a3f..93407d0 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -895,7 +895,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then done | perl -e ' print time."\n"; print "[[[header]]]\n"; - print "name|status|size|date\n"; + print "name|status|size|time\n"; print "[[[content]]]\n"; while (<>) { chomp $_; diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index af2bb7d..95e5580 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -112,7 +112,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then done | perl -e ' print time."\n"; print "[[[header]]]\n"; - print "name|status|size|date\n"; + print "name|status|size|time\n"; print "[[[content]]]\n"; while (<>) { chomp $_; diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 91e2f01..8bba808 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -684,7 +684,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then IFS=' ' echo "[[[header]]]" - echo " name | status | size | date " + echo " name | status | size | time " echo "[[[content]]]" # name | status (missing/stat failed/ok)) | size | date # filename|missing|| diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 69876b9..53062c5 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -373,7 +373,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then done | perl -e ' print time."\n"; print "[[[header]]]\n"; - print "name|status|size|date\n"; + print "name|status|size|time\n"; print "[[[content]]]\n"; while (<>) { chomp $_; diff --git a/checks/fileinfo b/checks/fileinfo index 2e1d3b3..a1998f4 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -50,31 +50,26 @@ import collections fileinfo_groups = [] -def _get_field(row, index): +def _get_field(row, index, data_type): try: - return row[index] - except IndexError: - return '' + return data_type(row[index]) + except (IndexError, ValueError, TypeError): + return None def _parse_backwards_compatible(info): for row in info[1:]: - name = _get_field(row, 0) + name = _get_field(row, 0, str) # endswith("No such file...") is needed to # support the very old solaris perl based version of fileinfo if not name or name.endswith("No such file or directory"): continue - ambiguous = _get_field(row, 1) + ambiguous = _get_field(row, 1, str) missing = ambiguous == 'missing' failed = ambiguous in ('not readable', '') - try: - size = int(ambiguous) - except ValueError: - size = None - try: - time = int(_get_field(row, 2)) - except ValueError: - time = None + size = _get_field(row, 1, int) + time = _get_field(row, 2, int) + yield name, missing, failed, size, time @@ -82,45 +77,39 @@ def parse_fileinfo(info): if not info: return {} parsed = {'files': {}} - try: - parsed['reftime'] = int(info[0][0]) - except (IndexError, ValueError): - pass + + parsed['reftime'] = _get_field(info[0], 0, int) FileinfoItem = collections.namedtuple( "FileinfoItem", "name missing failed size time") # deal with old agents' output: - if _get_field(_get_field(info, 1), 0) != '[[[header]]]': + if len(info) > 1 and _get_field(info[1], 0, str) != '[[[header]]]': for args in _parse_backwards_compatible(info): fi = FileinfoItem(*args) parsed['files'][fi.name] = fi return parsed - header = _get_field(info, 2) + if len(info) < 3: + return parsed + + header = info[2] name_i = header.index('name') if 'name' in header else None size_i = header.index('size') if 'size' in header else None time_i = header.index('time') if 'time' in header else None - status_i = header.index('status') if 'status' in header else None + stat_i = header.index('status') if 'status' in header else None for row in info[4:]: - name = _get_field(row, name_i) - if not name: - continue - status = _get_field(row, status_i) - if not status: + name = _get_field(row, name_i, str) + stat = _get_field(row, stat_i, str) + size = _get_field(row, size_i, int) + time = _get_field(row, time_i, int) + + if name is None or stat is None: continue - try: - size = int(row[size_i]) - except (IndexError, ValueError): - size = None - try: - time = int(row[time_i]) - except (IndexError, ValueError): - time = None - fi = FileinfoItem(name, ('missing' in status), - ('stat failed' in status), size, time) + fi = FileinfoItem(name, ('missing' in stat), + ('stat failed' in stat), size, time) parsed['files'][fi.name] = fi return parsed diff --git a/tests/unit/checks/generictests/datasets/fileinfo_new_empty.py b/tests/unit/checks/generictests/datasets/fileinfo_new_empty.py new file mode 100644 index 0000000..1f40c00 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/fileinfo_new_empty.py @@ -0,0 +1,15 @@ + + +checkname = 'fileinfo' + + +info = [ + ['1536557964'], + ['[[[header]]]'], + ['name', 'status', 'size', 'time'], + ['[[[content]]]'], +] + + +discovery = {'': [], 'groups': []} + diff --git a/tests/unit/checks/generictests/datasets/fileinfo_old_empty_regression.py b/tests/unit/checks/generictests/datasets/fileinfo_old_empty_regression.py new file mode 100644 index 0000000..e4ee53c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/fileinfo_old_empty_regression.py @@ -0,0 +1,13 @@ + + +checkname = 'fileinfo' + + +info = [ + ['1536557964'], +] + + +discovery = {'': [], 'groups': []} + +

6 years, 2 months

6769 FIX genua_fan genua_pfstate: Fixed crashing discovery on empty data

by Lars Michelsen

Module: check_mk Branch: master Commit: c3604e4cc18653eda0c65edbc1e3b59eda14c3ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3604e4cc18653… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 14:49:08 2018 +0200 6769 FIX genua_fan genua_pfstate: Fixed crashing discovery on empty data Change-Id: I3f8be2d4bb6790dc5c4ec8eced017e48843d51f2 --- .werks/6769 | 10 ++++++++++ checks/genua_fan | 3 +++ checks/genua_pfstate | 10 +++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.werks/6769 b/.werks/6769 new file mode 100644 index 0000000..b65e7b7 --- /dev/null +++ b/.werks/6769 @@ -0,0 +1,10 @@ +Title: genua_fan genua_pfstate: Fixed crashing discovery on empty data +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1538052524 +Class: fix + + diff --git a/checks/genua_fan b/checks/genua_fan index 8d5d2b1..f70cf00 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -35,6 +35,9 @@ def inventory_genua_fan(info): # remove empty elements due to alternative enterprise id in snmp_info info = filter(None, info) + if not info: + return + inventory = [] for _fanNo, fanName, _fanRPM, _fanState in info[0]: inventory.append( (fanName, {}) ) diff --git a/checks/genua_pfstate b/checks/genua_pfstate index b4f9590..78cbea1 100644 --- a/checks/genua_pfstate +++ b/checks/genua_pfstate @@ -36,11 +36,11 @@ def inventory_genua_pfstate(info): # remove empty elements due to alternative enterprise id in snmp_info info = filter(None, info) - if info[0]: - if len(info[0][0]) == 3: - return [ (None, genua_pfstate_default_levels) ] - else: - return [] + if not info or not info[0]: + return + + if len(info[0][0]) == 3: + return [ (None, genua_pfstate_default_levels) ] def pfstate(st):

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018