From: Florian Forster <octo@collectd.org>
Date: Fri, 18 Jan 2013 10:55:53 +0000 (+0100)
Subject: write_riemann plugin: Remove the "Delay" option.
X-Git-Tag: collectd-5.3.0~56^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b4da854362a1e649b5767d79361dc08d6f41c4e1;p=collectd.git

write_riemann plugin: Remove the "Delay" option.
---

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index d2cf950b..31dce556 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1044,7 +1044,6 @@
 #		Host "localhost">
 #		Port 5555
 #		StoreRates true
-#		Delay 1
 #	</Node>
 #	Tag "foobar"
 #</Plugin>
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 904f1862..6afd0b0e 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -5550,12 +5550,6 @@ Hostname or address to connect to. Defaults to C<localhost>.
 
 Service name or port number to connect to. Defaults to C<5555>.
 
-=item B<Delay> I<Seconds>
-
-Time (in seconds) that is added to each I<data set's> interval when calculating
-the I<time to live> (TTL) of the metric to be sent to I<Riemann>. Defaults to
-B<1>.
-
 =item B<StoreRates> B<false>|B<true>
 
 If set to B<true> (the default), convert counter values to rates. If set to
diff --git a/src/write_riemann.c b/src/write_riemann.c
index 79898908..cd0132d2 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -31,7 +31,6 @@
 #include <inttypes.h>
 #include <pthread.h>
 
-#define RIEMANN_DELAY		1
 #define RIEMANN_HOST		"localhost"
 #define RIEMANN_PORT		"5555"
 
@@ -40,7 +39,6 @@ struct riemann_host {
 #define F_CONNECT		 0x01
 	uint8_t			 flags;
 	pthread_mutex_t		 lock;
-	int			 delay;
 	_Bool			 store_rates;
 	char			*node;
 	char			*service;
@@ -277,7 +275,7 @@ 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);
@@ -551,7 +549,6 @@ riemann_config_node(oconfig_item_t *ci)
 	host->reference_count = 1;
 	host->node = NULL;
 	host->service = NULL;
-	host->delay = RIEMANN_DELAY;
 	host->store_rates = 1;
 
 	status = cf_util_get_string (ci, &host->name);
@@ -581,9 +578,6 @@ riemann_config_node(oconfig_item_t *ci)
 						"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);
 			if (status != 0)