Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

by Götz Golla

Module: check_mk Branch: master Commit: 7706a7b478cd7d5f3bbe9a2364147f2f823bb61b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7706a7b478cd7d… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 21 12:04:00 2014 +0100 commit cleanup --- checks/if.include | 56 +++++++++++++++++--------------------------------- checks/if64 | 43 +++++++++++++++++++------------------- checks/printer_pages | 2 +- 3 files changed, 41 insertions(+), 60 deletions(-) diff --git a/checks/if.include b/checks/if.include index eb2da81..897fb12 100644 --- a/checks/if.include +++ b/checks/if.include @@ -105,9 +105,9 @@ def if_pad_with_zeroes(info, ifIndex, has_nodeinfo): def inventory_if_common(info, has_nodeinfo = False): if has_nodeinfo: - length = 22 - else: length = 21 + else: + length = 20 if len(info) == 0 or len(info[0]) != length: return [] @@ -140,7 +140,7 @@ def inventory_if_common(info, has_nodeinfo = False): ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ - ifOutQLen, ifAlias, ifPhysAddress, ifRxSignal = line + ifOutQLen, ifAlias, ifPhysAddress = line ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) @@ -240,7 +240,7 @@ def check_if_common(item, params, info, has_nodeinfo = False): ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ - ifOutQLen, ifAlias, ifPhysAddress, ifRxSignal = line + ifOutQLen, ifAlias, ifPhysAddress = line if if_inventory_uses_description and ifDescr: group_item = ifDescr elif if_inventory_uses_alias and ifAlias: @@ -355,17 +355,9 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ - ifOutQLen, ifAlias, ifPhysAddress, ifRxSignal = line + ifOutQLen, ifAlias, ifPhysAddress = line ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - try: - ifRxSignal_tmp = re.sub(' dBm:','', ifRxSignal) - ifRxSignal, RxSignalState = ifRxSignal_tmp.split(' ') - ifRxSignal = float(ifRxSignal) - except: - ifRxSignal = 0.0 - RxSignalState = "" - if item.lstrip("0") == ifIndex \ or (item == "0" * len(item) and saveint(ifIndex) == 0) \ @@ -506,26 +498,22 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n ( "outucast", outucast, None, None, None, None), ( "outnucast", saveint(outmcast) + saveint(outbcast), None, None, None, None), ( "outdisc", ifOutDiscards, None, None, None, None), - ( "rxsignal", ifRxSignal, None, None, None, None), ( "outerr", ifOutErrors, err_warn, err_crit, None, None) ]: - if name != "rxsignal": - try: - if node == None: - timedif, rate = get_counter("if.%s.%s" % (name, item), this_time, saveint(counter)) - if force_counter_wrap: - raise MKCounterWrapped("if.%s.%s" % (name, item), "Forced counter wrap") - else: # clustered check needs one counter per variable, item AND NODE - timedif, rate = get_counter("if.%s.%s.%s" % (node, name, item), this_time, saveint(counter)) - if force_counter_wrap: - raise MKCounterWrapped("if.%s.%s.%s" % (node, name, item), "Forced counter wrap") - rates.append(rate) - perfdata.append( (name, rate, warn, crit, mmin, mmax) ) - except MKCounterWrapped: - wrapped = True - # continue, other counters might wrap as well - else: - perfdata.append( (name, counter, warn, crit, mmin, mmax) ) + try: + if node == None: + timedif, rate = get_counter("if.%s.%s" % (name, item), this_time, saveint(counter)) + if force_counter_wrap: + raise MKCounterWrapped("if.%s.%s" % (name, item), "Forced counter wrap") + else: # clustered check needs one counter per variable, item AND NODE + timedif, rate = get_counter("if.%s.%s.%s" % (node, name, item), this_time, saveint(counter)) + if force_counter_wrap: + raise MKCounterWrapped("if.%s.%s.%s" % (node, name, item), "Forced counter wrap") + rates.append(rate) + perfdata.append( (name, rate, warn, crit, mmin, mmax) ) + except MKCounterWrapped: + wrapped = True + # continue, other counters might wrap as well # if at least one counter wrapped, we do not handle the counters at all if wrapped: @@ -572,12 +560,6 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n state = max(state, 1) infotext += ' (!) >= ' + format_value(bw_warn) - if RxSignalState != "": - infotext += ", RxSignalState: %s" % RxSignalState - if RxSignalState != "Normal": - state = max(state, 1) - infotext += ' (!)' - pacrate = okrate + errorrate if pacrate > 0.0: # any packets transmitted? errperc = 100.0 * errorrate / (okrate + errorrate) diff --git a/checks/if64 b/checks/if64 index dbf86a1..f842658 100644 --- a/checks/if64 +++ b/checks/if64 @@ -67,28 +67,27 @@ check_info["if64"] = { 'service_description': 'Interface %s', 'has_perfdata': True, 'includes': [ 'if.include' ], - 'snmp_info': ( ".1.3.6.1", [ - "2.1.2.2.1.1", # ifIndex 0 - "2.1.2.2.1.2", # ifDescr 1 - "2.1.2.2.1.3", # ifType 2 - "2.1.31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit - "2.1.2.2.1.8", # ifOperStatus 4 - "2.1.31.1.1.1.6", # ifHCInOctets 5 - "2.1.31.1.1.1.7", # ifHCInUcastPkts 6 - "2.1.31.1.1.1.8", # ifHCInMulticastPkts 7 - "2.1.31.1.1.1.9", # ifHCInBroadcastPkts 8 - "2.1.2.2.1.13", # ifInDiscards 9 - "2.1.2.2.1.14", # ifInErrors 10 - "2.1.31.1.1.1.10", # ifHCOutOctets 11 - "2.1.31.1.1.1.11", # ifHCOutUcastPkts 12 - "2.1.31.1.1.1.12", # ifHCOutMulticastPkts 13 - "2.1.31.1.1.1.13", # ifHCOutBroadcastPkts 14 - "2.1.2.2.1.19", # ifOutDiscards 15 - "2.1.2.2.1.20", # ifOutErrors 16 - "2.1.2.2.1.21", # ifOutQLen 17 - "2.1.31.1.1.1.18", # ifAlias 18 - "2.1.2.2.1.6", # ifPhysAddress 19 - "4.1.1991.1.1.3.3.6.1.3", # rx signal 20 + 'snmp_info': ( ".1.3.6.1.2.1", [ + "2.2.1.1", # ifIndex 0 + "2.2.1.2", # ifDescr 1 + "2.2.1.3", # ifType 2 + "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit + "2.2.1.8", # ifOperStatus 4 + "31.1.1.1.6", # ifHCInOctets 5 + "31.1.1.1.7", # ifHCInUcastPkts 6 + "31.1.1.1.8", # ifHCInMulticastPkts 7 + "31.1.1.1.9", # ifHCInBroadcastPkts 8 + "2.2.1.13", # ifInDiscards 9 + "2.2.1.14", # ifInErrors 10 + "31.1.1.1.10", # ifHCOutOctets 11 + "31.1.1.1.11", # ifHCOutUcastPkts 12 + "31.1.1.1.12", # ifHCOutMulticastPkts 13 + "31.1.1.1.13", # ifHCOutBroadcastPkts 14 + "2.2.1.19", # ifOutDiscards 15 + "2.2.1.20", # ifOutErrors 16 + "2.2.1.21", # ifOutQLen 17 + "31.1.1.1.18", # ifAlias 18 + "2.2.1.6", # ifPhysAddress 19 ]), 'snmp_scan_function' : if64_scan_function, 'group' : 'if', diff --git a/checks/printer_pages b/checks/printer_pages index 3046e72..81d21bc 100644 --- a/checks/printer_pages +++ b/checks/printer_pages @@ -38,7 +38,7 @@ check_info["printer_pages"] = { 'inventory_function': inventory_printer_pages, 'service_description': 'Pages', 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.2.1.43.10.2.1.4', [ "1" ]), + 'snmp_info': ('.1.3.6.1.2.1.43.10.2.1.4.1', [ 1 ]), 'snmp_scan_function': \ lambda oid: oid(".1.3.6.1.2.1.43.10.2.1.4.1.1") != None, }

10 years, 3 months

Check_MK Git: check_mk: Fixed inline comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 15351c4b34fb445e3e2fefbf4864e32532267a69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15351c4b34fb44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 21 11:46:01 2014 +0100 Fixed inline comment --- checks/check_cmk_inv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/check_cmk_inv b/checks/check_cmk_inv index 8a83ff3..1619976 100644 --- a/checks/check_cmk_inv +++ b/checks/check_cmk_inv @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def check_cmk_inv(params): - # Current not parameters + # Currently no parameters are neccessary return "" active_check_info['cmk_inv'] = {

10 years, 3 months

Check_MK Git: check_mk: Slot number is now derived from drsServerSlotName instead of drsServerIndex

by Götz Golla

Module: check_mk Branch: master Commit: 9cf491bd4579cb7232b3454d863a6ef38ffe8bdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cf491bd4579cb… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 21 11:18:39 2014 +0100 Slot number is now derived from drsServerSlotName instead of drsServerIndex --- checkman/dell_chassis_slots | 2 +- checks/dell_chassis_slots | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/checkman/dell_chassis_slots b/checkman/dell_chassis_slots index a382cab..2cedd3d 100644 --- a/checkman/dell_chassis_slots +++ b/checkman/dell_chassis_slots @@ -15,7 +15,7 @@ description: of the server: drsServerServiceTag, drsServerSlotName item: - The id of the slot + The name of the slot as given by drsServerSlotNumber inventory: All slots where the state is not "absent". diff --git a/checks/dell_chassis_slots b/checks/dell_chassis_slots index a3a634a..dda58f2 100644 --- a/checks/dell_chassis_slots +++ b/checks/dell_chassis_slots @@ -25,10 +25,11 @@ # Boston, MA 02110-1301 USA. dell_chassis_slots_info = ( ".1.3.6.1.4.1.674.10892.2.5.1.1", [ - "1", # drsServerIndex + #"1", # drsServerIndex "2", # drsServerMonitoringCapable "3", # drsServerServiceTag "4", # drsServerSlotName + "5", # drsServerSlotNumber ]) dell_chassis_slots_scan = lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.2" @@ -36,18 +37,18 @@ dell_chassis_slots_scan = lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4. def inventory_dell_chassis_slots(info): inventory = [] for line in info: - index = line[0] - if saveint(index) in ( 1, 2, 3, 4, 5, 6, 7, 8, 9 ): - index = "0"+index - if line[1] != "1" and line[3] != "N/A": - inventory.append( ( index, None ) ) + number = line[3] + if saveint(number) in ( 1, 2, 3, 4, 5, 6, 7, 8, 9 ): + number = "0"+number + if line[0] != "1" and line[2] != "N/A": + inventory.append( ( number, None ) ) return inventory def check_dell_chassis_slots(item, _no_params, info): - for index, status, service_tag, name in info: - if saveint(index) in ( 1, 2, 3, 4, 5, 6, 7, 8, 9 ): - index = "0"+index - if item == index: + for status, service_tag, name, number in info: + if saveint(number) in ( 1, 2, 3, 4, 5, 6, 7, 8, 9 ): + number = "0"+number + if item == number: #absent = 1,none = 2,basic = 3,off = 4, state_table = { "1" : ( "absent", 0 ),

