write_http plugin: Rename the “http” plugin to “write_http”.

diff --git a/AUTHORS b/AUTHORS
index 062a42e4cd13e0342e4d5ebaa5dae28be6f070ba..11ce8a7aff1ef0060f61fa257478f8040c8d27d4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -109,7 +109,7 @@ Ondrej Zajicek <santiago at crfreenet.org>
 Paul Sadauskas <psadauskas at gmail.com>
  - tokyotyrant plugin.
  - `ReportByDevice' option of the df plugin.
- - http plugin.
+ - write_http plugin.
 
 Peter Holik <peter at holik.at>
  - cpufreq plugin.

diff --git a/README b/README
index 1cfa643492cfad182b161270c26dc67e13f59f8a..8d54b4dab4b02cf1489a0d77f718a32afa6b1929 100644 (file)
--- a/README
+++ b/README
@@ -261,6 +261,9 @@ Features
     - wireless
       Link quality of wireless cards. Linux only.
 
+    - write_http
+      Send data to a web-server using POST requests.
+
     - xmms
       Bitrate and frequency of music played with XMMS.
 
@@ -441,7 +444,8 @@ Prerequisites
     Used by the `oracle' plugin.
 
   * libcurl (optional)
-    If you want to use the `apache', `ascent', `curl' or `nginx' plugin.
+    If you want to use the `apache', `ascent', `curl', `nginx', or `write_http'
+    plugin.
     <http://curl.haxx.se/>
 
   * libdbi (optional)

diff --git a/configure.in b/configure.in
index e1dc8c641a38dc9feb0b756c17955b305a26a8df..fd9208122db2e7ed38c6b452c8261806f1265288 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3710,7 +3710,6 @@ AC_PLUGIN([filecount],   [yes],                [Count files in directories])
 AC_PLUGIN([fscache],     [$plugin_fscache],    [fscache statistics])
 AC_PLUGIN([gmond],       [$with_libganglia],   [Ganglia plugin])
 AC_PLUGIN([hddtemp],     [yes],                [Query hddtempd])
-AC_PLUGIN([http],        [$with_libcurl],      [HTTP output plugin])
 AC_PLUGIN([interface],   [$plugin_interface],  [Interface traffic statistics])
 AC_PLUGIN([ipmi],        [$plugin_ipmi],       [IPMI sensor statistics])
 AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters])
@@ -3774,6 +3773,7 @@ AC_PLUGIN([uuid],        [yes],                [UUID as hostname plugin])
 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_http],  [$with_libcurl],      [HTTP output plugin])
 AC_PLUGIN([xmms],        [$with_libxmms],      [XMMS statistics])
 
 dnl Default configuration file
@@ -4009,7 +4009,6 @@ Configuration:
     fscache . . . . . . . $enable_fscache
     gmond . . . . . . . . $enable_gmond
     hddtemp . . . . . . . $enable_hddtemp
-    http  . . . . . . . . $enable_http
     interface . . . . . . $enable_interface
     ipmi  . . . . . . . . $enable_ipmi
     iptables  . . . . . . $enable_iptables
@@ -4073,6 +4072,7 @@ Configuration:
     vmem  . . . . . . . . $enable_vmem
     vserver . . . . . . . $enable_vserver
     wireless  . . . . . . $enable_wireless
+    write_http  . . . . . $enable_write_http
     xmms  . . . . . . . . $enable_xmms
 
 EOF

diff --git a/src/Makefile.am b/src/Makefile.am
index d3e27f85884d505ed00e1c443d4b29e062ef3ab0..11c03486c22e81401811da2ba5604e63d026a5aa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -347,20 +347,6 @@ collectd_LDADD += "-dlopen" hddtemp.la
 collectd_DEPENDENCIES += hddtemp.la
 endif
 
