Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a949e7a74303f1093d5fa2bd9e7924662fc8805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a949e7a74303f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 10:04:18 2017 +0100 Updated bug entries #2477 Change-Id: I8f64f590aaeb6943717fa5ee88ffe6c9c87b5120 --- .bugs/2477 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2477 b/.bugs/2477 new file mode 100644 index 0000000..df31c9e --- /dev/null +++ b/.bugs/2477 @@ -0,0 +1,13 @@ +Title: Drop the "site icons" feature +Component: multisite +State: open +Date: 2017-02-24 10:03:00 +Targetversion: 1.5.0 +Class: nastiness + +There is a annicient and now hidden feature "site icons". The user can set the option +use_siteicons = True in the multisite.mk and put an icon named like this into the +images/icons directory: icons/site-%s-24.png. + +This can currently not be configured via WATO. Remove this feature, because this can +be configured using the custom host/service icon feature these days via WATO.

7 years, 6 months

4396 FIX Fixed exception in BI views when using site icons

by Lars Michelsen

Module: check_mk Branch: master Commit: b2f9e17669c2ef4127a0c65cdb788f038f0c28d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2f9e17669c2ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 10:05:52 2017 +0100 4396 FIX Fixed exception in BI views when using site icons There is a annicient and now hidden feature "site icons". The user can set the option use_siteicons = True in the multisite.mk and put an icon named like this into the images/icons directory: icons/site-%s-24.png. When this is enabled and the sites icon painter is added to a BI view, this leads to an exception. That the "site" key is not available. Change-Id: I09f6f678e117dad121f9ec23a05e82f8c07c43bc --- .werks/4396 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/4396 b/.werks/4396 new file mode 100644 index 0000000..4670546 --- /dev/null +++ b/.werks/4396 @@ -0,0 +1,16 @@ +Title: Fixed exception in BI views when using site icons +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487927077 + +There is a annicient and now hidden feature "site icons". The user can set the option +use_siteicons = True in the multisite.mk and put an icon named like this into the +images/icons directory: icons/site-%s-24.png. + +When this is enabled and the sites icon painter is added to a BI view, this leads +to an exception. That the "site" key is not available.

7 years, 6 months

ListOf valuespec: Fixed possible exception in complain phase

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b248af00f9714199e78f72d1cbaef159c7f1d70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b248af00f9714… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 09:53:07 2017 +0100 ListOf valuespec: Fixed possible exception in complain phase Change-Id: I7028bdcc096c74d897a7b1c196f9ec501a4c194b --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6f38f2a..13743bf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1318,7 +1318,7 @@ class ListOf(ValueSpec): def get_indexes(self, varprefix): - count = int(html.var(varprefix + "_count")) + count = int(html.var(varprefix + "_count", 0)) n = 1 indexes = {} while n <= count:

7 years, 6 months

4395 FIX Inventory filters: Fixed error handling when entering invalid regexes

by Lars Michelsen

Module: check_mk Branch: master Commit: d8308c3bc7eee93379a4cb9a0995be1ba41087e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8308c3bc7eee9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 09:26:30 2017 +0100 4395 FIX Inventory filters: Fixed error handling when entering invalid regexes Change-Id: I7c7edd13fcd1af3ac3e0d642e7375d48debcfa22 --- .werks/4395 | 11 +++++++++++ web/plugins/visuals/inventory.py | 24 +++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/4395 b/.werks/4395 new file mode 100644 index 0000000..590af27 --- /dev/null +++ b/.werks/4395 @@ -0,0 +1,11 @@ +Title: Inventory filters: Fixed error handling when entering invalid regexes +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487924766 + + diff --git a/web/plugins/visuals/inventory.py b/web/plugins/visuals/inventory.py index af54a35..12a9809 100644 --- a/web/plugins/visuals/inventory.py +++ b/web/plugins/visuals/inventory.py @@ -54,7 +54,13 @@ class FilterInvtableText(Filter): if not filtertext: return rows - regex = re.compile(filtertext, re.IGNORECASE) + try: + regex = re.compile(filtertext, re.IGNORECASE) + except re.error: + raise MKUserError(htmlvar, + _('You search statement is not valid. You need to provide a regular ' + 'expression (regex). For example you need to use <tt>\\\\</tt> instead of <tt>\\</tt> ' + 'if you like to search for a single backslash.')) newrows = [] for row in rows: @@ -332,7 +338,13 @@ class FilterInvText(Filter): if not filtertext: return rows - regex = re.compile(filtertext, re.IGNORECASE) + try: + regex = re.compile(filtertext, re.IGNORECASE) + except re.error: + raise MKUserError(htmlvar, + _('You search statement is not valid. You need to provide a regular ' + 'expression (regex). For example you need to use <tt>\\\\</tt> instead of <tt>\\</tt> ' + 'if you like to search for a single backslash.')) newrows = [] for row in rows: @@ -487,7 +499,13 @@ class FilterInvHasSoftwarePackage(Filter): negate = html.get_checkbox(self._varprefix + "negate") match = html.var(self._varprefix + "match") if match == "regex": - name = re.compile(name) + try: + name = re.compile(name) + except re.error: + raise MKUserError(self._varprefix + "name", + _('You search statement is not valid. You need to provide a regular ' + 'expression (regex). For example you need to use <tt>\\\\</tt> instead of <tt>\\</tt> ' + 'if you like to search for a single backslash.')) new_rows = [] for row in rows:

