Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

agent_kubernetes: fix a bug in the conversion to unix timestamps

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a8d8c5065e78b9562f5e84ee18eea4f4c1aaadb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8d8c5065e78b9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 7 18:27:29 2019 +0100 agent_kubernetes: fix a bug in the conversion to unix timestamps Change-Id: Iae4113246cf4c7b43ff7d702f2c8a8866dde480f --- cmk/special_agents/agent_kubernetes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 3ac84b5..f5c6293 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -166,7 +166,7 @@ class Metadata(object): if metadata: self.name = metadata.name self.namespace = metadata.namespace - self.creation_timestamp = (time.mktime(metadata.creation_timestamp.timetuple()) + self.creation_timestamp = (time.mktime(metadata.creation_timestamp.utctimetuple()) if metadata.creation_timestamp else None) else: self.name = None

5 years, 4 months

adva_fsp_if: Fixed missing include

by Simon Betz

Module: check_mk Branch: master Commit: cb1005d65a77c904bb82b234f3d66de4e7dc03e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb1005d65a77c9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 8 09:07:15 2019 +0100 adva_fsp_if: Fixed missing include Change-Id: I657c0b5f2903051fedc11243a22e7445eb236a31 --- checks/adva_fsp_if | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/adva_fsp_if b/checks/adva_fsp_if index 8bdddae..2792b99 100644 --- a/checks/adva_fsp_if +++ b/checks/adva_fsp_if @@ -135,4 +135,5 @@ check_info['adva_fsp_if'] = { ], ), "snmp_scan_function": snmp_scan_function_adva_fsp_if, + "includes": ["if.include"], }

5 years, 4 months

aws_ebs_limits: New check which monitors AWS/EBS limits

by Simon Betz

Module: check_mk Branch: master Commit: 9761e5805c2c9527a1fb80ddfaa6bc17fd581f5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9761e5805c2c95… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 28 15:26:33 2019 +0100 aws_ebs_limits: New check which monitors AWS/EBS limits Change-Id: I3e5ae1a43ea80bcb9f9cb4669875c01ed0d5b0a1 --- .werks/7121 | 19 +++ agents/special/agent_aws | 186 +++++++++++++++++++++++---- checkman/aws_ebs_limits | 31 +++++ checks/aws_ebs_limits | 73 +++++++++++ cmk/gui/plugins/metrics/check_mk.py | 42 ++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 38 ++++++ cmk/gui/plugins/wato/datasource_programs.py | 4 +- 7 files changed, 364 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9761e5805c…

5 years, 4 months

7197 FIX Solaris Agent: fixed problem with leading spaces in wc command output

by Ronny Bruska

Module: check_mk Branch: master Commit: 8a5b30d1513f3e51b69336cab2584ed0d5dcfca2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a5b30d1513f3e… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu Mar 7 20:18:57 2019 +0100 7197 FIX Solaris Agent: fixed problem with leading spaces in wc command output The output of "wc -l" on solaris can lead to leading spaces. In that case the check "cpu.threads" can not parse the agent output and will fail. This has been fixed. Change-Id: I164f2837f12abccaf442245f0220519865d7044d --- .werks/7197 | 12 ++++++++++++ agents/check_mk_agent.solaris | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7197 b/.werks/7197 new file mode 100644 index 0000000..19e9281 --- /dev/null +++ b/.werks/7197 @@ -0,0 +1,12 @@ +Title: Solaris Agent: fixed problem with leading spaces in wc command output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551986037 +Class: fix + +The output of "wc -l" on solaris can lead to leading spaces. +In that case the check "cpu.threads" can not parse the agent output and will fail. +This has been fixed. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 1c5bc66..38dfa3d 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -286,7 +286,7 @@ fi # Simulated Output of Linux /proc/cpu echo '<<<cpu>>>' load=$(uptime|sed -e 's;.*average: $[0-9]\{1,\}\.[0-9]\{1,\}$, $[0-9]\{1,\}\.[0-9]\{1,\}$, $[0-9]\{1,\}\.[0-9]\{1,\}$.*;\1 \2 \3;') -nthreads=$(ps -AL | wc -l) +nthreads=$(($(ps -AL | wc -l))) procs=$(($(psrinfo | wc -l))) echo $load 1/$nthreads $$ $procs

