From: Florian Forster <octo@collectd.org>
Date: Mon, 12 Sep 2016 18:22:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1915'
X-Git-Tag: collectd-5.7.0~100
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a302b46b0f8b178ea6e360e21a525273598bf652;p=collectd.git

Merge remote-tracking branch 'github/pr/1915'
---

a302b46b0f8b178ea6e360e21a525273598bf652
diff --cc src/collectd.conf.pod
index ab809159,c7a818dd..ec2a0c50
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -7818,28 -7818,14 +7818,34 @@@ If set to B<true>, append the name of t
  identifier. If set to B<false> (the default), this is only done when there is
  more than one DS.
  
+ =item B<DropDuplicateFields> B<false>|B<true>
+ 
+ If set to B<true>, detect and remove duplicate components in Graphite metric
+ names. For example, the metric name  C<host.load.load.shortterm> will
+ be shortened to C<host.load.shortterm>.
+ 
  =back
  
 +=head2 Plugin C<write_log>
 +
 +The C<write_log> plugin writes metrics as INFO log messages.
 +
 +This plugin supports two output formats: I<Graphite> and I<JSON>.
 +
 +Synopsis:
 +
 + <Plugin write_log>
 +   Format Graphite
 + </Plugin>
 +
 +=over 4
 +
 +=item B<Format> I<Format>
 +
 +The output format to use. Can be one of C<Graphite> or C<JSON>.
 +
 +=back
 +
  =head2 Plugin C<write_tsdb>
  
  The C<write_tsdb> plugin writes data to I<OpenTSDB>, a scalable open-source