Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Sort and group werks in a table-driven way.

by Sven Panne

Module: check_mk Branch: master Commit: e137119619a13deb06f7dd3438f246d31d3c30c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e137119619a13d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 14 15:32:51 2018 +0100 Sort and group werks in a table-driven way. This makes the relationship between the sorter and the grouping function explicit and is much clearer, too. Change-Id: I2e9b4084171bae672404874413c1849fc75976b6 --- cmk/gui/werks.py | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py index f1addc7..897e622 100644 --- a/cmk/gui/werks.py +++ b/cmk/gui/werks.py @@ -305,8 +305,28 @@ def render_unacknowleged_werks(): html.close_div() -def render_werks_table(): +# NOTE: The sorter and the grouping function should better agree, otherwise chaos will ensue... +_SORT_AND_GROUP = { + "version": ( + cmk.utils.werks.sort_by_version_and_component, + lambda werk: werk["version"] # + ), + "day": ( + cmk.utils.werks.sort_by_date, + lambda werk: time.strftime("%Y-%m-%d", time.localtime(werk["date"])) # + ), + "week": ( + cmk.utils.werks.sort_by_date, + lambda werk: time.strftime("%s %%U - %%Y" % _("Week"), time.localtime(werk["date"])) # + ), + None: ( + cmk.utils.werks.sort_by_date, + lambda _werk: None # + ), +} + +def render_werks_table(): werk_table_options = render_werk_table_options() if html.var("show_unack") and not html.has_var("wo_set"): @@ -314,14 +334,12 @@ def render_werks_table(): werk_table_options["compatibility"] = ["incomp_unack"] current_group, number_of_groups, number_of_werks = False, 0, 0 - if werk_table_options["grouping"] == "version": - werklist = cmk.utils.werks.sort_by_version_and_component(g_werks.values()) - else: - werklist = cmk.utils.werks.sort_by_date(g_werks.values()) + sorter, grouper = _SORT_AND_GROUP[werk_table_options["grouping"]] + werklist = sorter(g_werks.values()) for werk in werklist: if werk_matches_options(werk, werk_table_options): - group = werk_group_value(werk, werk_table_options["grouping"]) + group = grouper(werk) if group != current_group: if number_of_groups >= werk_table_options["group_limit"]: break @@ -362,18 +380,6 @@ def render_werks_table(): html.h3(_("No matching Werks found.")) -def werk_group_value(werk, grouping): - if grouping is None: - return None - elif grouping == "version": - return werk["version"] - - broken_time = time.localtime(werk["date"]) - if grouping == "day": - return time.strftime("%Y-%m-%d", broken_time) - return time.strftime("%s %%U - %%Y" % _("Week"), broken_time) - - def werk_matches_options(werk, werk_table_options): if not ((not werk_table_options["id"] or werk["id"] == int(werk_table_options["id"])) and \ werk["level"] in werk_table_options["levels"] and \

5 years, 6 months

Improved werks sorting.

by Sven Panne

Module: check_mk Branch: master Commit: e5c15c48c1e802ce17f46591b93eb784f3646b46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c15c48c1e802… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 14 12:08:44 2018 +0100 Improved werks sorting. Change-Id: I56776970b729cedaed87bfeaaeef3ef983e8a63e --- cmk/utils/werks.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/cmk/utils/werks.py b/cmk/utils/werks.py index a5a650c..c3c7a57 100644 --- a/cmk/utils/werks.py +++ b/cmk/utils/werks.py @@ -230,15 +230,28 @@ def write_werk_as_text(f, werk): f.write(" NOTE: Please refer to the migration notes!\n") +_CLASS_SORTING_VALUE = { + "feature": 1, + "security": 2, + "fix": 3, +} + +_COMPATIBLE_SORTING_VALUE = { + "incomp_unack": 1, + "incomp_ack": 2, + "compat": 3, +} + + # sort by version and within one version by component def sort_by_version_and_component(werks): return sorted(werks, - key=lambda w: (parse_check_mk_version(w["version"]), + key=lambda w: (-parse_check_mk_version(w["version"]), werk_components().get(w["component"], w["component"]), - w["class"] != "fix", - w["class"] != "sec", - w["title"]), - reverse=True) + _CLASS_SORTING_VALUE.get(w["class"], 99), + -w["level"], + _COMPATIBLE_SORTING_VALUE.get(w["compatible"], 99), + w["title"])) def sort_by_date(werks):

