[checkmk-commits] Check_MK Git: check_mk: df&friends: disable trend perfdata per default

Module: check_mk Branch: master Commit: 5cbe4bec2c45217aa20a499ed0b2e821bd46f335 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cbe4bec2c4521… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 24 16:27:31 2011 +0100 df&friends: disable trend perfdata per default --- ChangeLog | 7 ------- checkman/df | 20 ++++++++++---------- checks/df.include | 10 ++++++++-- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a42a02..6a57a57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,4 @@ 1.1.9i9: - INCOMPATIBLE CHANGES: - * All filesystem checks now have trends enabled per default. The checks - output now three performance values instead of one. This can break - updates of PNP graphs. Either delete all PNP graphs of {fs_} checks - or switch off trend reporting in order for your graphs to work. Trends - are very usefull, however... - Core, Setup, etc.: * FIX: check_mk_templates.cfg: add missing check_period for hosts (needed for Shinken) diff --git a/checkman/df b/checkman/df index 7050794..7f26520 100644 --- a/checkman/df +++ b/checkman/df @@ -22,7 +22,7 @@ description: a logarithmic average that weights the more recent time more than time farer away. Also data beyond the 24 hours will to some small degree be reflected in the computation. The advantage of this algorithm is a more - precise predection and a simpler implementation, which does not need any + precise prediction and a simpler implementation, which does not need any access to any RRDs or similar storage. Please note, that when a filesystem is started being monitored, then @@ -30,14 +30,6 @@ description: that it will take at least one trend range of time until the trend approximately reflects the reality. - Please note that after an update to {1.1.9i9} the output of the performance - data is not compatible with older versions any longer since it outputs two - additional values. If you use PNP in {MULTIPLE} mode then this should not be - a problem. If you use PNP in {SINGLE} mode - which still is the default - - then you either have to {(1)} delete your RRD files beginning with {fs_} - or {(2)} switch off trend computing by setting - {filesystem_default_levels["trend_range"] = None}. - item: The mount point of the filesystem (UNIX) or the drive letter in upper case followed by a colon (Windows). @@ -89,11 +81,16 @@ examples: perfdata: One or three values: The first value is the used space of the filesystem in MB. Also the minimum (0 MB), maximum (size of the filesystem) and the warning and critical - levels in MB are provided. If {trend_range} is set (the default), then + levels in MB are provided. If you set {filesystem_trend_perfdata = True}, then two additional values are output: the change of the usage in MB per range since the last check (e.g. in MB per 24 hours) and the averaged change (so called trend), also in MB per range. + Please note, that - until you use the storage type {MULTIPLE} in PNP4Nagios - + changing the setting of {filesystem_trend_perfdata} will stop all updates to + your existing filesystem RRDs. You need either to delete or convert your RRDs + if you want to change. + inventory: df supports inventory. All filesystem the agent reports will be inventorized except mount points listed in @@ -164,3 +161,6 @@ inventory_df_exclude_mountpoints (list of strings): List of mount points to excl filesystem_default_levels: Default levels for filesystem detected by inventory. This variable is preset to {{ "levels" : (80, 90), "magic_normsize" : 20, "levels_low" : (50, 60), "trend_range" : 24 }} +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. diff --git a/checks/df.include b/checks/df.include index a34054e..b2f3699 100644 --- a/checks/df.include +++ b/checks/df.include @@ -58,6 +58,10 @@ filesystem_default_levels = { # Users might have set filesystem_default_levels to old format like (80, 90) +# Turn off trend perfdata per default in order to keep +# compatible to existing RRDs +filesystem_trend_perfdata = False + # needed by df, df_netapp and vms_df and maybe others in future: # compute warning and critical levels. Takes into account the size of @@ -159,7 +163,8 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): this_time = time.time() # rate in MB/s, allow negative timdif, rate = get_counter("df.%s.delta" % mountpoint, this_time, used_mb, True) - perfdata.append(("growth", rate * range_sec)) + if filesystem_trend_perfdata: + perfdata.append(("growth", rate * range_sec)) # average trend, initialize with zero timedif, rate_avg = get_average("df.%s.trend" % mountpoint, this_time, rate, range_sec, True) @@ -196,7 +201,8 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): status = 2 problems[-1] += "!" - perfdata.append(("trend", trend, wa, cr, 0, size_mb / range)) + if filesystem_trend_perfdata: + perfdata.append(("trend", trend, wa, cr, 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course) if trend > 0: