X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=5f5441ff4ed7b9b4ff78b7bbce00d63333b0b6be;hb=e35f3c5c634216860f14586a7d17232022d8b588;hp=4fa7aa1b11a9f8dbf192271abfe65322be0e3806;hpb=37905c5a2370c8e6edae5011978773eeaa589d09;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 4fa7aa1b..5f5441ff 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -1,7 +1,8 @@
 /**
  * collectd - src/apache.c
- * Copyright (C) 2006-2008  Florian octo Forster
- * Copyright (C) 2007  Florent EppO Monbillard
+ * Copyright (C) 2006-2009  Florian octo Forster
+ * Copyright (C) 2007       Florent EppO Monbillard
+ * Copyright (C) 2009       Amit Gupta
  *
  * 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
@@ -20,6 +21,7 @@
  *   Florian octo Forster <octo at verplant.org>
  *   Florent EppO Monbillard <eppo at darox.net>
  *   - connections/lighttpd extension
+ *   Amit Gupta <amit.gupta221 at gmail.com>
  **/
 
 #include "collectd.h"
@@ -29,216 +31,512 @@
 
 #include <curl/curl.h>
 
-static char *url         = NULL;
-static char *user        = NULL;
-static char *pass        = NULL;
-static char *verify_peer = NULL;
-static char *verify_host = NULL;
-static char *cacert      = NULL;
-
-static CURL *curl = NULL;
-
-static char  *apache_buffer = NULL;
-static size_t apache_buffer_size = 0;
-static size_t apache_buffer_fill = 0;
-static char   apache_curl_error[CURL_ERROR_SIZE];
-
-static const char *config_keys[] =
+enum server_enum
 {
-	"URL",
-	"User",
-	"Password",
-	"VerifyPeer",
-	"VerifyHost",
-	"CACert"
+	APACHE = 0,
+	LIGHTTPD
 };
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+
+struct apache_s
+{
+	int server_type;
+	char *name;
+	char *host;
+	char *url;
+	char *user;
+	char *pass;
+	int   verify_peer;
+	int   verify_host;
+	char *cacert;
+	char *server; /* user specific server type */
+	char *apache_buffer;
+	char apache_curl_error[CURL_ERROR_SIZE];
+	size_t apache_buffer_size;
+	size_t apache_buffer_fill;
+	CURL *curl;
+}; /* apache_s */
+
+typedef struct apache_s apache_t;
+
+/* TODO: Remove this prototype */
+static int apache_read_host (user_data_t *user_data);
+
+static void apache_free (apache_t *st)
+{
+	if (st == NULL)
+		return;
+
+	sfree (st->name);
+	sfree (st->host);
+	sfree (st->url);
+	sfree (st->user);
+	sfree (st->pass);
+	sfree (st->cacert);
+	sfree (st->server);
+	sfree (st->apache_buffer);
+	if (st->curl) {
+		curl_easy_cleanup(st->curl);
+		st->curl = NULL;
+	}
+} /* apache_free */
 
 static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
-		void __attribute__((unused)) *stream)
+		void *user_data)
 {
 	size_t len = size * nmemb;
+	apache_t *st;
+
+	st = user_data;
+	if (st == NULL)
+	{
+		ERROR ("apache plugin: apache_curl_callback: "
+				"user_data pointer is NULL.");
+		return (0);
+	}
 
 	if (len <= 0)
 		return (len);
 
-	if ((apache_buffer_fill + len) >= apache_buffer_size)
+	if ((st->apache_buffer_fill + len) >= st->apache_buffer_size)
 	{
 		char *temp;
 
-		temp = (char *) realloc (apache_buffer,
-				apache_buffer_fill + len + 1);
+		temp = (char *) realloc (st->apache_buffer,
+				st->apache_buffer_fill + len + 1);
 		if (temp == NULL)
 		{
 			ERROR ("apache plugin: realloc failed.");
 			return (0);
 		}
-		apache_buffer = temp;
-		apache_buffer_size = apache_buffer_fill + len + 1;
+		st->apache_buffer = temp;
+		st->apache_buffer_size = st->apache_buffer_fill + len + 1;
 	}
 
-	memcpy (apache_buffer + apache_buffer_fill, (char *) buf, len);
-	apache_buffer_fill += len;
-	apache_buffer[apache_buffer_fill] = 0;
+	memcpy (st->apache_buffer + st->apache_buffer_fill, (char *) buf, len);
+	st->apache_buffer_fill += len;
+	st->apache_buffer[st->apache_buffer_fill] = 0;
 
 	return (len);
-}
+} /* int apache_curl_callback */
 
