Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e9e3ae0a2c5a0f9ca3375a800e8f56061d8e4759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e3ae0a2c5a0f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Dec 20 09:47:58 2018 +0100 Fix unit test Change-Id: I1bfc641007e1db7ef417a50279825547367f7fc5 --- tests/unit/checks/test_if_winperf_if.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unit/checks/test_if_winperf_if.py b/tests/unit/checks/test_if_winperf_if.py index b3aa3a8..e9391b5 100644 --- a/tests/unit/checks/test_if_winperf_if.py +++ b/tests/unit/checks/test_if_winperf_if.py @@ -1,6 +1,6 @@ import pytest -from checktestlib import DiscoveryResult +from checktestlib import DiscoveryResult, assertDiscoveryResultsEqual # Mark all tests in this file as check related tests pytestmark = pytest.mark.checks @@ -150,4 +150,5 @@ def test_winperf_if_inventory_teaming(check_manager, monkeypatch, settings, info monkeypatch.setitem(check.context, "_prepare_if_group_patterns_from_conf", lambda: {}) parsed = check.run_parse(info) actual_discovery = check.run_discovery(parsed) - assert DiscoveryResult(expected_discovery) == DiscoveryResult(actual_discovery) + assertDiscoveryResultsEqual(check, DiscoveryResult(expected_discovery), + DiscoveryResult(actual_discovery))

5 years, 9 months

6950 FIX db2_connections: Fix crash upon decimal comma

by Moritz Kiemer

Module: check_mk Branch: master Commit: f87ec40b55e27472ce02d10bdb252f9be419e021 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f87ec40b55e274… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 20 09:23:21 2018 +0100 6950 FIX db2_connections: Fix crash upon decimal comma Change-Id: I21b73ff2bf9daefedab3bc4ed4133a1233ea17b9 --- .werks/6950 | 9 +++++ checks/db2_connections | 6 +++- .../generictests/datasets/db2_connections.py | 39 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/.werks/6950 b/.werks/6950 new file mode 100644 index 0000000..ba1d481 --- /dev/null +++ b/.werks/6950 @@ -0,0 +1,9 @@ +Title: db2_connections: Fix crash upon decimal comma +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1545294137 +Class: fix + diff --git a/checks/db2_connections b/checks/db2_connections index d92dc8d..691109f 100644 --- a/checks/db2_connections +++ b/checks/db2_connections @@ -64,7 +64,11 @@ def check_db2_connections(item, params, parsed): ms = int(latency) else: # handle old time format: 'min:seconds.milliseconds' minutes, rest = data["latency"].split(":") - seconds, mseconds = rest.split(".") + # handle different locale settings + if ',' in rest: + seconds, mseconds = rest.split(",") + else: + seconds, mseconds = rest.split(".") ms = int(minutes) * 60 * 1000 + int(seconds) * 1000 + int(mseconds) yield 0, "Latency: %.2f ms" % ms, [("latency", ms)] diff --git a/tests/unit/checks/generictests/datasets/db2_connections.py b/tests/unit/checks/generictests/datasets/db2_connections.py new file mode 100644 index 0000000..d1eee87 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/db2_connections.py @@ -0,0 +1,39 @@ + + +checkname = 'db2_connections' + + +info = [ + ['[[[db2taddm:CMDBS1]]]'], + ['port', '50214'], + ['connections', '40'], + ['latency', '0:1.03'], + ['[[[db2taddm:CMDBS1de]]]'], + ['port', '50213'], + ['connections', '42'], + ['latency', '0:1,03'], +] + + +discovery = { + '': [ + ('db2taddm:CMDBS1', None), + ('db2taddm:CMDBS1de', None), + ], +} + + +checks = { + '': [ + ('db2taddm:CMDBS1', {'levels_total': (150, 200)}, [ + (0, 'Connections: 40', [('connections', 40, 150, 200, None, None)]), + (0, 'Port: 50214', []), + (0, 'Latency: 1003.00 ms', [('latency', 1003, None, None, None, None)]), + ]), + ('db2taddm:CMDBS1de', {'levels_total': (150, 200)}, [ + (0, 'Connections: 42', [('connections', 42, 150, 200, None, None)]), + (0, 'Port: 50213', []), + (0, 'Latency: 1003.00 ms', [('latency', 1003, None, None, None, None)]), + ]), + ], +}