5 years, 6 months

refactor alcatel_temp check

by Florian Kromer

Module: check_mk Branch: master Commit: 18ad6d09362265b45594c44410ae1fc5acfcdae6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18ad6d09362265… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Dec 5 12:40:55 2018 +0100 refactor alcatel_temp check CMK-1188 Change-Id: Ie6e6e5e0dc3783b3a566ea57015bb6a530ead88f --- checks/alcatel.include | 32 ++++++++++++++++++++++++++++++++ checks/alcatel_temp | 43 +++++-------------------------------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/checks/alcatel.include b/checks/alcatel.include index d000cda..fdf4d2c 100644 --- a/checks/alcatel.include +++ b/checks/alcatel.include @@ -24,6 +24,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +factory_settings['alcatel_temp'] = { + "levels": (45, 50), +} + def alcatel_networking_products_scan_function(oid): sys_object_id = ".1.3.6.1.2.1.1.2.0" # MIB object "sysObjectID" @@ -52,3 +56,31 @@ def check_alcatel_power(item, _no_params, info): return 2, "Supply in error condition (%s)" % status return 0, "Supply status OK" return 3, "Supply not found" + + +def inventory_alcatel_temp(info): + with_slot = len(info) != 1 + for index, row in enumerate(info): + for oid, name in enumerate(["Board", "CPU"]): + if row[oid] != '0': + if with_slot: + yield "Slot %s %s" % (index + 1, name), {} + else: + yield name, {} + + +def check_alcatel_temp(item, params, info): + if len(info) == 1: + slot_index = 0 + else: + slot = int(item.split()[1]) + slot_index = slot - 1 + sensor = item.split()[-1] + items = {"Board": 0, "CPU": 1} + try: + # If multiple switches are staked and one of them are + # not reachable, prevent a exception + temp_celsius = int(info[slot_index][items[sensor]]) + except: + return 3, "Sensor not found" + return check_temperature(temp_celsius, params, "alcatel_temp_%s" % item) diff --git a/checks/alcatel_temp b/checks/alcatel_temp index 87cf2ed..ed12630 100644 --- a/checks/alcatel_temp +++ b/checks/alcatel_temp @@ -24,39 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -factory_settings['alcatel_temp'] = { - "levels": (45, 50), -} - - -def inventory_alcatel_temp(info): - with_slot = len(info) != 1 - for index, row in enumerate(info): - for oid, name in enumerate(["Board", "CPU"]): - if row[oid] != '0': - if with_slot: - yield "Slot %s %s" % (index + 1, name), {} - else: - yield name, {} - - -def check_alcatel_temp(item, params, info): - if len(info) == 1: - slot_index = 0 - else: - slot = int(item.split()[1]) - slot_index = slot - 1 - sensor = item.split()[-1] - items = {"Board": 0, "CPU": 1} - try: - # If multiple switches are staked and one of them are - # not reachable, prevent a exception - temp_celsius = int(info[slot_index][items[sensor]]) - except: - return 3, "Sensor not found" - return check_temperature(temp_celsius, params, "alcatel_temp_%s" % item) - - check_info["alcatel_temp"] = { "check_function": check_alcatel_temp, "inventory_function": inventory_alcatel_temp, @@ -64,12 +31,12 @@ check_info["alcatel_temp"] = { "group": "temperature", "default_levels_variable": "alcatel_temp", "has_perfdata": True, - "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_scan_function": alcatel_networking_products_scan_function, "snmp_info": ( - ".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.3.1", + ".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.3.1", # MIB object "alaChasEntPhysFanTable" [ - 4, # chasHardwareBoardTemp - 5, # chasHardwareCpuTemp + 4, # MIB object "chasHardwareBoardTemp" + 5, # MIB object "chasHardwareCpuTemp" ]), - "includes": ["temperature.include"], + "includes": ["alcatel.include", "temperature.include"], }

5 years, 6 months

juniper_bgp_state: fix missing integer conversion

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5d8f1b65dffda7fada19864ac186fb35fc802008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d8f1b65dffda7… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Dec 17 12:43:56 2018 +0100 juniper_bgp_state: fix missing integer conversion Change-Id: I7d4799938c75a209ff6cf45bba12d8d263693b76 --- checks/juniper_bgp_state | 4 ++-- .../checks/generictests/datasets/juniper_bgp_state_ip_addresses.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index 6f4c96e..7af961f 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -30,7 +30,7 @@ def _clean_v4_address(chunks): def _clean_v6_address(chunks): - ichunks = iter('%02x' % i for i in chunks) + ichunks = iter('%02x' % int(i) for i in chunks) blocks = ("%s%s" % pair for pair in zip(ichunks, ichunks)) stripped_blocks = ('0' if b == '0000' else b.lstrip('0') for b in blocks) v6_string = ':'.join(b for b in stripped_blocks) @@ -56,7 +56,7 @@ def juniper_bgp_state_create_item(peering_entry): return _clean_v6_address(peering_entry) except (ValueError, IndexError): pass - return ' '.join('%02X' % i for i in peering_entry) # that's what has been in the data + return ' '.join('%02X' % int(i) for i in peering_entry) # that's what has been in the data def parse_juniper_bgp_state(info): diff --git a/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py b/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py index 2164fdf..cec3c9a 100644 --- a/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py +++ b/tests/unit/checks/generictests/datasets/juniper_bgp_state_ip_addresses.py @@ -1,8 +1,8 @@ checkname = 'juniper_bgp_state' info = [ - [u'4', u'1', [222, 173, 190, 239, 0, 64, 1, 17, 0, 0, 0, 0, 0, 0, 0, 1]], - [u'4', u'2', [0] * 16], + [u'4', u'1', [u'222', u'173', u'190', u'239', u'0', u'64', u'1', u'17', u'0', u'0', u'0', u'0', u'0', u'0', u'0', u'1']], + [u'4', u'2', [u'0'] * 16], ] discovery = {'': [('[dead:beef:40:111::1]', {}), ("[::]", {})]}

5 years, 6 months

6991 FIX genua_carp, genua_fan, genua_pfstate, genua_state_correlation, genua_vpn: Also discover Genubox and Genuscript devices

by Simon Betz

