switch default write_graphite protocol back to TCP

The *default* protocol was switched to UDP in 498a0dcd, when UDP support
was added to the plugin.

Switching this default back to TCP, because it makes the plugin break
for users upgrading to 5.4, and also because the UDP listener is disabled
in a default graphite installation (cf.
https://github.com/graphite-project/carbon/blob/0.9.x/conf/carbon.conf.example#L78)

Fixes GH#428

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index f93cda5c039a8523c6bce04a132723c7667f3198..6d19c3222786c76890cc702265a9e10dafe7586c 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1133,7 +1133,7 @@
 #  <Node "example">
 #    Host "localhost"
 #    Port "2003"
-#    Protocol "udp"
+#    Protocol "tcp"
 #    LogSendErrors true
 #    Prefix "collectd"
 #    Postfix "collectd"

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 2aebbd3acafaf9007a725cdb048e9a72da8945fc..4bd8aac3e81c98d824668399b62f52da64ecdef6 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -6085,7 +6085,7 @@ Synopsis:
    <Node "example">
      Host "localhost"
      Port "2003"
-     Protocol "udp"
+     Protocol "tcp"
      LogSendErrors true
      Prefix "collectd"
    </Node>
@@ -6106,7 +6106,7 @@ Service name or port number to connect to. Defaults to C<2003>.
 
 =item B<Protocol> I<String>
 
-Protocol to use when connecting to I<Graphite>. Defaults to C<udp>.
+Protocol to use when connecting to I<Graphite>. Defaults to C<tcp>.
 
 =item B<LogSendErrors> B<false>|B<true>
 

diff --git a/src/write_graphite.c b/src/write_graphite.c
index 6124d33edf5a07ae26f922b1cc7a151a959b6c28..667c11e3dd9aca469c438c27d477fb718b6ad904 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef WG_DEFAULT_PROTOCOL
-# define WG_DEFAULT_PROTOCOL "udp"
+# define WG_DEFAULT_PROTOCOL "tcp"
 #endif
 
 #ifndef WG_DEFAULT_LOG_SEND_ERRORS