email plugin: Made socket settings configurable.

[collectd.git] / src / apache.c

diff --git a/src/apache.c b/src/apache.c
index 7bb0a2a..530481b 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -34,30 +34,35 @@
 #  define APACHE_HAVE_READ 0
 #endif
 
-static char *url  = NULL;
-static char *user = NULL;
-static char *pass = NULL;
+static char *url    = NULL;
+static char *user   = NULL;
+static char *pass   = NULL;
+static char *cacert = NULL;
 
-#if APACHE_HAVE_READ
+#if HAVE_LIBCURL
 static CURL *curl = NULL;
 
-static char apache_buffer[4096];
+#define ABUFFER_SIZE 16384
+static char apache_buffer[ABUFFER_SIZE];
 static int  apache_buffer_len = 0;
 static char apache_curl_error[CURL_ERROR_SIZE];
-#endif
+#endif /* HAVE_LIBCURL */
 
+/* Limit to 2^27 bytes/s. That's what a gigabit-ethernet link can handle, in
+ * theory. */
 static char *bytes_file = "apache/apache_bytes.rrd";
 static char *bytes_ds_def[] =
 {
-       "DS:count:COUNTER:25:0:U",
+       "DS:count:COUNTER:"COLLECTD_HEARTBEAT":0:134217728",
        NULL
 };
 static int bytes_ds_num = 1;
 
+/* Limit to 2^20 requests/s */
 static char *requests_file = "apache/apache_requests.rrd";
 static char *requests_ds_def[] =
 {
-       "DS:count:COUNTER:25:0:U",
+       "DS:count:COUNTER:"COLLECTD_HEARTBEAT":0:1048576",
        NULL
 };
 static int requests_ds_num = 1;
@@ -65,28 +70,29 @@ static int requests_ds_num = 1;
 static char *scoreboard_file = "apache/apache_scoreboard-%s.rrd";
 static char *scoreboard_ds_def[] =
 {
-       "DS:count:GAUGE:25:0:U",
+       "DS:count:GAUGE:"COLLECTD_HEARTBEAT":0:U",
        NULL
 };
 static int scoreboard_ds_num = 1;
 
 static char *config_keys[] =
 {
-       "URI",
+       "URL",
        "User",
        "Password",
+       "CACert",
        NULL
 };
-static int config_keys_num = 3;
-
+static int config_keys_num = 4;
 
+#if HAVE_LIBCURL
 static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
 {
        size_t len = size * nmemb;
 
-       if ((apache_buffer_len + len) >= 4096)
+       if ((apache_buffer_len + len) >= ABUFFER_SIZE)
        {
-               len = 4095 - apache_buffer_len;
+               len = (ABUFFER_SIZE - 1) - apache_buffer_len;
        }
 
        if (len <= 0)
@@ -98,8 +104,9 @@ static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *
 
        return (len);
 }
+#endif /* HAVE_LIBCURL */
 
-static void config_set (char **var, char *value)
+static int config_set (char **var, char *value)
 {
        if (*var != NULL)
        {
@@ -115,27 +122,29 @@ static void config_set (char **var, char *value)
 
 static int config (char *key, char *value)
 {
-       if (strcasecmp (key, "uri") == 0)
-               return (config_set (&key, value));
+       if (strcasecmp (key, "url") == 0)
+               return (config_set (&url, value));
        else if (strcasecmp (key, "user") == 0)
                return (config_set (&user, value));
        else if (strcasecmp (key, "password") == 0)
                return (config_set (&pass, value));
+       else if (strcasecmp (key, "cacert") == 0)
+               return (config_set (&cacert, value));
        else
                return (-1);
 }
 
 static void init (void)
 {
-#if APACHE_HAVE_READ
-       static credentials[1024];
+#if HAVE_LIBCURL
+       static char credentials[1024];
 
        if (curl != NULL)
        {
                curl_easy_cleanup (curl);
        }
 
-       if ((curl = curl_easy_init (CURL_GLOBAL_NOTHING)) == NULL)
+       if ((curl = curl_easy_init ()) == NULL)
        {
                syslog (LOG_ERR, "apache: `curl_easy_init' failed.");
                return;
@@ -160,7 +169,12 @@ static void init (void)
        {
                curl_easy_setopt (curl, CURLOPT_URL, url);
        }
-#endif /* APACHE_HAVE_READ */
+
+       if (cacert != NULL)
+       {
+               curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
+       }
+#endif /* HAVE_LIBCURL */
 }
 
 static void bytes_write (char *host, char *inst, char *val)
@@ -255,9 +269,8 @@ static void submit_scoreboard (char *buf)
        submit ("apache_scoreboard", "idle_cleanup", idle_cleanup);
 }
 
-static void read (void)
+static void apache_read (void)
 {
-       CURLcode status;
        int i;
 
        char *ptr;
@@ -272,9 +285,10 @@ static void read (void)
        if (url == NULL)
                return;
 
+       apache_buffer_len = 0;
        if (curl_easy_perform (curl) != 0)
        {
-               syslog (LOG_WARN, "apache: curl_easy_perform failed: %s", apache_curl_error);
+               syslog (LOG_WARNING, "apache: curl_easy_perform failed: %s", apache_curl_error);
                return;
        }
 
@@ -311,12 +325,12 @@ static void read (void)
        apache_buffer_len = 0;
 }
 #else
-#  define read NULL
+#  define apache_read NULL
 #endif /* APACHE_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register (MODULE_NAME, init, read, NULL);
+       plugin_register (MODULE_NAME, init, apache_read, NULL);
        plugin_register ("apache_requests",   NULL, NULL, requests_write);
        plugin_register ("apache_bytes",      NULL, NULL, bytes_write);
        plugin_register ("apache_scoreboard", NULL, NULL, scoreboard_write);