5 years, 9 months

Removed aws_s3; necessary information is already available from aws_s3_objects

by Simon Betz

Module: check_mk Branch: master Commit: 9baccde9b55176b3440149dbfb3f9a0f6f0a56a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9baccde9b55176… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 08:43:49 2018 +0100 Removed aws_s3; necessary information is already available from aws_s3_objects Change-Id: I35a88d5d55abce3dec7fb057c41dff90b0d3a606 --- agents/special/agent_aws | 99 +----------------------------------------------- checkman/aws_s3 | 13 ------- checkman/aws_s3_objects | 3 +- checks/aws_s3 | 51 ------------------------- checks/aws_s3_objects | 37 +++++++++++------- 5 files changed, 26 insertions(+), 177 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9baccde9b5…

5 years, 9 months

6949 ACME SBC Health (via SNMP)

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5fcd950400559d742703d9801002efa641c7036f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fcd950400559d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 20 08:35:40 2018 +0100 6949 ACME SBC Health (via SNMP) This SNMP check reports the health status in percent and the redundancy state of an ACME SBC device. Change-Id: Ifbc2573820dfce036b93a3e2cc40644c6a2f7d8d --- .werks/6949 | 11 +++ checkman/acme_sbc_snmp | 14 ++++ checks/acme_sbc_snmp | 92 ++++++++++++++++++++++ .../plugins/wato/check_parameters/acme_sbc_snmp.py | 55 +++++++++++++ .../checks/generictests/datasets/acme_sbc_snmp.py | 25 ++++++ tests/unit/cmk/gui/test_watolib.py | 2 + 6 files changed, 199 insertions(+) diff --git a/.werks/6949 b/.werks/6949 new file mode 100644 index 0000000..79e1d27 --- /dev/null +++ b/.werks/6949 @@ -0,0 +1,11 @@ +Title: ACME SBC Health (via SNMP) +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1545291224 +Class: feature + +This SNMP check reports the health status in percent and the redundancy state of +an ACME SBC device. diff --git a/checkman/acme_sbc_snmp b/checkman/acme_sbc_snmp new file mode 100644 index 0000000..2efa09b --- /dev/null +++ b/checkman/acme_sbc_snmp @@ -0,0 +1,14 @@ +title: ACME SBC: Health (via SNMP) +agents: snmp +catalog: hw/network/acme +license: GPL +distribution: check_mk +description: + This is a simple check which checks the health status in percent and the redundancy state. + The percent value is reported by the devices and reflects the status of cluster + and hardware. If the status not is at 100 %, a {WARN} is raised. If a device is in outOfService + or unassigned state, a {CRIT} will be raised. If the device is in an initial or pending state, a + {WARN} will be raised. + +inventory: + One check will be created. diff --git a/checks/acme_sbc_snmp b/checks/acme_sbc_snmp new file mode 100644 index 0000000..d800b84 --- /dev/null +++ b/checks/acme_sbc_snmp @@ -0,0 +1,92 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# comNET GmbH, Fabian Binder + +# .1.3.6.1.4.1.9148.3.2.1.1.3 Health Score (apSysHealthScore) +# .1.3.6.1.4.1.9148.3.2.1.1.4 Health Status Description (apSysRedundancy) + +factory_settings["acme_sbc_snmp_default_levels"] = { + "levels_lower": (99, 75), +} + + +def inventory_acme_sbc_snmp(info): + yield None, {} + + +def check_acme_sbc_snmp(_no_item, params, info): + map_states = { + "0": (3, "unknown"), + "1": (1, "initial"), + "2": (0, "active"), + "3": (0, "standby"), + "4": (2, "out of service"), + "5": (2, "unassigned"), + "6": (1, "active (pending)"), + "7": (1, "standby (pending)"), + "8": (1, "out of service (pending)"), + "9": (1, "recovery"), + } + + try: + score, state = info[0] + except (IndexError, ValueError): + return + health_state, health_state_readable = map_states.get(state, (3, "unknown")) + yield health_state, "Health state: %s" % (health_state_readable) + + try: + score = int(score) + except ValueError: + yield 3, "Unknown score: %s" % score + return + warn, crit = params.get("levels_lower", (None, None)) + levels_msg = " (warn/crit at or below %s%%/%s%%)" % (warn, crit) + score_msg = "Score: %s%%" % score + if crit is not None and score <= crit: + yield 2, score_msg + levels_msg + elif warn is not None and score <= warn: + yield 1, score_msg + levels_msg + else: + yield 0, score_msg + + +check_info['acme_sbc_snmp'] = { + 'inventory_function': inventory_acme_sbc_snmp, + 'check_function': check_acme_sbc_snmp, + 'service_description': 'ACME SBC health', + 'snmp_info': ( + '.1.3.6.1.4.1.9148.3.2.1.1', + [ + "3", # APSYSMGMT-MIB::apSysHealthScore + "4", # APSYSMGMT-MIB::apSysRedundancy + ]), + 'snmp_scan_function': scan_acme, + 'includes': ['acme.include'], + 'group': 'acme_sbc_snmp', + 'default_levels_variable': 'acme_sbc_snmp_default_levels', +} diff --git a/cmk/gui/plugins/wato/check_parameters/acme_sbc_snmp.py b/cmk/gui/plugins/wato/check_parameters/acme_sbc_snmp.py new file mode 100644 index 0000000..ec83909 --- /dev/null +++ b/cmk/gui/plugins/wato/check_parameters/acme_sbc_snmp.py @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from cmk.gui.i18n import _ +from cmk.gui.valuespec import ( + Integer, + Dictionary, + Tuple, +) +from cmk.gui.plugins.wato import ( + RulespecGroupCheckParametersApplications, + register_check_parameters, +) + +register_check_parameters( + RulespecGroupCheckParametersApplications, + "acme_sbc_snmp", + _("ACME SBC health"), + Dictionary( + elements=[ + ("levels_lower", + Tuple( + title=_("Levels on health status score in percent"), + elements=[ + Integer(title=_("Warning below"), unit=_("percent"), default_value=99), + Integer(title=_("Critical below"), unit=_("percent"), default_value=75), + ])), + ], + required_keys=["levels_lower"]), + None, + match_type="dict", +) diff --git a/tests/unit/checks/generictests/datasets/acme_sbc_snmp.py b/tests/unit/checks/generictests/datasets/acme_sbc_snmp.py new file mode 100644 index 0000000..ef1a7b8 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/acme_sbc_snmp.py @@ -0,0 +1,25 @@ + + +checkname = 'acme_sbc_snmp' + + +info = [ + ['20', '2'], +] + + +discovery = { + '': [ + (None, {}), + ], +} + + +checks = { + '': [ + (None, {'levels_lower': (99, 75)}, [ + (0, 'Health state: active', []), + (2, 'Score: 20% (warn/crit at or below 99%/75%)', []), + ]), + ], +} diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index bec1ece..15d5aa5 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -582,6 +582,7 @@ def test_grouped_rulespecs(): 'static_checks:skype_xmpp', 'static_checks:skype_edgeauth', 'static_checks:acme_certificates', + 'static_checks:acme_sbc_snmp', 'static_checks:skype', 'static_checks:skype_proxy', 'static_checks:skype_edge', @@ -1088,6 +1089,7 @@ def test_grouped_rulespecs(): 'checkgroup_parameters:skype_xmpp', 'checkgroup_parameters:skype_edgeauth', 'checkgroup_parameters:acme_certificates', + 'checkgroup_parameters:acme_sbc_snmp', 'checkgroup_parameters:skype', 'checkgroup_parameters:skype_proxy', 'checkgroup_parameters:skype_edge',