-if BUILD_PLUGIN_HTTP
-pkglib_LTLIBRARIES += http.la
-http_la_SOURCES = http.c
-http_la_LDFLAGS = -module -avoid-version
-http_la_CFLAGS = $(AM_CFLAGS)
-http_la_LIBADD =
-collectd_LDADD += "-dlopen" http.la
-if BUILD_WITH_LIBCURL
-http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
-http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
-endif
-collectd_DEPENDENCIES += http.la
-endif
-
 if BUILD_PLUGIN_INTERFACE
 pkglib_LTLIBRARIES += interface.la
 interface_la_SOURCES = interface.c
@@ -1056,6 +1042,20 @@ collectd_LDADD += "-dlopen" wireless.la
 collectd_DEPENDENCIES += wireless.la
 endif
 
+if BUILD_PLUGIN_WRITE_HTTP
+pkglib_LTLIBRARIES += write_http.la
+write_http_la_SOURCES = write_http.c
+write_http_la_LDFLAGS = -module -avoid-version
+write_http_la_CFLAGS = $(AM_CFLAGS)
+write_http_la_LIBADD =
+collectd_LDADD += "-dlopen" write_http.la
+if BUILD_WITH_LIBCURL
+write_http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
+write_http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
+endif
+collectd_DEPENDENCIES += write_http.la
+endif
+
 if BUILD_PLUGIN_XMMS
 pkglib_LTLIBRARIES += xmms.la
 xmms_la_SOURCES = xmms.c

