Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
	src/collectd.conf.pod

diff --cc src/collectd.conf.pod
index 7a4eb9383718d746d6c259ffcd2a2f3c6f6e1bec,16397e21d78e2d50024ee8f549e68d00d72dcdca..5f9538b7233e70771848103cef7c7b20b06bce16
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -4692,60 -3881,14 +4692,68 @@@ Enables or disables the creation of RR
  locally, or B<DataDir> is set to a relative path, this will not work as
  expected. Default is B<true>.
  
 +=item B<CreateFilesAsync> B<false>|B<true>
 +
 +When enabled, new RRD files are enabled asynchronously, using a separate thread
 +that runs in the background. This prevents writes to block, which is a problem
 +especially when many hundreds of files need to be created at once. However,
 +since the purpose of creating the files asynchronously is I<not> to block until
 +the file is available, values before the file is available will be discarded.
 +When disabled (the default) files are created synchronously, blocking for a
 +short while, while the file is being written.
 +
 +=item B<StepSize> I<Seconds>
 +
 +B<Force> the stepsize of newly created RRD-files. Ideally (and per default)
 +this setting is unset and the stepsize is set to the interval in which the data
 +is collected. Do not use this option unless you absolutely have to for some
 +reason. Setting this option may cause problems with the C<snmp plugin>, the
 +C<exec plugin> or when the daemon is set up to receive data from other hosts.
 +
 +=item B<HeartBeat> I<Seconds>
 +
 +B<Force> the heartbeat of newly created RRD-files. This setting should be unset
 +in which case the heartbeat is set to twice the B<StepSize> which should equal
 +the interval in which data is collected. Do not set this option unless you have
 +a very good reason to do so.
 +
 +=item B<RRARows> I<NumRows>
 +
 +The C<rrdtool plugin> calculates the number of PDPs per CDP based on the
 +B<StepSize>, this setting and a timespan. This plugin creates RRD-files with
 +three times five RRAs, i. e. five RRAs with the CFs B<MIN>, B<AVERAGE>, and
 +B<MAX>. The five RRAs are optimized for graphs covering one hour, one day, one
 +week, one month, and one year.
 +
 +So for each timespan, it calculates how many PDPs need to be consolidated into
 +one CDP by calculating:
 +  number of PDPs = timespan / (stepsize * rrarows)
 +
 +Bottom line is, set this no smaller than the width of you graphs in pixels. The
 +default is 1200.
 +
 +=item B<RRATimespan> I<Seconds>
 +
 +Adds an RRA-timespan, given in seconds. Use this option multiple times to have
 +more then one RRA. If this option is never used, the built-in default of (3600,
 +86400, 604800, 2678400, 31622400) is used.
 +
 +For more information on how RRA-sizes are calculated see B<RRARows> above.
 +
 +=item B<XFF> I<Factor>
 +
 +Set the "XFiles Factor". The default is 0.1. If unsure, don't set this option.
 +I<Factor> must be in the range C<[0.0-1.0)>, i.e. between zero (inclusive) and
 +one (exclusive).
 +
+ =item B<CollectStatistics> B<false>|B<true>
+ 
+ When set to B<true>, various statistics about the I<rrdcached> daemon will be
+ collected, with "rrdcached" as the I<plugin name>. Defaults to B<false>.
+ 
+ Statistics are read via I<rrdcached>s socket using the STATS command.
+ See L<rrdcached(1)> for details.
+ 
  =back
  
  =head2 Plugin C<rrdtool>

diff --cc src/ipmi.c
Simple merge