[checkmk-commits] Check_MK Git: check_mk: FIX: added snmp scan functions for decru_* and fjdary*

Module: check_mk Branch: master Commit: 2d02da2cc143b8b319cba3eeb7b7b987e728ccc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d02da2cc143b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 14:39:04 2011 +0100 FIX: added snmp scan functions for decru_* and fjdary* --- ChangeLog | 2 ++ checks/decru_cpu | 4 ++-- checks/decru_fans | 5 ++--- checks/decru_perf | 5 ++--- checks/decru_power | 5 ++--- checks/decru_temps | 5 ++--- checks/fjdarye60_devencs | 2 +- checks/fjdarye60_disks | 2 ++ 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2426909..c54fbd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * printer_alerts: Added new check for monitoring alert states reported by printers using the PRINTER-MIB * diskstat: rewritten check: now show different devices, r+w in one check + * FIX: fjdarye60_devencs, fjdarye60_disks.summary: added snmp scan functions + * FIX: decru_*: added snmp scan functions 1.1.10: diff --git a/checks/decru_cpu b/checks/decru_cpu index e3b9c4a..03107a2 100644 --- a/checks/decru_cpu +++ b/checks/decru_cpu @@ -42,5 +42,5 @@ def check_decru_cpu(item, _no_params, info): check_info['decru_cpu'] = (check_decru_cpu, "CPU utilization", 1, inventory_decru_cpu) snmp_info['decru_cpu'] = ( ".1.3.6.1.4.1.12962.1.1", [ 8 ] ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_cpu'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_cpu'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_fans b/checks/decru_fans index e05ddfe..1c8633f 100644 --- a/checks/decru_fans +++ b/checks/decru_fans @@ -48,6 +48,5 @@ def check_decru_fans(item, params, info): check_info['decru_fans'] = (check_decru_fans, "FAN %s", 1, inventory_decru_fans) snmp_info['decru_fans'] = ( ".1.3.6.1.4.1.12962.1.2.3.1", [ 2, 3 ] ) -# snmp_scan_info['decru_fans'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_fans'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_fans'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_perf b/checks/decru_perf index 5929a3c..85879be 100644 --- a/checks/decru_perf +++ b/checks/decru_perf @@ -57,6 +57,5 @@ def check_decru_perf(item, _no_params, info): check_info['decru_perf'] = (check_decru_perf, "COUNTER %s", 1, inventory_decru_perf) snmp_info['decru_perf'] = ( ".1.3.6.1.4.1.12962.1.1.2.1.1", [ 1, 2 ] ) -# snmp_scan_info['decru_perf'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_perf'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_perf'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_power b/checks/decru_power index 1aae145..5a29642 100644 --- a/checks/decru_power +++ b/checks/decru_power @@ -40,6 +40,5 @@ def check_decru_power(item, params, info): check_info['decru_power'] = (check_decru_power, "POWER %s", 0, inventory_decru_power) snmp_info['decru_power'] = ( ".1.3.6.1.4.1.12962.1.2.6.1", [ 2, 3 ] ) -# snmp_scan_info['decru_power'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_power'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_power'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/decru_temps b/checks/decru_temps index 6472f3d..6d97951 100644 --- a/checks/decru_temps +++ b/checks/decru_temps @@ -46,6 +46,5 @@ def check_decru_temps(item, params, info): check_info['decru_temps'] = (check_decru_temps, "TEMP %s", 1, inventory_decru_temps) snmp_info['decru_temps'] = ( ".1.3.6.1.4.1.12962.1.2.4.1", [ 2, 3 ] ) -# snmp_scan_info['decru_temps'] = ( "enterprises.12962.1.1.1.1", "=", "san" ) -# oder (SNMPv2-MIB::sysObjectID.0 = OID: SNMPv2-SMI::enterprises.12962.2.1.4): -# snmp_scan_info['decru_temps'] = ( ".1.3.6.1.2.1.1.2.0", "=", ".1.3.6.1.4.1.12962.2.1.4" ) +snmp_scan_functions['decru_temps'] = \ + lambda oid: "datafort" in oid('.1.3.6.1.2.1.1.1.0').lower() diff --git a/checks/fjdarye60_devencs b/checks/fjdarye60_devencs index b2598b9..4850a79 100644 --- a/checks/fjdarye60_devencs +++ b/checks/fjdarye60_devencs @@ -52,5 +52,5 @@ check_info['fjdarye60_devencs'] = (check_fjdarye60, "Device Enclosure %s", 0, i # 1: fjdaryDeIndex, 3: fjdaryDeStatus snmp_info['fjdarye60_devencs'] = (".1.3.6.1.4.1.211.1.21.1.60.2.7.2.1", [ 1, 3 ]) -snmp_scan_functions['fjdarye60_disks'] \ +snmp_scan_functions['fjdarye60_devencs'] \ = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60" diff --git a/checks/fjdarye60_disks b/checks/fjdarye60_disks index 5864aad..e836507 100644 --- a/checks/fjdarye60_disks +++ b/checks/fjdarye60_disks @@ -68,6 +68,8 @@ def check_fjdarye60_disks_summary(index, expected_status, info): check_info['fjdarye60_disks.summary'] = (check_fjdarye60_disks_summary, "Disk summary", 0, inventory_fjdarye60_disks_summary) snmp_info['fjdarye60_disks.summary'] = (".1.3.6.1.4.1.211.1.21.1.60.2.12.2.1", [ 1, 3 ]) +snmp_scan_functions['fjdarye60_disks.summary'] \ + = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60" # -------------------------------------------------------------------------------- # 2. Single disk version of check -> one check for each disk