write_graphite plugin: Adding UDP support to docs, README, etc.

diff --git a/README b/README
index 04e87abfb5edc5a15b5e311c8d8d53ab72028149..4a125bd7aa71ac7d856900e2403d459ca3f86c97 100644 (file)
--- a/README
+++ b/README
@@ -387,7 +387,7 @@ Features
       done.
 
     - write_graphite
-      Sends data to Carbon, the storage layer of Graphite.
+      Sends data to Carbon, the storage layer of Graphite using TCP or UDP.
 
     - write_http
       Sends the values collected by collectd to a web-server using HTTP POST

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 4a88e6646f7dec844ea208231e6867676c4d2e60..3788455f34cf5cd400c61731c3debec43a5549d1 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1091,6 +1091,7 @@
 #  <Node "example">
 #    Host "localhost"
 #    Port "2003"
+#    Protocol "udp"
 #    Prefix "collectd"
 #    Postfix "collectd"
 #    StoreRates true

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 541af4ce9340b66450a06a21a5d582e3c9331c63..bce17bd73a32c2e5ce33cc365743ed27248d880e 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -5837,9 +5837,9 @@ iptables to feed data for the guest IPs into the iptables plugin.
 
 The C<write_graphite> plugin writes data to I<Graphite>, an open-source metrics
 storage and graphing project. The plugin connects to I<Carbon>, the data layer
-of I<Graphite>, and sends data via the "line based" protocol (per default using
-portE<nbsp>2003). The data will be sent in blocks of at most 1428 bytes to
-minimize the number of network packets.
+of I<Graphite>, via I<TCP> or I<UDP> and sends data via the "line based"
+protocol (per default using portE<nbsp>2003). The data will be sent in blocks
+of at most 1428 bytes to minimize the number of network packets.
 
 Synopsis:
 
@@ -5847,6 +5847,7 @@ Synopsis:
    <Node "example">
      Host "localhost"
      Port "2003"
+     Protocol "udp"
      Prefix "collectd"
    </Node>
  </Plugin>
@@ -5864,6 +5865,10 @@ Hostname or address to connect to. Defaults to C<localhost>.
 
 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<tcp>.
+
 =item B<Prefix> I<String>
 
 When set, I<String> is added in front of the host name. Dots and whitespace are