-/*
+/**
* 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"
uint8_t flags;
pthread_mutex_t lock;
_Bool store_rates;
+ _Bool always_append_ds;
char *node;
char *service;
+ _Bool use_tcp;
int s;
int reference_count;
}
buffer_len = msg__get_packed_size(msg);
+ if (host->use_tcp)
+ buffer_len += 4;
+
buffer = malloc (buffer_len);
if (buffer == NULL) {
pthread_mutex_unlock (&host->lock);
}
memset (buffer, 0, buffer_len);
- msg__pack(msg, buffer);
+ if (host->use_tcp)
+ {
+ uint32_t length = htonl ((uint32_t) (buffer_len - 4));
+ memcpy (buffer, &length, 4);
+ msg__pack(msg, buffer + 4);
+ }
+ else
+ {
+ msg__pack(msg, buffer);
+ }
status = (int) swrite (host->s, buffer, buffer_len);
if (status != 0)
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->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_socktype = SOCK_DGRAM;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = host->use_tcp ? SOCK_STREAM : SOCK_DGRAM;
#ifdef AI_ADDRCONFIG
hints.ai_flags |= AI_ADDRCONFIG;
#endif
host->node = NULL;
host->service = NULL;
host->store_rates = 1;
+ host->always_append_ds = 0;
+ host->use_tcp = 0;
status = cf_util_get_string (ci, &host->name);
if (status != 0) {
"option.");
break;
}
+ } else if (strcasecmp ("Protocol", child->key) == 0) {
+ char tmp[16];
+ status = cf_util_get_string_buffer (child,
+ tmp, sizeof (tmp));
+ if (status != 0)
+ {
+ ERROR ("write_riemann plugin: cf_util_get_"
+ "string_buffer failed with "
+ "status %i.", status);
+ break;
+ }
+
+ if (strcasecmp ("UDP", tmp) == 0)
+ host->use_tcp = 0;
+ else if (strcasecmp ("TCP", tmp) == 0)
+ host->use_tcp = 1;
+ else
+ WARNING ("write_riemann plugin: The value "
+ "\"%s\" is not valid for the "
+ "\"Protocol\" option. Use "
+ "either \"UDP\" or \"TCP\".",
+ tmp);
} 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 {