Module: check_mk
Branch: master
Commit: e0e010eb4345526e86824cfbff0146c66226b0ef
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0e010eb434552…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Mon Sep 25 10:53:06 2017 +0200
names of functions are now similar to check plugin name
Change-Id: I80f6c2e42629906da249f62971dd1b988ebbc1e5
---
checks/dell_om_fans | 24 ++++++++++++------------
checks/dell_om_power | 16 ++++++++--------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/checks/dell_om_fans b/checks/dell_om_fans
index e4835f4..2096e87 100644
--- a/checks/dell_om_fans
+++ b/checks/dell_om_fans
@@ -26,11 +26,11 @@
-def inventory_dell_idrac_fans(info):
+def inventory_dell_om_fans(info):
for line in info:
yield ( line[0], {} )
-def check_dell_idrac_fans(item, params, info):
+def check_dell_om_fans(item, params, info):
translate_status = {
"1" : (3, "OTHER"),
"2" : (3, "UNKNOWN"),
@@ -64,19 +64,19 @@ def check_dell_idrac_fans(item, params, info):
check_info["dell_om_fans"] = {
- "check_function" : check_dell_idrac_fans,
- "inventory_function" : inventory_dell_idrac_fans,
+ "check_function" : check_dell_om_fans,
+ "inventory_function" : inventory_dell_om_fans,
"service_description" : "Fan %s",
"snmp_scan_function" : scan_dell_om,
"snmp_info" : (".1.3.6.1.4.1.674.10892.1.700.12.1",
[
- "2", # IDRAC-MIB::coolingDeviceIndex
- "5", # IDRAC-MIB::coolingDeviceStatus
- "6", # IDRAC-MIB::coolingDeviceReading
- "8", #
IDRAC-MIB::coolingDeviceLocationName
- "10", #
IDRAC-MIB::coolingDeviceUpperNonCriticalThreshold
- "11", #
IDRAC-MIB::coolingDeviceUpperCriticalThreshold
- "12", #
IDRAC-MIB::coolingDeviceLowerNonCriticalThreshold
- "13", #
IDRAC-MIB::coolingDeviceLowerCriticalThreshold
+ "2", # MIB-Dell-10892::coolingDeviceIndex
+ "5", #
MIB-Dell-10892::coolingDeviceStatus
+ "6", #
MIB-Dell-10892::coolingDeviceReading
+ "8", #
MIB-Dell-10892::coolingDeviceLocationName
+ "10", #
MIB-Dell-10892::coolingDeviceUpperNonCriticalThreshold
+ "11", #
MIB-Dell-10892::coolingDeviceUpperCriticalThreshold
+ "12", #
MIB-Dell-10892::coolingDeviceLowerNonCriticalThreshold
+ "13", #
MIB-Dell-10892::coolingDeviceLowerCriticalThreshold
]),
"includes" : [ "fan.include",
"dell_om.include" ],
"group" : "hw_fans",
diff --git a/checks/dell_om_power b/checks/dell_om_power
index 93a8245..cdffb91 100644
--- a/checks/dell_om_power
+++ b/checks/dell_om_power
@@ -39,12 +39,12 @@
# .1.3.6.1.4.1.674.10892.1.600.12.1.8.1.2 PS2 Status
-def inventory_dell_idrac_power(info):
+def inventory_dell_om_power(info):
for index, status, count in info[0]:
yield ( index, None )
-def check_dell_idrac_power(item, params, info):
+def check_dell_om_power(item, params, info):
translate_status = {
"1" : (3, "other"),
"2" : (3, "unknown"),
@@ -62,8 +62,8 @@ def check_dell_idrac_power(item, params, info):
check_info['dell_om_power'] = {
- 'inventory_function' : inventory_dell_idrac_power,
- 'check_function' : check_dell_idrac_power,
+ 'inventory_function' : inventory_dell_om_power,
+ 'check_function' : check_dell_om_power,
'service_description' : 'Power Supply Redundancy %s',
'snmp_info' : [ ('.1.3.6.1.4.1.674.10892.1.600.10.1', [
"2", # MIB-Dell-10892::powerUnitIndex
@@ -82,12 +82,12 @@ check_info['dell_om_power'] = {
}
-def inventory_dell_idrac_power_unit(info):
+def inventory_dell_om_power_unit(info):
for line in info[1]:
yield ( line[0], None )
-def check_dell_idrac_power_unit(item, _no_params, info):
+def check_dell_om_power_unit(item, _no_params, info):
translate_status = {
"1" : (3, "OTHER"),
"2" : (3, "UNKNOWN"),
@@ -119,7 +119,7 @@ def check_dell_idrac_power_unit(item, _no_params, info):
( state_readable, psu_type_readable, location )
check_info['dell_om_power.unit'] = {
- 'inventory_function' : inventory_dell_idrac_power_unit,
- 'check_function' : check_dell_idrac_power_unit,
+ 'inventory_function' : inventory_dell_om_power_unit,
+ 'check_function' : check_dell_om_power_unit,
'service_description' : 'Power Supply %s',
}