From: Michael Schenck <mschenck@digitalocean.com>
Date: Tue, 21 Oct 2014 17:31:40 +0000 (-0400)
Subject: Including vl->type, even when vl->type_instance is available to avoid over-writing... 
X-Git-Tag: collectd-5.5.0~166^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1742b4d728511847944b0a9ac4af02b2e038a724;p=collectd.git

Including vl->type, even when vl->type_instance is available to avoid over-writing values (i.e. with the 'df' plugin)
---

diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index aeed6350..efc71467 100644
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -387,8 +387,8 @@ static int wt_format_name(char *ret, int ret_len,
         ssnprintf(ret, ret_len, "%s%s.%s.%s",
                   prefix, vl->plugin, vl->plugin_instance, vl->type);
     } else {
-        ssnprintf(ret, ret_len, "%s%s.%s.%s",
-                  prefix, vl->plugin, vl->plugin_instance, vl->type_instance);
+        ssnprintf(ret, ret_len, "%s%s.%s.%s.%s",
+                  prefix, vl->plugin, vl->plugin_instance, vl->type, vl->type_instance);
     }
 
     sfree(temp);