X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_format_graphite.c;h=220258f40c6122ede7178d71247b484eb74fcab2;hb=9817e7298bd6c364fa17347327af54adf048bd21;hp=b0ebc1ebf05e2f99fc36c8ada8e678b3aed5d16b;hpb=2320afb2d74ee94e24442c669a19dae3f8fa9858;p=collectd.git diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c index b0ebc1eb..220258f4 100644 --- a/src/utils_format_graphite.c +++ b/src/utils_format_graphite.c @@ -1,6 +1,7 @@ /** * collectd - src/utils_format_graphite.c * Copyright (C) 2012 Thomas Meson + * Copyright (C) 2012 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -15,23 +16,26 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * Author: + * Authors: * Thomas Meson + * Florian octo Forster **/ #include "collectd.h" #include "plugin.h" #include "common.h" +#include "utils_format_graphite.h" #include "utils_cache.h" -#include "utils_format_json.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 */ static int gr_format_values (char *ret, size_t ret_len, - int ds_num, const data_set_t *ds, const value_list_t *vl) + int ds_num, const data_set_t *ds, const value_list_t *vl, + gauge_t const *rates) { size_t offset = 0; int status; @@ -57,6 +61,8 @@ static int gr_format_values (char *ret, size_t ret_len, if (ds->ds[ds_num].type == DS_TYPE_GAUGE) BUFFER_ADD ("%f", vl->values[ds_num].gauge); + else if (rates != NULL) + BUFFER_ADD ("%f", rates[ds_num]); else if (ds->ds[ds_num].type == DS_TYPE_COUNTER) BUFFER_ADD ("%llu", vl->values[ds_num].counter); else if (ds->ds[ds_num].type == DS_TYPE_DERIVE) @@ -75,7 +81,7 @@ static int gr_format_values (char *ret, size_t ret_len, return (0); } -static void copy_escape_part (char *dst, const char *src, size_t dst_len, +static void gr_copy_escape_part (char *dst, const char *src, size_t dst_len, char escape_char) { size_t i; @@ -103,11 +109,12 @@ static void copy_escape_part (char *dst, const char *src, size_t dst_len, } static int gr_format_name (char *ret, int ret_len, - const value_list_t *vl, - const char *ds_name, - char *prefix, - char *postfix, - char escape_char) + value_list_t const *vl, + char const *ds_name, + char const *prefix, + char const *postfix, + char const escape_char, + unsigned int flags) { char n_host[DATA_MAX_NAME_LEN]; char n_plugin[DATA_MAX_NAME_LEN]; @@ -124,21 +131,21 @@ static int gr_format_name (char *ret, int ret_len, if (postfix == NULL) postfix = ""; - copy_escape_part (n_host, vl->host, + gr_copy_escape_part (n_host, vl->host, sizeof (n_host), escape_char); - copy_escape_part (n_plugin, vl->plugin, + gr_copy_escape_part (n_plugin, vl->plugin, sizeof (n_plugin), escape_char); - copy_escape_part (n_plugin_instance, vl->plugin_instance, + gr_copy_escape_part (n_plugin_instance, vl->plugin_instance, sizeof (n_plugin_instance), escape_char); - copy_escape_part (n_type, vl->type, + gr_copy_escape_part (n_type, vl->type, sizeof (n_type), escape_char); - copy_escape_part (n_type_instance, vl->type_instance, + gr_copy_escape_part (n_type_instance, vl->type_instance, sizeof (n_type_instance), escape_char); if (n_plugin_instance[0] != '\0') ssnprintf (tmp_plugin, sizeof (tmp_plugin), "%s%c%s", n_plugin, - '-', + (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-', n_plugin_instance); else sstrncpy (tmp_plugin, n_plugin, sizeof (tmp_plugin)); @@ -146,11 +153,13 @@ static int gr_format_name (char *ret, int ret_len, if (n_type_instance[0] != '\0') 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) ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s", prefix, n_host, postfix, tmp_plugin, tmp_type, ds_name); @@ -161,40 +170,61 @@ 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, - const data_set_t *ds, const value_list_t *vl, char *prefix, - char *postfix, char escape_char) + data_set_t const *ds, value_list_t const *vl, + char const *prefix, char const *postfix, char const escape_char, + unsigned int flags) { int status = 0; int i; int buffer_pos = 0; + gauge_t *rates = NULL; + if (flags & GRAPHITE_STORE_RATES) + rates = uc_get_rate (ds, vl); + for (i = 0; i < ds->ds_num; i++) { - const char *ds_name = NULL; + char const *ds_name = NULL; char key[10*DATA_MAX_NAME_LEN]; char values[512]; size_t message_len; char message[1024]; - ds_name = ds->ds[i].name; + if ((flags & GRAPHITE_ALWAYS_APPEND_DS) + || (ds->ds_num > 1)) + ds_name = ds->ds[i].name; /* Copy the identifier to `key' and escape it. */ status = gr_format_name (key, sizeof (key), vl, ds_name, - prefix, postfix, escape_char); + prefix, postfix, escape_char, flags); if (status != 0) { - ERROR ("amqp plugin: error with gr_format_name"); + ERROR ("format_graphite: error with gr_format_name"); + sfree (rates); 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); + status = gr_format_values (values, sizeof (values), i, ds, vl, rates); if (status != 0) { ERROR ("format_graphite: error with gr_format_values"); + sfree (rates); return (status); } @@ -207,6 +237,7 @@ int format_graphite (char *buffer, size_t buffer_size, if (message_len >= sizeof (message)) { ERROR ("format_graphite: message buffer too small: " "Need %zu bytes.", message_len + 1); + sfree (rates); return (-ENOMEM); } @@ -214,11 +245,13 @@ int format_graphite (char *buffer, size_t buffer_size, if ((buffer_pos + message_len) >= buffer_size) { ERROR ("format_graphite: target buffer too small"); + sfree (rates); return (-ENOMEM); } memcpy((void *) (buffer + buffer_pos), message, message_len); buffer_pos += message_len; } + sfree (rates); return (status); } /* int format_graphite */