solaris-fixes branch: Applied the swap-patch by Christophe Kalt.

[collectd.git] / src / apache.c

diff --git a/src/apache.c b/src/apache.c
index e27350d..c731908 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -38,26 +38,29 @@ static char *url  = NULL;
 static char *user = NULL;
 static char *pass = NULL;
 
-#if APACHE_HAVE_READ
+#if HAVE_LIBCURL
 static CURL *curl = NULL;
 
 static char apache_buffer[4096];
 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,7 +68,7 @@ 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;
@@ -79,7 +82,7 @@ static char *config_keys[] =
 };
 static int config_keys_num = 3;
 
-
+#if HAVE_LIBCURL
 static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
 {
        size_t len = size * nmemb;
@@ -98,6 +101,7 @@ static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *
 
        return (len);
 }
+#endif /* HAVE_LIBCURL */
 
 static int config_set (char **var, char *value)
 {
@@ -127,7 +131,7 @@ static int config (char *key, char *value)
 
 static void init (void)
 {
-#if APACHE_HAVE_READ
+#if HAVE_LIBCURL
        static char credentials[1024];
 
        if (curl != NULL)
@@ -160,7 +164,7 @@ static void init (void)
        {
                curl_easy_setopt (curl, CURLOPT_URL, url);
        }
-#endif /* APACHE_HAVE_READ */
+#endif /* HAVE_LIBCURL */
 }
 
 static void bytes_write (char *host, char *inst, char *val)