summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3458b76)
raw | patch | inline | side by side (parent: 3458b76)
author | Michael Leinartas <mleinartas@twitter.com> | |
Mon, 12 Sep 2016 17:20:16 +0000 (12:20 -0500) | ||
committer | Michael Leinartas <mleinartas@twitter.com> | |
Mon, 12 Sep 2016 17:20:16 +0000 (12:20 -0500) |
src/utils_format_graphite.c | patch | blob | history |
index 904f43c5ac0c6ad7d507783860bbc93285d5cede..f09e0bc8400db3453f62315b9fc12a9c616601ad 100644 (file)
sstrncpy (tmp_plugin, n_plugin, sizeof (tmp_plugin));
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));
-
/* Assert always_append_ds -> ds_name */
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);