5 years, 4 months

7210 FIX mssql.vbs: Don't crash upon connection failure

by Moritz Kiemer

Module: check_mk Branch: master Commit: abd0f8d4fcd2dcc12e7fda8b5f251956868f7bb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abd0f8d4fcd2dc… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 21 12:05:06 2019 +0100 7210 FIX mssql.vbs: Don't crash upon connection failure and 7211 mssql_tablespaces: Also discover empty tablespaces Change-Id: I40bd38bf52363709f2ed84f71e1db1ce1055a9f7 --- .werks/7210 | 10 ++ .werks/7211 | 10 ++ agents/windows/plugins/mssql.vbs | 316 +++++++++++++++++++++++---------------- 3 files changed, 211 insertions(+), 125 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=abd0f8d4fc…

5 years, 4 months

ibm_svc_*: Special agent provides a header, otherwise use a default header

by Simon Betz

Module: check_mk Branch: master Commit: e751d26769c5b9089d3a8905b8fcec66d9b331b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e751d26769c5b9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 6 11:04:43 2019 +0100 ibm_svc_*: Special agent provides a header, otherwise use a default header CMK-1618 Change-Id: I6bf4c04db38af1aca8e717508a684ef27cdf2f01 --- agents/special/agent_ibmsvc | 26 +-- checks/ibm_svc.include | 39 +++++ checks/ibm_svc_array | 64 ++++--- checks/ibm_svc_disks | 44 +++-- checks/ibm_svc_enclosure | 179 ++++++++++++++------ checks/ibm_svc_enclosurestats | 59 ++++--- checks/ibm_svc_host | 56 ++++--- checks/ibm_svc_mdisk | 51 ++++-- checks/ibm_svc_mdiskgrp | 168 ++++++++++++------- checks/ibm_svc_node | 64 ++++--- checks/ibm_svc_nodestats | 183 ++++++++++----------- checks/ibm_svc_portfc | 69 +++++--- checks/ibm_svc_portsas | 72 +++++--- .../datasets/ibm_svc_array_regression.py | 4 +- .../datasets/ibm_svc_enclosure_regression.py | 148 ----------------- .../datasets/ibm_svc_enclosure_regression_13.py | 86 ++++++++++ .../datasets/ibm_svc_enclosure_regression_15.py | 32 ++++ .../datasets/ibm_svc_enclosure_regression_17.py | 35 ++++ .../datasets/ibm_svc_enclosure_regression_9.py | 25 +++ .../datasets/ibm_svc_enclosurestats_regression.py | 12 +- .../datasets/ibm_svc_node_regression.py | 4 +- 21 files changed, 879 insertions(+), 541 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e751d26769…

5 years, 4 months

ucs_c_rack_server_health: Make check reliable against namespace conflict

by Florian Kromer

