Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

6924 FIX Reporting: Fixed exception when joining with not existing services

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f3184374c32a87e0488047dfa816c7a6c8483b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f3184374c32a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 12:55:33 2018 +0100 6924 FIX Reporting: Fixed exception when joining with not existing services Fixed an exception that could occur when adding a host view element to a report that contains a joined service column which refers to a not existing service. Change-Id: I75b50b1bdd237d23f0d67b8ff34ecf1a206bd268 --- .werks/6924 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6924 b/.werks/6924 new file mode 100644 index 0000000..285adcc --- /dev/null +++ b/.werks/6924 @@ -0,0 +1,12 @@ +Title: Reporting: Fixed exception when joining with not existing services +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1544083646 + +Fixed an exception that could occur when adding a host view element to a report +that contains a joined service column which refers to a not existing service.

5 years, 6 months

Expected package sizes changed again...

by Sven Panne

Module: check_mk Branch: master Commit: 90c2051d2562f01a4fd4806e1f4902e94b76d970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90c2051d2562f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 6 11:54:00 2018 +0100 Expected package sizes changed again... Change-Id: Ie4974926b74270787576c13a24c9dcb26b2fecb2 --- tests/packaging/test_files.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index b1372d1..ba974f7 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -23,10 +23,10 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 152 * 1024 * 1024, 235 * 1024 * 1024), - ("deb", 126 * 1024 * 1024, 196 * 1024 * 1024), - ("cma", 214 * 1024 * 1024, 241 * 1024 * 1024), - ("tar.gz", 370 * 1024 * 1024, 439 * 1024 * 1024), + ("rpm", 176 * 1024 * 1024, 253 * 1024 * 1024), + ("deb", 142 * 1024 * 1024, 155 * 1024 * 1024), + ("cma", 248 * 1024 * 1024, 259 * 1024 * 1024), + ("tar.gz", 349 * 1024 * 1024, 461 * 1024 * 1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

5 years, 6 months

6896 diskstat: Allow configuration of disk io operations

by Florian Kromer

Module: check_mk Branch: master Commit: e0f1a3b6ba2f4c1208b4eedfca6054dfe6b0ba8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0f1a3b6ba2f4c… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Nov 22 14:05:47 2018 +0100 6896 diskstat: Allow configuration of disk io operations This werk adds support for the configuration of disk io operation values in rule "Levels for disk IO". CMK-1285 Change-Id: I4c414ecaa178f91fb0313e215ae9bf75d58e6794 --- .werks/6896 | 13 +++ checks/diskstat.include | 33 ++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 4 + tests/unit/checks/test_diskstat.py | 98 +++++++++++++++++++++++ 4 files changed, 148 insertions(+) diff --git a/.werks/6896 b/.werks/6896 new file mode 100644 index 0000000..84caadf --- /dev/null +++ b/.werks/6896 @@ -0,0 +1,13 @@ +Title: diskstat: Allow configuration of disk io operations +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542891708 +Class: feature + +This werk adds support for the configuration of disk io +operation values in rule "Levels for disk IO". + +CMK-1285 diff --git a/checks/diskstat.include b/checks/diskstat.include index 569ec35..bfcd82d 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -156,6 +156,26 @@ def check_diskstat_line(this_time, item, params, line, mode='sectors'): ios_per_sec = None if len(line) >= 6 and line[4] >= 0 and line[5] > 0: reads, writes = map(int, line[4:6]) + if "read_ios" in params: + warn, crit = params["read_ios"] + if reads >= crit: + infos.append('Read operations: %d (!!)' % (reads)) + status = 2 + elif reads >= warn: + infos.append('Read operations: %d (!)' % (reads)) + status = max(status, 1) + else: + warn, crit = None, None + if "write_ios" in params: + warn, crit = params["write_ios"] + if writes >= crit: + infos.append('Write operations: %d (!!)' % (writes)) + status = 2 + elif writes >= warn: + infos.append('Write operations: %d (!)' % (writes)) + status = max(status, 1) + else: + warn, crit = None, None ios = reads + writes ios_per_sec = get_rate(countername + ".ios", this_time, ios) infos.append("IOs: %.2f/sec" % ios_per_sec) @@ -467,6 +487,19 @@ def check_diskstat_dict(item, params, disks): yield check_levels( ql, what, params.get(what), statemarkers=False, infoname="Average %s" % plugin_text) + # I/O operations + for what in "read", "write": + if what + "_ios" in disk: + ios = disk.pop(what + "_ios") + yield check_levels( + ios, + "disk_" + what + "_ios", + params.get(what + "_ios"), + unit="1/s", + statemarkers=False, + infoname="%s operations" % what.title(), + ) + # All the other metrics are currently not output in the plugin output - simply because # of their amount. They are present as performance data and will shown in graphs. diff --git a/cmk/gui/plugins/wato/check_parameters/unsorted.py b/cmk/gui/plugins/wato/check_parameters/unsorted.py index a6b4a96..ed2ac49 100644 --- a/cmk/gui/plugins/wato/check_parameters/unsorted.py +++ b/cmk/gui/plugins/wato/check_parameters/unsorted.py @@ -11692,6 +11692,10 @@ register_check_parameters( "introduce a loss of accuracy in your graphs. "), default_value=300, )), + ("read_ios", + Levels(title=_("Read operations"), unit=_("1/s"), default_levels=(400.0, 600.0))), + ("write_ios", + Levels(title=_("Write operations"), unit=_("1/s"), default_levels=(300.0, 400.0))), ]), TextAscii( title=_("Device"), diff --git a/tests/unit/checks/test_diskstat.py b/tests/unit/checks/test_diskstat.py new file mode 100644 index 0000000..6cefc22 --- /dev/null +++ b/tests/unit/checks/test_diskstat.py @@ -0,0 +1,98 @@ +import pytest + +from checktestlib import CheckResult, assertCheckResultsEqual + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("item, params, disks, expected", [ + ("sda", { + 'average': 0.0, + 'read_ios': (200.0, 300.0), + 'write_ios': (400.0, 500.0), + 'latency': 0.0, + 'latency_perfdata': 0.0, + 'read_ql': 0.0, + 'write_ql': 0.0, + 'ql_perfdata': 0.0, + }, { + "sda": { + 'node': 'node_name', + 'read_ios': 201.0, + 'write_ios': 401.0, + 'read_throughput': 0.0, + 'write_throughput': 0.0, + 'utilization': 0.0, + 'latency': 0.0, + 'average_request_size': 0.0, + 'average_wait': 0.0, + 'average_read_wait': 0.0, + 'average_read_request_size': 0.0, + 'average_write_wait': 0.0, + 'average_write_request_size': 0.0, + 'queue_length': 0.0, + } + }, [(0, 'Utilization: 0.00 %', [('disk_utilization', 0.0)]), + (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0)]), + (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0)]), + (0, 'Average Wait: 0.00 ms', [('wait', 0.0)]), + (0, 'Average Read Wait: 0.00 ms', [('read_wait', 0.0)]), + (0, 'Average Write Wait: 0.00 ms', [('write_wait', 0.0)]), + (0, 'Latency: 0.00 ms', [('disk_latency', 0.0)]), + (0, 'Average Queue Length: 0.00', [('queue_length', 0.0)]), + (1, 'Read operations: 201.00 1/s (warn/crit at 200.00 1/s/300.00 1/s)', + [('disk_read_ios', 201.0, 200.0, 300.0)]), + (1, 'Write operations: 401.00 1/s (warn/crit at 400.00 1/s/500.00 1/s)', + [('disk_write_ios', 401.0, 400.0, 500.0)]), + (0, '', [('disk_average_read_request_size', 0.0), ('disk_average_request_size', 0.0), + ('disk_average_write_request_size', 0.0)])]), + ("sda", { + 'average': 0.0, + 'read_ios': (200.0, 300.0), + 'write_ios': (400.0, 500.0), + 'latency': 0.0, + 'latency_perfdata': 0.0, + 'read_ql': 0.0, + 'write_ql': 0.0, + 'ql_perfdata': 0.0, + }, { + "sda": { + 'node': 'node_name', + 'read_ios': 301.0, + 'write_ios': 501.0, + 'read_throughput': 0.0, + 'write_throughput': 0.0, + 'utilization': 0.0, + 'latency': 0.0, + 'average_request_size': 0.0, + 'average_wait': 0.0, + 'average_read_wait': 0.0, + 'average_read_request_size': 0.0, + 'average_write_wait': 0.0, + 'average_write_request_size': 0.0, + 'queue_length': 0.0, + } + }, [(0, 'Utilization: 0.00 %', [('disk_utilization', 0.0)]), + (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0)]), + (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0)]), + (0, 'Average Wait: 0.00 ms', [('wait', 0.0)]), + (0, 'Average Read Wait: 0.00 ms', [('read_wait', 0.0)]), + (0, 'Average Write Wait: 0.00 ms', [('write_wait', 0.0)]), + (0, 'Latency: 0.00 ms', [('disk_latency', 0.0)]), + (0, 'Average Queue Length: 0.00', [('queue_length', 0.0)]), + (2, 'Read operations: 301.00 1/s (warn/crit at 200.00 1/s/300.00 1/s)', + [('disk_read_ios', 301.0, 200.0, 300.0)]), + (2, 'Write operations: 501.00 1/s (warn/crit at 400.00 1/s/500.00 1/s)', + [('disk_write_ios', 501.0, 400.0, 500.0)]), + (0, '', [('disk_average_read_request_size', 0.0), ('disk_average_request_size', 0.0), + ('disk_average_write_request_size', 0.0)])]) +]) +def test_diskstat_dict_warns_and_crits_about_read_and_write_ios(check_manager, item, params, disks, + expected, monkeypatch): + check = check_manager.get_check("diskstat") + check_diskstat_dict = check.context["check_diskstat_dict"] + with monkeypatch.context() as m: + m.setattr('time.time', lambda: 0.0) + actual_result = CheckResult(check_diskstat_dict(item, params, disks)) + expected_result = CheckResult(expected) + assertCheckResultsEqual(actual_result, expected_result)

5 years, 6 months

Use a shell wrapper for mypy to get MYPYPATH right.

by Sven Panne

Module: check_mk Branch: master Commit: a3ca743bc723a78b2a70619a260c1b222986feeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3ca743bc723a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 6 11:25:45 2018 +0100 Use a shell wrapper for mypy to get MYPYPATH right. Change-Id: I2162d2ffe78d666573708bebbc22799ec4b5f586 --- .dir-locals.el | 2 +- tests/static/Makefile | 2 +- tests/static/run_mypy | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 3a94cb2..871a188 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,4 +1,4 @@ ((c++-mode . ((flycheck-cppcheck-suppressions . ("passedByValue")))) (python-mode . ((eval setq flycheck-python-mypy-executable (concat (projectile-locate-dominating-file default-directory dir-locals-file) - "tests/static/.venv/bin/mypy"))))) + "tests/static/run_mypy"))))) diff --git a/tests/static/Makefile b/tests/static/Makefile index 082b80c..355c8a7 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -15,7 +15,7 @@ PIPENV := PIPENV_NO_INHERIT=true PIPENV_VENV_IN_PROJECT=true pipenv .PHONY: test-mypy test-mypy: .venv - MYPYPATH="$(MYPYPATH)" $(PIPENV) run mypy --config-file=$(realpath ../../mypy.ini) $(FILES_TO_CHECK) + ./run_mypy --config-file=$(realpath ../../mypy.ini) $(FILES_TO_CHECK) Pipfile.lock: Pipfile $(PIPENV) lock diff --git a/tests/static/run_mypy b/tests/static/run_mypy new file mode 100755 index 0000000..0ffe729 --- /dev/null +++ b/tests/static/run_mypy @@ -0,0 +1,4 @@ +#! /bin/sh +# mypy_path in mypy.ini doesn't support relative paths, so we need this wrapper... :-/ +cd `dirname $0` +MYPYPATH=`realpath typeshed` exec ./.venv/bin/mypy "$@"