5 years, 9 months

agent_aws: Split metric queries info 100-sized chunks (

by Simon Betz

pagination not supported for cloudwatch.get_metric_data) Message-ID: <5c1b4c1e.F5sfVtSmrQD3DFy9%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: ed0f6d0d9e4685ddb8b00a78eb81d2a2fe786b60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed0f6d0d9e4685… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 19 15:24:35 2018 +0100 agent_aws: Split metric queries info 100-sized chunks (pagination not supported for cloudwatch.get_metric_data) Change-Id: I15940f23b260eba088199746411c07ad05916493 --- agents/special/agent_aws | 102 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 77 insertions(+), 25 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index d3fdb18..934a5bf 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -57,6 +57,10 @@ def _datetime_converter(o): return o.__str__() +def _chunks(list_, length=100): + return [list_[i:i + length] for i in xrange(0, len(list_), length)] + + #. # .--section API---------------------------------------------------------. # | _ _ _ ____ ___ | @@ -233,11 +237,24 @@ class EC2(AWSSection): metrics = self._get_metrics() if not metrics: return {} - return self._client.get_metric_data( - MetricDataQueries=metrics, - StartTime=start_time, - EndTime=end_time, - ) + + # A single GetMetricData call can include up to 100 MetricDataQuery structures + # There's no pagination for this operation: + # self._client.can_paginate('get_metric_data') = False + raw_result = [] + for chunk in _chunks(metrics): + response = self._client.get_metric_data( + MetricDataQueries=chunk, + StartTime=start_time, + EndTime=end_time, + ) + try: + metrics = response['MetricDataResults'] + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + continue + raw_result.extend(metrics) + return raw_result def _get_metrics(self): instance_ids = [] @@ -357,11 +374,24 @@ class S3(AWSSection): metrics = self._get_metrics() if not metrics: return {} - return self._client.get_metric_data( - MetricDataQueries=metrics, - StartTime=start_time, - EndTime=end_time, - ) + + # A single GetMetricData call can include up to 100 MetricDataQuery structures + # There's no pagination for this operation: + # self._client.can_paginate('get_metric_data') = False + raw_result = [] + for chunk in _chunks(metrics): + response = self._client.get_metric_data( + MetricDataQueries=chunk, + StartTime=start_time, + EndTime=end_time, + ) + try: + metrics = response['MetricDataResults'] + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + continue + raw_result.extend(metrics) + return raw_result def _get_metrics(self): bucket_ids = [] @@ -403,11 +433,7 @@ class S3(AWSSection): return metrics def _extract_content_from(self, raw_result): - try: - return raw_result['MetricDataResults'] - except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) - return [] + return raw_result def _format_content(self, content): content_by_piggyback_hosts = {} @@ -536,11 +562,24 @@ class ELB(AWSSection): metrics = self._get_metrics() if not metrics: return {} - return self._client.get_metric_data( - MetricDataQueries=metrics, - StartTime=start_time, - EndTime=end_time, - ) + + # A single GetMetricData call can include up to 100 MetricDataQuery structures + # There's no pagination for this operation: + # self._client.can_paginate('get_metric_data') = False + raw_result = [] + for chunk in _chunks(metrics): + response = self._client.get_metric_data( + MetricDataQueries=chunk, + StartTime=start_time, + EndTime=end_time, + ) + try: + metrics = response['MetricDataResults'] + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + continue + raw_result.extend(metrics) + return raw_result def _get_metrics(self): load_balancers = [] @@ -699,11 +738,24 @@ class EBS(AWSSection): metrics = self._get_metrics() if not metrics: return {} - return self._client.get_metric_data( - MetricDataQueries=metrics, - StartTime=start_time, - EndTime=end_time, - ) + + # A single GetMetricData call can include up to 100 MetricDataQuery structures + # There's no pagination for this operation: + # self._client.can_paginate('get_metric_data') = False + raw_result = [] + for chunk in _chunks(metrics): + response = self._client.get_metric_data( + MetricDataQueries=chunk, + StartTime=start_time, + EndTime=end_time, + ) + try: + metrics = response['MetricDataResults'] + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + continue + raw_result.extend(metrics) + return raw_result def _get_metrics(self): volumes = []