7 years, 6 months

Integration tests: When trying to install another package wait for other dpkg to finish

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d744052da29fdce5d72ad5ee332bc97923806dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d744052da29fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 24 09:38:44 2017 +0100 Integration tests: When trying to install another package wait for other dpkg to finish Change-Id: I1fb95a8ee1ed427d4648e95edbdf216052cc1148 --- tests/testlib/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index fa54837..fdfd74a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -137,6 +137,13 @@ class CMKVersion(object): raise Exception("Failed to load package: %s" % self.package_url()) file(temp_package_path, "w").write(response.content) + # The following gdebi call will fail in case there is another package + # manager task being active. Try to wait for other task to finish. Sure + # this is not race free, but hope it's sufficient. + while os.system("sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1") >> 8 == 0: + print("Waiting for other dpkg process to complete...\n") + time.sleep(1) + cmd = "sudo /usr/bin/gdebi --non-interactive %s" % temp_package_path print(cmd) sys.stdout.flush()

7 years, 6 months

logwatch: Refactored check function to use yield

by Lars Michelsen

Module: check_mk Branch: master Commit: 41e55728090a619f2e89e4d5f6efc50d33473ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41e55728090a61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 23 13:32:49 2017 +0100 logwatch: Refactored check function to use yield Change-Id: I6331a6c8d60c316d567fb86e5626e05d7d5b8cfc --- checks/logwatch | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 36cf164..5d46b27 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -704,7 +704,8 @@ def check_logwatch_ec(item, params, info): if len(info) == 1: line = " ".join(info[0][1:]) if line.startswith("CANNOT READ CONFIG FILE"): - return 3, "Error in agent configuration: %s" % " ".join(info[0][5:]) + yield 3, "Error in agent configuration: %s" % " ".join(info[0][5:]) + return # 1. Parse lines in info and separate by logfile logs = {} @@ -738,12 +739,10 @@ def check_logwatch_ec(item, params, info): logs = single_logs # Check if the number of expected files matches the actual one - status = 0 - infotexts = [] if params.get('monitor_logfilelist'): if 'expected_logfiles' not in params: - infotexts.append("You enabled monitoring the list of forwarded logfiles. You need to redo service discovery.") - status = 1 + yield 1, "You enabled monitoring the list of forwarded logfiles. " \ + "You need to redo service discovery." else: expected = params['expected_logfiles'] missing = [] @@ -751,16 +750,14 @@ def check_logwatch_ec(item, params, info): if f not in logs: missing.append(f) if missing: - infotexts.append("Missing logfiles: %s" % (", ".join(missing))) - status = 1 + yield 1, "Missing logfiles: %s" % (", ".join(missing)) exceeding = [] for f in logs: if f not in expected: exceeding.append(f) if exceeding: - infotexts.append("Newly appeared logfiles: %s" % (", ".join(exceeding))) - status = 1 + yield 1, "Newly appeared logfiles: %s" % (", ".join(exceeding)) # 3. create syslog message of each line # <128> Oct 24 10:44:27 Klappspaten /var/log/syslog: Oct 24 10:44:27 Klappspaten logger: asdasdad as @@ -878,17 +875,19 @@ def check_logwatch_ec(item, params, info): else: logfile_info = "" - infotexts.append('Forwarded %d messages%s to event console' % (num_messages, logfile_info)) - if rclfd_total: - infotexts.append('Reclassified %d messages through logwatch patterns (%d to IGNORE)' % - (rclfd_total, rclfd_to_ignore)) - return (status, ", ".join(infotexts), [('messages', num_messages)]) + yield 0, 'Forwarded %d messages%s to event console' % (num_messages, logfile_info), \ + [('messages', num_messages)] except Exception, e: - return (2, 'Unable to forward messages to event console (%s). Lost %d messages.' % + yield (2, 'Unable to forward messages to event console (%s). Lost %d messages.' % (e, num_messages)) + if rclfd_total: + yield 0, 'Reclassified %d messages through logwatch patterns (%d to IGNORE)' % \ + (rclfd_total, rclfd_to_ignore) + + def logwatch_ec_precompile(hostname, item, params): params = params.copy()

