Module: check_mk Branch: master Commit: 53c3738eabacadc17526c5f3160592c209357d39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53c3738eabacad… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sun Feb 27 11:59:33 2011 +0100 df: fix bug when using magic number --- ChangeLog | 2 ++ checkman/df | 2 ++ checks/df.include | 13 +++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ba9f10..7a74094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * Added SNMP scan function of df_netapp and df_netapp32 * 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. 1.1.9i9: diff --git a/checkman/df b/checkman/df index 7f26520..13880e2 100644 --- a/checkman/df +++ b/checkman/df @@ -164,3 +164,5 @@ 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 b2f3699..a6d6f4d 100644 --- a/checks/df.include +++ b/checks/df.include @@ -28,8 +28,9 @@ # 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 @@ -102,10 +103,10 @@ 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 < lowest_warning_level: - warn_scaled = lowest_warning_level - if crit_scaled < lowest_critical_level: - crit_scaled = lowest_critical_level + 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 else: warn_scaled = warn crit_scaled = crit