summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 334b552)
raw | patch | inline | side by side (parent: 334b552)
author | Florian Forster <octo@collectd.org> | |
Fri, 12 Oct 2012 06:16:17 +0000 (08:16 +0200) | ||
committer | Florian Forster <octo@collectd.org> | |
Fri, 12 Oct 2012 06:16:17 +0000 (08:16 +0200) |
This functionality must have been lost in the refactoring that added
Graphite support to the AMQP plugin.
Graphite support to the AMQP plugin.
src/amqp.c | patch | blob | history | |
src/utils_format_graphite.c | patch | blob | history | |
src/utils_format_graphite.h | patch | blob | history | |
src/write_graphite.c | patch | blob | history |
diff --git a/src/amqp.c b/src/amqp.c
index 876f7e9e2cb0fb034cf365156d6165d002367c73..c9e46c45df0cac7ef0e0cc4f3bdd2e1bda8ad96e 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
else if (conf->format == CAMQP_FORMAT_GRAPHITE)
{
status = format_graphite (buffer, sizeof (buffer), ds, vl,
- conf->prefix, conf->postfix, conf->escape_char);
+ conf->prefix, conf->postfix, conf->escape_char,
+ conf->store_rates);
if (status != 0)
{
ERROR ("amqp plugin: format_graphite failed with status %i.",
index 49a59c506959fa4938d3cdc60fb6b1fe281fb9b7..b9b906fa373943b427e02d2b72f1fb39d3f21ed6 100644 (file)
* 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;
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)
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)
+ char *postfix, char escape_char,
+ _Bool store_rates)
{
int status = 0;
int i;
int buffer_pos = 0;
+ gauge_t *rates = NULL;
+ if (store_rates)
+ rates = uc_get_rate (ds, vl);
+
for (i = 0; i < ds->ds_num; i++)
{
const char *ds_name = NULL;
prefix, postfix, escape_char);
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));
/* 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);
}
if (message_len >= sizeof (message)) {
ERROR ("format_graphite: message buffer too small: "
"Need %zu bytes.", message_len + 1);
+ sfree (rates);
return (-ENOMEM);
}
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 */
index a3c4d85c9f4f2368e3b2bb3df165977315ad06f7..a7a05bbbadfea7f006801b6649beb7ed56656f85 100644 (file)
int format_graphite (char *buffer,
size_t buffer_size, const data_set_t *ds,
const value_list_t *vl, const char *prefix,
- const char *postfix, const char escape_char);
+ const char *postfix, const char escape_char,
+ _Bool store_rates);
#endif /* UTILS_FORMAT_GRAPHITE_H */
diff --git a/src/write_graphite.c b/src/write_graphite.c
index f3753da20dbd669175b7307a2585d1f5f95176b8..2ae30efe2ca179b0fd13cfafe5914f5a031b14ff 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
memset (buffer, 0, sizeof (buffer));
status = format_graphite (buffer, sizeof (buffer), ds, vl,
- cb->prefix, cb->postfix, cb->escape_char);
+ cb->prefix, cb->postfix, cb->escape_char, cb->store_rates);
if (status != 0) /* error message has been printed already. */
return (status);