5 years, 6 months

6821 FIX HW/SW Inventory history: Display the whole row if there are any changes

by Simon Betz

Module: check_mk Branch: master Commit: 7559a2729980deb552ae36d6735c7aad691c24d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7559a2729980de… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 6 10:07:19 2018 +0100 6821 FIX HW/SW Inventory history: Display the whole row if there are any changes Change-Id: I8d860bdf4ee00821504314ec764a8fa744b659d7 --- .werks/6821 | 21 +++++++++++++++++++++ cmk/structured_data.py | 8 ++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/6821 b/.werks/6821 new file mode 100644 index 0000000..fdbde18 --- /dev/null +++ b/.werks/6821 @@ -0,0 +1,21 @@ +Title: HW/SW Inventory history: Display the whole row if there are any changes +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544087188 + +The HW/SW Inventory history shows new, changed or removed entries. If there are +changed entries in one row in a list Check_MK version 1.5.0p9 only shows these +changes. This is a regression because the previous stable version 1.4.0 +displayed not only the changed entries, but also the unchanged entries in order +to refer to the right row. + +Example: +Check_MK 1.4.0 displays all entries of a changed row in the package list: +{{libtiff5, 4.0.8, x86_64, deb, 2+deb9u2 -> 2+deb9u4}} + +but Check_MK 1.5.0p9 only shows {{2+deb9u2 -> 2+deb9u4}}. diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 43f96fa..ed1e5ab 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -748,7 +748,7 @@ class Numeration(Leaf): # In this case we assume that each entry corresponds to the # other one with the same index. num_new, num_changed, num_removed = 0, 0, 0 - data = [] + compared_rows = [] for own_row, other_row in zip(own_rows, other_rows): new_entries, changed_entries, removed_entries, identical_entries = \ _compare_dicts(other_row, own_row) @@ -758,11 +758,11 @@ class Numeration(Leaf): row = {} for entries in [new_entries, changed_entries, removed_entries]: row.update(entries) - if keep_identical: + if keep_identical or new_entries or changed_entries or removed_entries: row.update(identical_entries) if row: - data.append(row) - return num_new, num_changed, num_removed, data + compared_rows.append(row) + return num_new, num_changed, num_removed, compared_rows def encode_for_delta_tree(self, encode_as): delta_node = Numeration()