-static int config_set (char **var, const char *value)
+static size_t apache_header_callback (void *buf, size_t size, size_t nmemb,
+		void *user_data)
 {
-	if (*var != NULL)
+	size_t len = size * nmemb;
+	apache_t *st;
+
+	st = user_data;
+	if (st == NULL)
 	{
-		free (*var);
-		*var = NULL;
+		ERROR ("apache plugin: apache_header_callback: "
+				"user_data pointer is NULL.");
+		return (0);
 	}
 
-	if ((*var = strdup (value)) == NULL)
-		return (1);
+	if (len <= 0)
+		return (len);
+
+	/* look for the Server header */
+	if (strncasecmp (buf, "Server: ", strlen ("Server: ")) != 0)
+		return (len);
+
+	if (strstr (buf, "Apache") != NULL)
+		st->server_type = APACHE;
+	else if (strstr (buf, "lighttpd") != NULL)
+		st->server_type = LIGHTTPD;
 	else
-		return (0);
-}
+	{
+		const char *hdr = buf;
+
+		hdr += strlen ("Server: ");
+		NOTICE ("apache plugin: Unknown server software: %s", hdr);
+	}
 
-static int config (const char *key, const char *value)
+	return (len);
+} /* apache_header_callback */
+
+/* Configuration handling functiions
+ * <Plugin apache>
+ *   <Instance "instance_name">
+ *     URL ...
+ *   </Instance>
+ *   URL ...
+ * </Plugin>
+ */
+static int config_set_string (char **ret_string, /* {{{ */
+				    oconfig_item_t *ci)
 {
-	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, "verifypeer") == 0)
-		return (config_set (&verify_peer, value));
-	else if (strcasecmp (key, "verifyhost") == 0)
-		return (config_set (&verify_host, value));
-	else if (strcasecmp (key, "cacert") == 0)
-		return (config_set (&cacert, value));
-	else
+	char *string;
+
+	if ((ci->values_num != 1)
+			|| (ci->values[0].type != OCONFIG_TYPE_STRING))
+	{
+		WARNING ("apache plugin: The `%s' config option "
+				"needs exactly one string argument.", ci->key);
 		return (-1);
-}
+	}
+
+	string = strdup (ci->values[0].value.string);
+	if (string == NULL)
+	{
+		ERROR ("apache plugin: strdup failed.");
+		return (-1);
+	}
+
+	if (*ret_string != NULL)
+		free (*ret_string);
+	*ret_string = string;
+
+	return (0);
+} /* }}} int config_set_string */
 
