-/*
- * collectd - src/riemann.c
+/**
+ * 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 RIEMANN_MAX_TAGS 37
-#define RIEMANN_EXTRA_TAGS 32
struct riemann_host {
+ char *name;
#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;
static int riemann_connect(struct riemann_host *);
static int riemann_disconnect (struct riemann_host *host);
static void riemann_free(void *);
-static int riemann_config_host(oconfig_item_t *);
+static int riemann_config_node(oconfig_item_t *);
static int riemann_config(oconfig_item_t *);
void module_register(void);
pthread_mutex_unlock (&host->lock);
ERROR ("write_riemann plugin: Sending to Riemann at %s:%s failed: %s",
- host->node,
+ (host->node != NULL) ? host->node : RIEMANN_HOST,
(host->service != NULL) ? host->service : RIEMANN_PORT,
sstrerror (errno, errbuf, sizeof (errbuf)));
sfree (buffer);
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: "
{
int e;
struct addrinfo *ai, *res, hints;
+ char const *node;
char const *service;
if (host->flags & F_CONNECT)
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;
#endif
- assert (host->node != NULL);
+ node = (host->node != NULL) ? host->node : RIEMANN_HOST;
service = (host->service != NULL) ? host->service : RIEMANN_PORT;
- if ((e = getaddrinfo(host->node, service, &hints, &res)) != 0) {
+ if ((e = getaddrinfo(node, service, &hints, &res)) != 0) {
ERROR ("write_riemann plugin: Unable to resolve host \"%s\": %s",
- host->node, gai_strerror(e));
+ node, gai_strerror(e));
return -1;
}
host->flags |= F_CONNECT;
DEBUG("write_riemann plugin: got a succesful connection for: %s:%s",
- host->node, service);
+ node, service);
break;
}
if (host->s < 0) {
WARNING("write_riemann plugin: Unable to connect to Riemann at %s:%s",
- host->node, service);
+ node, service);
return -1;
}
return 0;
}
static int
-riemann_config_host(oconfig_item_t *ci)
+riemann_config_node(oconfig_item_t *ci)
{
struct riemann_host *host = NULL;
int status = 0;
int i;
oconfig_item_t *child;
- char w_cb_name[DATA_MAX_NAME_LEN];
- char n_cb_name[DATA_MAX_NAME_LEN];
+ char callback_name[DATA_MAX_NAME_LEN];
user_data_t ud;
if ((host = calloc(1, sizeof (*host))) == NULL) {
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->node);
+ status = cf_util_get_string (ci, &host->name);
if (status != 0) {
WARNING("write_riemann plugin: Required host name is missing.");
riemann_free (host);
child = &ci->children[i];
status = 0;
- if (strcasecmp(child->key, "port") == 0) {
+ if (strcasecmp ("Host", child->key) == 0) {
+ status = cf_util_get_string (child, &host->node);
+ if (status != 0)
+ break;
+ } else if (strcasecmp ("Port", child->key) == 0) {
status = cf_util_get_service (child, &host->service);
if (status != 0) {
ERROR ("write_riemann plugin: Invalid argument "
"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 {
return status;
}
- ssnprintf(w_cb_name, sizeof(w_cb_name), "write-riemann/%s:%s",
- host->node,
- (host->service != NULL) ? host->service : RIEMANN_PORT);
- ssnprintf(n_cb_name, sizeof(n_cb_name), "notification-riemann/%s:%s",
- host->node,
- (host->service != NULL) ? host->service : RIEMANN_PORT);
+ ssnprintf (callback_name, sizeof (callback_name), "write_riemann/%s",
+ host->name);
ud.data = host;
ud.free_func = riemann_free;
pthread_mutex_lock (&host->lock);
- status = plugin_register_write (w_cb_name, riemann_write, &ud);
+ status = plugin_register_write (callback_name, riemann_write, &ud);
if (status != 0)
WARNING ("write_riemann plugin: plugin_register_write (\"%s\") "
"failed with status %i.",
- w_cb_name, status);
+ callback_name, status);
else /* success */
host->reference_count++;
- status = plugin_register_notification (n_cb_name,
+ status = plugin_register_notification (callback_name,
riemann_notification, &ud);
if (status != 0)
WARNING ("write_riemann plugin: plugin_register_notification (\"%s\") "
"failed with status %i.",
- n_cb_name, status);
+ callback_name, status);
else /* success */
host->reference_count++;
for (i = 0; i < ci->children_num; i++) {
child = &ci->children[i];
- if (strcasecmp(child->key, "host") == 0) {
- riemann_config_host(child);
+ if (strcasecmp("Node", child->key) == 0) {
+ riemann_config_node (child);
} else if (strcasecmp(child->key, "tag") == 0) {
char *tmp = NULL;
status = cf_util_get_string(child, &tmp);
void
module_register(void)
{
- plugin_register_complex_config ("riemann", riemann_config);
+ plugin_register_complex_config ("write_riemann", riemann_config);
}
/* vim: set sw=8 sts=8 ts=8 noet : */
projects / collectd.git / blobdiff