X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_riemann.c;h=b558b0600c8ca108c4e9ac0d5ded3c46f288248c;hb=aee87d9c1665ca8823c7489bfc9900ff12e0e177;hp=f638c67b848d9eaff9bdd26a7107afda421128b0;hpb=f1eed3f69e512d9ecd67c674150f193a520ff2c9;p=collectd.git

diff --git a/src/write_riemann.c b/src/write_riemann.c
index f638c67b..b558b060 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -1,7 +1,8 @@
-/*
- * 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
@@ -15,6 +16,9 @@
  * 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"
@@ -31,19 +35,19 @@
 #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;
+	_Bool			 use_tcp;
 	int			 s;
 
 	int			 reference_count;
@@ -52,18 +56,10 @@ struct riemann_host {
 static char	**riemann_tags;
 static size_t	  riemann_tags_num;
 
-static int	riemann_send(struct riemann_host *, Msg const *);
-static int	riemann_notification(const notification_t *, user_data_t *);
-static int	riemann_write(const data_set_t *, const value_list_t *, user_data_t *);
-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(oconfig_item_t *);
-void	module_register(void);
-
 static void riemann_event_protobuf_free (Event *event) /* {{{ */
 {
+	size_t i;
+
 	if (event == NULL)
 		return;
 
@@ -76,10 +72,19 @@ static void riemann_event_protobuf_free (Event *event) /* {{{ */
 	event->tags = NULL;
 	event->n_tags = 0;
 
+	for (i = 0; i < event->n_attributes; i++)
+	{
+		sfree (event->attributes[i]->key);
+		sfree (event->attributes[i]->value);
+		sfree (event->attributes[i]);
+	}
+	sfree (event->attributes);
+	event->n_attributes = 0;
+
 	sfree (event);
 } /* }}} void riemann_event_protobuf_free */
 
-static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */
+static void riemann_msg_protobuf_free(Msg *msg) /* {{{ */
 {
 	size_t i;
 
@@ -98,72 +103,243 @@ static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */
 	sfree (msg);
 } /* }}} void riemann_msg_protobuf_free */
 
-static int
-riemann_send(struct riemann_host *host, Msg const *msg)
+/* host->lock must be held when calling this function. */
+static int riemann_connect(struct riemann_host *host) /* {{{ */
 {
-	u_char *buffer;
-	size_t  buffer_len;
-	int status;
+	int			 e;
+	struct addrinfo		*ai, *res, hints;
+	char const		*node;
+	char const		*service;
 
-	pthread_mutex_lock (&host->lock);
+	if (host->flags & F_CONNECT)
+		return 0;
+
+	memset(&hints, 0, sizeof(hints));
+	memset(&service, 0, sizeof(service));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = host->use_tcp ? SOCK_STREAM : SOCK_DGRAM;
+#ifdef AI_ADDRCONFIG
+	hints.ai_flags |= AI_ADDRCONFIG;
+#endif
+
+	node = (host->node != NULL) ? host->node : RIEMANN_HOST;
+	service = (host->service != NULL) ? host->service : RIEMANN_PORT;
+
+	if ((e = getaddrinfo(node, service, &hints, &res)) != 0) {
+		ERROR ("write_riemann plugin: Unable to resolve host \"%s\": %s",
+			node, gai_strerror(e));
+		return -1;
+	}
+
+	host->s = -1;
+	for (ai = res; ai != NULL; ai = ai->ai_next) {
+		if ((host->s = socket(ai->ai_family,
+				      ai->ai_socktype,
+				      ai->ai_protocol)) == -1) {
+			continue;
+		}
+
+		if (connect(host->s, ai->ai_addr, ai->ai_addrlen) != 0) {
+			close(host->s);
+			host->s = -1;
+			continue;
+		}
+
+		host->flags |= F_CONNECT;
+		DEBUG("write_riemann plugin: got a succesful connection for: %s:%s",
+				node, service);
+		break;
+	}
+
+	freeaddrinfo(res);
+
+	if (host->s < 0) {
+		WARNING("write_riemann plugin: Unable to connect to Riemann at %s:%s",
+				node, service);
+		return -1;
+	}
+	return 0;
+} /* }}} int riemann_connect */
+
+/* host->lock must be held when calling this function. */
+static int riemann_disconnect (struct riemann_host *host) /* {{{ */
+{
+	if ((host->flags & F_CONNECT) == 0)
+		return (0);
+
+	close (host->s);
+	host->s = -1;
+	host->flags &= ~F_CONNECT;
+
+	return (0);
+} /* }}} int riemann_disconnect */
+
+static int riemann_send_msg (struct riemann_host *host, const Msg *msg) /* {{{ */
+{
+	int status = 0;
+	u_char *buffer = NULL;
+	size_t  buffer_len;
 
 	status = riemann_connect (host);
 	if (status != 0)
-	{
-		pthread_mutex_unlock (&host->lock);
 		return status;
-	}
 
 	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);
 		ERROR ("write_riemann plugin: malloc failed.");
 		return ENOMEM;
 	}
 	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)
 	{
 		char errbuf[1024];
-
-		riemann_disconnect (host);
-		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);
 		return -1;
 	}
 
-	pthread_mutex_unlock (&host->lock);
 	sfree (buffer);
 	return 0;
-}
+} /* }}} int riemann_send_msg */
+
+static int riemann_recv_ack(struct riemann_host *host) /* {{{ */
+{
+	int status = 0;
+	Msg *msg = NULL;
+	uint32_t header;
+
+	status = (int) sread (host->s, &header, 4);
+
+	if (status != 0)
+		return -1;
+
+	size_t size = ntohl(header);
+
+	// Buffer on the stack since acknowledges are typically small.
+	u_char buffer[size];
+	memset (buffer, 0, size);
+
+	status = (int) sread (host->s, buffer, size);
+
+	if (status != 0)
+		return status;
+
+	msg = msg__unpack (NULL, size, buffer);
+
+	if (msg == NULL)
+		return -1;
+
+	if (!msg->ok)
+	{
+		ERROR ("write_riemann plugin: Sending to Riemann at %s:%s acknowledgement message reported error: %s",
+				(host->node != NULL) ? host->node : RIEMANN_HOST,
+				(host->service != NULL) ? host->service : RIEMANN_PORT,
+				msg->error);
+
+		msg__free_unpacked(msg, NULL);
+		return -1;
+	}
+
+	msg__free_unpacked (msg, NULL);
+	return 0;
+} /* }}} int riemann_recv_ack */
+
+/**
+ * Function to send messages (Msg) to riemann.
+ *
+ * Acquires the host lock, disconnects on errors.
+ */
+static int riemann_send(struct riemann_host *host, Msg const *msg) /* {{{ */
+{
+	int status = 0;
+	pthread_mutex_lock (&host->lock);
+
+	status = riemann_send_msg(host, msg);
+	if (status != 0) {
+		riemann_disconnect (host);
+		pthread_mutex_unlock (&host->lock);
+		return status;
+	}
+
+	/*
+	 * For TCP we need to receive message acknowledgemenent.
+	 */
+	if (host->use_tcp)
+	{
+		status = riemann_recv_ack(host);
+
+		if (status != 0)
+		{
+			riemann_disconnect (host);
+			pthread_mutex_unlock (&host->lock);
+			return status;
+		}
+	}
+
+	pthread_mutex_unlock (&host->lock);
+	return 0;
+} /* }}} int riemann_send */
 
-static int riemann_event_add_tag (Event *event, /* {{{ */
-		char const *format, ...)
+static int riemann_event_add_tag (Event *event, char const *tag) /* {{{ */
 {
-	va_list ap;
-	char buffer[1024];
-	size_t ret;
-
-	va_start (ap, format);
-	ret = vsnprintf (buffer, sizeof (buffer), format, ap);
-	if (ret >= sizeof (buffer))
-		ret = sizeof (buffer) - 1;
-	buffer[ret] = 0;
-	va_end (ap);
-
-	return (strarray_add (&event->tags, &event->n_tags, buffer));
+	return (strarray_add (&event->tags, &event->n_tags, tag));
 } /* }}} int riemann_event_add_tag */
 
