Module: check_mk
Branch: master
Commit: f2f45ff2587ee59cc3bfddeefa45026473b9712a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2f45ff2587ee5…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Mar 14 15:39:39 2013 +0100
jolokia_metrics: fixed compatibility with python 2.4
---
checks/jolokia_metrics | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics
index 8a15000..ce2cd0e 100644
--- a/checks/jolokia_metrics
+++ b/checks/jolokia_metrics
@@ -206,8 +206,8 @@ def check_jolokia_metrics_mem(item, params, info):
if params.get(what):
if type(params[what][0]) == int:
if what != "total":
- warn_level = value_max - params[what][0] if value_max != ""
else ""
- crit_level = value_max - params[what][1] if value_max != ""
else ""
+ warn_level = ("", value_max - params[what][0])[value_max !=
""]
+ crit_level = ("", value_max - params[what][1])[value_max !=
""]
perfdata.append((what, value, warn_level, crit_level, "",
value_max))
if not value_max:
param_state = 0
@@ -219,8 +219,8 @@ def check_jolokia_metrics_mem(item, params, info):
level_info = "%s(warn at %sMB free)" % (state_sign[1],
params[what][0])
else:
if what != "total":
- warn_level = value_max * params[what][0] / 100.0 if value_max !=
"" else ""
- crit_level = value_max * params[what][1] / 100.0 if value_max !=
"" else ""
+ warn_level = ("", value_max * params[what][0] /
100.0)[value_max != ""]
+ crit_level = ("", value_max * params[what][1] /
100.0)[value_max != ""]
perfdata.append((what, value, warn_level, crit_level, "",
value_max))
if not value_max:
param_state = 0
@@ -235,7 +235,7 @@ def check_jolokia_metrics_mem(item, params, info):
perfdata.append((what, value, "", "", "",
value_max))
- used_info = "/%.1f%% used" % (value / value_max * 100) if value_max !=
"" else ""
+ used_info = ("", "/%.1f%% used" % (value / value_max *
100))[value_max != ""]
info_list.append("%s: %0.fMB%s%s" % (what.title(), value, used_info,
level_info))
worst_state = max(param_state, worst_state)