Module: check_mk Branch: master Commit: 6a44cabe5c745188e71d2846385d1b893a0c939d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a44cabe5c7451… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Mar 7 16:30:58 2019 +0100 ucs_c_rack_server_health: Make check reliable against namespace conflict Change-Id: Ia1b4873ae66fd05be633236f56147719dd7b4389 --- checks/ucs_c_rack_server_health | 24 ++++++------- .../datasets/ucs_c_rack_server_health.py | 42 ++++++++++++---------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/checks/ucs_c_rack_server_health b/checks/ucs_c_rack_server_health index f3ff547..05aa57b 100644 --- a/checks/ucs_c_rack_server_health +++ b/checks/ucs_c_rack_server_health @@ -30,18 +30,6 @@ # storageControllerHealth<TAB>dn # sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0 <TAB>id SLOT-HBA<TAB>health Good -# Dict keys are storage controller health strings provided via special agent -> XML -# API of servers. Dict values are corresponding check status. -# For information about the data provided by the special agent -# "storageControllerHealth" refer to Cisco C-Series Rack Server XML 2.0 Schema files: -# [https://community.cisco.com/t5/unified-computing-system/cisco-ucs-c-series-…] -# Note: The possible string values are not defined/documented in the XML schema. -# "Good" is the only value known from exemplary data output. Pre-process the -# data to lowercase only chars. -health_to_status_mapping = { - 'good': 0, -} - def parse_ucs_c_rack_server_health(info): """ @@ -72,6 +60,18 @@ def check_ucs_c_rack_server_health(item, params, health): Check function is called only in case parsed is a dict and item exists as key in parsed[item]. All other potential bad case conditions are handled by @get_parsed_item_data. """ + # Dict keys are storage controller health strings provided via special agent -> XML + # API of servers. Dict values are corresponding check status. + # For information about the data provided by the special agent + # "storageControllerHealth" refer to Cisco C-Series Rack Server XML 2.0 Schema files: + # [https://community.cisco.com/t5/unified-computing-system/cisco-ucs-c-series-…] + # Note: The possible string values are not defined/documented in the XML schema. + # "Good" is the only value known from exemplary data output. Pre-process the + # data to lowercase only chars. + health_to_status_mapping = { + 'good': 0, + } + try: status = health_to_status_mapping[health] status_readable = health diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py index 52cf0de..5b05c59 100644 --- a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py +++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_health.py @@ -1,20 +1,26 @@ +# yapf: disable + + checkname = 'ucs_c_rack_server_health' -info = [[ - 'storageControllerHealth', 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', 'id SLOT-HBA', - 'health Good' -], - [ - 'storageControllerHealth', 'dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0', - 'id SLOT-HBA', 'health AnythingElse' - ]] - -discovery = { - '': [('Rack unit 1 Storage SAS SLOT HBA vd 0', {}), ('Rack unit 2 Storage SAS SLOT HBA vd 0', - {})] -} - -checks = { - '': [('Rack unit 1 Storage SAS SLOT HBA vd 0', {}, [(0, 'Status: good', [])]), - ('Rack unit 2 Storage SAS SLOT HBA vd 0', {}, [(3, 'Status: unknown[anythingelse]', [])])] -} + +info = [['storageControllerHealth', + 'dn sys/rack-unit-1/board/storage-SAS-SLOT-HBA/vd-0', + 'id SLOT-HBA', + 'health Good'], + ['storageControllerHealth', + 'dn sys/rack-unit-2/board/storage-SAS-SLOT-HBA/vd-0', + 'id SLOT-HBA', + 'health AnythingElse']] + + +discovery = {'': [('Rack unit 1 Storage SAS SLOT HBA vd 0', {}), + ('Rack unit 2 Storage SAS SLOT HBA vd 0', {})]} + + +checks = {'': [('Rack unit 1 Storage SAS SLOT HBA vd 0', + {}, + [(0, 'Status: good', [])]), + ('Rack unit 2 Storage SAS SLOT HBA vd 0', + {}, + [(3, 'Status: unknown[anythingelse]', [])])]} \ No newline at end of file

5 years, 4 months

ucs_c_rack_server_fans: Make reliable against namespace conflict

by Florian Kromer

