Fix indentation, change Prefix to EventServicePrefix

[collectd.git] / src / write_riemann.c

diff --git a/src/write_riemann.c b/src/write_riemann.c
index 5675212..32c034c 100644 (file)
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -431,7 +431,7 @@ static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{
                riemann_event_add_tag (event, riemann_tags[i]);
 
        format_name (service_buffer, sizeof (service_buffer),
-                       /* host = */ host->prefix, n->plugin, n->plugin_instance,
+                       /* host = */ "", n->plugin, n->plugin_instance,
                        n->type, n->type_instance);
        event->service = strdup (&service_buffer[1]);
 
@@ -567,14 +567,22 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
        }
 
        format_name (name_buffer, sizeof (name_buffer),
-                       /* host = */ host->prefix, vl->plugin, vl->plugin_instance,
+                       /* 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);
+               if (host->prefix == NULL)
+                       ssnprintf (service_buffer, sizeof (service_buffer),
+                                       "%s/%s", &name_buffer[1], ds->ds[index].name);
+               else
+                       ssnprintf (service_buffer, sizeof (service_buffer),
+                                       "%s/%s/%s", host->prefix, &name_buffer[1], ds->ds[index].name);
        else
-               sstrncpy (service_buffer, &name_buffer[1],
-                               sizeof (service_buffer));
+               if (host->prefix == NULL)
+                       sstrncpy (service_buffer, &name_buffer[1],
+                                       sizeof (service_buffer));
+               else
+                       ssnprintf (service_buffer, sizeof (service_buffer),
+                                       "%s/%s", host->prefix, &name_buffer[1]);
 
        event->service = strdup (service_buffer);
 
@@ -756,7 +764,7 @@ static int riemann_config_node(oconfig_item_t *ci) /* {{{ */
             status = cf_util_get_boolean(child, &host->notifications);
             if (status != 0)
                 break;
-        } else if (strcasecmp ("Prefix", child->key) == 0) {
+        } else if (strcasecmp ("EventServicePrefix", child->key) == 0) {
             status = cf_util_get_string (child, &host->prefix);
                 break;
         } else if (strcasecmp ("CheckThresholds", child->key) == 0) {