Module: check_mk
Branch: master
Commit: 3a74af862dc22a0d50e15770b0290e0347a0d5b1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a74af862dc22a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Mar 14 10:26:48 2011 +0100
FIX: df: fix display of trend warn/crit in PNP-graph
---
ChangeLog | 1 +
checks/df.include | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 33e215e..dff84f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
* FIX: df: fix layout problems in PNP template
* FIX: df: fix trend computation (thanks to Sebastian Talmon)
* FIX: df: fix status in case of critical trend and warning used
+ * FIX: df: fix display of trend warn/crit in PNP-graph
1.1.10:
diff --git a/checks/df.include b/checks/df.include
index 34356e0..fd5edea 100644
--- a/checks/df.include
+++ b/checks/df.include
@@ -169,11 +169,14 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb,
params):
trend = rate_avg * range_sec
sign = trend > 0 and "+" or ""
infotext += ", trend: %s%s / %g hours" % (sign,
get_bytes_human_readable(trend * MB), range)
+ # levels for performance data
+ warn_perf, crit_perf = None, None
# apply levels for absolute growth in MB / interval
trend_mb = levels.get("trend_mb")
if trend_mb:
wa, cr = trend_mb
+ warn_perf, crit_perf = wa, cr
if trend >= wa:
problems.append("growing too fast (levels at %s/%s per
%.1fh)!" %
( get_bytes_human_readable(wa * MB), get_bytes_human_readable(cr *
MB), range))
@@ -190,6 +193,11 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb,
params):
wa_perc, cr_perc = trend_perc
wa = wa_perc / 100.0 * size_mb
cr = cr_perc / 100.0 * size_mb
+ if warn_perf != None:
+ warn_perf = min(warn_perf, wa)
+ crit_perf = min(crit_perf, cr)
+ else:
+ warn_perf, crit_perf = wa, cr
if trend >= wa:
problems.append("growing too fast (levels at %.3f%%/%.3f%% per
%.1fh)!" %
( wa_perc, cr_perc, range))
@@ -199,7 +207,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb,
params):
problems[-1] += "!"
if levels.get("trend_perfdata"):
- perfdata.append(("trend", trend, wa, cr, 0, size_mb / range))
+ perfdata.append(("trend", trend, warn_perf, crit_perf, 0,
size_mb / range))
# compute time until filesystem is full (only for positive trend, of course)
if trend > 0: