Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Generic tests using dict parameters now have to specify all key value pairs

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b2fa43f19297620a778ca44da25cf00cc7d60dcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2fa43f1929762… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 15:33:08 2018 +0100 Generic tests using dict parameters now have to specify all key value pairs Change-Id: I59d5755eceba9cb5d5e990d4504656be2b8073a9 --- .../datasets/apc_symmetra_regression.py | 2 +- .../generictests/datasets/df_lnx_regression.py | 26 ++++++++-------------- tests/unit/checks/generictests/run.py | 3 +-- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/apc_symmetra_regression.py b/tests/unit/checks/generictests/datasets/apc_symmetra_regression.py index 1b670e5..accb558 100644 --- a/tests/unit/checks/generictests/datasets/apc_symmetra_regression.py +++ b/tests/unit/checks/generictests/datasets/apc_symmetra_regression.py @@ -29,7 +29,7 @@ checks = {'': [(None, 'Time remaining: 61 m', [('runtime', 61.0, None, None, None, None)])]), (None, - {'battery_replace_state': 2}, + {'capacity': (95, 80), 'calibration_state': 0, 'battery_replace_state': 2}, [(0, 'Battery status: normal', []), (2, 'battery needs replacing', []), (0, 'Output status: on line (calibration invalid)', []), diff --git a/tests/unit/checks/generictests/datasets/df_lnx_regression.py b/tests/unit/checks/generictests/datasets/df_lnx_regression.py index 5d662c7..bfc8c34 100644 --- a/tests/unit/checks/generictests/datasets/df_lnx_regression.py +++ b/tests/unit/checks/generictests/datasets/df_lnx_regression.py @@ -1,19 +1,11 @@ - - checkname = 'df' - -info = [[u'/dev/sda4', - u'ext4', - u'143786696', - u'101645524', - u'34814148', - u'75%', - u'/'], - [u'[df_inodes_start]'], - [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], - [u'[df_inodes_end]']] - +info = [ + [u'/dev/sda4', u'ext4', u'143786696', u'101645524', u'34814148', u'75%', u'/'], + [u'[df_inodes_start]'], + [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], + [u'[df_inodes_end]'], +] discovery = {'': [(u'/', {})]} @@ -42,7 +34,7 @@ checks = { ), ] ), - (u'/dev/sda4 /', {"subtract_reserved": True, "show_reserved": True}, + (u'/dev/sda4 /', {'trend_range': 24, 'show_levels': 'onmagic', 'inodes_levels': (10.0, 5.0), 'magic_normsize': 20, 'show_inodes': 'onlow', 'levels': (80.0, 90.0), 'show_reserved': True, 'subtract_reserved': True, 'levels_low': (50.0, 60.0), 'trend_perfdata': True,}, [(0, '74.5% used (96.94 of 130.14 GB), additionally reserved for root: 6.99 GB,' \ ' trend: 0.00 B / 24 hours', [(u'/', 99263.20703125, 112333.35625, 126375.02578125, 0, 140416.6953125), @@ -56,7 +48,7 @@ checks = { ), ] ), - (u'/', {"show_reserved": True}, + (u'/', {'trend_range': 24, 'show_levels': 'onmagic', 'inodes_levels': (10.0, 5.0), 'magic_normsize': 20, 'show_inodes': 'onlow', 'levels': (80.0, 90.0), 'show_reserved': True, 'levels_low': (50.0, 60.0), 'trend_perfdata': True}, [(0, '75.8% used (103.92 of 137.13 GB), therein reserved for root: 5.1% (6.99 GB),' \ ' trend: 0.00 B / 24 hours', [(u'/', 106418.50390625, 112333.35625, 126375.02578125, 0, 140416.6953125), @@ -69,7 +61,7 @@ checks = { ), ] ), - (u'/dev/sda4 /', {"show_reserved": True}, + (u'/dev/sda4 /', {'trend_range': 24, 'show_levels': 'onmagic', 'inodes_levels': (10.0, 5.0), 'magic_normsize': 20, 'show_inodes': 'onlow', 'levels': (80.0, 90.0), 'show_reserved': True, 'levels_low': (50.0, 60.0), 'trend_perfdata': True}, [(0, '75.8% used (103.92 of 137.13 GB), therein reserved for root: 5.1% (6.99 GB),' \ ' trend: 0.00 B / 24 hours', [(u'/', 106418.50390625, 112333.35625, 126375.02578125, 0, 140416.6953125), diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 9f6c71a..bffcfc6 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -65,8 +65,7 @@ def get_check_merged_parameters(check, provided_p): if provided_p is None: return provided_p if isinstance(provided_p, dict): - default_p.update(provided_p) - return default_p + return provided_p if isinstance(provided_p, tuple): return provided_p raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p))

5 years, 6 months

Revert "refactor alcatel_fans check"

by Florian Kromer

Module: check_mk Branch: master Commit: cbbba3e94b6064cfa28e28e63ce9bc0b5948ce04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbbba3e94b6064… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Dec 17 09:45:13 2018 +0100 Revert "refactor alcatel_fans check" This reverts commit 33eb97b8f44e2a1491348f82a85606bf457fef4f. --- checks/alcatel.include | 56 -------------------------------------------------- checks/alcatel_fans | 31 +++++++++++++++++++++------- 2 files changed, 24 insertions(+), 63 deletions(-) diff --git a/checks/alcatel.include b/checks/alcatel.include deleted file mode 100644 index ba7e376..0000000 --- a/checks/alcatel.include +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2018 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. - - -def alcatel_scan_function(oid): - sys_descr_id = ".1.3.6.1.2.1.1.1.0" - return "alcatel" in oid(sys_descr_id).lower() - - -def alcatel_networking_products_scan_function(oid): - sys_object_id = ".1.3.6.1.2.1.1.2.0" # MIB object "sysObjectID" - alcatel_ind_1_base_mib = ".1.3.6.1.4.1.6486.800" # MIB object "alcatelIND1BaseMIB" - return alcatel_scan_function(oid) and oid(sys_object_id).startswith(alcatel_ind_1_base_mib) - - -def inventory_alcatel_fans(info): - for nr, _value in enumerate(info, 1): - yield nr, None - - -def check_alcatel_fans(item, _no_params, info): - fan_states = { - 0: "has no status", - 1: "not running", - 2: "running", - } - for nr, value in enumerate(info): - if nr + 1 == item: - fan_state = int(value[0]) - state = 0 - if fan_state != 2: - state = 2 - return state, "Fan " + fan_states[fan_state] diff --git a/checks/alcatel_fans b/checks/alcatel_fans index 426b0c6..b74ca1a 100644 --- a/checks/alcatel_fans +++ b/checks/alcatel_fans @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -24,14 +24,31 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +def inventory_alcatel_fans(info): + for nr, _value in enumerate(info, 1): + yield nr, None + + +def check_alcatel_fans(item, _no_params, info): + fan_states = { + 0: "has no status", + 1: "not running", + 2: "running", + } + for nr, value in enumerate(info): + if nr + 1 == item: + fan_state = int(value[0]) + state = 0 + if fan_state != 2: + state = 2 + return state, "Fan " + fan_states[fan_state] + + check_info["alcatel_fans"] = { "check_function": check_alcatel_fans, "inventory_function": inventory_alcatel_fans, "service_description": "Fan %s", - "snmp_scan_function": alcatel_networking_products_scan_function, - "snmp_info": ( - ".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.11.1", # MIB object "alaChasEntPhysFanTable" - [2] # MIB object "alaChasEntPhysFanStatus": noStatus(0), notRunning(1), running(2) - ), - "includes": ["alcatel.include"], + "snmp_scan_function": lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), + "snmp_info": (".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.11.1", [2]), }

5 years, 6 months

added WK6701: The hostname information was missing when exporting BI data via csv/json/ python

by Andreas Boesl

Module: check_mk Branch: master Commit: 14e707e9007f78724263fc5f0c7c3b7d7e404ab7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14e707e9007f78… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 14 17:33:04 2018 +0100 added WK6701: The hostname information was missing when exporting BI data via csv/json/python Change-Id: I91d4554b8118d307d8c758dedad2b14a9b2cbc54 --- .werks/6701 | 13 +++++++++++++ cmk/gui/bi.py | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/.werks/6701 b/.werks/6701 new file mode 100644 index 0000000..ac595ad --- /dev/null +++ b/.werks/6701 @@ -0,0 +1,13 @@ +Title: The hostname information was missing when exporting BI data via csv/json/python +Level: 1 +Component: bi +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544778288 + +The hostname and site information was missing on BI end nodes. This has been fixed. + + diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 476b011..03dbadc 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -2718,6 +2718,11 @@ def render_tree_json(row): "in_service_period": tree[0]["in_service_period"], } + if is_leaf: + site, hostname = tree[2]["host"] + json_node["site"] = site + json_node["hostname"] = hostname + # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) if tree[1] and tree[0] != tree[1]: json_node["assumed"] = True

5 years, 6 months

agent azure: satisfy pylint

by Moritz Kiemer

Module: check_mk Branch: master Commit: 03999bf2b2024bdff30ba4b4430320b06406082b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03999bf2b2024b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Dec 14 15:24:45 2018 +0100 agent azure: satisfy pylint Change-Id: Idabb926de69bcf1872f4043fc3483ede6847d603 --- agents/special/agent_azure | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 7d298f9..aca0ce6 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -233,7 +233,8 @@ class ResourceConfig(object): self.name = name self.fetchall = True - def add_key(self, key, value): + @staticmethod + def add_key(key, _value): raise ValueError("unknown key: %r" % key) def __str__(self): @@ -361,7 +362,7 @@ class IssueCollecter(object): return len(self._list) -class AzureMetric(object): +class AzureMetric(object): # pylint: disable=too-few-public-methods HEADER = ("name", "aggregation", "value", "unit", "timestamp", "timegrain", "filters") AGGREGATIONS = ("total", "average", "maximum", "minimum", "last", "count") @@ -431,20 +432,20 @@ class AzureComputeClient(object): super(AzureComputeClient, self).__init__() self._client = ComputeManagementClient(creds, subs) - def process(self, vm, args): + def process(self, vmach, args): use_keys = ('statuses',) inst_view = self._client.virtual_machines.get( - vm.info["group"], vm.info["name"], expand='instanceView').instance_view.as_dict() + vmach.info["group"], vmach.info["name"], expand='instanceView').instance_view.as_dict() items = ((k, inst_view.get(k)) for k in use_keys) - vm.info["specific_info"] = {k: v for k, v in items if v is not None} + vmach.info["specific_info"] = {k: v for k, v in items if v is not None} if args.piggyback_vms in ("agenthost", "all"): - vm.piggytargets.append('') + vmach.piggytargets.append('') if args.piggyback_vms in ("self", "all"): - vm.piggytargets.append(vm.info["name"]) + vmach.piggytargets.append(vmach.info["name"]) -class AzureClient(object): +class AzureClient(object): # pylint: disable=too-many-instance-attributes SPECIFIC_CLIENTS = { 'Microsoft.Compute/virtualMachines': AzureComputeClient,

5 years, 6 months

6946 Microsoft Azure: Monitor Storage Accounts

by Moritz Kiemer

Module: check_mk Branch: master Commit: d2e4fbfae839a9ba800821f6f7cf9e90972edeca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2e4fbfae839a9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Dec 12 11:37:34 2018 +0100 6946 Microsoft Azure: Monitor Storage Accounts Add check to monitor Microsoft Azure storage accounts. Monitored metrics are: used capacity, ingress, egress, transaction count, server latency, ent-to-end latency and availability. CMK-1390 Change-Id: Id44c1dca4f3bdb6189832e997e9831570b531b86 --- .werks/6946 | 14 +++ agents/special/agent_azure | 6 +- checkman/azure_storageaccounts | 17 +++ checkman/azure_storageaccounts.flow | 18 ++++ checkman/azure_storageaccounts.performance | 18 ++++ checks/azure_storageaccounts | 118 +++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 52 +++++++++ cmk/gui/plugins/wato/check_parameters/azure.py | 43 ++++++++ .../generictests/datasets/azure_storageaccounts.py | 91 ++++++++++++++++ tests/unit/cmk/gui/test_watolib.py | 2 + 10 files changed, 376 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d2e4fbfae8…

5 years, 6 months

azure.include: minor changes

by Moritz Kiemer

Module: check_mk Branch: master Commit: 739819a7c68825269fd5182f3573a8b8627c5535 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=739819a7c68825… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Dec 14 10:09:22 2018 +0100 azure.include: minor changes * improve formatting * convert ms to s * satisfy/silence pylint Change-Id: I9c9c645e2ff86913edf61072dd125fcd801d757a --- checks/azure.include | 43 +++++++++++++++------- .../checks/generictests/datasets/azure_sites.py | 4 +- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/checks/azure.include b/checks/azure.include index d3c134b..52e074c 100644 --- a/checks/azure.include +++ b/checks/azure.include @@ -27,8 +27,8 @@ import json def azure_iter_informative_attrs(resource, include_keys=('location',)): - def cap(s): # not quite what str.title() does - return s[0].upper() + s[1:] + def cap(string): # not quite what str.title() does + return string[0].upper() + string[1:] for key in include_keys: if key in resource: @@ -39,15 +39,16 @@ def azure_iter_informative_attrs(resource, include_keys=('location',)): yield cap(key), value -def check_azure_metric(resource, - metric_key, - cmk_key, - display_name, - levels=None, - levels_lower=None, - minv=None, - maxv=None, - use_rate=False): +def check_azure_metric( + resource, # pylint: disable=too-many-locals + metric_key, + cmk_key, + display_name, + levels=None, + levels_lower=None, + minv=None, + maxv=None, + use_rate=False): metric = resource.get('metrics', {}).get(metric_key) if metric is None: return None @@ -55,16 +56,30 @@ def check_azure_metric(resource, if use_rate: countername = "%s.%s" % (resource['id'], metric_key) value = get_rate(countername, time.time(), metric.value) + unit = "%s_rate" % metric.unit else: value = metric.value + unit = metric.unit + if value is None: return 3, "Metric %s is 'None'" % display_name, [] + # convert to SI-unit + if unit == "milli_seconds": + value /= 1000. + elif unit == "seconds_rate": + # we got seconds, but we computed the rate -> seconds per second: + # how long happend something / time period = percent of the time + # e.g. CPU time: how much percent of of the time was the CPU busy. + value *= 100. + unit = "percent" + formatter = { "percent": get_percent_human_readable, "bytes": get_bytes_human_readable, - "milli_seconds": lambda ms: "%d ms" % ms - }.get(metric.unit, str) + "seconds": lambda s: "%.2f s" % s, + "milli_seconds": lambda ms: "%d ms" % (ms * 1000), + }.get(unit, str) text = "%s: %s" % (display_name, formatter(value)) l_state, u_state = 0, 0 @@ -112,7 +127,7 @@ def _read(row, types, defaults=None): try: raw = row[i] yield tfunc(raw) - except: # or do we trust it's an Index-/ValueError? + except (IndexError, ValueError): yield default diff --git a/tests/unit/checks/generictests/datasets/azure_sites.py b/tests/unit/checks/generictests/datasets/azure_sites.py index 1871d37..262b0bf 100644 --- a/tests/unit/checks/generictests/datasets/azure_sites.py +++ b/tests/unit/checks/generictests/datasets/azure_sites.py @@ -85,8 +85,8 @@ checks = {'': [(u'spo-solutions-fa1', (u'zcldazwamonseas-as', 'default', [(0, - 'CPU time: 0.0', [('cpu_time_percent', 0.0, 85.0, 95.0, 0, None)]), - (0, 'Average response time: 0.0', [('avg_response_time', 0.0, 1.0, 10.0, 0, None)]), + 'CPU time: 0.0%', [('cpu_time_percent', 0.0, 85.0, 95.0, 0, None)]), + (0, 'Average response time: 0.00 s', [('avg_response_time', 0.0, 1.0, 10.0, 0, None)]), (0, 'Rate of server errors: 0.0', [('error_rate', 0.0, 0.01, 0.04, 0, None)]), (0, u'Location: southeastasia', []), (0, u'OpLevel: Operation', []),

5 years, 6 months

6936 FIX cmk-update-agent: Handle Windows encoding

by Andreas Umbreit

Module: check_mk Branch: master Commit: 84401a09238397e6757aee36b7c5875a32cf404b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84401a09238397… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Dec 14 11:48:17 2018 +0100 6936 FIX cmk-update-agent: Handle Windows encoding When running the agent updater on windows command line, special (non-ASCII) input characters were not handled properly. This is now mitigated by applying proper codepages to input from command line arguments and the user's stdin-input. Please note that there might still occur some issues with special characters within the windows command line, caused by limitations of the underlying shell, depending on your system's configuration. CMK-1438 Change-Id: I399e9b976b664b689897ef4b729e5d7626bacb07 --- .werks/6936 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/6936 b/.werks/6936 new file mode 100644 index 0000000..949a208 --- /dev/null +++ b/.werks/6936 @@ -0,0 +1,17 @@ +Title: cmk-update-agent: Handle Windows encoding +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1544782378 + +When running the agent updater on windows command line, special (non-ASCII) input characters +were not handled properly. This is now mitigated by applying proper codepages to input +from command line arguments and the user's stdin-input. + +Please note that there might still occur some issues with special characters within the +windows command line, caused by limitations of the underlying shell, +depending on your system's configuration.

5 years, 6 months

Fixed syntax error in werk.

by Sven Panne

Module: check_mk Branch: master Commit: 5de5a61182f835dfc6f9b696d6eab0a3685c2f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5de5a61182f835… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 14 14:08:19 2018 +0100 Fixed syntax error in werk. Change-Id: I1873c3ae1b5dc39574636b13f352635cadde292d --- .werks/1281 | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/1281 b/.werks/1281 index 4b4f401..02b6b71 100644 --- a/.werks/1281 +++ b/.werks/1281 @@ -5,6 +5,7 @@ Compatible: compat Version: 1.2.7i3 Date: 1439992949 Class: feature + To use the Azure Monitoring in OMD based installation: - Copy the azuremonitor folder to ~/local/lib/python

5 years, 6 months

Replace 'default' placeholder in some generic tests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f6a7ee2a2f7ebb7dd26209f01e54d44ae3c9aca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6a7ee2a2f7ebb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 13:12:10 2018 +0100 Replace 'default' placeholder in some generic tests Replace all 'default' placeholders which belong to a global variable defined in the checks by the actual value. Change-Id: Ic9e672d30ab0ea3567f88226eafd9e910e5cb5d2 --- .../datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py | 4 ++-- .../datasets/dotnet_clrmemory_server_windows_14_regression.py | 4 ++-- .../dotnet_clrmemory_server_windows_dotnet_regression.py | 4 ++-- .../dotnet_clrmemory_server_windows_interfaces_regression.py | 4 ++-- ...dotnet_clrmemory_server_windows_kaspersky_error_regression.py | 4 ++-- .../checks/generictests/datasets/hp_msa_volume_regression.py | 2 +- .../unit/checks/generictests/datasets/lparstat_aix_regression.py | 4 ++-- tests/unit/checks/generictests/datasets/vms_cpu_regression.py | 8 ++++---- tests/unit/checks/generictests/run.py | 9 ++++++--- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py index 9c0906d..add7817 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py @@ -669,7 +669,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '2.54% time in GC', - [('percent', 2.5363462051694157, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 2.5363462051694157, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py index 8b7b3b7..e4052a1 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py @@ -174,7 +174,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '8.78% time in GC', - [('percent', 8.778833599942464, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 8.778833599942464, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py index e54f2dd..90257c0 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py @@ -867,7 +867,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '1.84% time in GC', - [('percent', 1.8385322768796544, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 1.8385322768796544, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py index fc8c281..0021970 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py @@ -504,7 +504,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '4.08% time in GC', - [('percent', 4.082020000573718, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 4.082020000573718, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py index b88cb1e..813b672 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py @@ -240,7 +240,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '0.07% time in GC', - [('percent', 0.06994060242314372, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 0.06994060242314372, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py b/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py index 0143994..cbe6b11 100644 --- a/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py +++ b/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py @@ -80,7 +80,7 @@ checks = { ('growth', 0.0, None, None, None, None), ('trend', 0, None, None, 0, 17481)])]) ], - 'io': [('SUMMARY', 'default', [ + 'io': [('SUMMARY', {}, [ (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0, None, None, None, None)]), (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0, None, None, None, None)]), ])] diff --git a/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py b/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py index 8e5f951..6b1933e 100644 --- a/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py +++ b/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py @@ -8,14 +8,14 @@ discovery = { } checks = { - '': [(None, 'default', + '': [(None, None, [(0, 'Physc: 0.02, Entc: 9.3%, Lbusy: 0.1, App: 519, Vcsw: 0, Phint: 101, Nsp: 0.00%', [('physc', 0.02, None, None, None, None), ('entc', 9.3, None, None, None, None), ('lbusy', 0.1, None, None, None, None), ('app', 519.0, None, None, None, None), ('vcsw', 0.0, None, None, None, None), ('phint', 101.0, None, None, None, None), ('nsp', 0.0, None, None, None, None)])])], 'cpu_util': [ - (None, 'default', [(0, 'user: 0.2%, system: 1.2%, wait: 0.2%', + (None, None, [(0, 'user: 0.2%, system: 1.2%, wait: 0.2%', [('user', 0.2, None, None, None, None), ('system', 1.2, None, None, None, None), ('wait', 0.2, None, None, None, None)])]), diff --git a/tests/unit/checks/generictests/datasets/vms_cpu_regression.py b/tests/unit/checks/generictests/datasets/vms_cpu_regression.py index f0f9f00..e2a78fa 100644 --- a/tests/unit/checks/generictests/datasets/vms_cpu_regression.py +++ b/tests/unit/checks/generictests/datasets/vms_cpu_regression.py @@ -6,10 +6,10 @@ discovery = {'': [(None, 'vms_cpu_default_levels')]} checks = { '': [ - (None, 'default', [(0, 'user: 0.5%, system: 0.1%, wait: 0.2%', - [('user', 0.54, None, None, None, None), - ('system', 0.10999999999999827, None, None, None, None), - ('wait', 0.18, 0, 0, None, None)])]), + (None, None, [(0, 'user: 0.5%, system: 0.1%, wait: 0.2%', + [('user', 0.54, None, None, None, None), + ('system', 0.10999999999999827, None, None, None, None), + ('wait', 0.18, 0, 0, None, None)])]), (None, (0.1, 0.5), [(1, 'user: 0.5%, system: 0.1%, wait: 0.2%', [('user', 0.54, None, None, None, None), ('system', 0.10999999999999827, None, None, None, None), diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 7b5c17c..d10990b 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -46,8 +46,9 @@ def get_discovered_merged_parameters(check, provided_p): if not provided_p: return default_p, "default" if isinstance(provided_p, str): - # TODO: this is not correct since it may be the name of a variable defined in - # the check or the repr of a dict as e.g. in winperf_if + if provided_p in check.context: + return check.context[provided_p], check.context[provided_p] + # TODO: the repr case used e.g. in winperf_if is still not correct return default_p, "default" raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) @@ -57,7 +58,9 @@ def get_check_merged_parameters(check, provided_p): if provided_p == 'default': return default_p - if isinstance(default_p, dict) and isinstance(provided_p, dict): + if provided_p is None: + return provided_p + if isinstance(provided_p, dict): default_p.update(provided_p) return default_p if isinstance(provided_p, tuple):

5 years, 6 months

6827 aws_s3_summary: New check which gives an overview over all AWS/ S3 buckets

by Simon Betz

Module: check_mk Branch: master Commit: 5112d456aaa860697d4ee2188e38aec16662788e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5112d456aaa860… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 14 10:53:51 2018 +0100 6827 aws_s3_summary: New check which gives an overview over all AWS/S3 buckets Change-Id: Icfc76d2d1b1a66a6f74878a18b08b04b87aee9c9 --- .werks/6827 | 10 ++++++++++ checkman/aws_s3_summary | 13 +++++++++++++ checks/aws_s3_summary | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/.werks/6827 b/.werks/6827 new file mode 100644 index 0000000..8359594 --- /dev/null +++ b/.werks/6827 @@ -0,0 +1,10 @@ +Title: aws_s3_summary: New check which gives an overview over all AWS/S3 buckets +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544781208 +Class: feature + + diff --git a/checkman/aws_s3_summary b/checkman/aws_s3_summary new file mode 100644 index 0000000..88d4e3e --- /dev/null +++ b/checkman/aws_s3_summary @@ -0,0 +1,13 @@ +title: AWS S3 Summary +agents: aws +catalog: applications +license: GPL +distribution: check_mk +description: + This check monitors all AWS S3 buckets and reports + a summary of their states. + To make this check work you have to configure the related + special agent {{Amazon Web Services (AWS)}}. + +inventory: + One summary service is created. diff --git a/checks/aws_s3_summary b/checks/aws_s3_summary new file mode 100644 index 0000000..88e68fb --- /dev/null +++ b/checks/aws_s3_summary @@ -0,0 +1,48 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + + +def inventory_aws_s3_summary(parsed): + if parsed: + return [(None, {})] + + +def check_aws_s3_summary(item, params, parsed): + yield 0, 'Buckets: %s' % len(parsed) + long_output = [] + for row in parsed: + long_output.append("Bucket: %s, Creation date: %s" % (row['Name'], row['CreationDate'])) + if long_output: + yield 0, '\n%s' % '\n'.join(long_output) + + +check_info['aws_s3_summary'] = { + 'parse_function': parse_aws, + 'inventory_function': inventory_aws_s3_summary, + 'check_function': check_aws_s3_summary, + 'service_description': 'AWS/S3 Summary', + 'includes': ['aws.include'], +}

5 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
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