5 years, 6 months

6925 FIX Fixed "Update & acknowledge" label of EC action

by Lars Michelsen

Module: check_mk Branch: master Commit: f197ee47b78c60bf50330dd0472fa28ac59b23c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f197ee47b78c60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 6 09:49:14 2018 +0100 6925 FIX Fixed "Update & acknowledge" label of EC action Change-Id: I3e8d6897306fa23294a434decd692981f48087da --- .werks/6925 | 11 +++++++++++ cmk/gui/plugins/views/mkeventd.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6925 b/.werks/6925 new file mode 100644 index 0000000..788bc5e --- /dev/null +++ b/.werks/6925 @@ -0,0 +1,11 @@ +Title: Fixed "Update & acknowledge" label of EC action +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544086090 + + diff --git a/cmk/gui/plugins/views/mkeventd.py b/cmk/gui/plugins/views/mkeventd.py index dbb9868..7770a48 100644 --- a/cmk/gui/plugins/views/mkeventd.py +++ b/cmk/gui/plugins/views/mkeventd.py @@ -618,7 +618,7 @@ if config.mkeventd_enabled: multisite_commands.append({ "tables": ["event"], "permission": "mkeventd.update", - "title": _("Update & Acknowledge"), + "title": _("Update & Acknowledge"), "render": render_mkeventd_update, "action": command_mkeventd_update, "executor": command_executor_mkeventd,

5 years, 6 months

Use projectile to avoid unexpanded ~.

by Sven Panne

Module: check_mk Branch: master Commit: 55fc9d8a3c496db23ea0cdef5f8a8f61c2fea162 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fc9d8a3c496d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 6 09:39:01 2018 +0100 Use projectile to avoid unexpanded ~. Change-Id: I891327bd1c52321de44a8483712bf3f8b05a3d50 --- .dir-locals.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 3a640fb..3a94cb2 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,4 +1,4 @@ ((c++-mode . ((flycheck-cppcheck-suppressions . ("passedByValue")))) - (python-mode . ((eval . (setq flycheck-python-mypy-executable - (concat (locate-dominating-file default-directory dir-locals-file) - "tests/static/.venv/bin/mypy")))))) + (python-mode . ((eval setq flycheck-python-mypy-executable + (concat (projectile-locate-dominating-file default-directory dir-locals-file) + "tests/static/.venv/bin/mypy")))))

5 years, 6 months

6655 FIX PS: Crash when zombie processes are found on Solaris

by Óscar Nájera

Module: check_mk Branch: master Commit: 83fa80cf16f593a3b7b76c8231316e8acd4f2ec2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83fa80cf16f593… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Dec 5 17:07:39 2018 +0100 6655 FIX PS: Crash when zombie processes are found on Solaris Solaris agent returns "-" as cputime on zombie processes. This produced a crash since it cannot be converted to a time. This Werk put such input into consideration and transforms it to zero cputime, letting the PS check work normally. Change-Id: I4c75b829f9dc53843c8e90ae2cbb12cb3cb4c04b --- .werks/6655 | 13 +++++++++++++ checks/ps | 3 ++- checks/ps.include | 7 +++++-- tests/unit/checks/test_ps.py | 29 ++++++++++++++++++++++++++--- 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/.werks/6655 b/.werks/6655 new file mode 100644 index 0000000..31e39df --- /dev/null +++ b/.werks/6655 @@ -0,0 +1,13 @@ +Title: PS: Crash when zombie processes are found on Solaris +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544025714 +Class: fix + +Solaris agent returns "-" as cputime on zombie processes. This produced a +crash since it cannot be converted to a time. This Werk put such input into +consideration and transforms it to zero cputime, letting the PS check work +normally. diff --git a/checks/ps b/checks/ps index 620813d..e9eb3cc 100644 --- a/checks/ps +++ b/checks/ps @@ -230,7 +230,8 @@ def ps_parse_process_entries(parsed): # Filter out any lines where no process command line is available, e.g. # [None, u'(<defunct>,,,)'] - parsed = [x for x in parsed if len(x) > 2] + # [None, u'(<defunct>,,,)', u''] + parsed = [x for x in parsed if len(x) > 2 and x[2]] return parsed diff --git a/checks/ps.include b/checks/ps.include index 6c8acdc..f993407 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -296,12 +296,13 @@ def format_process_list(processes, html_output): def parse_ps_time(text): if "-" in text: tokens = text.split("-") - days = int(tokens[0]) + days = int(tokens[0] or 0) text = tokens[1] else: days = 0 - day_secs = sum([factor * int(v) for factor, v in zip([1, 60, 3600], reversed(text.split(":")))]) + day_secs = sum( + [factor * int(v or 0) for factor, v in zip([1, 60, 3600], reversed(text.split(":")))]) return 86400 * days + day_secs @@ -636,6 +637,8 @@ class ProcessAggregator(object): process.append(("pid", (pid, ""))) else: # Solaris, BSD, aix cpu times + if pcpu_text == '-': # Solaris defunct + pcpu_text = 0.0 pcpu = float(pcpu_text) * self.core_weight(is_win=False) self.percent_cpu += pcpu diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 849325f..38646cb 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -1,3 +1,4 @@ +from itertools import izip_longest from collections import namedtuple import pytest from cmk_base.check_api import MKGeneralException @@ -21,7 +22,12 @@ def generate_inputs(): (on,1050360,303252,00:14:59/1-03:59:39,9902) emacs (on,2924232,472252,00:12:05/07:24:15,7912) /usr/lib/firefox/firefox"""), # solaris (5 entry cmk>=1.5) - splitter("(root,4056,1512,0.0/52-04:56:05,5689) /usr/lib/ssh/sshd", node="solaris"), + splitter( + """(root,4056,1512,0.0/52-04:56:05,5689) /usr/lib/ssh/sshd +(zombie,0,0,-/-,1952) <defunct> +(zombie,0,0,-/-,3952) +(zombie,0,0,-/-,4952) """, + node="solaris"), # windows agent splitter( """(SYSTEM,0,0,0,0,0,0,0,0,1,0) System Idle Process @@ -80,7 +86,8 @@ result_parse = [ "emacs"], [None, ("on", "2924232", "472252", "00:12:05/07:24:15", "7912"), "/usr/lib/firefox/firefox"]]), - (1, [["solaris", ("root", "4056", "1512", "0.0/52-04:56:05", "5689"), "/usr/lib/ssh/sshd"]]), + (1, [["solaris", ("root", "4056", "1512", "0.0/52-04:56:05", "5689"), "/usr/lib/ssh/sshd"], + ["solaris", ("zombie", "0", "0", "-/-", "1952"), "<defunct>"]]), (1, [[None, ("SYSTEM", "0", "0", "0", "0", "0", "0", "0", "0", "1", "0"), "System Idle Process"], [ @@ -168,7 +175,7 @@ def test_parse_ps(check_manager, capture, result): parsed = check.run_parse(capture) assert parsed[0] == result[0] # cpu_cores - for out, ref in zip(parsed[1], result[1]): + for out, ref in izip_longest(parsed[1], result[1]): assert out[0] == ref[0] assert out[1] == check.context["ps_info"](*ref[1]) assert out[2:] == ref[2:] @@ -252,6 +259,11 @@ PS_DISCOVERY_WATO_RULES = [ "disabled": True, "description": u"sshd" }), + ({ + 'default_params': {}, + 'descr': 'PS counter', + 'user': 'zombie', + }, [], ["@all"], {}), ] PS_DISCOVERY_SPECS = [ @@ -291,6 +303,9 @@ PS_DISCOVERY_SPECS = [ ("sshd", "~.*sshd", None, None, { 'cpu_rescale_max': None }), + ('PS counter', None, 'zombie', None, { + 'cpu_rescale_max': None + }), ] @@ -379,6 +394,11 @@ PS_DISCOVERED_ITEMS = [ "user": None, 'cpu_rescale_max': None, }), + ("PS counter", { + 'cpu_rescale_max': None, + 'process': None, + 'user': 'zombie' + }), ("svchost", { "cpulevels": (90.0, 98.0), "handle_count": (1000, 2000), @@ -457,6 +477,9 @@ check_results = [ (0, "0.0% CPU", [("pcpu", 0.0, None, None, None, None)]), (0, "running for 52 d", []), ]), + CheckResult([(0, '1 process [running on solaris]', [('count', 1, 100000, 100000, 0, None)]), + (0, '0.0% CPU', [('pcpu', 0.0, None, None, None, None)]), + (0, 'running for 0.00 s', [])]), CheckResult([ (0, "3 processes", [("count", 3, 100000, 100000, 0, None)]), (0, "136.26 MB virtual", [("vsz", 139532, 1073741824000, 2147483648000, None, None)]),

5 years, 6 months

Fix PyNaCL installation.

by Sven Panne

Module: check_mk Branch: master Commit: 7fffa1288db842a2ade2964ba363529bd2310278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fffa1288db842… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 6 09:06:31 2018 +0100 Fix PyNaCL installation. Change-Id: I42c38ad78ec68f048d504016a63f51bd6340e63a --- omd/packages/python-modules/python-modules.make | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 0089c7c..76f0e4e 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -227,9 +227,9 @@ $(PYTHON_MODULES_PATCHING): $(PYTHON_MODULES_UNPACK) done $(TOUCH) $@ -$(PYTHON_MODULES_UNPACK): $(addprefix $(PACKAGE_DIR)/$(PYTHON_MODULES)/src/,$(PYTHON_MODULES_LIST)) $(PYTHON_MODULES_PATCHES) $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches +$(PYTHON_MODULES_UNPACK): $(addprefix $(PACKAGE_DIR)/$(PYTHON_MODULES)/src/,$(PYTHON_MODULES_LIST)) $(PYTHON_MODULES_PATCHES) $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches $(RM) -r $(PYTHON_MODULES_DIR) - $(MKDIR) $(PYTHON_MODULES_DIR) + $(MKDIR) $(PYTHON_MODULES_DIR) cd $(PYTHON_MODULES_DIR) && \ for M in $(PYTHON_MODULES_LIST); do \ echo "Unpacking $$M..." ; \ @@ -242,9 +242,14 @@ $(PYTHON_MODULES_UNPACK): $(addprefix $(PACKAGE_DIR)/$(PYTHON_MODULES)/src/,$(PY $(MKDIR) $(BUILD_HELPER_DIR) $(TOUCH) $@ +# NOTE: Setting SODIUM_INSTALL variable below is an extremely cruel hack to +# avoid installing libsodium headers and libraries. The need for this hack +# arises because of our "interesting" flag use for "setup.py install" and our +# double installation. We should really switch to e.g. pipenv here. $(PYTHON_MODULES_INSTALL): $(PYTHON_MODULES_BUILD) $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/python set -e ; cd $(PYTHON_MODULES_DIR) ; \ + export SODIUM_INSTALL="system" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_MODULES_PYTHONPATH)" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_PYTHONPATH)" ; \ export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \

5 years, 6 months

Add flycheck-python-mypy-executable to .dir-locals.el

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e0f79b09dd995ff8f3dd2d28b7e730044a53062b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0f79b09dd995f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Dec 4 16:45:53 2018 +0100 Add flycheck-python-mypy-executable to .dir-locals.el Change-Id: I7b7b6eba72adcf20135e0332f9836b04600cc0fb --- .dir-locals.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index e0be8eb..3a640fb 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1 +1,4 @@ -((c++-mode . ((flycheck-cppcheck-suppressions . ("passedByValue"))))) +((c++-mode . ((flycheck-cppcheck-suppressions . ("passedByValue")))) + (python-mode . ((eval . (setq flycheck-python-mypy-executable + (concat (locate-dominating-file default-directory dir-locals-file) + "tests/static/.venv/bin/mypy"))))))

5 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018