From 28133354cb4fd16a4428992dcacf0732a9aff621 Mon Sep 17 00:00:00 2001 From: oetiker Date: Thu, 30 Jul 2009 07:56:31 +0000 Subject: [PATCH] rrd_tune HW Update Allow to set the smoothing window (alpha, beta, gamma) to zero. I'm using rrdtool 1.3.8 with abberant behavior detection from the Brutlag method. I need to use a week seasonality and no smoothing for the SEASONAL and DEVSEASONAL. So I use rrdtune in order to set the smoothing window to 0.0. This calls the set_hwarg(). But this method is also used to tune the alpha, beta and gamma that can't be set to 0.0 So when I tune my smoothing window size to 0.0, it returns -1 due to the if(window<=0.0) then do nothing. I join here a small correction with a differnent method used to set only the smoothing window size and allowing it to be zero. -- sylvain.luiset gmail.com git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1875 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/src/rrd_tune.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/program/src/rrd_tune.c b/program/src/rrd_tune.c index 0df0476b..fe2e4796 100644 --- a/program/src/rrd_tune.c +++ b/program/src/rrd_tune.c @@ -305,7 +305,7 @@ int rrd_tune( break; case 's': strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing_window causes Version 4 */ - if (set_hwarg + if (set_hwsmootharg (&rrd, CF_SEASONAL, RRA_seasonal_smoothing_window, optarg)) { rrd_free(&rrd); return -1; @@ -313,7 +313,7 @@ int rrd_tune( break; case 'S': strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing_window causes Version 4 */ - if (set_hwarg + if (set_hwsmootharg (&rrd, CF_DEVSEASONAL, RRA_seasonal_smoothing_window, optarg)) { rrd_free(&rrd); @@ -398,6 +398,41 @@ int set_hwarg( return 0; } +int set_hwsmootharg( + rrd_t *rrd, + enum cf_en cf, + enum rra_par_en rra_par, + char *arg) +{ + double param; + unsigned long i; + signed short rra_idx = -1; + + /* read the value */ + param = atof(arg); + /* in order to avoid smoothing of SEASONAL or DEVSEASONAL, we need to + * the 0.0 value*/ + if (param < 0.0 || param > 1.0) { + rrd_set_error("Holt-Winters parameter must be between 0 and 1"); + return -1; + } + /* does the appropriate RRA exist? */ + for (i = 0; i < rrd->stat_head->rra_cnt; ++i) { + if (cf_conv(rrd->rra_def[i].cf_nam) == cf) { + rra_idx = i; + break; + } + } + if (rra_idx == -1) { + rrd_set_error("Holt-Winters RRA does not exist in this RRD"); + return -1; + } + + /* set the value */ + rrd->rra_def[rra_idx].par[rra_par].u_val = param; + return 0; +} + int set_deltaarg( rrd_t *rrd, enum rra_par_en rra_par, -- 2.30.2