Module: check_mk Branch: master Commit: 90e0e6c4b968c50fd2d92d9491e44a9f2f02f083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90e0e6c4b968c5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 17 13:19:06 2018 +0100 6991 FIX genua_carp, genua_fan, genua_pfstate, genua_state_correlation, genua_vpn: Also discover Genubox and Genuscript devices Change-Id: If5e8ad975331803d5f09d6af5f704a30964f1406 --- .werks/6991 | 11 +++++++++++ checkman/genua_carp | 4 ++-- checkman/genua_fan | 6 +++--- checkman/genua_pfstate | 8 ++++---- checkman/genua_state_correlation | 6 +++--- checkman/genua_vpn | 5 ++++- checks/genua.include | 37 +++++++++++++++++++++++++++++++++++++ checks/genua_carp | 3 ++- checks/genua_fan | 4 ++-- checks/genua_pfstate | 3 ++- checks/genua_state_correlation | 4 ++-- checks/genua_vpn | 3 ++- 12 files changed, 74 insertions(+), 20 deletions(-) diff --git a/.werks/6991 b/.werks/6991 new file mode 100644 index 0000000..0f61217 --- /dev/null +++ b/.werks/6991 @@ -0,0 +1,11 @@ +Title: genua_carp, genua_fan, genua_pfstate, genua_state_correlation, genua_vpn: Also discover Genubox and Genuscript devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1545047502 + + diff --git a/checkman/genua_carp b/checkman/genua_carp index 7b78fad..2014f2a 100644 --- a/checkman/genua_carp +++ b/checkman/genua_carp @@ -1,4 +1,4 @@ -title: Genuscreen: State of Carp Interfaces on Carp Clusters and Nodes +title: Genua: State of Carp Interfaces on Carp Clusters and Nodes agents: snmp catalog: hw/network/genua license: GPL @@ -20,7 +20,7 @@ description: inventory: The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) - and if the name of this OID contains "genuscreen" (case insensitive). + and if the name of this OID contains "genuscreen", "genuscript" or "genubox" (case insensitive). If this is true the system is inventorized. item: diff --git a/checkman/genua_fan b/checkman/genua_fan index 1c26cf5..f447534 100644 --- a/checkman/genua_fan +++ b/checkman/genua_fan @@ -1,4 +1,4 @@ -title: Genuscreen: Fan State and RPM +title: Genua: Fan State and RPM agents: snmp catalog: hw/network/genua license: GPL @@ -13,8 +13,8 @@ description: inventory: The inventory process checks if the device has a system description OID - of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" - (case insensitive). + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). If this is true and a fan is found, then the it is inventorized. item: diff --git a/checkman/genua_pfstate b/checkman/genua_pfstate index 979961a..b634cf0 100644 --- a/checkman/genua_pfstate +++ b/checkman/genua_pfstate @@ -1,4 +1,4 @@ -title: Genuscreen: State of Packetfilter Engine +title: Genua: State of Packetfilter Engine agents: snmp catalog: hw/network/genua license: GPL @@ -17,7 +17,7 @@ description: inventory: The inventory process checks if the device has a system description OID - of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" - (case insensitive). If it also contains valid pf state output, the device is - inventorized. + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). If it also contains valid + pf state output, the device is inventorized. diff --git a/checkman/genua_state_correlation b/checkman/genua_state_correlation index d910ec0..ff2f18c 100644 --- a/checkman/genua_state_correlation +++ b/checkman/genua_state_correlation @@ -1,4 +1,4 @@ -title: Genuscreen: Correlation of the State of Carp Interfaces +title: Genua: Correlation of the State of Carp Interfaces agents: snmp catalog: hw/network/genua license: GPL @@ -13,7 +13,7 @@ description: inventory: The inventory process checks if the device has a system description OID - of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" - (case insensitive). + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). If this is true and at least two carp interfaces are found, then the system is inventorized. diff --git a/checkman/genua_vpn b/checkman/genua_vpn index ba35bc7..dc13777 100644 --- a/checkman/genua_vpn +++ b/checkman/genua_vpn @@ -1,4 +1,4 @@ -title: Genuscreen: VPN state +title: Genua: VPN state agents: snmp catalog: hw/network/genua license: GPL @@ -10,4 +10,7 @@ item: The VPN id. inventory: + The inventory process checks if the device has a system description OID + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). One service per VPN is created. diff --git a/checks/genua.include b/checks/genua.include new file mode 100644 index 0000000..ac5473b --- /dev/null +++ b/checks/genua.include @@ -0,0 +1,37 @@ +#!/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 scan_genua(oid): + sys_descr = oid(".1.3.6.1.2.1.1.1.0").lower() + for type_ in [ + "genuscreen", + "genubox", + "genucrypt", + ]: + if type_ in sys_descr: + return True + return False diff --git a/checks/genua_carp b/checks/genua_carp index 57a9863..27efb1a 100644 --- a/checks/genua_carp +++ b/checks/genua_carp @@ -151,5 +151,6 @@ check_info['genua_carp'] = { "1.7", # "ifCarpState" ]), ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], } diff --git a/checks/genua_fan b/checks/genua_fan index 6a64e44..7604fc2 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -89,7 +89,7 @@ check_info['genua_fan'] = { "4" # "fanState" ]) ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function": scan_genua, + "includes": ["genua.include", "fan.include"], "default_levels_variable": "genua_fan_default_levels", - "includes": ["fan.include"], } diff --git a/checks/genua_pfstate b/checks/genua_pfstate index f397453..61dd672 100644 --- a/checks/genua_pfstate +++ b/checks/genua_pfstate @@ -112,5 +112,6 @@ check_info['genua_pfstate'] = { 3, # "pfstateStatus" ]) ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], } diff --git a/checks/genua_state_correlation b/checks/genua_state_correlation index 3ffee08..baf9d5a 100644 --- a/checks/genua_state_correlation +++ b/checks/genua_state_correlation @@ -115,6 +115,6 @@ check_info['genua_state_correlation'] = { "1.7", # "ifCarpState" ]) ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() - #"snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.3717.2.1.2.1.7") is not None + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], } diff --git a/checks/genua_vpn b/checks/genua_vpn index be3f516..99c7bd5 100644 --- a/checks/genua_vpn +++ b/checks/genua_vpn @@ -83,5 +83,6 @@ check_info['genua_vpn'] = { "5", # vpn remote "6", # vpn status (2:OK, 1:FAULT) ]), - 'snmp_scan_function': lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], }

5 years, 6 months

aws_ebs_health: Adapted man page

by Simon Betz

Module: check_mk Branch: master Commit: 1bcc5293c621308145989344944217f1ce21799f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bcc5293c62130… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 17 13:02:18 2018 +0100 aws_ebs_health: Adapted man page Change-Id: Ia8b42437c79fce49f10f34d0ac05fd1c94e888b9 --- checkman/aws_ebs_health | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/aws_ebs_health b/checkman/aws_ebs_health index 39069cc..eda447e 100644 --- a/checkman/aws_ebs_health +++ b/checkman/aws_ebs_health @@ -11,4 +11,4 @@ description: Details of the single status checks are also reported. inventory: - One service will be created. + One service per volume will be created.

5 years, 6 months

6828 aws_ebs_health, aws_ebs_summary: New checks for AWS/EBS

by Simon Betz

Module: check_mk Branch: master Commit: 6b9405952aa1eaeb0eb382aaf20deb9d96033254 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b9405952aa1ea… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 14 12:59:59 2018 +0100 6828 aws_ebs_health, aws_ebs_summary: New checks for AWS/EBS Change-Id: Iab5da0b339be49ed26be31462d3c69a600042a96 --- .werks/6828 | 10 +++++++ checkman/aws_ebs_health | 14 +++++++++ checkman/aws_ebs_summary | 13 +++++++++ checks/aws_ebs_health | 46 +++++++++++++++++++++++++++++ checks/aws_ebs_summary | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+) diff --git a/.werks/6828 b/.werks/6828 new file mode 100644 index 0000000..f06b900 --- /dev/null +++ b/.werks/6828 @@ -0,0 +1,10 @@ +Title: aws_ebs_health, aws_ebs_summary: New checks for AWS/EBS +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544788776 +Class: feature + + diff --git a/checkman/aws_ebs_health b/checkman/aws_ebs_health new file mode 100644 index 0000000..39069cc --- /dev/null +++ b/checkman/aws_ebs_health @@ -0,0 +1,14 @@ +title: AWS EBS Health +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors health of AWS elastic block storages. + To make this check work you have to configure the related + special agent {{Amazon Web Services (AWS)}}. + If the EBS status is OK the check returns OK otherwise CRIT. + Details of the single status checks are also reported. + +inventory: + One service will be created. diff --git a/checkman/aws_ebs_summary b/checkman/aws_ebs_summary new file mode 100644 index 0000000..156dd99 --- /dev/null +++ b/checkman/aws_ebs_summary @@ -0,0 +1,13 @@ +title: AWS EBS Summary +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors all AWS EBS 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_ebs_health b/checks/aws_ebs_health new file mode 100644 index 0000000..37d2a0d --- /dev/null +++ b/checks/aws_ebs_health @@ -0,0 +1,46 @@ +#!/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 parse_aws_health(info): + return {k: v for row in parse_aws(info) for k, v in row.iteritems()} + + +@get_parsed_item_data +def check_aws_ebs_health(item, params, metrics): + ebs_status = metrics["Status"] + yield 0 if ebs_status.lower() == 'ok' else 2, "Status: %s" % ebs_status + for row in metrics['Details']: + yield 0, "%s: %s" % (row['Name'], row['Status']) + + +check_info['aws_ebs_health'] = { + 'parse_function': parse_aws_health, + 'inventory_function': discover(), + 'check_function': check_aws_ebs_health, + 'service_description': 'AWS/EBS Health %s', + 'includes': ['aws.include'], +} diff --git a/checks/aws_ebs_summary b/checks/aws_ebs_summary new file mode 100644 index 0000000..ea818e4 --- /dev/null +++ b/checks/aws_ebs_summary @@ -0,0 +1,76 @@ +#!/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. + +AWSEBSStorageTypes = { + "gp2": "General Purpose SSD", + "io1": "Provisioned IOPS SSD", + "st1": "Throughput Optimized HDD", + "sc1": "Cold HDD", +} + + +def parse_aws_summary(info): + parsed = {} + for row in parse_aws(info): + inst = parsed.setdefault(row['VolumeId'], row) + type_ = row['VolumeType'] + inst.setdefault('type_readable', AWSEBSStorageTypes.get(type_, "unknown[%s]" % type_)) + return parsed + + +def inventory_aws_ebs_summary(parsed): + if parsed: + return [(None, {})] + + +def check_aws_ebs_summary(item, params, parsed): + stores_by_state = {} + stores_by_type = {} + long_output = [] + for volume_id, row in parsed.iteritems(): + stores_by_state.setdefault(row['State'], []).append(volume_id) + stores_by_type.setdefault(row['VolumeType'], []).append(volume_id) + long_output.append( + "Volume: %s, Status: %s, Type: %s, Encrypted: %s, Creation time: %s"\ + % (volume_id, row['State'], row['VolumeType'], row['Encrypted'], row['CreateTime']) + ) + + yield 0, 'Stores: %s' % len(parsed) + for state, stores in stores_by_state.iteritems(): + yield 0, '%s: %s' % (state, len(stores)) + for type_, stores in stores_by_type.iteritems(): + yield 0, '%s: %s' % (AWSEBSStorageTypes.get(type_, "unknown[%s]" % type_), len(stores)) + if long_output: + yield 0, '\n%s' % '\n'.join(long_output) + + +check_info['aws_ebs_summary'] = { + 'parse_function': parse_aws_summary, + 'inventory_function': inventory_aws_ebs_summary, + 'check_function': check_aws_ebs_summary, + 'service_description': 'AWS/EBS Summary', + 'includes': ['aws.include'], +}