Module: check_mk Branch: master Commit: 2b7ff57d3ba0df18c59e8444917c8561c02bf243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b7ff57d3ba0df… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Mar 7 16:39:18 2019 +0100 ucs_c_rack_server_fans: Make reliable against namespace conflict Change-Id: I76ed9ad879a8c32aff4c0ca66d64b38b85452f0f --- checks/ucs_c_rack_server_fans | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/checks/ucs_c_rack_server_fans b/checks/ucs_c_rack_server_fans index ae7f66a..3ac49d6 100644 --- a/checks/ucs_c_rack_server_fans +++ b/checks/ucs_c_rack_server_fans @@ -46,15 +46,13 @@ def parse_ucs_c_rack_server_fans(info): return parsed -operability_to_status_mapping = { - "unknown": 3, - "operable": 0, - "inoperable": 2, -} - - @get_parsed_item_data def check_ucs_c_rack_server_fans(item, _no_params, data): + operability_to_status_mapping = { + "unknown": 3, + "operable": 0, + "inoperable": 2, + } operability = data["operability"] try: status = operability_to_status_mapping[operability]

5 years, 4 months

add check_levels parameter docs

by Florian Kromer

Module: check_mk Branch: master Commit: eb82b6e7688243e716b9505d78bc4c7e7d23c9be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb82b6e7688243… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Mar 6 17:16:28 2019 +0100 add check_levels parameter docs Change-Id: Id99733ad057dbc542eed00d55ab100d48edd59b2 --- cmk_base/check_api.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index a926fcc..43cf88a 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -370,6 +370,15 @@ def check_levels(value, value: currently measured value dsname: name of the datasource in the RRD that corresponds to this value + params: None or Tuple(None, None) -> no level checking. + Tuple variants with non-None values: + Tuple[warn_upper, crit_upper] -> upper level checking only. + Tuple[warn_upper, crit_upper, warn_lower, crit_lower] + -> upper and lower level checking. + Dict containing "lower" as key -> lower level checking. + Dict containing "upper" or "levels_upper_min" as key -> upper level checking. + Dict containing "lower" and "upper"/"levels_upper_min" as key -> + lower and upper level checking. unit: unit to be displayed in the plugin output. Be aware: if a (builtin) human_readable_func is stated which already provides a unit info, then this unit is not necessary. An additional

5 years, 4 months

7045 alcatel_power_aos7: Support for new switches

by Florian Kromer

Module: check_mk Branch: master Commit: bf851cab402f3dc455728d87afc35c45ff12ac7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf851cab402f3d… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Mar 1 16:02:09 2019 +0100 7045 alcatel_power_aos7: Support for new switches This werk adds power supply monitoring (equivalent to alcatel_power) support for the new switch devices running at least AOS7. CMK-1775 Change-Id: Ic546c1e5447c2019495c401bba7c77672f78270a --- .werks/7045 | 13 ++++ checkman/alcatel_power_aos7 | 27 +++++++ checks/alcatel_power_aos7 | 89 ++++++++++++++++++++++ .../generictests/datasets/alcatel_power_aos7.py | 34 +++++++++ 4 files changed, 163 insertions(+) diff --git a/.werks/7045 b/.werks/7045 new file mode 100644 index 0000000..649cbd1 --- /dev/null +++ b/.werks/7045 @@ -0,0 +1,13 @@ +Title: alcatel_power_aos7: Support for new switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551451576 +Class: feature + +This werk adds power supply monitoring (equivalent to alcatel_power) support +for the new switch devices running at least AOS7. + +CMK-1775 diff --git a/checkman/alcatel_power_aos7 b/checkman/alcatel_power_aos7 new file mode 100644 index 0000000..4d67a47 --- /dev/null +++ b/checkman/alcatel_power_aos7 @@ -0,0 +1,27 @@ +title: Alcatel switches: Power Supplies +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + This check monitors the status of power supplies in Alcatel switches running + operating system AOS7 or higher. Please consider that this check does not + behave like {alcatel_power} for Alcatel switches running operating system + AOS6 or lower. + + Check status: + - {OK} in case the monitored value is one of: + up, master + - {WARN} in case the monitored value is one of: + testing, secondary, idle, pwrsave + - {CRIT} in case the monitored value is one of: + down, unpowered + - {UNKNOWN} in case the monitored value is one of: + unknown + +item: + The ID of the power supply as output from the SNMP agent. + +inventory: + One check is created for each present power supply. + diff --git a/checks/alcatel_power_aos7 b/checks/alcatel_power_aos7 new file mode 100644 index 0000000..5dba3ba --- /dev/null +++ b/checks/alcatel_power_aos7 @@ -0,0 +1,89 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 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. + +alcatel_power_aos7_operability_to_status_mapping = { + '1': "up", + '2': "down", + '3': "testing", + '4': "unknown", + '5': "secondary", + '6': "not present", # no check status required + '7': "unpowered", + '8': "master", + '9': "idle", + '10': "power save", +} + +alcatel_power_aos7_no_power_supply = "no power supply" + +alcatel_power_aos7_power_type_mapping = { + '0': alcatel_power_aos7_no_power_supply, + '1': "AC", + '2': "DC", +} + +PowerSupplyEntry = collections.namedtuple('PowerSupplyEntry', 'status_readable power_supply_type') + + +def parse_alcatel_power_aos7(info): + return { + item: PowerSupplyEntry( + alcatel_power_aos7_operability_to_status_mapping[operability_status], + alcatel_power_aos7_power_type_mapping[power_supply_type], + ) for (item, operability_status, power_supply_type) in info + } + + +@discover +def inventory_alcatel_power_aos7(_oidend, device): + return (device.power_supply_type != alcatel_power_aos7_no_power_supply and + device.status_readable != "not present") + + +@get_parsed_item_data +def check_alcatel_power_aos7(item, _no_params, device): + if device.status_readable == 'up': + status = 0 + else: + status = 2 + yield status, "[%s] Status: %s" % (device.power_supply_type, device.status_readable) + + +check_info["alcatel_power_aos7"] = { + "parse_function": parse_alcatel_power_aos7, + "check_function": check_alcatel_power_aos7, + "inventory_function": inventory_alcatel_power_aos7, + "service_description": "Power Supply %s", + "snmp_scan_function": alcatel_new_networking_products_scan_function, + "snmp_info": ( + ".1.3.6.1.4.1.6486.801.1.1.1.1.1.1.1", # MIB object "chasEntPhysicalEntry" + [ + OID_END, + 2, # MIB object "chasEntPhysOperStatus" + 35, # MIB object "chasEntPhysPowerType" + ]), + "includes": ["alcatel.include"], +} diff --git a/tests/unit/checks/generictests/datasets/alcatel_power_aos7.py b/tests/unit/checks/generictests/datasets/alcatel_power_aos7.py new file mode 100644 index 0000000..b2c5bb8 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/alcatel_power_aos7.py @@ -0,0 +1,34 @@ +#yapf: disable + + +checkname = 'alcatel_power_aos7' + + +info = [[u'1', u'1', u'1'], + [u'2', u'2', u'1'], + [u'3', u'3', u'1'], + [u'4', u'4', u'1'], + [u'5', u'5', u'0'], + [u'6', u'6', u'0'], + [u'7', u'7', u'0'], + [u'8', u'8', u'2'], + [u'9', u'9', u'2'], + [u'10', u'10', u'2']] + + +discovery = {'': [(u'1', {}), + (u'10', {}), + (u'2', {}), + (u'3', {}), + (u'4', {}), + (u'8', {}), + (u'9', {})]} + + +checks = {'': [(u'1', {}, [(0, '[AC] Status: up', [])]), + (u'10', {}, [(2, '[DC] Status: power save', [])]), + (u'2', {}, [(2, '[AC] Status: down', [])]), + (u'3', {}, [(2, '[AC] Status: testing', [])]), + (u'4', {}, [(2, '[AC] Status: unknown', [])]), + (u'8', {}, [(2, '[DC] Status: master', [])]), + (u'9', {}, [(2, '[DC] Status: idle', [])])]}

5 years, 4 months

← Newer
1
...
30
31
32
33
34
35
36
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019