11d3b98950
Update collectd, the backbone of Luci statistics, to 5.5.1 Refresh patches. Main changes: - Remove 500-upstream-parallel-build-fix.patch (implemented upstream) - Add 600-fix-libmodbus-detection.patch to revert an upstream change that broke libmodbus detection in collectd's configure script Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
57 lines
1.3 KiB
Diff
57 lines
1.3 KiB
Diff
--- a/src/rrdtool.c
|
|
+++ b/src/rrdtool.c
|
|
@@ -82,6 +82,7 @@ static const char *config_keys[] =
|
|
"HeartBeat",
|
|
"RRARows",
|
|
"RRATimespan",
|
|
+ "RRASingle",
|
|
"XFF",
|
|
"WritesPerSecond",
|
|
"RandomTimeout"
|
|
@@ -103,6 +104,8 @@ static rrdcreate_config_t rrdcreate_conf
|
|
/* timespans = */ NULL,
|
|
/* timespans_num = */ 0,
|
|
|
|
+ /* rrasingle = */ 0,
|
|
+
|
|
/* consolidation_functions = */ NULL,
|
|
/* consolidation_functions_num = */ 0,
|
|
|
|
@@ -1110,6 +1113,14 @@ static int rrd_config (const char *key,
|
|
|
|
free (value_copy);
|
|
}
|
|
+ else if (strcasecmp ("RRASingle", key) == 0)
|
|
+ {
|
|
+ if (IS_TRUE (value))
|
|
+ {
|
|
+ rrdcreate_config.rrasingle = 1;
|
|
+ NOTICE ("rrdtool plugin: RRASingle = true: creating only AVERAGE RRAs");
|
|
+ }
|
|
+ }
|
|
else if (strcasecmp ("XFF", key) == 0)
|
|
{
|
|
double tmp = atof (value);
|
|
--- a/src/utils_rrdcreate.c
|
|
+++ b/src/utils_rrdcreate.c
|
|
@@ -213,6 +213,9 @@ static int rra_get (char ***ret, const v
|
|
rts_num = rra_timespans_num;
|
|
}
|
|
|
|
+ if (cfg->rrasingle)
|
|
+ rra_types_num = 1;
|
|
+
|
|
rra_max = rts_num * rra_types_num;
|
|
assert (rra_max > 0);
|
|
|
|
--- a/src/utils_rrdcreate.h
|
|
+++ b/src/utils_rrdcreate.h
|
|
@@ -41,6 +41,8 @@ struct rrdcreate_config_s
|
|
int *timespans;
|
|
size_t timespans_num;
|
|
|
|
+ int rrasingle;
|
|
+
|
|
char **consolidation_functions;
|
|
size_t consolidation_functions_num;
|
|
|