Module: check_mk Branch: master Commit: 7cfbef1093b5bfe16a64a6809158ca13991fb886 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cfbef1093b5bf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 15 11:04:37 2015 +0200 #1246 blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter --- .werks/1246 | 9 +++++++++ ChangeLog | 1 + checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 5 +---- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.werks/1246 b/.werks/1246 new file mode 100644 index 0000000..e7178b8 --- /dev/null +++ b/.werks/1246 @@ -0,0 +1,9 @@ +Title: blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1431680627 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d92f3f2..1599737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,6 +176,7 @@ * 2252 SEC: mk_logwatch: Fixed mostly uncritical command injection from config... * 2270 windows agent: now able to add cached information into section headers... * 2271 logwatch_ec: Now able to create a single check for each logfile forwarded to the event console... + * 1246 blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/blade_bays b/checks/blade_bays index 0daac3a..ab22f0c 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -77,5 +77,5 @@ check_info["blade_bays"] = { "3", # powerDomain2 ], [ "1.1.5", "1.1.6", "1.1.2", "1.1.1" ] ), # BLADE-MIB 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blades b/checks/blade_blades index 24c4a29..cda13bd 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -79,5 +79,5 @@ check_info["blade_blades"] = { 6, # bladeName ]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blowers b/checks/blade_blowers index 555c5f4..6e9b382 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -106,5 +106,5 @@ check_info["blade_blowers"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2', [3]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_health b/checks/blade_health index 2c1d892..568cce6 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -59,5 +59,5 @@ check_info["blade_health"] = { 'service_description': 'Summary health state', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.7', ['1.0', '2.1.3.1']), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 1d001b2..1c80fb4 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -41,14 +41,11 @@ def check_blade_mediatray(_no_item, _no_params, info): return (0, "media tray present and communicating") - - - check_info["blade_mediatray"] = { 'check_function': check_blade_mediatray, 'inventory_function': inventory_blade_mediatray, 'service_description': 'Media tray', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.5.2', [74, 75]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, }