-/*
+/**
* collectd - src/write_riemann.c
*
- * Copyright (C) 2012 Pierre-Yves Ritschard <pyr@spootnik.org>
+ * Copyright (C) 2012,2013 Pierre-Yves Ritschard
+ * Copyright (C) 2013 Florian octo Forster
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
+ * Authors:
+ * Pierre-Yves Ritschard <pyr at spootnik.org>
+ * Florian octo Forster <octo at collectd.org>
*/
#include "collectd.h"
#include <inttypes.h>
#include <pthread.h>
-#define RIEMANN_DELAY 1
#define RIEMANN_HOST "localhost"
#define RIEMANN_PORT "5555"
#define F_CONNECT 0x01
uint8_t flags;
pthread_mutex_t lock;
- int delay;
_Bool store_rates;
+ _Bool always_append_ds;
char *node;
char *service;
int s;
for (i = 0; i < riemann_tags_num; i++)
riemann_event_add_tag (event, "%s", riemann_tags[i]);
- /* TODO: Use FORMAT_VL() here. */
- ssnprintf (service_buffer, sizeof(service_buffer),
- "%s-%s-%s-%s", n->plugin, n->plugin_instance,
+ format_name (service_buffer, sizeof (service_buffer),
+ /* host = */ "", n->plugin, n->plugin_instance,
n->type, n->type_instance);
- event->service = strdup (service_buffer);
+ event->service = strdup (&service_buffer[1]);
/* Pull in values from threshold */
for (meta = n->meta; meta != NULL; meta = meta->next)
gauge_t const *rates)
{
Event *event;
+ char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
int i;
event->host = strdup (vl->host);
event->time = CDTIME_T_TO_TIME_T (vl->time);
event->has_time = 1;
- event->ttl = CDTIME_T_TO_TIME_T (vl->interval) + host->delay;
+ event->ttl = CDTIME_T_TO_TIME_T (2 * vl->interval);
event->has_ttl = 1;
riemann_event_add_tag (event, "plugin:%s", vl->plugin);
event->metric_sint64 = (int64_t) vl->values[index].counter;
}
- /* TODO: Use FORMAT_VL() here. */
- ssnprintf (service_buffer, sizeof(service_buffer),
- "%s-%s-%s-%s-%s", vl->plugin, vl->plugin_instance,
- vl->type, vl->type_instance, ds->ds[index].name);
+ format_name (name_buffer, sizeof (name_buffer),
+ /* host = */ "", vl->plugin, vl->plugin_instance,
+ vl->type, vl->type_instance);
+ if (host->always_append_ds || (ds->ds_num > 1))
+ ssnprintf (service_buffer, sizeof (service_buffer),
+ "%s/%s", &name_buffer[1], ds->ds[index].name);
+ else
+ sstrncpy (service_buffer, &name_buffer[1],
+ sizeof (service_buffer));
+
event->service = strdup (service_buffer);
DEBUG ("write_riemann plugin: Successfully created protobuf for metric: "
memset(&hints, 0, sizeof(hints));
memset(&service, 0, sizeof(service));
- hints.ai_family = PF_UNSPEC;
+ hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
#ifdef AI_ADDRCONFIG
hints.ai_flags |= AI_ADDRCONFIG;
host->reference_count = 1;
host->node = NULL;
host->service = NULL;
- host->delay = RIEMANN_DELAY;
host->store_rates = 1;
+ host->always_append_ds = 0;
status = cf_util_get_string (ci, &host->name);
if (status != 0) {
"option.");
break;
}
- } else if (strcasecmp(child->key, "delay") == 0) {
- if ((status = cf_util_get_int(ci, &host->delay)) != 0)
- break;
} else if (strcasecmp ("StoreRates", child->key) == 0) {
- status = cf_util_get_boolean (ci, &host->store_rates);
+ status = cf_util_get_boolean (child, &host->store_rates);
+ if (status != 0)
+ break;
+ } else if (strcasecmp ("AlwaysAppendDS", child->key) == 0) {
+ status = cf_util_get_boolean (child,
+ &host->always_append_ds);
if (status != 0)
break;
} else {