5 years, 9 months

aws_s3_summary: Add location information of each bucket

by Simon Betz

Module: check_mk Branch: master Commit: 6ac25d857a834eb14c7efa42219948f4873777a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ac25d857a834e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 19 15:01:57 2018 +0100 aws_s3_summary: Add location information of each bucket Change-Id: Idf7db4f3639c2919249bf51616547558f9cb52f7 --- agents/special/agent_aws | 14 ++++++++++---- checks/aws_s3_summary | 12 ++++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index a93be4a..d3fdb18 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -318,15 +318,21 @@ class S3Summary(AWSSection): return 86400 def _get_raw_result(self): - return self._client.list_buckets() - - def _extract_content_from(self, raw_result): + raw_result = self._client.list_buckets() try: - return raw_result['Buckets'] + buckets = raw_result['Buckets'] except KeyError, e: logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] + for entry in buckets: + response = self._client.get_bucket_location(Bucket=entry['Name']) + entry['LocationConstraint'] = response['LocationConstraint'] + return buckets + + def _extract_content_from(self, raw_result): + return raw_result + def _format_content(self, content): return [AWSSectionResult("", content)] diff --git a/checks/aws_s3_summary b/checks/aws_s3_summary index 88e68fb..da00ea0 100644 --- a/checks/aws_s3_summary +++ b/checks/aws_s3_summary @@ -31,10 +31,18 @@ def inventory_aws_s3_summary(parsed): def check_aws_s3_summary(item, params, parsed): - yield 0, 'Buckets: %s' % len(parsed) + yield 0, '%s buckets' % len(parsed) + buckets_by_region = {} + for row in parsed: + buckets_by_region.setdefault(row['LocationConstraint'], []).append(row) + + for region, buckets in buckets_by_region.iteritems(): + yield 0, "%s buckets in region %s" % (len(buckets), region) + long_output = [] for row in parsed: - long_output.append("Bucket: %s, Creation date: %s" % (row['Name'], row['CreationDate'])) + long_output.append("Bucket: %s, Region: %s, Creation date: %s"\ + % (row['Name'], row['LocationConstraint'], row['CreationDate'])) if long_output: yield 0, '\n%s' % '\n'.join(long_output)

