Module: check_mk
Branch: master
Commit: 6ad0a368a69c338b3c8f7e4ddba3dd2d87808f9c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ad0a368a69c33…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 7 12:10:31 2015 +0200
Minor code cleanup
---
checks/etherbox | 2 +-
checks/etherbox2_temp | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/checks/etherbox b/checks/etherbox
index 8b32a69..4fb5c19 100644
--- a/checks/etherbox
+++ b/checks/etherbox
@@ -94,7 +94,7 @@ def check_etherbox_temp(item, params, info):
check_info["etherbox.temp"] = {
"check_function" : check_etherbox_temp,
- "inventory_function" : lambda x: inventory_etherbox(x, "1"),
+ "inventory_function" : lambda info: inventory_etherbox(info,
"1"),
"service_description" : "Sensor %s",
"has_perfdata" : True,
"group" : "temperature",
diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp
index 5d0983d..4e2465e 100644
--- a/checks/etherbox2_temp
+++ b/checks/etherbox2_temp
@@ -42,7 +42,6 @@
# suggested by customer
factory_settings['etherbox_temp_default_levels'] = {
'levels' : (25, 30),
- 'levels_lower' : (10, 15),
}
@@ -58,9 +57,9 @@ def parse_etherbox_temp(info):
parsed = {}
sensor_indicators, sensors = info
for sensor_index in range(0, len(sensors)):
- indicator_index_1, indicator_index_2 = (lambda x: (2*x, 2*x+1))(sensor_index)
- if float(sensor_indicators[indicator_index_1][0].split(" ")[0]) > 4
and \
- float(sensor_indicators[indicator_index_2][0].split(" ")[0]) >
1:
+ indicator_index = 2 * sensor_index
+ if float(sensor_indicators[indicator_index][0].split(" ")[0]) > 4
and \
+ float(sensor_indicators[indicator_index + 1][0].split(" ")[0]) >
1:
parsed["Sensor %s" % sensors[sensor_index][0]] =
float(sensors[sensor_index][1]) / 10
return parsed
@@ -75,7 +74,7 @@ def check_etherbox_temp(item, params, parsed):
return check_temperature(parsed[item], params)
-check_info['etherbox_temp'] = {
+check_info['etherbox2_temp'] = {
'parse_function' : parse_etherbox_temp,
'inventory_function' : inventory_etherbox_temp,
'check_function' : check_etherbox_temp,
@@ -88,7 +87,7 @@ check_info['etherbox_temp'] = {
# located under these OIDs. There are no standard OIDs
for
# disk space reasons.
'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0")
== "" and \
- "Version 1.21" in
oid(".1.3.6.1.4.1.14848.2.1.1.1.0", ""),
+ "Version 1.2" in
oid(".1.3.6.1.4.1.14848.2.1.1.1.0", ""),
'default_levels_variable' : 'etherbox_temp_default_levels',
'group' : 'temperature',
'includes' : [ "temperature.include" ],