From: Florian Forster <octo@collectd.org>
Date: Fri, 4 Dec 2015 15:39:30 +0000 (+0100)
Subject: Merge branch 'pr/1395'
X-Git-Tag: collectd-5.6.0~528
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e96afedbc67f8a508e37b73217c224aa5bd25f66;hp=-c;p=collectd.git

Merge branch 'pr/1395'
---

e96afedbc67f8a508e37b73217c224aa5bd25f66
diff --combined src/collectd.conf.pod
index 7c5a3c0c,46dbca4d..a5af5762
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -4957,6 -4957,13 +4957,13 @@@ Default: B<0.9
  
  Sets the Time-To-Live of generated ICMP packets.
  
+ =item B<Size> I<size>
+ 
+ Sets the size of the data payload in ICMP packet to specified I<size> (it
+ will be filled with regular ASCII pattern). If not set, default 56 byte
+ long string is used so that the packet size of an ICMPv4 packet is exactly
+ 64 bytes, similar to the behaviour of normal ping(1) command.
+ 
  =item B<SourceAddress> I<host>
  
  Sets the source address to use. I<host> may either be a numerical network
@@@ -6232,12 -6239,6 +6239,12 @@@ rate of counters and size of sets will 
  are unchanged. If set to B<True>, the such metrics are not dispatched and
  removed from the internal cache.
  
 +=item B<CounterSum> B<false>|B<true>
 +
 +When enabled, create a C<count> metric which reports the change since the last
 +read. This option primarily exists for compatibility with the I<statsd>
 +impelemtation by Etsy.
 +
  =item B<TimerPercentile> I<Percent>
  
  Calculate and dispatch the configured percentile, i.e. compute the latency, so
@@@ -7277,14 -7278,6 +7284,14 @@@ Service name or port number to connect 
  
  Protocol to use when connecting to I<Graphite>. Defaults to C<tcp>.
  
 +=item B<ReconnectInterval> I<Seconds>
 +
 +When set to non-zero, forces the connection to the Graphite backend to be
 +closed and re-opend periodically. This behavior is desirable in environments
 +where the connection to the Graphite backend is done through load balancers,
 +for example. When set to zero, the default, the connetion is kept open for as
 +long as possible.
 +
  =item B<LogSendErrors> B<false>|B<true>
  
  If set to B<true> (the default), logs errors when sending data to I<Graphite>.