diff --git a/src/http.c b/src/http.c
deleted file mode 100644 (file)
index e68f2a1..0000000
--- a/src/http.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * collectd - src/http.c
- * Copyright (C) 2009       Paul Sadauskas
- * Copyright (C) 2007-2009  Florian octo Forster
- * Copyright (C) 2009       Doug MacEachern
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * Authors:
- *   Florian octo Forster <octo at verplant.org>
- *   Doug MacEachern <dougm@hyperic.com>
- *   Paul Sadauskas <psadauskas@gmail.com>
- **/
-
-#include "collectd.h"
-#include "plugin.h"
-#include "common.h"
-#include "utils_cache.h"
-#include "utils_parse_option.h"
-
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
-#include <curl/curl.h>
-
-/*
- * Private variables
- */
-static const char *config_keys[] =
-{
-        "URL", "User", "Password"
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-
-static char *location   = NULL;
-
-char *user;
-char *pass;
-char *credentials;
-
-CURL *curl;
-char curl_errbuf[CURL_ERROR_SIZE];
-
-#define SEND_BUFFER_SIZE 4096
-static char   send_buffer[SEND_BUFFER_SIZE];
-static size_t send_buffer_free;
-static size_t send_buffer_fill;
-static time_t send_buffer_init_time;
-
-static pthread_mutex_t  send_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static void http_init_buffer (void)  /* {{{ */
-{
-        memset (send_buffer, 0, sizeof (send_buffer));
-        send_buffer_free = sizeof (send_buffer);
-        send_buffer_fill = 0;
-        send_buffer_init_time = time (NULL);
-} /* }}} http_init_buffer */
-
-static int http_init(void) /* {{{ */
-{
-
-        curl = curl_easy_init ();
-
-        if (curl == NULL)
-        {
-                ERROR ("curl plugin: curl_easy_init failed.");
-                return (-1);
-        }
-
-        struct curl_slist *headers=NULL;
-
-        curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
-
-        headers = curl_slist_append(headers, "Accept:  */*");
-        headers = curl_slist_append(headers, "Content-Type: text/plain");
-        curl_easy_setopt (curl, CURLOPT_HTTPHEADER, headers);
-
-        curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, curl_errbuf);
-        curl_easy_setopt (curl, CURLOPT_URL, location);
-
-        if (user != NULL)
-        {
-                size_t credentials_size;
-
-                credentials_size = strlen (user) + 2;
-                if (pass != NULL)
-                        credentials_size += strlen (pass);
-
-                credentials = (char *) malloc (credentials_size);
-                if (credentials == NULL)
-                {
-                        ERROR ("curl plugin: malloc failed.");
-                        return (-1);
-                }
-
-                ssnprintf (credentials, credentials_size, "%s:%s",
-                                user, (pass == NULL) ? "" : pass);
-                curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
-                curl_easy_setopt (curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-        }
-
-        http_init_buffer ();
-
-        return (0);
-} /* }}} */
-
-static int http_value_list_to_string (char *buffer, /* {{{ */
-                size_t buffer_size,
-                const data_set_t *ds, const value_list_t *vl)
-{
-        size_t offset = 0;
-        int status;
-        int i;
-
-        assert (0 == strcmp (ds->type, vl->type));
-
-        memset (buffer, 0, buffer_size);
-
-#define BUFFER_ADD(...) do { \
-        status = ssnprintf (buffer + offset, buffer_size - offset, \
-                        __VA_ARGS__); \
-        if (status < 1) \
-                return (-1); \
-        else if (((size_t) status) >= (buffer_size - offset)) \
-                return (-1); \
-        else \
-                offset += ((size_t) status); \
-} while (0)
-
-        BUFFER_ADD ("%lu", (unsigned long) vl->time);
-
-        for (i = 0; i < ds->ds_num; i++)
-{
-        if (ds->ds[i].type == DS_TYPE_GAUGE)
-                BUFFER_ADD (":%f", vl->values[i].gauge);
-        else if (ds->ds[i].type == DS_TYPE_COUNTER)
-                BUFFER_ADD (":%llu", vl->values[i].counter);
-        else if (ds->ds[i].type == DS_TYPE_DERIVE)
-                BUFFER_ADD (":%"PRIi64, vl->values[i].derive);
-        else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
-                BUFFER_ADD (":%"PRIu64, vl->values[i].absolute);
-        else
-        {
-                ERROR ("http plugin: Unknown data source type: %i",
-                                ds->ds[i].type);
-                return (-1);
-        }
-} /* for ds->ds_num */
-
-#undef BUFFER_ADD
-
-return (0);
-} /* }}} int http_value_list_to_string */
-
-static int http_config (const char *key, const char *value) /* {{{ */
-{
-        if (strcasecmp ("URL", key) == 0)
-        {
-                if (location != NULL)
-                        free (location);
-                location = strdup (value);
-                if (location != NULL)
-                {
-                        int len = strlen (location);
-                        while ((len > 0) && (location[len - 1] == '/'))
-                        {
-                                len--;
-                                location[len] = '\0';
-                        }
-                        if (len <= 0)
-                        {
-                                free (location);
-                                location = NULL;
-                        }
-                }
-        }
-        else if (strcasecmp ("User", key) == 0)
-        {
-                if (user != NULL)
-                        free (user);
-                user = strdup (value);
-                if (user != NULL)
-                {
-                        int len = strlen (user);
-                        while ((len > 0) && (user[len - 1] == '/'))
-                        {
-                                len--;
-                                user[len] = '\0';
-                        }
-                        if (len <= 0)
-                        {
-                                free (user);
-                                user = NULL;
-                        }
-                }
-        }
-        else if (strcasecmp ("Password", key) == 0)
-        {
-                if (pass != NULL)
-                        free (pass);
-                pass = strdup (value);
-                if (pass != NULL)
-                {
-                        int len = strlen (pass);
-                        while ((len > 0) && (pass[len - 1] == '/'))
-                        {
-                                len--;
-                                pass[len] = '\0';
-                        }
-                        if (len <= 0)
-                        {
-                                free (pass);
-                                pass = NULL;
-                        }
-                }
-        }
-        else
-        {
-                return (-1);
-        }
-        return (0);
-} /* }}} int http_config */
-
-static int http_send_buffer (char *buffer) /* {{{ */
-{
-        int status = 0;
-
-        curl_easy_setopt (curl, CURLOPT_POSTFIELDS, buffer);
-        status = curl_easy_perform (curl);
-        if (status != 0)
-        {
-                ERROR ("http plugin: curl_easy_perform failed with staus %i: %s",
-                                status, curl_errbuf);
-        }
-        return (status);
-} /* }}} http_send_buffer */
-
-static int http_flush_nolock (int timeout) /* {{{ */
-{
-        int status;
-
-        DEBUG ("http plugin: http_flush_nolock: timeout = %i; "
-                        "send_buffer =\n  %s", timeout, send_buffer);
-
-        if (timeout > 0)
-        {
-                time_t now;
-
-                now = time (NULL);
-                if ((send_buffer_init_time + timeout) > now)
-                        return (0);
-        }
-
-        if (send_buffer_fill <= 0)
-        {
-                send_buffer_init_time = time (NULL);
-                return (0);
-        }
-
-        status = http_send_buffer (send_buffer);
-        http_init_buffer ();
-
-        return (status);
-} /* }}} http_flush_nolock */
-
-static int http_flush (int timeout, /* {{{ */
-                const char *identifier __attribute__((unused)),
-                user_data_t *user_data __attribute__((unused)))
-{
-        int status;
-
-        pthread_mutex_lock (&send_lock);
-        status = http_flush_nolock (timeout);
-        pthread_mutex_unlock (&send_lock);
-
-        return (status);
-} /* }}} int http_flush */
-
-static int http_write_command (const data_set_t *ds, const value_list_t *vl) /* {{{ */
-{
-        char key[10*DATA_MAX_NAME_LEN];
-        char values[512];
-        char command[1024];
-        size_t command_len;
-
-        int status;
-
-        if (0 != strcmp (ds->type, vl->type)) {
-                ERROR ("http plugin: DS type does not match value list type");
-                return -1;
-        }
-
-        /* Copy the identifier to `key' and escape it. */
-        status = FORMAT_VL (key, sizeof (key), vl);
-        if (status != 0) {
-                ERROR ("http plugin: error with format_name");
-                return (status);
-        }
-        escape_string (key, sizeof (key));
-
-        /* Convert the values to an ASCII representation and put that into
-         * `values'. */
-        status = http_value_list_to_string (values, sizeof (values), ds, vl);
-        if (status != 0) {
-                ERROR ("http plugin: error with http_value_list_to_string");
-                return (status);
-        }
-
-        command_len = (size_t) ssnprintf (command, sizeof (command),
-                        "PUTVAL %s interval=%i %s\n",
-                        key, vl->interval, values);
-        if (command_len >= sizeof (command)) {
-                ERROR ("http plugin: Command buffer too small: "
-                                "Need %zu bytes.", command_len + 1);
-                return (-1);
-        }
-
-        pthread_mutex_lock (&send_lock);
-
-        /* Check if we have enough space for this command. */
-        if (command_len >= send_buffer_free)
-        {
-                status = http_flush_nolock (/* timeout = */ -1);
-                if (status != 0)
-                {
-                        pthread_mutex_unlock (&send_lock);
-                        return status;
-                }
-        }
-        assert (command_len < send_buffer_free);
-
-        /* `command_len + 1' because `command_len' does not include the
-         * trailing null byte. Neither does `send_buffer_fill'. */
-        memcpy (send_buffer + send_buffer_fill, command, command_len + 1);
-        send_buffer_fill += command_len;
-        send_buffer_free -= command_len;
-
-        pthread_mutex_unlock (&send_lock);
-
-        return (0);
-} /* }}} int http_write_command */
-
-static int http_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
-                user_data_t __attribute__((unused)) *user_data)
-{
-        int status;
-
-        status = http_write_command (ds, vl);
-
-        return (status);
-} /* }}} int http_write */
-
-static int http_shutdown (void) /* {{{ */
-{
-        http_flush_nolock (/* timeout = */ -1);
-        curl_easy_cleanup(curl);
-        return (0);
-} /* }}} int http_shutdown */
-
-void module_register (void) /* {{{ */
-{
-        plugin_register_init("http", http_init);
-        plugin_register_config ("http", http_config,
-                        config_keys, config_keys_num);
-        plugin_register_write ("http", http_write, /* user_data = */ NULL);
-        plugin_register_flush ("http", http_flush, /* user_data = */ NULL);
-        plugin_register_shutdown("http", http_shutdown);
-} /* }}} void module_register */
-
-/* vim: set fdm=marker sw=8 ts=8 tw=78 et : */

