[checkmk-commits] Unified scan functions in all EMC Isilon checks

Module: check_mk Branch: master Commit: cec242bded7e8175d56aabba9c1ab92cf2c91146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cec242bded7e81… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Nov 23 17:46:47 2016 +0100 Unified scan functions in all EMC Isilon checks --- checks/emc_isilon | 2 +- checks/emc_isilon_diskstatus | 3 +-- checks/emc_isilon_iops | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/checks/emc_isilon b/checks/emc_isilon index 6c06717..0013ee4 100644 --- a/checks/emc_isilon +++ b/checks/emc_isilon @@ -33,7 +33,7 @@ emc_isilon_info = [(".1.3.6.1.4.1.12124.1.1", [1, # clusterName ] def emc_isilon_scan(oid): - return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") + return "isilon" in oid(".1.3.6.1.2.1.1.1.0").lower() # .--ClusterHealth------------------------------------------------------. diff --git a/checks/emc_isilon_diskstatus b/checks/emc_isilon_diskstatus index 16a91e9..a4bc5da 100644 --- a/checks/emc_isilon_diskstatus +++ b/checks/emc_isilon_diskstatus @@ -51,7 +51,6 @@ check_info["emc_isilon_diskstatus"] = { 5, # diskStatus 7, # diskSerialNumber ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12325.1"), + "snmp_scan_function" : lambda oid: "isilon" in oid(".1.3.6.1.2.1.1.1.0").lower(), } diff --git a/checks/emc_isilon_iops b/checks/emc_isilon_iops index 09d3e8a..b0958f9 100644 --- a/checks/emc_isilon_iops +++ b/checks/emc_isilon_iops @@ -47,6 +47,6 @@ check_info["emc_isilon_iops"] = { [ 2, # diskPerfDeviceName 3, # diskPerfOpsPerSecond ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") + "snmp_scan_function" : lambda oid: "isilon" in oid(".1.3.6.1.2.1.1.1.0").lower(), }