Module: check_mk
Branch: master
Commit: 1e2311db556d506f598e81aa4afdea9db8b87ed8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e2311db556d50…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Feb 27 13:12:41 2011 +0100
df: use levels_low instaed of df_lowest_...
---
ChangeLog | 2 +-
checkman/df | 2 --
checks/df.include | 14 +++++++-------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 529e16d..309aa11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@
* FIX: repaired apc_symmetra (was broken due to new option -Ot
for SNMP)
* FIX: df, hr_fs and other filesystem checks: fix bug if using
- magic number.
+ magic number. levels_low is now honored.
* FIX: scan function avoids hr_cpu and ucd_cpu_utilization
at the same time
* FIX: HP-UX agent: fixed output of df for long mount points
diff --git a/checkman/df b/checkman/df
index a38630b..0445723 100644
--- a/checkman/df
+++ b/checkman/df
@@ -164,5 +164,3 @@ filesystem_default_levels: Default levels for filesystem detected by
inventory.
filesystem_trend_perfdata (boolean): Whether or not to output trend performance data.
This is
preset to {False} so that no trend performance data is output. If you change this
setting you
need to convert or delete all RRD databases of filesystems.
-df_lowest_warning_level(int): The magic factor will never lower the warning level for
filesystems below this percentage. The default is {50}.
-df_lowest_critical_level(int): This is the minimum critical level when using the magic
factor. This is preset to {60} (percent).
diff --git a/checks/df.include b/checks/df.include
index 5fbb42d..b8e60bc 100644
--- a/checks/df.include
+++ b/checks/df.include
@@ -28,9 +28,8 @@
# OBSOLETE:
# df_magicnumber_normsize = 20 # Standard size if 20 GB
-
-df_lowest_warning_level = 50 # Never move warn level below 50% due to magic
factor
-df_lowest_critical_level = 60 # Never move crit level below 60% due to magic
factor
+# df_lowest_warning_level = 50 # Never move warn level below 50% due to magic
factor
+# df_lowest_critical_level = 60 # Never move crit level below 60% due to magic
factor
# Settings for filesystem checks (df, df_vms, df_netapp and maybe others)
filesystem_levels = [] # obsolete. Just here to check config and warn if
changed
@@ -103,10 +102,11 @@ def get_filesystem_levels(host, mountpoint, size_gb, params):
crit_scaled = 100 - (( 100 - crit ) * scale)
# Make sure, levels do never get too low due to magic factor
- if warn_scaled < df_lowest_warning_level:
- warn_scaled = df_lowest_warning_level
- if crit_scaled < df_lowest_critical_level:
- crit_scaled = df_lowest_critical_level
+ lowest_warning_level, lowest_critical_level = levels["levels_low"]
+ if warn_scaled < lowest_warning_level:
+ warn_scaled = lowest_warning_level
+ if crit_scaled < lowest_critical_level:
+ crit_scaled = lowest_critical_level
else:
warn_scaled = warn
crit_scaled = crit