[checkmk-commits] Check_MK Git: check_mk: #1786 casa_cpu_mem, casa_cpu_temp, casa_cpu_util, casa_fan, casa_power: support more devices, also C100G

Module: check_mk Branch: master Commit: ecb49b1881b98fbd4cc323757c5880ed26f05cce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb49b1881b98f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 17 14:33:39 2014 +0100 #1786 casa_cpu_mem, casa_cpu_temp, casa_cpu_util, casa_fan, casa_power: support more devices, also C100G --- .werks/1786 | 9 +++++++++ ChangeLog | 1 + checks/casa_cpu_mem | 4 +--- checks/casa_cpu_temp | 4 +--- checks/casa_cpu_util | 4 +--- checks/casa_fan | 4 +--- checks/casa_power | 4 +--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.werks/1786 b/.werks/1786 new file mode 100644 index 0000000..d897486 --- /dev/null +++ b/.werks/1786 @@ -0,0 +1,9 @@ +Title: casa_cpu_mem, casa_cpu_temp, casa_cpu_util, casa_fan, casa_power: support more devices, also C100G +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1418823191 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fa25552..a57d0e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 1782 msexch_replhealth: new check for monitoring health of MS Exchange DAG * 1458 msexch_dag.contentindex, msexch_dag.copyqueue, msexch_dag.dbcopy: new checks for MS Exchange Mailbox Servers in a DAG... * 1207 services: Check can now be configured with additional names for matching... + * 1786 casa_cpu_mem, casa_cpu_temp, casa_cpu_util, casa_fan, casa_power: support more devices, also C100G * 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/casa_cpu_mem b/checks/casa_cpu_mem index cb50289..2976b15 100644 --- a/checks/casa_cpu_mem +++ b/checks/casa_cpu_mem @@ -94,8 +94,7 @@ check_info["casa_cpu_mem"] = { "service_description" : "Memory %s", "has_perfdata" : True, "group" : "memory_multiitem", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in - [".1.3.6.1.4.1.20858.2.400", ".1.3.6.1.4.1.20858.2.50"], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.20858.2."), "snmp_info" : [ ( ".1.3.6.1.2.1.47.1.1.1.1.2", [ OID_END, '' ] ), # Entity descriptions, quite long... ( ".1.3.6.1.4.1.20858.10.13.1.1.1.1", [ OID_END, '' ] ), # Total mem @@ -103,4 +102,3 @@ check_info["casa_cpu_mem"] = { ( ".1.3.6.1.4.1.20858.10.36.1.1.1.1", [ OID_END, '' ] ), # Installed slot ] } - diff --git a/checks/casa_cpu_temp b/checks/casa_cpu_temp index 5aa4f03..564ed48 100644 --- a/checks/casa_cpu_temp +++ b/checks/casa_cpu_temp @@ -87,8 +87,7 @@ check_info["casa_cpu_temp"] = { "service_description" : "Temperature %s", "group" : "hw_temperature", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in - [".1.3.6.1.4.1.20858.2.400", ".1.3.6.1.4.1.20858.2.50"], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.20858.2."), "snmp_info" : [ ( ".1.3.6.1.2.1.47.1.1.1.1.2", [ OID_END, '' ] ), # Entity descriptions, quite long... ( ".1.3.6.1.2.1.99.1.1.1.4", [ OID_END, '' ] ), # Temperatures, Value @@ -96,4 +95,3 @@ check_info["casa_cpu_temp"] = { ( ".1.3.6.1.2.1.99.1.1.1.6", [ OID_END, '' ] ), # Temperatures, Unit ] } - diff --git a/checks/casa_cpu_util b/checks/casa_cpu_util index a189f8f..646a7b5 100644 --- a/checks/casa_cpu_util +++ b/checks/casa_cpu_util @@ -76,11 +76,9 @@ check_info["casa_cpu_util"] = { "service_description" : "CPU utilization %s", "has_perfdata" : True, "group" : "cpu_utilization_multiitem", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in - [".1.3.6.1.4.1.20858.2.400", ".1.3.6.1.4.1.20858.2.50"], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.20858.2."), "snmp_info" : [ ( ".1.3.6.1.2.1.47.1.1.1.1.2", [ OID_END, '' ] ), # Entity descriptions, quite long... ( ".1.3.6.1.4.1.20858.10.13.1.1.1.4", [ OID_END, '' ] ), # CPU utilization ] } - diff --git a/checks/casa_fan b/checks/casa_fan index 2876ac3..3408fa7 100644 --- a/checks/casa_fan +++ b/checks/casa_fan @@ -54,11 +54,9 @@ check_info["casa_fan"] = { "inventory_function" : inventory_casa_fan, "service_description" : "Fan %s", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in - [".1.3.6.1.4.1.20858.2.400", ".1.3.6.1.4.1.20858.2.50"], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.20858.2."), "snmp_info" : [ ( ".1.3.6.1.4.1.20858.10.31.1.1.1.2", [ OID_END, '' ] ), # FAN Speed ( ".1.3.6.1.4.1.20858.10.33.1.4.1.4", [ OID_END, '' ] ), # FAN State ] } - diff --git a/checks/casa_power b/checks/casa_power index eae1809..3cd492e 100644 --- a/checks/casa_power +++ b/checks/casa_power @@ -54,10 +54,8 @@ check_info["casa_power"] = { "inventory_function" : inventory_casa_power, "service_description" : "Power %s", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in - [".1.3.6.1.4.1.20858.2.400", ".1.3.6.1.4.1.20858.2.50"], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.20858.2."), "snmp_info" : ( ".1.3.6.1.4.1.20858.10.33.1.5.1.4", [ '' ] ), # Power State } -