diff --git a/src/write_http.c b/src/write_http.c
new file mode 100644 (file)
index 0000000..27d1842
--- /dev/null
+++ b/src/write_http.c
@@ -0,0 +1,386 @@
+/**
+ * collectd - src/write_http.c
+ * Copyright (C) 2009       Paul Sadauskas
+ * Copyright (C) 2009       Doug MacEachern
+ * Copyright (C) 2007-2009  Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Florian octo Forster <octo at verplant.org>
+ *   Doug MacEachern <dougm@hyperic.com>
+ *   Paul Sadauskas <psadauskas@gmail.com>
+ **/
+
+#include "collectd.h"
+#include "plugin.h"
+#include "common.h"
+#include "utils_cache.h"
+#include "utils_parse_option.h"
+
+#if HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
+
+#include <curl/curl.h>
+
+/*
+ * Private variables
+ */
+static const char *config_keys[] =
+{
+        "URL", "User", "Password"
+};
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+
+static char *location   = NULL;
+
+char *user;
+char *pass;
+char *credentials;
+
+CURL *curl;
+char curl_errbuf[CURL_ERROR_SIZE];
+
+#define SEND_BUFFER_SIZE 4096
+static char   send_buffer[SEND_BUFFER_SIZE];
+static size_t send_buffer_free;
+static size_t send_buffer_fill;
+static time_t send_buffer_init_time;
+
+static pthread_mutex_t  send_lock = PTHREAD_MUTEX_INITIALIZER;
+
+static void wh_init_buffer (void)  /* {{{ */
+{
+        memset (send_buffer, 0, sizeof (send_buffer));
+        send_buffer_free = sizeof (send_buffer);
+        send_buffer_fill = 0;
+        send_buffer_init_time = time (NULL);
+} /* }}} wh_init_buffer */
+
+static int wh_init(void) /* {{{ */
+{
+
+        curl = curl_easy_init ();
+
+        if (curl == NULL)
+        {
+                ERROR ("curl plugin: curl_easy_init failed.");
+                return (-1);
+        }
+
+        struct curl_slist *headers=NULL;
+
+        curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
+
+        headers = curl_slist_append(headers, "Accept:  */*");
+        headers = curl_slist_append(headers, "Content-Type: text/plain");
+        curl_easy_setopt (curl, CURLOPT_HTTPHEADER, headers);
+
+        curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, curl_errbuf);
+        curl_easy_setopt (curl, CURLOPT_URL, location);
+
+        if (user != NULL)
+        {
+                size_t credentials_size;
+
+                credentials_size = strlen (user) + 2;
+                if (pass != NULL)
+                        credentials_size += strlen (pass);
+
+                credentials = (char *) malloc (credentials_size);
+                if (credentials == NULL)
+                {
+                        ERROR ("curl plugin: malloc failed.");
+                        return (-1);
+                }
+
+                ssnprintf (credentials, credentials_size, "%s:%s",
+                                user, (pass == NULL) ? "" : pass);
+                curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
+                curl_easy_setopt (curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+        }
+
+        wh_init_buffer ();
+
+        return (0);
+} /* }}} */
+
+static int wh_value_list_to_string (char *buffer, /* {{{ */
+                size_t buffer_size,
+                const data_set_t *ds, const value_list_t *vl)
+{
+        size_t offset = 0;
+        int status;
+        int i;
+
+        assert (0 == strcmp (ds->type, vl->type));
+
+        memset (buffer, 0, buffer_size);
+
+#define BUFFER_ADD(...) do { \
+        status = ssnprintf (buffer + offset, buffer_size - offset, \
+                        __VA_ARGS__); \
+        if (status < 1) \
+                return (-1); \
+        else if (((size_t) status) >= (buffer_size - offset)) \
+                return (-1); \
+        else \
+                offset += ((size_t) status); \
+} while (0)
+
+        BUFFER_ADD ("%lu", (unsigned long) vl->time);
+
+        for (i = 0; i < ds->ds_num; i++)
+{
+        if (ds->ds[i].type == DS_TYPE_GAUGE)
+                BUFFER_ADD (":%f", vl->values[i].gauge);
+        else if (ds->ds[i].type == DS_TYPE_COUNTER)
+                BUFFER_ADD (":%llu", vl->values[i].counter);
+        else if (ds->ds[i].type == DS_TYPE_DERIVE)
+                BUFFER_ADD (":%"PRIi64, vl->values[i].derive);
+        else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
+                BUFFER_ADD (":%"PRIu64, vl->values[i].absolute);
+        else
+        {
+                ERROR ("write_http plugin: Unknown data source type: %i",
+                                ds->ds[i].type);
+                return (-1);
+        }
+} /* for ds->ds_num */
+
+#undef BUFFER_ADD
+
+return (0);
+} /* }}} int wh_value_list_to_string */
+
+static int wh_config (const char *key, const char *value) /* {{{ */
+{
+        if (strcasecmp ("URL", key) == 0)
+        {
+                if (location != NULL)
+                        free (location);
+                location = strdup (value);
+                if (location != NULL)
+                {
+                        int len = strlen (location);
+                        while ((len > 0) && (location[len - 1] == '/'))
+                        {
+                                len--;
+                                location[len] = '\0';
+                        }
+                        if (len <= 0)
+                        {
+                                free (location);
+                                location = NULL;
+                        }
+                }
+        }
+        else if (strcasecmp ("User", key) == 0)
+        {
+                if (user != NULL)
+                        free (user);
+                user = strdup (value);
+                if (user != NULL)
+                {
+                        int len = strlen (user);
+                        while ((len > 0) && (user[len - 1] == '/'))
+                        {
+                                len--;
+                                user[len] = '\0';
+                        }
+                        if (len <= 0)
+                        {
+                                free (user);
+                                user = NULL;
+                        }
+                }
+        }
+        else if (strcasecmp ("Password", key) == 0)
+        {
+                if (pass != NULL)
+                        free (pass);
+                pass = strdup (value);
+                if (pass != NULL)
+                {
+                        int len = strlen (pass);
+                        while ((len > 0) && (pass[len - 1] == '/'))
+                        {
+                                len--;
+                                pass[len] = '\0';
+                        }
+                        if (len <= 0)
+                        {
+                                free (pass);
+                                pass = NULL;
+                        }
+                }
+        }
+        else
+        {
+                return (-1);
+        }
+        return (0);
+} /* }}} int wh_config */
+
+static int wh_send_buffer (char *buffer) /* {{{ */
+{
+        int status = 0;
+
+        curl_easy_setopt (curl, CURLOPT_POSTFIELDS, buffer);
+        status = curl_easy_perform (curl);
+        if (status != 0)
+        {
+                ERROR ("write_http plugin: curl_easy_perform failed with "
+                                "staus %i: %s",
+                                status, curl_errbuf);
+        }
+        return (status);
+} /* }}} wh_send_buffer */
+
+static int wh_flush_nolock (int timeout) /* {{{ */
+{
+        int status;
+
+        DEBUG ("write_http plugin: wh_flush_nolock: timeout = %i; "
+                        "send_buffer =\n  %s", timeout, send_buffer);
+
+        if (timeout > 0)
+        {
+                time_t now;
+
+                now = time (NULL);
+                if ((send_buffer_init_time + timeout) > now)
+                        return (0);
+        }
+
+        if (send_buffer_fill <= 0)
+        {
+                send_buffer_init_time = time (NULL);
+                return (0);
+        }
+
+        status = wh_send_buffer (send_buffer);
+        wh_init_buffer ();
+
+        return (status);
+} /* }}} wh_flush_nolock */
+
+static int wh_flush (int timeout, /* {{{ */
+                const char *identifier __attribute__((unused)),
+                user_data_t *user_data __attribute__((unused)))
+{
+        int status;
+
+        pthread_mutex_lock (&send_lock);
+        status = wh_flush_nolock (timeout);
+        pthread_mutex_unlock (&send_lock);
+
+        return (status);
+} /* }}} int wh_flush */
+
+static int wh_write_command (const data_set_t *ds, const value_list_t *vl) /* {{{ */
+{
+        char key[10*DATA_MAX_NAME_LEN];
+        char values[512];
+        char command[1024];
+        size_t command_len;
+
+        int status;
+
+        if (0 != strcmp (ds->type, vl->type)) {
+                ERROR ("write_http plugin: DS type does not match "
+                                "value list type");
+                return -1;
+        }
+
+        /* Copy the identifier to `key' and escape it. */
+        status = FORMAT_VL (key, sizeof (key), vl);
+        if (status != 0) {
+                ERROR ("write_http plugin: error with format_name");
+                return (status);
+        }
+        escape_string (key, sizeof (key));
+
+        /* Convert the values to an ASCII representation and put that into
+         * `values'. */
+        status = wh_value_list_to_string (values, sizeof (values), ds, vl);
+        if (status != 0) {
+                ERROR ("write_http plugin: error with "
+                                "wh_value_list_to_string");
+                return (status);
+        }
+
+        command_len = (size_t) ssnprintf (command, sizeof (command),
+                        "PUTVAL %s interval=%i %s\n",
+                        key, vl->interval, values);
+        if (command_len >= sizeof (command)) {
+                ERROR ("write_http plugin: Command buffer too small: "
+                                "Need %zu bytes.", command_len + 1);
+                return (-1);
+        }
+
+        pthread_mutex_lock (&send_lock);
+
+        /* Check if we have enough space for this command. */
+        if (command_len >= send_buffer_free)
+        {
+                status = wh_flush_nolock (/* timeout = */ -1);
+                if (status != 0)
+                {
+                        pthread_mutex_unlock (&send_lock);
+                        return status;
+                }
+        }
+        assert (command_len < send_buffer_free);
+
+        /* `command_len + 1' because `command_len' does not include the
+         * trailing null byte. Neither does `send_buffer_fill'. */
+        memcpy (send_buffer + send_buffer_fill, command, command_len + 1);
+        send_buffer_fill += command_len;
+        send_buffer_free -= command_len;
+
+        pthread_mutex_unlock (&send_lock);
+
+        return (0);
+} /* }}} int wh_write_command */
+
+static int wh_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+                user_data_t __attribute__((unused)) *user_data)
+{
+        int status;
+
+        status = wh_write_command (ds, vl);
+
+        return (status);
+} /* }}} int wh_write */
+
+static int wh_shutdown (void) /* {{{ */
+{
+        wh_flush_nolock (/* timeout = */ -1);
+        curl_easy_cleanup(curl);
+        return (0);
+} /* }}} int wh_shutdown */
+
+void module_register (void) /* {{{ */
+{
+        plugin_register_init("write_http", wh_init);
+        plugin_register_config ("write_http", wh_config,
+                        config_keys, config_keys_num);
+        plugin_register_write ("write_http", wh_write, /* user_data = */ NULL);
+        plugin_register_flush ("write_http", wh_flush, /* user_data = */ NULL);
+        plugin_register_shutdown("write_http", wh_shutdown);
+} /* }}} void module_register */
+
+/* vim: set fdm=marker sw=8 ts=8 tw=78 et : */