-static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{ */
+static int riemann_event_add_attribute(Event *event, /* {{{ */
+		char const *key, char const *value)
+{
+	Attribute **new_attributes;
+	Attribute *a;
+
+	new_attributes = realloc (event->attributes,
+			sizeof (*event->attributes) * (event->n_attributes + 1));
+	if (new_attributes == NULL)
+	{
+		ERROR ("write_riemann plugin: realloc failed.");
+		return (ENOMEM);
+	}
+	event->attributes = new_attributes;
+
+	a = malloc (sizeof (*a));
+	if (a == NULL)
+	{
+		ERROR ("write_riemann plugin: malloc failed.");
+		return (ENOMEM);
+	}
+	attribute__init (a);
+
+	a->key = strdup (key);
+	if (value != NULL)
+		a->value = strdup (value);
+
+	event->attributes[event->n_attributes] = a;
+	event->n_attributes++;
+
+	return (0);
+} /* }}} int riemann_event_add_attribute */
+
+static Msg *riemann_notification_to_protobuf(struct riemann_host *host, /* {{{ */
 		notification_t const *n)
 {
 	Msg *msg;
@@ -210,34 +386,35 @@ static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{
 
 	switch (n->severity)
 	{
-		case NOTIF_OKAY:	severity = "okay"; break;
+		case NOTIF_OKAY:	severity = "ok"; break;
 		case NOTIF_WARNING:	severity = "warning"; break;
-		case NOTIF_FAILURE:	severity = "failure"; break;
+		case NOTIF_FAILURE:	severity = "critical"; break;
 		default:		severity = "unknown";
 	}
 	event->state = strdup (severity);
 
 	riemann_event_add_tag (event, "notification");
+	if (n->host[0] != 0)
+		riemann_event_add_attribute (event, "host", n->host);
 	if (n->plugin[0] != 0)
-		riemann_event_add_tag (event, "plugin:%s", n->plugin);
+		riemann_event_add_attribute (event, "plugin", n->plugin);
 	if (n->plugin_instance[0] != 0)
-		riemann_event_add_tag (event, "plugin_instance:%s",
+		riemann_event_add_attribute (event, "plugin_instance",
 				n->plugin_instance);
 
 	if (n->type[0] != 0)
-		riemann_event_add_tag (event, "type:%s", n->type);
+		riemann_event_add_attribute (event, "type", n->type);
 	if (n->type_instance[0] != 0)
-		riemann_event_add_tag (event, "type_instance:%s",
+		riemann_event_add_attribute (event, "type_instance",
 				n->type_instance);
 
 	for (i = 0; i < riemann_tags_num; i++)
-		riemann_event_add_tag (event, "%s", riemann_tags[i]);
+		riemann_event_add_tag (event, 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)
@@ -256,12 +433,13 @@ static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{
 	return (msg);
 } /* }}} Msg *riemann_notification_to_protobuf */
 
-static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ */
+static Event *riemann_value_to_protobuf(struct riemann_host const *host, /* {{{ */
 		data_set_t const *ds,
 		value_list_t const *vl, size_t index,
 		gauge_t const *rates)
 {
 	Event *event;
+	char name_buffer[5 * DATA_MAX_NAME_LEN];
 	char service_buffer[6 * DATA_MAX_NAME_LEN];
 	int i;
 
@@ -277,34 +455,42 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
 	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);
+	riemann_event_add_attribute (event, "plugin", vl->plugin);
 	if (vl->plugin_instance[0] != 0)
-		riemann_event_add_tag (event, "plugin_instance:%s",
+		riemann_event_add_attribute (event, "plugin_instance",
 				vl->plugin_instance);
 
-	riemann_event_add_tag (event, "type:%s", vl->type);
+	riemann_event_add_attribute (event, "type", vl->type);
 	if (vl->type_instance[0] != 0)
-		riemann_event_add_tag (event, "type_instance:%s",
+		riemann_event_add_attribute (event, "type_instance",
 				vl->type_instance);
 
 	if ((ds->ds[index].type != DS_TYPE_GAUGE) && (rates != NULL))
 	{
-		riemann_event_add_tag (event, "ds_type:%s:rate",
+		char ds_type[DATA_MAX_NAME_LEN];
+
+		ssnprintf (ds_type, sizeof (ds_type), "%s:rate",
 				DS_TYPE_TO_STRING(ds->ds[index].type));
+		riemann_event_add_attribute (event, "ds_type", ds_type);
 	}
 	else
 	{
-		riemann_event_add_tag (event, "ds_type:%s",
+		riemann_event_add_attribute (event, "ds_type",
 				DS_TYPE_TO_STRING(ds->ds[index].type));
 	}
-	riemann_event_add_tag (event, "ds_name:%s", ds->ds[index].name);
-	riemann_event_add_tag (event, "ds_index:%zu", index);
+	riemann_event_add_attribute (event, "ds_name", ds->ds[index].name);
+	{
+		char ds_index[DATA_MAX_NAME_LEN];
+
+		ssnprintf (ds_index, sizeof (ds_index), "%zu", index);
+		riemann_event_add_attribute (event, "ds_index", ds_index);
+	}
 
 	for (i = 0; i < riemann_tags_num; i++)
-		riemann_event_add_tag (event, "%s", riemann_tags[i]);
+		riemann_event_add_tag (event, riemann_tags[i]);
 
 	if (ds->ds[index].type == DS_TYPE_GAUGE)
 	{
@@ -327,10 +513,16 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
 			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: "
@@ -339,7 +531,7 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
 	return (event);
 } /* }}} Event *riemann_value_to_protobuf */
 
-static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /* {{{ */
+static Msg *riemann_value_list_to_protobuf(struct riemann_host const *host, /* {{{ */
 		data_set_t const *ds,
 		value_list_t const *vl)
 {
@@ -394,8 +586,7 @@ static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /*
 	return (msg);
 } /* }}} Msg *riemann_value_list_to_protobuf */
 
-static int
-riemann_notification(const notification_t *n, user_data_t *ud)
+static int riemann_notification(const notification_t *n, user_data_t *ud) /* {{{ */
 {
 	int			 status;
 	struct riemann_host	*host = ud->data;
@@ -414,8 +605,7 @@ riemann_notification(const notification_t *n, user_data_t *ud)
 	return (status);
 } /* }}} int riemann_notification */
 
-static int
-riemann_write(const data_set_t *ds,
+static int riemann_write(const data_set_t *ds, /* {{{ */
 	      const value_list_t *vl,
 	      user_data_t *ud)
 {
@@ -434,82 +624,9 @@ riemann_write(const data_set_t *ds,
 
 	riemann_msg_protobuf_free (msg);
 	return status;
-}
-
-/* host->lock must be held when calling this function. */
-static int
-riemann_connect(struct riemann_host *host)
-{
-	int			 e;
-	struct addrinfo		*ai, *res, hints;
-	char const		*service;
-
-	if (host->flags & F_CONNECT)
-		return 0;
-
-	memset(&hints, 0, sizeof(hints));
-	memset(&service, 0, sizeof(service));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;
-#ifdef AI_ADDRCONFIG
-	hints.ai_flags |= AI_ADDRCONFIG;
-#endif
-
-	assert (host->node != NULL);
-	service = (host->service != NULL) ? host->service : RIEMANN_PORT;
-
-	if ((e = getaddrinfo(host->node, service, &hints, &res)) != 0) {
-		ERROR ("write_riemann plugin: Unable to resolve host \"%s\": %s",
-			host->node, gai_strerror(e));
-		return -1;
-	}
-
-	host->s = -1;
-	for (ai = res; ai != NULL; ai = ai->ai_next) {
-		if ((host->s = socket(ai->ai_family,
-				      ai->ai_socktype,
-				      ai->ai_protocol)) == -1) {
-			continue;
-		}
-
-		if (connect(host->s, ai->ai_addr, ai->ai_addrlen) != 0) {
-			close(host->s);
-			host->s = -1;
-			continue;
-		}
-
-		host->flags |= F_CONNECT;
-		DEBUG("write_riemann plugin: got a succesful connection for: %s:%s",
-				host->node, service);
-		break;
-	}
+} /* }}} int riemann_write */
 
-	freeaddrinfo(res);
-
-	if (host->s < 0) {
-		WARNING("write_riemann plugin: Unable to connect to Riemann at %s:%s",
-				host->node, service);
-		return -1;
-	}
-	return 0;
-}
-
-/* host->lock must be held when calling this function. */
-static int
-riemann_disconnect (struct riemann_host *host)
-{
-	if ((host->flags & F_CONNECT) == 0)
-		return (0);
-
-	close (host->s);
-	host->s = -1;
-	host->flags &= ~F_CONNECT;
-
-	return (0);
-}
-
-static void
-riemann_free(void *p)
+static void riemann_free(void *p) /* {{{ */
 {
 	struct riemann_host	*host = p;
 
@@ -530,17 +647,15 @@ riemann_free(void *p)
 	sfree(host->service);
 	pthread_mutex_destroy (&host->lock);
 	sfree(host);
-}
+} /* }}} void riemann_free */
 
-static int
-riemann_config_host(oconfig_item_t *ci)
+static int 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) {
@@ -551,9 +666,11 @@ riemann_config_host(oconfig_item_t *ci)
 	host->reference_count = 1;
 	host->node = NULL;
 	host->service = NULL;
-	host->delay = RIEMANN_DELAY;
+	host->store_rates = 1;
+	host->always_append_ds = 0;
+	host->use_tcp = 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);
@@ -568,7 +685,11 @@ riemann_config_host(oconfig_item_t *ci)
 		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 "
@@ -576,11 +697,35 @@ riemann_config_host(oconfig_item_t *ci)
 						"option.");
 				break;
 			}
-		} else if (strcasecmp(child->key, "delay") == 0) {
-			if ((status = cf_util_get_int(ci, &host->delay)) != 0)
+		} 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 {
@@ -593,31 +738,27 @@ riemann_config_host(oconfig_item_t *ci)
 		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++;
 
@@ -636,10 +777,9 @@ riemann_config_host(oconfig_item_t *ci)
 	pthread_mutex_unlock (&host->lock);
 
 	return status;
-}
+} /* }}} int riemann_config_node */
 
-static int
-riemann_config(oconfig_item_t *ci)
+static int riemann_config(oconfig_item_t *ci) /* {{{ */
 {
 	int		 i;
 	oconfig_item_t	*child;
@@ -648,8 +788,8 @@ riemann_config(oconfig_item_t *ci)
 	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);
@@ -666,12 +806,11 @@ riemann_config(oconfig_item_t *ci)
 		}
 	}
 	return (0);
-}
+} /* }}} int riemann_config */
 
-void
-module_register(void)
+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 : */