-static int init (void)
+static int config_set_boolean (int *ret_boolean, /* {{{ */
+				    oconfig_item_t *ci)
 {
-	static char credentials[1024];
+	if ((ci->values_num != 1)
+			|| ((ci->values[0].type != OCONFIG_TYPE_BOOLEAN)
+				&& (ci->values[0].type != OCONFIG_TYPE_STRING)))
+	{
+		WARNING ("apache plugin: The `%s' config option "
+				"needs exactly one boolean argument.", ci->key);
+		return (-1);
+	}
 
-	if (url == NULL)
+	if (ci->values[0].type == OCONFIG_TYPE_BOOLEAN)
+	{
+		if (ci->values[0].value.boolean)
+			*ret_boolean = 1;
+		else
+			*ret_boolean = 0;
+	}
+	else /* if (ci->values[0].type != OCONFIG_TYPE_STRING) */
 	{
-		WARNING ("apache plugin: init: No URL configured, returning "
-				"an error.");
+		char *string = ci->values[0].value.string;
+		if (IS_TRUE (string))
+			*ret_boolean = 1;
+		else if (IS_FALSE (string))
+			*ret_boolean = 0;
+		else
+		{
+			ERROR ("apache plugin: Cannot parse string "
+					"as boolean value: %s", string);
+			return (-1);
+		}
+	}
+
+	return (0);
+} /* }}} int config_set_boolean */
+
+static int config_add (oconfig_item_t *ci)
+{
+	apache_t *st;
+	int i;
+	int status;
+
+	if ((ci->values_num != 1)
+		|| (ci->values[0].type != OCONFIG_TYPE_STRING))
+	{
+		WARNING ("apache plugin: The `%s' config option "
+			"needs exactly one string argument.", ci->key);
 		return (-1);
 	}
 
-	if (curl != NULL)
+	st = (apache_t *) malloc (sizeof (*st));
+	if (st == NULL)
 	{
-		curl_easy_cleanup (curl);
+		ERROR ("apache plugin: malloc failed.");
+		return (-1);
 	}
 
-	if ((curl = curl_easy_init ()) == NULL)
+	memset (st, 0, sizeof (*st));
+
+	status = config_set_string (&st->name, ci);
+	if (status != 0)
 	{
-		ERROR ("apache plugin: init: `curl_easy_init' failed.");
+		sfree (st);
+		return (status);
+	}
+	assert (st->name != NULL);
+
+	for (i = 0; i < ci->children_num; i++)
+	{
+		oconfig_item_t *child = ci->children + i;
+
+		if (strcasecmp ("URL", child->key) == 0)
+			status = config_set_string (&st->url, child);
+		else if (strcasecmp ("Host", child->key) == 0)
+			status = config_set_string (&st->host, child);
+		else if (strcasecmp ("User", child->key) == 0)
+			status = config_set_string (&st->user, child);
+		else if (strcasecmp ("Password", child->key) == 0)
+			status = config_set_string (&st->pass, child);
+		else if (strcasecmp ("VerifyPeer", child->key) == 0)
+			status = config_set_boolean (&st->verify_peer, child);
+		else if (strcasecmp ("VerifyHost", child->key) == 0)
+			status = config_set_boolean (&st->verify_host, child);
+		else if (strcasecmp ("CACert", child->key) == 0)
+			status = config_set_string (&st->cacert, child);
+		else if (strcasecmp ("Server", child->key) == 0)
+			status = config_set_string (&st->server, child);
+		else
+		{
+			WARNING ("apache plugin: Option `%s' not allowed here.",
+					child->key);
+			status = -1;
+		}
+
+		if (status != 0)
+			break;
+	}
+
+	/* Check if struct is complete.. */
+	if ((status == 0) && (st->url == NULL))
+	{
+		ERROR ("apache plugin: Instance `%s': "
+				"No URL has been configured.",
+				st->name);
+		status = -1;
+	}
+
+	if (status == 0)
+	{
+		user_data_t ud;
+		char callback_name[3*DATA_MAX_NAME_LEN];
+
+		memset (&ud, 0, sizeof (ud));
+		ud.data = st;
+		ud.free_func = (void *) apache_free;
+
+		memset (callback_name, 0, sizeof (callback_name));
+		ssnprintf (callback_name, sizeof (callback_name),
+				"apache/%s/%s",
+				(st->host != NULL) ? st->host : hostname_g,
+				(st->name != NULL) ? st->name : "default"),
+
+		status = plugin_register_complex_read (/* group = */ NULL,
+				/* name      = */ callback_name,
+				/* callback  = */ apache_read_host,
+				/* interval  = */ NULL,
+				/* user_data = */ &ud);
+	}
+
+	if (status != 0)
+	{
+		apache_free(st);
 		return (-1);
 	}
 
-	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, apache_curl_callback);
-	curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
-	curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, apache_curl_error);
+	return (0);
+} /* int config_add */
 