5 years, 6 months

agent_aws, aws_ec2, aws_s3: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: ae2ee70f1a064e3c242992713419b69c63d54aab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae2ee70f1a064e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 14 11:21:44 2018 +0100 agent_aws, aws_ec2, aws_s3: Minor cleanup Change-Id: I498dab111013bae1b8fa7fe8bd8ee7d54595836f --- agents/special/agent_aws | 34 ++++++++----- checks/aws.include | 23 +++++++-- checks/aws_ec2 | 124 +++++++++++++++++++++++++---------------------- checks/aws_s3 | 18 ++++--- 4 files changed, 115 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ae2ee70f1a…

5 years, 6 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 7e130ebf302fff23d59b295a913b44d0aabe2915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e130ebf302fff… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 17 12:47:09 2018 +0100 Reserved 20 Werk IDS Change-Id: I3d45ba10ebd56bd9b2565ce7e5b72b529245138d --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c521a1f..02e69ee 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6991 +7011

5 years, 6 months

alcatel_power: refactor

by Florian Kromer

Module: check_mk Branch: master Commit: adff40229fd5975994c88edb91a72274884b77ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adff40229fd597… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Dec 17 11:00:32 2018 +0100 alcatel_power: refactor CMK-1188 Change-Id: Ib22d41a41d04f5c16ce5d3dc70486ab1335b2c80 --- checks/alcatel.include | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ checks/alcatel_power | 35 ++++++-------------------------- 2 files changed, 60 insertions(+), 29 deletions(-) diff --git a/checks/alcatel.include b/checks/alcatel.include new file mode 100644 index 0000000..d000cda --- /dev/null +++ b/checks/alcatel.include @@ -0,0 +1,54 @@ +#!/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_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 oid(sys_object_id).startswith(alcatel_ind_1_base_mib) + + +def inventory_alcatel_power(info): + for line in info: + oid_end, _, device_type, power_type = line + if (power_type and power_type != '0' or device_type in [ + '0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009' + ]): + yield oid_end, None + + +def check_alcatel_power(item, _no_params, info): + for line in info: + oid_end, status, device_type, power_type = line + if item == oid_end: + if (power_type and power_type == '0' or device_type not in [ + '0x35000001', '0x45000004', '0x45000002', '0x45000008', '0x45000009' + ]): + return 3, "No Power supply connected to this port" + if status != '1': + return 2, "Supply in error condition (%s)" % status + return 0, "Supply status OK" + return 3, "Supply not found" diff --git a/checks/alcatel_power b/checks/alcatel_power index f25d6ea..e5c2ac2 100644 --- a/checks/alcatel_power +++ b/checks/alcatel_power @@ -24,41 +24,18 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -def inventory_alcatel_power(info): - for line in info: - oid_end, _, device_type, power_type = line - if (power_type and power_type != '0' or device_type in [ - '0x35000001', '0x45000002', '0x45000004', '0x45000008', '0x45000009' - ]): - yield oid_end, None - - -def check_alcatel_power(item, _no_params, info): - for line in info: - oid_end, status, device_type, power_type = line - if item == oid_end: - if (power_type and power_type == '0' or device_type not in [ - '0x35000001', '0x45000004', '0x45000002', '0x45000008', '0x45000009' - ]): - return 3, "No Power supply connected to this port" - if status != '1': - return 2, "Supply in error condition (%s)" % status - return 0, "Supply status OK" - return 3, "Supply not found" - - check_info["alcatel_power"] = { "check_function": check_alcatel_power, "inventory_function": inventory_alcatel_power, "service_description": "Power Supply %s", - "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_scan_function": alcatel_networking_products_scan_function, "snmp_info": ( - ".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1", + ".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1", # MIB object "chasEntPhysicalEntry" [ OID_END, - 2, # Error Status - 5, # Device Type (0x35000001 == Power Supply) - 36, # chasEntPhysPowerType: 0 no power supply, 1 ac, 2 dc (not available on old devices) + 2, # MIB object "chasEntPhysOperStatus": up(1), down(2), testing(3), unknown(4), secondary(5), notPresent(6), unpowered(7), master(9) + 5, # MIB object "chasEntPhysModuleType": Device Type (0x35000001 == Power Supply) + 36, # MIB object "chasEntPhysPowerType": 0 no power supply, 1 ac, 2 dc (not available on old devices) ]), + "includes": ["alcatel.include"], }

5 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
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