5 years, 9 months

mk_filestats: encode utf8 path

by Moritz Kiemer

Module: check_mk Branch: master Commit: f781146303a4f47d4293908231734ae3f2a64f3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f781146303a4f4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Dec 19 14:16:35 2018 +0100 mk_filestats: encode utf8 path Change-Id: Ia5add050b7fffc7fd798e45aea4bb87db33773c3 --- agents/plugins/mk_filestats.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_filestats.py b/agents/plugins/mk_filestats.py index 79df6d6..c85a56b 100755 --- a/agents/plugins/mk_filestats.py +++ b/agents/plugins/mk_filestats.py @@ -172,8 +172,9 @@ class LazyFileStats(object): LOGGER.debug("os.stat(%r)", self.path) + path = self.path.encode('utf8') try: - stat = os.stat(self.path) + stat = os.stat(path) except OSError, exc: self.stat_status = "file vanished" if exc.errno == 2 else str(exc) return

5 years, 9 months

7014 Add host name completion in different places

by Lars Michelsen

Module: check_mk Branch: master Commit: 1e614fa5d183d440117944d805e7311628bf205f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e614fa5d183d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 19 08:59:19 2018 +0100 7014 Add host name completion in different places When entering host names in different places, like for example the parent attribute fields of a host or the nodes fields of a cluster host, a dropdown is shown with the host names matching the already inserted hostname parts. You may klick on the matching hostname to add it to the input field. Change-Id: I2ec79aedf073543a5a18363d7536d9e73e10d03c --- .werks/7014 | 12 ++++++++++ cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/builtin_attributes.py | 2 ++ cmk/gui/plugins/wato/utils/__init__.py | 1 + cmk/gui/valuespec.py | 36 ++++++++++++------------------ cmk/gui/wato/pages/hosts.py | 4 ++-- cmk/gui/wato/pages/pattern_editor.py | 12 +++++++--- cmk/gui/wato/pages/rulesets.py | 4 ++-- cmk/gui/wato/pages/sites.py | 13 +++++++++-- cmk/gui/watolib.py | 24 ++++++++++++++++++++ 10 files changed, 78 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1e614fa5d1…

