From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Sun, 2 Feb 2014 08:25:46 +0000 (-0800)
Subject: Merge pull request #525 from collectd/feature-better-graphite-escape
X-Git-Tag: collectd-5.5.0~321
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=14439845047df76a968be2c1ac852d6c701332a9;hp=f2106c1e8c35c24e274f5ec08b70e967ade27ba4;p=collectd.git

Merge pull request #525 from collectd/feature-better-graphite-escape

Graphite deals poorly with metric names containing quotes.
---

diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c
index 83512015..c9516b49 100644
--- a/src/utils_format_graphite.c
+++ b/src/utils_format_graphite.c
@@ -29,6 +29,8 @@
 #include "utils_cache.h"
 #include "utils_parse_option.h"
 
+#define GRAPHITE_FORBIDDEN " \t\"\\:!/\n\r"
+
 /* Utils functions to format data sets in graphite format.
  * Largely taken from write_graphite.c as it remains the same formatting */
 
@@ -169,6 +171,18 @@ static int gr_format_name (char *ret, int ret_len,
     return (0);
 }
 
+static void escape_graphite_string (char *buffer, char escape_char)
+{
+	char *head;
+
+	assert (strchr(GRAPHITE_FORBIDDEN, escape_char) == NULL);
+
+	for (head = buffer + strcspn(buffer, GRAPHITE_FORBIDDEN);
+	     *head != '\0';
+	     head += strcspn(head, GRAPHITE_FORBIDDEN))
+		*head = escape_char;
+}
+
 int format_graphite (char *buffer, size_t buffer_size,
     data_set_t const *ds, value_list_t const *vl,
     char const *prefix, char const *postfix, char const escape_char,
@@ -204,7 +218,7 @@ int format_graphite (char *buffer, size_t buffer_size,
             return (status);
         }
 
-        escape_string (key, sizeof (key));
+        escape_graphite_string (key, escape_char);
         /* Convert the values to an ASCII representation and put that into
          * `values'. */
         status = gr_format_values (values, sizeof (values), i, ds, vl, rates);