From: Michael Leinartas <mleinartas@twitter.com>
Date: Mon, 12 Sep 2016 15:20:34 +0000 (-0500)
Subject: Update collectd.conf manpage and address style issues
X-Git-Tag: collectd-5.7.0~100^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3458b7647a8a5b7555b3fb0097d81bda4923e7c6;p=collectd.git

Update collectd.conf manpage and address style issues
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 0fa74d54..c7a818dd 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -7818,6 +7818,12 @@ If set to B<true>, append the name of the I<Data Source> (DS) to the "metric"
 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_tsdb>
diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c
index c7262655..904f43c5 100644
--- a/src/utils_format_graphite.c
+++ b/src/utils_format_graphite.c
@@ -151,12 +151,16 @@ static int gr_format_name (char *ret, int ret_len,
 
     if (n_type_instance[0] != '\0')
         if ((flags & GRAPHITE_DROP_DUPE_FIELDS) && strcmp(n_plugin, n_type) == 0)
+        {
             sstrncpy (tmp_type, n_type_instance, sizeof (tmp_type));
+        }
         else
+        {
             ssnprintf (tmp_type, sizeof (tmp_type), "%s%c%s",
                 n_type,
                 (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-',
                 n_type_instance);
+        }
     else
         sstrncpy (tmp_type, n_type, sizeof (tmp_type));
 
@@ -164,11 +168,15 @@ static int gr_format_name (char *ret, int ret_len,
     assert (!(flags & GRAPHITE_ALWAYS_APPEND_DS) || (ds_name != NULL));
     if (ds_name != NULL)
         if ((flags & GRAPHITE_DROP_DUPE_FIELDS) && strcmp(tmp_plugin, tmp_type) == 0)
+        {
             ssnprintf (ret, ret_len, "%s%s%s.%s.%s",
                 prefix, n_host, postfix, tmp_plugin, ds_name);
+        }
         else
+        {
             ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s",
                 prefix, n_host, postfix, tmp_plugin, tmp_type, ds_name);
+        }
     else
         ssnprintf (ret, ret_len, "%s%s%s.%s.%s",
             prefix, n_host, postfix, tmp_plugin, tmp_type);