-	if (user != NULL)
+static int config (oconfig_item_t *ci)
+{
+	int status = 0;
+	int i;
+	oconfig_item_t *lci = NULL; /* legacy config */
+
+	for (i = 0; i < ci->children_num; i++)
+	{
+		oconfig_item_t *child = ci->children + i;
+
+		if (strcasecmp ("Instance", child->key) == 0 && child->children_num > 0)
+			config_add (child);
+		else
+		{
+			/* legacy mode - convert to <Instance ...> config */
+			if (lci == NULL)
+			{
+				lci = malloc (sizeof(*lci));
+				if (lci == NULL)
+				{
+					ERROR ("apache plugin: malloc failed.");
+					return (-1);
+				}
+				memset (lci, '\0', sizeof (*lci));
+			}
+
+			lci->children_num++;
+			lci->children =
+				realloc (lci->children,
+					 lci->children_num * sizeof (*child));
+			if (lci->children == NULL)
+			{
+				ERROR ("apache plugin: realloc failed.");
+				return (-1);
+			}
+			memcpy (&lci->children[lci->children_num-1], child, sizeof (*child));
+		}
+	} /* for (ci->children) */
+
+	if (lci)
+	{
+		/* create a <Instance ""> entry */
+		lci->key = "Instance";
+		lci->values_num = 1;
+		lci->values = (oconfig_value_t *) malloc (lci->values_num * sizeof (oconfig_value_t));
+		lci->values[0].type = OCONFIG_TYPE_STRING;
+		lci->values[0].value.string = "";
+
+		status = config_add (lci);
+		sfree (lci->values);
+		sfree (lci->children);
+		sfree (lci);
+	}
+
+	return status;
+} /* int config */
+
+/* initialize curl for each host */
+static int init_host (apache_t *st) /* {{{ */
+{
+	static char credentials[1024];
+
+	assert (st->url != NULL);
+	/* (Assured by `config_add') */
+
+	if (st->curl != NULL)
+	{
+		curl_easy_cleanup (st->curl);
+		st->curl = NULL;
+	}
+
+	if ((st->curl = curl_easy_init ()) == NULL)
+	{
+		ERROR ("apache plugin: init_host: `curl_easy_init' failed.");
+		return (-1);
+	}
+
+	curl_easy_setopt (st->curl, CURLOPT_NOSIGNAL, 1);
+	curl_easy_setopt (st->curl, CURLOPT_WRITEFUNCTION, apache_curl_callback);
+	curl_easy_setopt (st->curl, CURLOPT_WRITEDATA, st);
+
+	/* not set as yet if the user specified string doesn't match apache or
+	 * lighttpd, then ignore it. Headers will be parsed to find out the
+	 * server type */
+	st->server_type = -1;
+
+	if (st->server != NULL)
+	{
+		if (strcasecmp(st->server, "apache") == 0)
+			st->server_type = APACHE;
+		else if (strcasecmp(st->server, "lighttpd") == 0)
+			st->server_type = LIGHTTPD;
+		else
+			WARNING ("apache plugin: Unknown `Server' setting: %s",
+					st->server);
+	}
+
+	/* if not found register a header callback to determine the server_type */
+	if (st->server_type == -1)
+	{
+		curl_easy_setopt (st->curl, CURLOPT_HEADERFUNCTION, apache_header_callback);
+		curl_easy_setopt (st->curl, CURLOPT_WRITEHEADER, st);
+	}
+
+	curl_easy_setopt (st->curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
+	curl_easy_setopt (st->curl, CURLOPT_ERRORBUFFER, st->apache_curl_error);
+
+	if (st->user != NULL)
 	{
 		int status;
 
 		status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
-				user, (pass == NULL) ? "" : pass);
+				st->user, (st->pass == NULL) ? "" : st->pass);
 		if ((status < 0) || ((size_t) status >= sizeof (credentials)))
 		{
-			ERROR ("apache plugin: init: Returning an error "
+			ERROR ("apache plugin: init_host: Returning an error "
 					"because the credentials have been "
 					"truncated.");
+			curl_easy_cleanup (st->curl);
+			st->curl = NULL;
 			return (-1);
 		}
 
-		curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
+		curl_easy_setopt (st->curl, CURLOPT_USERPWD, credentials);
 	}
 
-	curl_easy_setopt (curl, CURLOPT_URL, url);
+	curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
+	curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1);
 
