X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=371e1d4b3439824a17a07d416a0080fb740c531f;hb=3ada23491952cc01baadd19ffeba27e0c332f0c1;hp=530481be3f802b88bb4582a14dd9aef84612eef5;hpb=e913f3f6b71b0ba4abd6aaf2202100a5cef48b75;p=collectd.git diff --git a/src/apache.c b/src/apache.c index 530481be..371e1d4b 100644 --- a/src/apache.c +++ b/src/apache.c @@ -1,11 +1,12 @@ /** * collectd - src/apache.c - * Copyright (C) 2006 Florian octo Forster + * 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * 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 @@ -18,6 +19,9 @@ * * Authors: * Florian octo Forster + * Florent EppO Monbillard + * - connections/lighttpd extension + * Amit Gupta **/ #include "collectd.h" @@ -25,207 +29,515 @@ #include "plugin.h" #include "configfile.h" -#define MODULE_NAME "apache" - -#if HAVE_LIBCURL && HAVE_CURL_CURL_H -# define APACHE_HAVE_READ 1 -# include -#else -# define APACHE_HAVE_READ 0 -#endif - -static char *url = NULL; -static char *user = NULL; -static char *pass = NULL; -static char *cacert = NULL; - -#if HAVE_LIBCURL -static CURL *curl = NULL; - -#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 /* 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:"COLLECTD_HEARTBEAT":0:134217728", - NULL -}; -static int bytes_ds_num = 1; +#include -/* Limit to 2^20 requests/s */ -static char *requests_file = "apache/apache_requests.rrd"; -static char *requests_ds_def[] = +enum server_enum { - "DS:count:COUNTER:"COLLECTD_HEARTBEAT":0:1048576", - NULL + APACHE = 0, + LIGHTTPD }; -static int requests_ds_num = 1; -static char *scoreboard_file = "apache/apache_scoreboard-%s.rrd"; -static char *scoreboard_ds_def[] = +struct apache_s { - "DS:count:GAUGE:"COLLECTD_HEARTBEAT":0:U", - NULL -}; -static int scoreboard_ds_num = 1; - -static char *config_keys[] = + 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) { - "URL", - "User", - "Password", - "CACert", - NULL -}; -static int config_keys_num = 4; + 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 */ -#if HAVE_LIBCURL -static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream) +static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, + void *user_data) { size_t len = size * nmemb; + apache_t *st; - if ((apache_buffer_len + len) >= ABUFFER_SIZE) + st = user_data; + if (st == NULL) { - len = (ABUFFER_SIZE - 1) - apache_buffer_len; + ERROR ("apache plugin: apache_curl_callback: " + "user_data pointer is NULL."); + return (0); } if (len <= 0) return (len); - memcpy (apache_buffer + apache_buffer_len, (char *) buf, len); - apache_buffer_len += len; - apache_buffer[apache_buffer_len] = '\0'; + if ((st->apache_buffer_fill + len) >= st->apache_buffer_size) + { + char *temp; + + temp = (char *) realloc (st->apache_buffer, + st->apache_buffer_fill + len + 1); + if (temp == NULL) + { + ERROR ("apache plugin: realloc failed."); + return (0); + } + st->apache_buffer = temp; + st->apache_buffer_size = st->apache_buffer_fill + len + 1; + } + + 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); -} -#endif /* HAVE_LIBCURL */ +} /* int apache_curl_callback */ -static int config_set (char **var, 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; -static int config (char *key, char *value) + hdr += strlen ("Server: "); + NOTICE ("apache plugin: Unknown server software: %s", hdr); + } + + return (len); +} /* apache_header_callback */ + +/* Configuration handling functiions + * + * + * URL ... + * + * URL ... + * + */ +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, "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); + } -static void init (void) + if (*ret_string != NULL) + free (*ret_string); + *ret_string = string; + + return (0); +} /* }}} int config_set_string */ + +static int config_set_boolean (int *ret_boolean, /* {{{ */ + oconfig_item_t *ci) { -#if HAVE_LIBCURL - 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 (curl != 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) */ { - curl_easy_cleanup (curl); + char *string = ci->values[0].value.string; + if ((strcasecmp ("true", string) == 0) + || (strcasecmp ("yes", string) == 0) + || (strcasecmp ("on", string) == 0)) + *ret_boolean = 1; + else if ((strcasecmp ("false", string) == 0) + || (strcasecmp ("no", string) == 0) + || (strcasecmp ("off", string) == 0)) + *ret_boolean = 0; + else + { + ERROR ("apache plugin: Cannot parse string " + "as boolean value: %s", string); + return (-1); + } } - if ((curl = curl_easy_init ()) == NULL) + 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)) { - syslog (LOG_ERR, "apache: `curl_easy_init' failed."); - return; + WARNING ("apache plugin: The `%s' config option " + "needs exactly one string argument.", ci->key); + return (-1); + } + + st = (apache_t *) malloc (sizeof (*st)); + if (st == NULL) + { + ERROR ("apache plugin: malloc failed."); + 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); + memset (st, 0, sizeof (*st)); - if (user != NULL) + status = config_set_string (&st->name, ci); + if (status != 0) { - if (snprintf (credentials, 1024, "%s:%s", user, pass == NULL ? "" : pass) >= 1024) + 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 { - syslog (LOG_ERR, "apache: Credentials would have been truncated."); - return; + WARNING ("apache plugin: Option `%s' not allowed here.", + child->key); + status = -1; } - curl_easy_setopt (curl, CURLOPT_USERPWD, credentials); + if (status != 0) + break; } - if (url != NULL) + /* Check if struct is complete.. */ + if ((status == 0) && (st->url == NULL)) { - curl_easy_setopt (curl, CURLOPT_URL, url); + ERROR ("apache plugin: Instance `%s': " + "No URL has been configured.", + st->name); + status = -1; } - if (cacert != NULL) + if (status == 0) { - curl_easy_setopt (curl, CURLOPT_CAINFO, cacert); + 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 (callback_name, + /* callback = */ apache_read_host, + /* interval = */ NULL, + /* user_data = */ &ud); } -#endif /* HAVE_LIBCURL */ -} -static void bytes_write (char *host, char *inst, char *val) -{ - rrd_update_file (host, bytes_file, val, bytes_ds_def, bytes_ds_num); -} + if (status != 0) + { + apache_free(st); + return (-1); + } -static void requests_write (char *host, char *inst, char *val) -{ - rrd_update_file (host, requests_file, val, requests_ds_def, requests_ds_num); -} + return (0); +} /* int config_add */ -static void scoreboard_write (char *host, char *inst, char *val) +static int config (oconfig_item_t *ci) { - char buf[1024]; + int status = 0; + int i; + oconfig_item_t *lci = NULL; /* legacy config */ - if (snprintf (buf, 1024, scoreboard_file, inst) >= 1024) - return; + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; - rrd_update_file (host, buf, val, scoreboard_ds_def, scoreboard_ds_num); -} + if (strcasecmp ("Instance", child->key) == 0 && child->children_num > 0) + config_add (child); + else + { + /* legacy mode - convert to 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 APACHE_HAVE_READ -static void submit (char *type, char *inst, long long value) + if (lci) + { + /* create a 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) /* {{{ */ { - char buf[1024]; - int status; + static char credentials[1024]; - status = snprintf (buf, 1024, "%u:%lli", (unsigned int) curtime, value); - if (status < 0) + assert (st->url != NULL); + /* (Assured by `config_add') */ + + if (st->curl != NULL) { - syslog (LOG_ERR, "apache: bytes_submit: snprintf failed"); - return; + curl_easy_cleanup (st->curl); + st->curl = NULL; } - else if (status >= 1024) + + if ((st->curl = curl_easy_init ()) == NULL) { - syslog (LOG_WARNING, "apache: bytes_submit: snprintf was truncated"); - return; + ERROR ("apache plugin: init_host: `curl_easy_init' failed."); + return (-1); } - plugin_submit (type, inst, buf); -} + 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", + st->user, (st->pass == NULL) ? "" : st->pass); + if ((status < 0) || ((size_t) status >= sizeof (credentials))) + { + 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 (st->curl, CURLOPT_USERPWD, credentials); + } + + curl_easy_setopt (st->curl, CURLOPT_URL, st->url); + + if (st->verify_peer != 0) + { + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 1); + } + else + { + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 0); + } + + if (st->verify_host != 0) + { + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 2); + } + else + { + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 0); + } -static void submit_scoreboard (char *buf) + if (st->cacert != NULL) + { + curl_easy_setopt (st->curl, CURLOPT_CAINFO, st->cacert); + } + + return (0); +} /* }}} int init_host */ + +static void submit_value (const char *type, const char *type_instance, + value_t value, apache_t *st) +{ + value_list_t vl = VALUE_LIST_INIT; + + vl.values = &value; + vl.values_len = 1; + + sstrncpy (vl.host, (st->host != NULL) ? st->host : hostname_g, + sizeof (vl.host)); + + sstrncpy (vl.plugin, "apache", sizeof (vl.plugin)); + 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 g, apache_t *st) +{ + value_t v; + v.gauge = g; + submit_value (type, type_instance, v, st); +} /* void submit_gauge */ + +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; @@ -239,8 +551,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++; @@ -254,46 +574,93 @@ 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 ("apache_scoreboard", "open" , open); - submit ("apache_scoreboard", "waiting" , waiting); - submit ("apache_scoreboard", "starting" , starting); - submit ("apache_scoreboard", "reading" , reading); - submit ("apache_scoreboard", "sending" , sending); - submit ("apache_scoreboard", "keepalive", keepalive); - submit ("apache_scoreboard", "dnslookup", dnslookup); - submit ("apache_scoreboard", "closing" , closing); - submit ("apache_scoreboard", "logging" , logging); - submit ("apache_scoreboard", "finishing", finishing); - submit ("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 void apache_read (void) +static int apache_read_host (user_data_t *user_data) /* {{{ */ { int i; char *ptr; + char *saveptr; char *lines[16]; int lines_num = 0; char *fields[4]; int fields_num; - if (curl == NULL) - return; - if (url == NULL) - return; + apache_t *st; - apache_buffer_len = 0; - if (curl_easy_perform (curl) != 0) + st = user_data->data; + + assert (st->url != NULL); + /* (Assured by `config_add') */ + + if (st->curl == NULL) { - syslog (LOG_WARNING, "apache: curl_easy_perform failed: %s", apache_curl_error); - return; + int status; + + status = init_host (st); + if (status != 0) + return (-1); } + assert (st->curl != NULL); - ptr = apache_buffer; - while ((lines[lines_num] = strtok (ptr, "\n\r")) != NULL) + st->apache_buffer_fill = 0; + if (curl_easy_perform (st->curl) != 0) + { + ERROR ("apache: curl_easy_perform failed: %s", + st->apache_curl_error); + return (-1); + } + + /* 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) { ptr = NULL; lines_num++; @@ -310,31 +677,30 @@ static void apache_read (void) { if ((strcmp (fields[0], "Total") == 0) && (strcmp (fields[1], "Accesses:") == 0)) - submit ("apache_requests", NULL, atoll (fields[2])); + submit_counter ("apache_requests", "", + atoll (fields[2]), st); else if ((strcmp (fields[0], "Total") == 0) && (strcmp (fields[1], "kBytes:") == 0)) - submit ("apache_bytes", NULL, 1024LL * atoll (fields[2])); + submit_counter ("apache_bytes", "", + 1024LL * atoll (fields[2]), st); } else if (fields_num == 2) { if (strcmp (fields[0], "Scoreboard:") == 0) - submit_scoreboard (fields[1]); + submit_scoreboard (fields[1], st); + else if (strcmp (fields[0], "BusyServers:") == 0) + submit_gauge ("apache_connections", NULL, atol (fields[1]), st); } } - apache_buffer_len = 0; -} -#else -# define apache_read NULL -#endif /* APACHE_HAVE_READ */ + st->apache_buffer_fill = 0; + + return (0); +} /* }}} int apache_read_host */ void module_register (void) { - 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); - cf_register (MODULE_NAME, config, config_keys, config_keys_num); -} + plugin_register_complex_config ("apache", config); +} /* void module_register */ -#undef MODULE_NAME +/* vim: set sw=8 noet fdm=marker : */