[checkmk-commits] 4629 dell_powerconnect_fans, dell_powerconnect_psu: Discovery now also works for Force10 switches

Module: check_mk Branch: master Commit: 3fc9cbb6dcd131a3c6a64c6cf033da8dbc38c074 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fc9cbb6dcd131… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu May 11 13:20:48 2017 +0200 4629 dell_powerconnect_fans, dell_powerconnect_psu: Discovery now also works for Force10 switches Change-Id: I4c7cb3e6abba67a05984ac527d81693f3c95dedb --- .werks/4629 | 10 ++++++++++ checks/dell_powerconnect_fans | 4 ++-- checks/dell_powerconnect_psu | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4629 b/.werks/4629 new file mode 100644 index 0000000..83d3f7d --- /dev/null +++ b/.werks/4629 @@ -0,0 +1,10 @@ +Title: dell_powerconnect_fans, dell_powerconnect_psu: Discovery now also works for Force10 switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494501605 +Class: feature + + diff --git a/checks/dell_powerconnect_fans b/checks/dell_powerconnect_fans index 621b8b4..0e996da 100644 --- a/checks/dell_powerconnect_fans +++ b/checks/dell_powerconnect_fans @@ -80,6 +80,6 @@ check_info["dell_powerconnect_fans"] = { 'service_description': 'Sensor %s', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.674.10895.3000.1.2.110.7.1.1', ['1', '2', '3']), - 'snmp_scan_function': \ - lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0") or \ + ".1.3.6.1.4.1.6027.1.3.22" in oid(".1.3.6.1.2.1.1.2.0"), } diff --git a/checks/dell_powerconnect_psu b/checks/dell_powerconnect_psu index 842b0a9..8485e26 100644 --- a/checks/dell_powerconnect_psu +++ b/checks/dell_powerconnect_psu @@ -114,5 +114,6 @@ check_info["dell_powerconnect_psu"] = { '3', # envMonSupplyState '4', # envMonSupplySource ])], - 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0") or \ + ".1.3.6.1.4.1.6027.1.3.22" in oid(".1.3.6.1.2.1.1.2.0"), }