-	if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+	if (st->verify_peer != 0)
 	{
-		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
+		curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 1);
 	}
 	else
 	{
-		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
+		curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 0);
 	}
 
-	if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0))
+	if (st->verify_host != 0)
 	{
-		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
+		curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 2);
 	}
 	else
 	{
-		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0);
+		curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 0);
 	}
 
-	if (cacert != NULL)
+	if (st->cacert != NULL)
 	{
-		curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
+		curl_easy_setopt (st->curl, CURLOPT_CAINFO, st->cacert);
 	}
 
 	return (0);
-} /* int init */
+} /* }}} int init_host */
 
-static void submit_counter (const char *type, const char *type_instance,
-		counter_t value)
+static void submit_value (const char *type, const char *type_instance,
+		value_t value, apache_t *st)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].counter = value;
-
-	vl.values = values;
+	vl.values = &value;
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+
+	sstrncpy (vl.host, (st->host != NULL) ? st->host : hostname_g,
+			sizeof (vl.host));
+
 	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
-	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
-	sstrncpy (vl.type, type, sizeof (vl.type));
+	if (st->name != NULL)
+		sstrncpy (vl.plugin_instance, st->name,
+				sizeof (vl.plugin_instance));
 
+	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_instance != NULL)
 		sstrncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
 
 	plugin_dispatch_values (&vl);
+} /* void submit_value */
+
+static void submit_counter (const char *type, const char *type_instance,
+		counter_t c, apache_t *st)
+{
+	value_t v;
+	v.counter = c;
+	submit_value (type, type_instance, v, st);
 } /* void submit_counter */
 
 static void submit_gauge (const char *type, const char *type_instance,
-		gauge_t value)
+		gauge_t g, apache_t *st)
 {
-	value_t values[1];
-	value_list_t vl = VALUE_LIST_INIT;
-
-	values[0].gauge = value;
+	value_t v;
+	v.gauge = g;
+	submit_value (type, type_instance, v, st);
+} /* void submit_gauge */
 