5 years, 9 months

Make parsing of ps section deterministic between runs.

by Sven Panne

Module: check_mk Branch: master Commit: d1c429a26ea1f275b7bf2e02650fda53b28f4f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1c429a26ea1f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 19 09:40:44 2018 +0100 Make parsing of ps section deterministic between runs. Note: The hash value of None is based on the memory address of the singleton, so it varies between runs. Consequently, the hash value of tuples containing None varies between runs, too. CMK-1465 Change-Id: Ia70fef31e23ff69c011205a995d949c9c93d0aec --- checks/ps | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/checks/ps b/checks/ps index e9eb3cc..a0a09cb 100644 --- a/checks/ps +++ b/checks/ps @@ -173,7 +173,7 @@ def extract_wmic_info(info): # # Node, if "Name" in row and "ProcessId" in row: - wmic_info[(row["node"], row["Name"], row["ProcessId"])] = row + wmic_info.setdefault((row["node"], row["Name"]), []).append(row) else: ps_result.append(line) # plain list of process names @@ -181,20 +181,14 @@ def extract_wmic_info(info): def merge_wmic(ps_result, wmic_info, wmic_headers): - def get_ps_info(node, name, processId=0): - for key, value in wmic_info.items(): - if (not processId and key[0:2] == (node, name)) or key == (node, name, processId): - # each info is only returned once! - del wmic_info[key] - return value - info = [] seen_pids = set([]) # Remove duplicate entries cpu_cores = 1 for line in ps_result: - psinfo = get_ps_info(line[0], line[1]) - # Get number of CPU cores from system idle process - if psinfo: + psinfos = wmic_info.get((line[0], line[1]), []) + if psinfos: + psinfo = psinfos.pop() # each info is used only once! + # Get number of CPU cores from system idle process if "ThreadCount" in wmic_headers and psinfo["Name"].lower() == "system idle process": cpu_cores = int(psinfo["ThreadCount"]) pid = int(psinfo["ProcessId"])

5 years, 9 months

Do not rely on the hash seed in various parts of checks and their corresponding tests.

by Sven Panne

Module: check_mk Branch: master Commit: 5fb0ec36e46f3dbc9cbbb9ec29c0338d7f14a2f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fb0ec36e46f3d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 19 11:21:49 2018 +0100 Do not rely on the hash seed in various parts of checks and their corresponding tests. CMK-1465 Change-Id: Ie5578caac259ff9c3a6ba7645ad40add30970dfd --- checks/azure.include | 2 +- checks/azure_virtualmachines | 2 +- checks/docker.include | 2 +- checks/ps.include | 2 +- checks/systemd_units | 2 +- cmk/gui/permissions.py | 2 +- cmk_base/data_sources/tcp.py | 4 ++-- tests/unit/checks/checktestlib.py | 14 ++++++++++++-- tests/unit/checks/generictests/datasets/azure_sites.py | 13 +++++++------ .../generictests/datasets/azure_virtualmachines_1.py | 4 ++-- .../datasets/azure_virtualmachines_1_on_grouphost.py | 4 ++-- .../generictests/datasets/azure_virtualmachines_1_on_vm.py | 2 +- .../datasets/systemd_units_services_2_failed_regression.py | 2 +- tests/unit/checks/generictests/run.py | 2 +- tests/unit/checks/test_df_check.py | 4 ++-- tests/unit/checks/test_docker_parse_node_info.py | 4 ++-- tests/unit/checks/test_hp_msa_volume.py | 4 ++-- tests/unit/checks/test_mbg_lantime_ng_refclock.py | 6 +++--- tests/unit/checks/test_nfsmounts_and_cifsmounts_check.py | 9 +++++---- tests/unit/checks/test_veritas_vcs_check.py | 4 ++-- tests/unit/checks/test_wmi_check.py | 2 +- tests/unit/cmk/gui/test_gui_config.py | 2 +- tests/unit/cmk/gui/test_userdb_ldap_connector.py | 2 +- tests/unit/cmk_base/test_data_sources_unit.py | 2 +- 24 files changed, 54 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5fb0ec36e4…

5 years, 9 months

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