Merge pull request #20 from pyr/ss/graphite

Remove spaces and dots from the identifier.

diff --git a/AUTHORS b/AUTHORS
index 14e96be..4c5b664 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -175,6 +175,9 @@ Rodolphe Quiédeville <rquiedeville at bearstech.com>
 Scott Garrett <sgarrett at technomancer.com>
  - tape plugin.
 
+Scott Sanders <scott at jssjr.com>
+ - Write-Graphite plugin.
+
 Sebastien Pahl <sebastien.pahl at dotcloud.com>
  - AMQP plugin.
 

diff --git a/README b/README
index ac79ce5..8a79855 100644 (file)
--- a/README
+++ b/README
@@ -358,6 +358,9 @@ Features
       needed. Please read collectd-unixsock(5) for a description on how that's
       done.
 
+    - write_graphite
+      Sends data to Carbon, the storage layer of Graphite.
+
     - write_http
       Sends the values collected by collectd to a web-server using HTTP POST
       requests. The transmitted data is either in a form understood by the

diff --git a/configure.in b/configure.in
index d8fce2c..db63a30 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4759,7 +4759,7 @@ AC_PLUGIN([varnish],     [$with_libvarnish],   [Varnish cache statistics])
 AC_PLUGIN([vmem],        [$plugin_vmem],       [Virtual memory statistics])
 AC_PLUGIN([vserver],     [$plugin_vserver],    [Linux VServer statistics])
 AC_PLUGIN([wireless],    [$plugin_wireless],   [Wireless statistics])
-AC_PLUGIN([write_graphite], [$with_libcurl],   [Graphite / Carbon output plugin])
+AC_PLUGIN([write_graphite], [yes],             [Graphite / Carbon output plugin])
 AC_PLUGIN([write_http],  [$with_libcurl],      [HTTP output plugin])
 AC_PLUGIN([write_redis], [$with_libcredis],    [Redis output plugin])
 AC_PLUGIN([write_mongodb], [$with_libmongoc],  [MongoDB output plugin])

diff --git a/src/Makefile.am b/src/Makefile.am
index c41c13f..2f2acc0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1235,13 +1235,7 @@ pkglib_LTLIBRARIES += write_graphite.la
 write_graphite_la_SOURCES = write_graphite.c \
                        utils_format_json.c utils_format_json.h
 write_graphite_la_LDFLAGS = -module -avoid-version
-write_graphite_la_CFLAGS = $(AM_CFLAGS)
-write_graphite_la_LIBADD =
 collectd_LDADD += "-dlopen" write_graphite.la
-if BUILD_WITH_LIBCURL
-write_graphite_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
-write_graphite_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
-endif
 collectd_DEPENDENCIES += write_graphite.la
 endif
 

diff --git a/src/write_graphite.c b/src/write_graphite.c
index bafe6ac..3842e4b 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -44,10 +44,6 @@
 #include <pthread.h>
 
 #include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <netinet/in.h>
 #include <netdb.h>
 
 #ifndef WG_FORMAT_NAME