7 years, 6 months

Refactoring table: creating table class.

by Roland Halbig

Module: check_mk Branch: master Commit: a16dd4b76bcc246a5479835876b49d2322b04604 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a16dd4b76bcc24… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 9 16:53:24 2017 +0100 Refactoring table: creating table class. Change-Id: I8c597817a0e213fb0f31fbbd7f3b6430291a9391 --- tests/web/classes.py | 11 +- tests/web/test_table.py | 285 ++++++++++++------- web/htdocs/table.py | 715 +++++++++++++++++++++++++----------------------- 3 files changed, 563 insertions(+), 448 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a16dd4b76b…

7 years, 6 months

Refactoring table: reordering functions.

by Roland Halbig

Module: check_mk Branch: master Commit: 592bdf603290a34fc701128e36ddb852949dd8c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=592bdf603290a3… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 9 16:03:36 2017 +0100 Refactoring table: reordering functions. Change-Id: I619eba6fd649fbe47df2419a30fe9744365d9098 --- web/htdocs/table.py | 86 ++++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index bc4fe9f..71426d7 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -41,6 +41,7 @@ mode = None next_func = None row_css = None + def begin(table_id=None, title=None, **kwargs): global table, mode, next_func @@ -86,11 +87,6 @@ def begin(table_id=None, title=None, **kwargs): mode = 'row' next_func = None -def finish_previous(): - global next_func - if next_func: - next_func(*next_args[0], **next_args[1]) - next_func = None def row(*posargs, **kwargs): finish_previous() @@ -98,27 +94,6 @@ def row(*posargs, **kwargs): next_func = add_row next_args = posargs, kwargs -def add_row(css=None, state=0, collect_headers=True, fixed=False): - if table["next_header"]: - table["rows"].append((table["next_header"], None, "header", True)) - table["next_header"] = None - - table["rows"].append(([], css, state, fixed)) - - if collect_headers: - if table["collect_headers"] == False: - table["collect_headers"] = True - elif table["collect_headers"] == True: - table["collect_headers"] = "finished" - - elif not collect_headers and table["collect_headers"] == True: - table["collect_headers"] = False - -# Intermediate title, shown as soon as there is a following row. -# We store the group headers in the list of rows, with css None -# and state set to "header" -def groupheader(title): - table["next_header"] = title def cell(*posargs, **kwargs): finish_previous() @@ -126,20 +101,12 @@ def cell(*posargs, **kwargs): next_func = add_cell next_args = posargs, kwargs -def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True): - if isinstance(text, HTML): - text = "%s" % text - if type(text) != unicode: - text = str(text) - htmlcode = text + html.drain() - if table["collect_headers"] == True: - # small helper to make sorting introducion easier. Cells which contain - # buttons are never sortable - if css and 'buttons' in css and sortable: - sortable = False - table["headers"].append((title, css, help, sortable)) - table["rows"][-1][0].append((htmlcode, css, colspan)) +# Intermediate title, shown as soon as there is a following row. +# We store the group headers in the list of rows, with css None +# and state set to "header" +def groupheader(title): + table["next_header"] = title def end(): @@ -206,6 +173,46 @@ def end(): return +def finish_previous(): + global next_func + if next_func: + next_func(*next_args[0], **next_args[1]) + next_func = None + + +def add_row(css=None, state=0, collect_headers=True, fixed=False): + if table["next_header"]: + table["rows"].append((table["next_header"], None, "header", True)) + table["next_header"] = None + + table["rows"].append(([], css, state, fixed)) + + if collect_headers: + if table["collect_headers"] == False: + table["collect_headers"] = True + elif table["collect_headers"] == True: + table["collect_headers"] = "finished" + + elif not collect_headers and table["collect_headers"] == True: + table["collect_headers"] = False + + +def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True): + + if isinstance(text, HTML): + text = "%s" % text + if type(text) != unicode: + text = str(text) + htmlcode = text + html.drain() + if table["collect_headers"] == True: + # small helper to make sorting introducion easier. Cells which contain + # buttons are never sortable + if css and 'buttons' in css and sortable: + sortable = False + table["headers"].append((title, css, help, sortable)) + table["rows"][-1][0].append((htmlcode, css, colspan)) + + def _evaluate_user_opts(table): table_id = table["id"] @@ -353,7 +360,6 @@ def _write_csv(table, csv_separator): html.write("\n") - def _render_headers(table, actions_enabled, actions_visible): if table["omit_headers"]: return