-	vl.values = values;
-	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
-	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
-	sstrncpy (vl.type, type, sizeof (vl.type));
-
-	if (type_instance != NULL)
-		sstrncpy (vl.type_instance, type_instance,
-				sizeof (vl.type_instance));
-
-	plugin_dispatch_values (&vl);
-} /* void submit_counter */
-
-static void submit_scoreboard (char *buf)
+static void submit_scoreboard (char *buf, apache_t *st)
 {
 	/*
 	 * Scoreboard Key:
-	 * "_" Waiting for Connection, "S" Starting up, "R" Reading Request,
+	 * "_" Waiting for Connection, "S" Starting up,
+	 * "R" Reading Request for apache and read-POST for lighttpd,
 	 * "W" Sending Reply, "K" Keepalive (read), "D" DNS Lookup,
 	 * "C" Closing connection, "L" Logging, "G" Gracefully finishing,
 	 * "I" Idle cleanup of worker, "." Open slot with no current process
+	 * Lighttpd specific legends -
+	 * "E" hard error, "." connect, "h" handle-request,
+	 * "q" request-start, "Q" request-end, "s" response-start
+	 * "S" response-end, "r" read
 	 */
 	long long open      = 0LL;
 	long long waiting   = 0LL;
@@ -252,8 +550,16 @@ static void submit_scoreboard (char *buf)
 	long long finishing = 0LL;
 	long long idle_cleanup = 0LL;
 
-	int i;
+	/* lighttpd specific */
+	long long hard_error     = 0LL;
+	long long lighttpd_read  = 0LL;
+	long long handle_request = 0LL;
+	long long request_start  = 0LL;
+	long long request_end    = 0LL;
+	long long response_start = 0LL;
+	long long response_end   = 0LL;
 
+	int i;
 	for (i = 0; buf[i] != '\0'; i++)
 	{
 		if (buf[i] == '.') open++;
@@ -267,22 +573,46 @@ static void submit_scoreboard (char *buf)
 		else if (buf[i] == 'L') logging++;
 		else if (buf[i] == 'G') finishing++;
 		else if (buf[i] == 'I') idle_cleanup++;
+		else if (buf[i] == 'r') lighttpd_read++;
+		else if (buf[i] == 'h') handle_request++;
+		else if (buf[i] == 'E') hard_error++;
+		else if (buf[i] == 'q') request_start++;
+		else if (buf[i] == 'Q') request_end++;
+		else if (buf[i] == 's') response_start++;
+		else if (buf[i] == 'S') response_end++;
 	}
 
-	submit_gauge ("apache_scoreboard", "open"     , open);
-	submit_gauge ("apache_scoreboard", "waiting"  , waiting);
-	submit_gauge ("apache_scoreboard", "starting" , starting);
-	submit_gauge ("apache_scoreboard", "reading"  , reading);
-	submit_gauge ("apache_scoreboard", "sending"  , sending);
-	submit_gauge ("apache_scoreboard", "keepalive", keepalive);
-	submit_gauge ("apache_scoreboard", "dnslookup", dnslookup);
-	submit_gauge ("apache_scoreboard", "closing"  , closing);
-	submit_gauge ("apache_scoreboard", "logging"  , logging);
-	submit_gauge ("apache_scoreboard", "finishing", finishing);
-	submit_gauge ("apache_scoreboard", "idle_cleanup", idle_cleanup);
+	if (st->server_type == APACHE)
+	{
+		submit_gauge ("apache_scoreboard", "open"     , open, st);
+		submit_gauge ("apache_scoreboard", "waiting"  , waiting, st);
+		submit_gauge ("apache_scoreboard", "starting" , starting, st);
+		submit_gauge ("apache_scoreboard", "reading"  , reading, st);
+		submit_gauge ("apache_scoreboard", "sending"  , sending, st);
+		submit_gauge ("apache_scoreboard", "keepalive", keepalive, st);
+		submit_gauge ("apache_scoreboard", "dnslookup", dnslookup, st);
+		submit_gauge ("apache_scoreboard", "closing"  , closing, st);
+		submit_gauge ("apache_scoreboard", "logging"  , logging, st);
+		submit_gauge ("apache_scoreboard", "finishing", finishing, st);
+		submit_gauge ("apache_scoreboard", "idle_cleanup", idle_cleanup, st);
+	}
+	else
+	{
+		submit_gauge ("apache_scoreboard", "connect"       , open, st);
+		submit_gauge ("apache_scoreboard", "close"         , closing, st);
+		submit_gauge ("apache_scoreboard", "hard_error"    , hard_error, st);
+		submit_gauge ("apache_scoreboard", "read"          , lighttpd_read, st);
+		submit_gauge ("apache_scoreboard", "read_post"     , reading, st);
+		submit_gauge ("apache_scoreboard", "write"         , sending, st);
+		submit_gauge ("apache_scoreboard", "handle_request", handle_request, st);
+		submit_gauge ("apache_scoreboard", "request_start" , request_start, st);
+		submit_gauge ("apache_scoreboard", "request_end"   , request_end, st);
+		submit_gauge ("apache_scoreboard", "response_start", response_start, st);
+		submit_gauge ("apache_scoreboard", "response_end"  , response_end, st);
+	}
 }
 
