respect riemann's terminology

[collectd.git] / src / write_riemann.c

diff --git a/src/write_riemann.c b/src/write_riemann.c
index e3f013e..72ec879 100644 (file)
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -44,8 +44,10 @@ struct riemann_host {
        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;
@@ -117,6 +119,9 @@ riemann_send(struct riemann_host *host, Msg const *msg)
        }
 
        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);
@@ -125,7 +130,16 @@ riemann_send(struct riemann_host *host, Msg const *msg)
        }
        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)
@@ -212,9 +226,9 @@ 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);
@@ -235,11 +249,10 @@ static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{
        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)
@@ -264,6 +277,7 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
                gauge_t const *rates)
 {
        Event *event;
+       char name_buffer[5 * DATA_MAX_NAME_LEN];
        char service_buffer[6 * DATA_MAX_NAME_LEN];
        int i;
 
@@ -329,10 +343,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: "
@@ -453,7 +473,7 @@ riemann_connect(struct riemann_host *host)
        memset(&hints, 0, sizeof(hints));
        memset(&service, 0, sizeof(service));
        hints.ai_family = AF_UNSPEC;
-       hints.ai_socktype = SOCK_DGRAM;
+       hints.ai_socktype = host->use_tcp ? SOCK_STREAM : SOCK_DGRAM;
 #ifdef AI_ADDRCONFIG
        hints.ai_flags |= AI_ADDRCONFIG;
 #endif
@@ -554,6 +574,8 @@ riemann_config_node(oconfig_item_t *ci)
        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) {
@@ -582,10 +604,37 @@ riemann_config_node(oconfig_item_t *ci)
                                                "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 (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 {
                        WARNING("write_riemann plugin: ignoring unknown config "
                                "option: \"%s\"", child->key);