7 years, 6 months

8755 FIX fixed statgrab_disk: Now computes rate correctly

by Simon Betz

Module: check_mk Branch: master Commit: be3ef3363762f61e1e29d2cc18536b5cee9e618d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be3ef3363762f6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 23 16:20:48 2017 +0100 8755 FIX fixed statgrab_disk: Now computes rate correctly Change-Id: If36dc7caedac80beb87441b969a56fbe5bbcd6db --- .werks/8755 | 11 +++++++++++ checks/statgrab_disk | 15 ++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.werks/8755 b/.werks/8755 new file mode 100644 index 0000000..6bc323a --- /dev/null +++ b/.werks/8755 @@ -0,0 +1,11 @@ +Title: fixed statgrab_disk: Now computes rate correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487863217 + + diff --git a/checks/statgrab_disk b/checks/statgrab_disk index 881401c..cf47de4 100644 --- a/checks/statgrab_disk +++ b/checks/statgrab_disk @@ -40,15 +40,16 @@ def parse_statgrab_disk(info): parsed = {} + now = time.time() for line in info: disk_name = line[0].split(".")[0] parsed.setdefault(disk_name, {}) if line[0].endswith('read_bytes'): - parsed[disk_name]["read_bytes"] = int(line[1]) + parsed[disk_name]["read_throughput"] = get_rate("statgrab_disk.read.%s" % disk_name, now, int(line[1])) elif line[0].endswith('write_bytes'): - parsed[disk_name]["write_bytes"] = int(line[1]) + parsed[disk_name]["write_throughput"] = get_rate("statgrab_disk.write.%s" % disk_name, now, int(line[1])) elif line[0].endswith("systime"): parsed[disk_name]["systime"] = int(line[1]) @@ -61,15 +62,7 @@ def inventory_statgrab_disk(parsed): def check_statgrab_disk(item, params, parsed): - now = time.time() - disks = {} - for disk_name, attrs in parsed.items(): - disks[disk_name] = { - "read_throughput" : get_rate("statgrab_disk.read.%s" % item, now, attrs["read_bytes"]), - "write_throughput" : get_rate("statgrab_disk.write.%s" % item, now, attrs["write_bytes"]), - } - - return check_diskstat_dict(item, params, disks) + return check_diskstat_dict(item, params, parsed) check_info["statgrab_disk"] = {

7 years, 6 months

4437 qlogic_fcport: added compatibility for HP StorageWorks Fibre Channel Switch

by Marcel Arentz

Module: check_mk Branch: master Commit: 8c74ccaf4cc9f6251e046292f5d7bc15c026f0ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c74ccaf4cc9f6… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Feb 23 15:25:15 2017 +0100 4437 qlogic_fcport: added compatibility for HP StorageWorks Fibre Channel Switch The checkplugin is now able to use information of HP StorageWorks Switches. Change-Id: Ia2332b097192ea73ef6969a6ed74984b9c253e18 --- .werks/4437 | 10 ++++++++++ checks/qlogic_fcport | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/4437 b/.werks/4437 new file mode 100644 index 0000000..e15032e --- /dev/null +++ b/.werks/4437 @@ -0,0 +1,10 @@ +Title: qlogic_fcport: added compatibility for HP StorageWorks Fibre Channel Switch +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1487859833 +Class: feature + +The checkplugin is now able to use information of HP StorageWorks Switches. diff --git a/checks/qlogic_fcport b/checks/qlogic_fcport index 12e88eb..b39cac2 100644 --- a/checks/qlogic_fcport +++ b/checks/qlogic_fcport @@ -217,9 +217,11 @@ check_info["qlogic_fcport"] = { # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter # .1.3.6.1.4.1.3873.1.12 QLogic 8 Gb and 4/8 Gb Intelligent Pass-thru Module # .1.3.6.1.4.1.3873.1.9 QLogic SANBox 5802 FC Switch + # .1.3.6.1.4.1.3873.1.11 HP StorageWorks 8/20q Fibre Channel Switch 'snmp_scan_function' : lambda oid: \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.11") \ or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.12") \ or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.9"), 'group': 'qlogic_fcport',

7 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017