From 21f35cd8376a29cbea8e1d0c690b0f9125cffdcd Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 15 Jan 2015 09:06:24 +0100
Subject: [PATCH] write_riemann: defaults to use TCP and batching

Fixes #891
---
 src/collectd.conf.in  | 4 ++--
 src/collectd.conf.pod | 9 +++++++--
 src/write_riemann.c   | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 608d3889..dda4fcc5 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1325,8 +1325,8 @@
 #	<Node "example">
 #		Host "localhost"
 #		Port 5555
-#		Protocol UDP
-#		Batch false
+#		Protocol TCP
+#		Batch true
 #		BatchMaxSize 8192
 #		StoreRates true
 #		AlwaysAppendDS false
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 35c90b86..1802d5ae 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -7229,7 +7229,7 @@ Service name or port number to connect to. Defaults to C<5555>.
 =item B<Protocol> B<UDP>|B<TCP>
 
 Specify the protocol to use when communicating with I<Riemann>. Defaults to
-B<UDP>.
+B<TCP>.
 
 =item B<Batch> B<true>|B<false>
 
@@ -7239,7 +7239,12 @@ regular intervals or when B<BatchMaxSize> is exceeded.
 
 Notifications are not batched and sent as soon as possible.
 
-Defaults to false
+When enabled, it can occur that events get processed by the Riemann server
+close to or after their expiration time. Tune the B<TTLFactor> and
+B<BatchMaxSize> settings according to the amount of values collected, if this
+is an issue.
+
+Defaults to true
 
 =item B<BatchMaxSize> I<size>
 
diff --git a/src/write_riemann.c b/src/write_riemann.c
index 0a8df6fe..a09c7236 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -854,10 +854,10 @@ static int riemann_config_node(oconfig_item_t *ci) /* {{{ */
 	host->check_thresholds = 0;
 	host->store_rates = 1;
 	host->always_append_ds = 0;
-	host->use_tcp = 0;
-    host->batch_mode = 0;
-    host->batch_max = RIEMANN_BATCH_MAX; /* typical MSS */
-    host->batch_init = cdtime();
+	host->use_tcp = 1;
+	host->batch_mode = 1;
+	host->batch_max = RIEMANN_BATCH_MAX; /* typical MSS */
+	host->batch_init = cdtime();
 	host->ttl_factor = RIEMANN_TTL_FACTOR;
 
 	status = cf_util_get_string (ci, &host->name);
-- 
2.30.2