Module: check_mk
Branch: master
Commit: 9234334ecd425b4d1c697143f4a0291be7aa3edb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9234334ecd425b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jan 19 16:29:24 2015 +0100
Minor code cleanup
---
checks/lnx_thermal | 12 ++++++------
checks/temperature.include | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/checks/lnx_thermal b/checks/lnx_thermal
index 2297bcb..959f00d 100644
--- a/checks/lnx_thermal
+++ b/checks/lnx_thermal
@@ -36,12 +36,12 @@
# thermal_zone1 pkg-temp-0 44000 0 passive 0 passive
def inventory_lnx_thermal(info):
- return [ (l[0].replace('thermal_zone', 'Zone '), None) for l in info
]
+ return [ (l[0].replace('thermal_zone', 'Zone '), {}) for l in info ]
def check_lnx_thermal(item, params, info):
for line in info:
- if line[0].replace('thermal_zone', '') == item:
+ if line[0].replace('thermal_zone', 'Zone ') == item:
# ['thermal_zone0', 'enabled', 'acpitz',
'51000', '90000', 'critical', '79000', 'passive']
state = 0
tp_reached = []
@@ -56,13 +56,13 @@ def check_lnx_thermal(item, params, info):
pass # -> regular line
# convert values from millidegree
- temp = int(line[3]) / 1000
+ temp = int(line[3]) / 1000.0
# parse trip points
dev_warn = None
dev_crit = None
if len(line) > 4:
- trip_points = dict(zip(line[5::2], map(lambda x: int(x) / 1000,
line[4::2])))
+ trip_points = dict(zip(line[5::2], map(lambda x: int(x) / 1000.0,
line[4::2])))
for tp_num, (tp_name, level) in enumerate(trip_points.items()):
# ignore active cooling device trip points (means enabling a fan or
similar)
if tp_name == 'active':
@@ -75,14 +75,14 @@ def check_lnx_thermal(item, params, info):
# If only one relevant trip point is found, use that for both warn and crit
if (dev_warn != None) != (dev_crit != None):
- dev_warn = dev_crit = min(dev_warn, dev_crit)
+ dev_warn = dev_crit = max(dev_warn, dev_crit)
if dev_warn and dev_crit:
dev_levels = (dev_warn, dev_crit)
else:
dev_levels = None
- return check_temperature(temp, params, None, dev_levels)
+ return check_temperature(temp, params, dev_levels=dev_levels)
check_info['lnx_thermal'] = {
diff --git a/checks/temperature.include b/checks/temperature.include
index 67b8464..ad59dae 100644
--- a/checks/temperature.include
+++ b/checks/temperature.include
@@ -160,7 +160,8 @@ def check_temperature(reading, params, dev_unit = "c",
# user levels exist (or no levels at all).
# Use least critical of your and device's levels. If just one of both is
defined,
- # take that (min and max deal correctly with None here).
+ # take than max deals correctly with None here. min does not work because None <
int
+ # TODO FIXME HIRN
elif dlh == "best":
warn, crit = max(usr_warn, dev_warn), max(usr_crit, dev_crit)
warn_lower, crit_lower = min(usr_warn_lower, dev_warn_lower), min(usr_crit_lower,
dev_crit_lower)