10 years, 3 months

Check_MK Git: check_mk: check_notify_count: New active check to monitor the number of notifications sent to contacts

by Lars Michelsen

Module: check_mk Branch: master Commit: a69b187b786474747eefd74804632f4ad11ef0c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a69b187b786474… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 21 11:14:54 2014 +0100 check_notify_count: New active check to monitor the number of notifications sent to contacts Check the number of sent notifications per contact using the plugin <tt>check_notify_count</tt> provided with Check_MK. This plugin counts the total number of notifcations sent by the local monitoring core and creates graphs for each individual contact. --- .werks/759 | 10 +++ ChangeLog | 1 + checkman/check_notify_count | 28 +++++++ checks/check_notify_count | 43 ++++++++++ doc/treasures/active_checks/check_notify_count | 99 ++++++++++++++++++++++++ pnp-templates/check_mk_active-notify_count.php | 44 +++++++++++ web/plugins/wato/active_checks.py | 40 ++++++++++ 7 files changed, 265 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a69b187b78…

10 years, 3 months

Check_MK Git: check_mk: Extended snmp scan function of some blade checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: 996f138a1263d8483bc413539c6cff9df5f05220 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=996f138a1263d8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 21 10:45:30 2014 +0100 Extended snmp scan function of some blade checks --- checks/blade_bx_blades | 3 ++- checks/blade_bx_powerfan | 3 ++- checks/blade_bx_powermod | 3 ++- checks/blade_bx_temp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/checks/blade_bx_blades b/checks/blade_bx_blades index c1fee74..db4e947 100644 --- a/checks/blade_bx_blades +++ b/checks/blade_bx_blades @@ -48,5 +48,6 @@ check_info['blade_bx_blades'] = { 5, # Serialnumber 21, # Name ]), - "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ + or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1", } diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan index b729f28..73910de 100644 --- a/checks/blade_bx_powerfan +++ b/checks/blade_bx_powerfan @@ -77,6 +77,7 @@ check_info['blade_bx_powerfan'] = { 7 # ctrlstate ]), - "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ + or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1", } diff --git a/checks/blade_bx_powermod b/checks/blade_bx_powermod index 58e491a..4c1159c 100644 --- a/checks/blade_bx_powermod +++ b/checks/blade_bx_powermod @@ -59,6 +59,7 @@ check_info['blade_bx_powermod'] = { 2, # status 4, # product name ]), - "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ + or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1", } diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 60d96a2..72a0a97 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -74,7 +74,8 @@ check_info['blade_bx_temp'] = { 6, # temp 7, # crit react ]), - "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ + or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1", "group" : "hw_temperature", }

10 years, 3 months

Check_MK Git: check_mk: FIX Availability: fix exception when summary is on and some elements have never been OK

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a036ced5c63df141d0fbf0d53d8dc8db0d2fb91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a036ced5c63df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 21 10:26:52 2014 +0100 FIX Availability: fix exception when summary is on and some elements have never been OK --- .werks/750 | 8 ++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/750 b/.werks/750 new file mode 100644 index 0000000..ee3c3b6 --- /dev/null +++ b/.werks/750 @@ -0,0 +1,8 @@ +Title: Availability: fix exception when summary is on and some elements have never been OK +Level: 1 +Component: reporting +Version: 1.2.5i1 +Date: 1395393981 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7d79fd1..56ced6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -354,6 +354,7 @@ * 0405 Add CSV export to availability views... * 0338 FIX: Introduce time limit on availability queries... * 0681 FIX: Display correct year for availability range for last month in january + * 0750 FIX: Availability: fix exception when summary is on and some elements have never been OK Event Console: * 0301 Handling messages of special syslog format correctly... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index ce7efa9..907a460 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1161,7 +1161,8 @@ def render_availability_group(group_title, range_title, group_id, availability, elif show_summary: summary.setdefault(sid, 0.0) if avoptions["timeformat"].startswith("percentage"): - summary[sid] += float(number) / considered_duration + if considered_duration > 0: + summary[sid] += float(number) / considered_duration else: summary[sid] += number @@ -1237,6 +1238,9 @@ def render_availability_group(group_title, range_title, group_id, availability, table.end() def check_av_levels(number, av_levels, considered_duration): + if considered_duration == 0: + return 0 + perc = 100 * float(number) / float(considered_duration) warn, crit = av_levels if perc < crit:

10 years, 3 months

Check_MK Git: check_mk: dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers

by Götz Golla

Module: check_mk Branch: master Commit: e90ff6446582aa723cdc1d3911dc5e09b7fa63d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e90ff6446582aa… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:17:04 2014 +0100 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers --- .werks/597 | 8 +++++ ChangeLog | 1 + checkman/dell_chassis_slots | 22 +++++++++++++ checks/dell_chassis_slots | 73 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) diff --git a/.werks/597 b/.werks/597 new file mode 100644 index 0000000..844d207 --- /dev/null +++ b/.werks/597 @@ -0,0 +1,8 @@ +Title: dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1395353802 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index aa14644..7d79fd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 0144 enterasys_cpu_util enterasys_powersupply: New Checks for CPU Utilization and Power Supplies on enterasys switches * 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption... * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC + * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/dell_chassis_slots b/checkman/dell_chassis_slots new file mode 100644 index 0000000..a382cab --- /dev/null +++ b/checkman/dell_chassis_slots @@ -0,0 +1,22 @@ +title: Dell PowerEdge Chassis: State of the Blade Slots +agents: snmp +catalog: hw/server/dell +license: GPL +distribution: check_mk +description: + This check monitors the blade slots of the chassis of Dell PowerEdge Servers. + + The check returns {OK} when a slot is in the {basic} state. It returns {WARN} + otherwise. + + No limits are set in the check. + + In addition to the state, the check displays the following other parameters + of the server: drsServerServiceTag, drsServerSlotName + +item: + The id of the slot + +inventory: + All slots where the state is not "absent". + diff --git a/checks/dell_chassis_slots b/checks/dell_chassis_slots new file mode 100644 index 0000000..a3a634a --- /dev/null +++ b/checks/dell_chassis_slots @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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- +# ails. 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. + +dell_chassis_slots_info = ( ".1.3.6.1.4.1.674.10892.2.5.1.1", [ + "1", # drsServerIndex + "2", # drsServerMonitoringCapable + "3", # drsServerServiceTag + "4", # drsServerSlotName + ]) + +dell_chassis_slots_scan = lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.2" + +def inventory_dell_chassis_slots(info): + inventory = [] + for line in info: + index = line[0] + if saveint(index) in ( 1, 2, 3, 4, 5, 6, 7, 8, 9 ): + index = "0"+index + if line[1] != "1" and line[3] != "N/A": + inventory.append( ( index, None ) ) + return inventory + +def check_dell_chassis_slots(item, _no_params, info): + for index, status, service_tag, name in info: + if saveint(index) in ( 1, 2, 3, 4, 5, 6, 7, 8, 9 ): + index = "0"+index + if item == index: + #absent = 1,none = 2,basic = 3,off = 4, + state_table = { + "1" : ( "absent", 0 ), + "2" : ( "none", 1 ), + "3" : ( "basic", 0 ), + "4" : ( "off", 1 ), + } + state_txt, state = state_table.get(status, ("unknown state, ", 3 )) + infotext = "Status: %s, Name: %s, ServiceTag: %s" % ( state_txt, name, service_tag ) + + return state, infotext + + return 3, "unknown slot" + +check_info["dell_chassis_slots"] = { + "check_function" : check_dell_chassis_slots, + "inventory_function" : inventory_dell_chassis_slots, + "service_description" : "Slot %s", + "has_perfdata" : False, + "snmp_info" : dell_chassis_slots_info, + "snmp_scan" : dell_chassis_slots_scan, +} +

10 years, 3 months

Check_MK Git: check_mk: dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC

by Götz Golla

Module: check_mk Branch: master Commit: 3bee61fb4711887e0f4d49d5b177b64c8bdce463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bee61fb471188… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:15:26 2014 +0100 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC --- .werks/596 | 8 ++++ ChangeLog | 1 + checkman/dell_chassis_fans | 15 ++++++++ checkman/dell_chassis_io | 15 ++++++++ checkman/dell_chassis_kvm | 18 +++++++++ checkman/dell_chassis_status | 19 ++++++++++ checkman/dell_chassis_temp | 20 ++++++++++ checks/dell_chassis_fans | 61 ++++++++++++++++++++++++++++++ checks/dell_chassis_io | 61 ++++++++++++++++++++++++++++++ checks/dell_chassis_kvm | 64 ++++++++++++++++++++++++++++++++ checks/dell_chassis_status | 71 +++++++++++++++++++++++++++++++++++ checks/dell_chassis_temp | 84 ++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 437 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3bee61fb47…

10 years, 3 months

Check_MK Git: check_mk: dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption

by Götz Golla

Module: check_mk Branch: master Commit: f06324e685686764bb4a585d1e84751f27b31c58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f06324e6856867… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:09:03 2014 +0100 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption These checks measure the overall power consumption of the chassis of the Dell Poweredge Blade Server as well as the power consumption of the individual blade nodes as given by the Dell Chassis Management Controller (CMC) --- .werks/595 | 10 ++++++ ChangeLog | 3 +- checkman/dell_chassis_power | 19 ++++++++++ checkman/dell_chassis_powersupplies | 25 +++++++++++++ checks/dell_chassis_power | 68 +++++++++++++++++++++++++++++++++++ checks/dell_chassis_powersupplies | 68 +++++++++++++++++++++++++++++++++++ checks/if.include | 56 +++++++++++++++++++---------- checks/if64 | 43 +++++++++++----------- checks/printer_pages | 2 +- web/plugins/perfometer/check_mk.py | 5 ++- 10 files changed, 256 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f06324e685…

10 years, 3 months

Check_MK Git: check_mk: Improved details of check output of all dell_poweredge_* checks

by Götz Golla

Module: check_mk Branch: master Commit: 279ee84de6a612596b31207fee6f60489858c78a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=279ee84de6a612… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:03:46 2014 +0100 Improved details of check output of all dell_poweredge_* checks --- checkman/dell_poweredge_pci | 2 +- checks/dell_poweredge_amperage | 24 +++++++++++++----------- checks/dell_poweredge_cpu | 2 +- checks/dell_poweredge_mem | 2 +- checks/dell_poweredge_netdev | 1 - checks/dell_poweredge_pci | 2 +- checks/dell_poweredge_status | 16 ++++++++-------- checks/dell_poweredge_temp | 2 +- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/checkman/dell_poweredge_pci b/checkman/dell_poweredge_pci index 995f01f..d0043fa 100644 --- a/checkman/dell_poweredge_pci +++ b/checkman/dell_poweredge_pci @@ -14,7 +14,7 @@ description: No limits are set in the check. - In addition to the state the following information of the memory modules + In addition to the state the following information is retrieved and displayed in the check output: width of the data bus, description of the device and manufacturer, diff --git a/checks/dell_poweredge_amperage b/checks/dell_poweredge_amperage index a6dfcb3..e31a561 100644 --- a/checks/dell_poweredge_amperage +++ b/checks/dell_poweredge_amperage @@ -78,18 +78,20 @@ def check_dell_poweredge_amperage(item, _no_params, info): } state_txt, state = state_table.get(Status, "2") - if UpperNonCritical or UpperCritical: + if UpperNonCritical and UpperCritical: limittext = " (upper limits %s/%s)" % (UpperNonCritical, UpperCritical) + maxi = savefloat(UpperCritical) * 1.1 else: limittext = "" + maxi = "" if ProbeType in ( "23", "25" ): # Amps current = str(int(Reading)/10.0) infotext = "%s Ampere %s" % ( current, state_txt ) - perfdata = [( "current", current+"A", UpperNonCritical, UpperCritical )] + perfdata = [( "current", current+"A", UpperNonCritical, UpperCritical, "", maxi )] elif ProbeType in ( "24", "26" ): # Watts infotext = "%s Watt %s" % ( Reading, state_txt ) - perfdata = [( "power", Reading+"W", UpperNonCritical, UpperCritical )] + perfdata = [( "power", Reading+"W", UpperNonCritical, UpperCritical, "", maxi )] else: infotext = "Unknown Probe Type %s" % ProbeType return 3, infotext @@ -107,11 +109,11 @@ check_info["dell_poweredge_amperage.power"] = { "snmp_scan" : dell_poweredge_amperage_scan, } -check_info["dell_poweredge_amperage.current"] = { - "check_function" : check_dell_poweredge_amperage, - "inventory_function" : inventory_dell_poweredge_amperage_current, - "service_description" : "%s", - "has_perfdata" : True, - "snmp_info" : dell_poweredge_amperage_info, - "snmp_scan" : dell_poweredge_amperage_scan, -} +#check_info["dell_poweredge_amperage.current"] = { +# "check_function" : check_dell_poweredge_amperage, +# "inventory_function" : inventory_dell_poweredge_amperage_current, +# "service_description" : "%s", +# "has_perfdata" : True, +# "snmp_info" : dell_poweredge_amperage_info, +# "snmp_scan" : dell_poweredge_amperage_scan, +#} diff --git a/checks/dell_poweredge_cpu b/checks/dell_poweredge_cpu index de91938..2168a67 100644 --- a/checks/dell_poweredge_cpu +++ b/checks/dell_poweredge_cpu @@ -65,7 +65,7 @@ def check_dell_poweredge_cpu(item, _no_params, info): "5" : ( "Critical", 2 ), "6" : ( "NonRecoverable", 2 ), } - state_txt, state = state_table.get(Status, "2") + state_txt, state = state_table.get(Status, ( "unknown state", 2 )) infotext = "%s %s" % ( BrandName, state_txt ) return state, infotext diff --git a/checks/dell_poweredge_mem b/checks/dell_poweredge_mem index 3acd7bc..083fefd 100644 --- a/checks/dell_poweredge_mem +++ b/checks/dell_poweredge_mem @@ -66,7 +66,7 @@ def check_dell_poweredge_mem(item, _no_params, info): "5" : ( "Critical", 2 ), "6" : ( "NonRecoverable", 2 ), } - infotext, state = state_table.get(status, "2") + infotext, state = state_table.get(status, ( "unknown state", 2 )) for parameter, value in di.items(): infotext += ", %s: %s" % ( parameter, value ) diff --git a/checks/dell_poweredge_netdev b/checks/dell_poweredge_netdev index a8f874a..687a901 100644 --- a/checks/dell_poweredge_netdev +++ b/checks/dell_poweredge_netdev @@ -55,7 +55,6 @@ def check_dell_poweredge_netdev(item, _no_params, info): di = dict() for status, connection_status, di['Product'], cur_mac, fqdd in info: if item == fqdd: - print connection_status di['MAC'] = '-'.join( [ "%02X" % ord( c ) for c in cur_mac ] ).strip() state_table = { "1" : ( "other,", 1 ), diff --git a/checks/dell_poweredge_pci b/checks/dell_poweredge_pci index 451ec19..f6a90c2 100644 --- a/checks/dell_poweredge_pci +++ b/checks/dell_poweredge_pci @@ -59,7 +59,7 @@ def check_dell_poweredge_pci(item, _no_params, info): "5" : ( "Critical", 2 ), "6" : ( "NonRecoverable", 2 ), } - infotext, state = state_table.get(status, "2") + infotext, state = state_table.get(status, ( "unknown state", 2 )) for parameter, value in di.items(): infotext += ", %s: %s" % ( parameter, value ) diff --git a/checks/dell_poweredge_status b/checks/dell_poweredge_status index 4724485..c3cd7ff 100644 --- a/checks/dell_poweredge_status +++ b/checks/dell_poweredge_status @@ -44,18 +44,18 @@ def check_dell_poweredge_status(item, _no_params, info): di['racURL'], di['Chassis'], di['Slot'], di['Model'], status, di['ServiceTag'] = info[0] state_table = { - "1" : ( "other", 1 ), - "2" : ( "unknown", 1 ), - "3" : ( "ok", 0 ), - "4" : ( "nonCritical", 1 ), - "5" : ( "Critical", 2 ), - "6" : ( "NonRecoverable", 2 ), + "1" : ( "other, ", 1 ), + "2" : ( "unknown, ", 1 ), + "3" : ( "", 0 ), + "4" : ( "nonCritical, ", 1 ), + "5" : ( "Critical, ", 2 ), + "6" : ( "NonRecoverable, ", 2 ), } state_txt, state = state_table.get(status, "2") infotext, state = state_table.get(status, "2") for parameter, value in di.items(): - infotext += ", %s: %s" % ( parameter, value ) - infotext = re.sub("^, ","", infotext) + infotext += "%s: %s, " % ( parameter, value ) + infotext = re.sub(", $","", infotext) return state, infotext diff --git a/checks/dell_poweredge_temp b/checks/dell_poweredge_temp index 6eb5d93..0790493 100644 --- a/checks/dell_poweredge_temp +++ b/checks/dell_poweredge_temp @@ -74,7 +74,7 @@ def check_dell_poweredge_temp(item, _no_params, info): "9" : ( "NonRecoverableLower", 2 ), "10" : ( "failed", 2 ), } - state_txt, state = state_table.get(Status, "2") + state_txt, state = state_table.get(Status, ( "unknown state", 2 )) infotext = "%.1f Degrees (upper limits %s/%s) %s" % ( temp, warn, crit, state_txt ) perfdata = [( "temp", temp, warn, crit )]

10 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014