-static int apache_read (void)
+static int apache_read_host (user_data_t *user_data) /* {{{ */
 {
 	int i;
 
@@ -294,20 +624,40 @@ static int apache_read (void)
 	char *fields[4];
 	int   fields_num;
 
-	if (curl == NULL)
-		return (-1);
-	if (url == NULL)
-		return (-1);
+	apache_t *st;
+
+	st = user_data->data;
+
+	assert (st->url != NULL);
+	/* (Assured by `config_add') */
+
+	if (st->curl == NULL)
+	{
+		int status;
+
+		status = init_host (st);
+		if (status != 0)
+			return (-1);
+	}
+	assert (st->curl != NULL);
 
-	apache_buffer_fill = 0;
-	if (curl_easy_perform (curl) != 0)
+	st->apache_buffer_fill = 0;
+	if (curl_easy_perform (st->curl) != 0)
 	{
 		ERROR ("apache: curl_easy_perform failed: %s",
-				apache_curl_error);
+				st->apache_curl_error);
 		return (-1);
 	}
 
-	ptr = apache_buffer;
+	/* fallback - server_type to apache if not set at this time */
+	if (st->server_type == -1)
+	{
+		WARNING ("apache plugin: Unable to determine server software "
+				"automatically. Will assume Apache.");
+		st->server_type = APACHE;
+	}
+
+	ptr = st->apache_buffer;
 	saveptr = NULL;
 	while ((lines[lines_num] = strtok_r (ptr, "\n\r", &saveptr)) != NULL)
 	{
@@ -327,30 +677,33 @@ static int apache_read (void)
 			if ((strcmp (fields[0], "Total") == 0)
 					&& (strcmp (fields[1], "Accesses:") == 0))
 				submit_counter ("apache_requests", "",
-						atoll (fields[2]));
+						atoll (fields[2]), st);
 			else if ((strcmp (fields[0], "Total") == 0)
 					&& (strcmp (fields[1], "kBytes:") == 0))
 				submit_counter ("apache_bytes", "",
-						1024LL * atoll (fields[2]));
+						1024LL * atoll (fields[2]), st);
 		}
 		else if (fields_num == 2)
 		{
 			if (strcmp (fields[0], "Scoreboard:") == 0)
-				submit_scoreboard (fields[1]);
-			else if (strcmp (fields[0], "BusyServers:") == 0)
-				submit_gauge ("apache_connections", NULL, atol (fields[1]));
+				submit_scoreboard (fields[1], st);
+			else if ((strcmp (fields[0], "BusyServers:") == 0) /* Apache 1.* */
+					|| (strcmp (fields[0], "BusyWorkers:") == 0) /* Apache 2.* */)
+				submit_gauge ("apache_connections", NULL, atol (fields[1]), st);
+			else if ((strcmp (fields[0], "IdleServers:") == 0) /* Apache 1.x */
+					|| (strcmp (fields[0], "IdleWorkers:") == 0) /* Apache 2.x */)
+				submit_gauge ("apache_idle_workers", NULL, atol (fields[1]), st);
 		}
 	}
 
-	apache_buffer_fill = 0;
+	st->apache_buffer_fill = 0;
 
 	return (0);
-} /* int apache_read */
+} /* }}} int apache_read_host */
 
 void module_register (void)
 {
-	plugin_register_config ("apache", config,
-			config_keys, config_keys_num);
-	plugin_register_init ("apache", init);
-	plugin_register_read ("apache", apache_read);
+	plugin_register_complex_config ("apache", config);
 } /* void module_register */
+
+/* vim: set sw=8 noet fdm=marker : */