[checkmk-commits] Check_MK Git: check_mk: #1968 qlogic_fcport, qlogic_sanbox,

qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now Message-ID: <54cb84ae.RqvzLZyctYgTIbqc%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9fdf7a3d891143267d6e48ee2bc9fc63ce1af647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fdf7a3d891143… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 14:18:35 2015 +0100 #1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now --- .werks/1968 | 9 +++++++++ ChangeLog | 1 + checks/qlogic_fcport | 6 +++++- checks/qlogic_sanbox | 14 ++++++++++---- checks/qlogic_sanbox_fabric_element | 6 +++++- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.werks/1968 b/.werks/1968 new file mode 100644 index 0000000..5485be5 --- /dev/null +++ b/.werks/1968 @@ -0,0 +1,9 @@ +Title: qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422623907 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3dd6ebe..8709a6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 1948 Livedump: Host names can now be prefixed with an individual string... * 1958 akcp_daisy_smoke: added new check for smoke sensors on expansion boards which are daisy chained to an AKCP securityProbe 5E... * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks + * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 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/qlogic_fcport b/checks/qlogic_fcport index fda98c7..4c5f279 100644 --- a/checks/qlogic_fcport +++ b/checks/qlogic_fcport @@ -200,7 +200,11 @@ check_info["qlogic_fcport"] = { "4.3.1.4", # fcFxPortC3OutOctets "4.3.1.5", # fcFxPortC3Discards ]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), 'group': 'qlogic_fcport', 'default_levels_variable': 'qlogic_fcport_default_levels', } diff --git a/checks/qlogic_sanbox b/checks/qlogic_sanbox index db858c2..ae2622a 100644 --- a/checks/qlogic_sanbox +++ b/checks/qlogic_sanbox @@ -91,7 +91,11 @@ check_info["qlogic_sanbox.temp"] = { 7, # connUnitSensorType 8, # connUnitSensorCharacteristic OID_END]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), } #. @@ -148,7 +152,9 @@ check_info["qlogic_sanbox.psu"] = { 7, # connUnitSensorType 8, # connUnitSensorCharacteristic OID_END]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), } - -#. diff --git a/checks/qlogic_sanbox_fabric_element b/checks/qlogic_sanbox_fabric_element index 8f8f7dd..6995326 100644 --- a/checks/qlogic_sanbox_fabric_element +++ b/checks/qlogic_sanbox_fabric_element @@ -53,5 +53,9 @@ check_info["qlogic_sanbox_fabric_element"] = { "has_perfdata" : False, "snmp_info" : (".1.3.6.1.2.1.75.1.1.4.1", [4, # fcFeModuleOperStatus OID_END]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), }