/**
* collectd - src/varnish.c
- * Copyright (C) 2010 Jerome Renard
+ * Copyright (C) 2010 Jérôme Renard
+ * Copyright (C) 2010 Marc Fournier
+ * Copyright (C) 2010-2012 Florian 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
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at verplant.org>
- * Jerome Renard <jerome.renard@gmail.com>
+ * Jérôme Renard <jerome.renard at gmail.com>
+ * Marc Fournier <marc.fournier at camptocamp.com>
+ * Florian octo Forster <octo at collectd.org>
**/
/**
* n_smf_frag N small free smf N
* n_smf_large N large free smf N
* n_vbe_conn N struct vbe_conn N
- * n_wrk N worker threads N
- * n_wrk_create N worker threads created N
- * n_wrk_failed N worker threads not created N
- * n_wrk_max N worker threads limited N
- * n_wrk_queue N queued work requests N
- * n_wrk_overflow N overflowed work requests N
- * n_wrk_drop N dropped work requests N
+ * n_wrk N worker threads Y
+ * n_wrk_create N worker threads created Y
+ * n_wrk_failed N worker threads not created Y
+ * n_wrk_max N worker threads limited Y
+ * n_wrk_queue N queued work requests Y
+ * n_wrk_overflow N overflowed work requests Y
+ * n_wrk_drop N dropped work requests Y
* n_backend N backends N
* n_expired N expired objects N
* n_lru_nuked N LRU nuked objects N
#include <varnish/varnishapi.h>
+#if HAVE_VARNISH_V3
+# include <varnish/vsc.h>
+typedef struct VSC_C_main c_varnish_stats_t;
+#endif
+
+#if HAVE_VARNISH_V2
+typedef struct varnish_stats c_varnish_stats_t;
+#endif
+
/* {{{ user_config_s */
struct user_config_s {
char *instance;
_Bool collect_fetch;
_Bool collect_hcb;
_Bool collect_shm;
- _Bool collect_sma;
_Bool collect_sms;
+#if HAVE_VARNISH_V2
_Bool collect_sm;
+ _Bool collect_sma;
+#endif
_Bool collect_totals;
+ _Bool collect_workers;
};
typedef struct user_config_s user_config_t; /* }}} */
static _Bool have_instance = 0;
static int varnish_submit (const char *plugin_instance, /* {{{ */
- const char *type, const char *type_instance, value_t value)
+ const char *category, const char *type, const char *type_instance, value_t value)
{
value_list_t vl = VALUE_LIST_INIT;
vl.values = &value;
vl.values_len = 1;
- sstrncpy(vl.host, hostname_g, sizeof(vl.host));
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+
+ sstrncpy (vl.plugin, "varnish", sizeof (vl.plugin));
+
+ if (plugin_instance == NULL)
+ plugin_instance = "default";
- sstrncpy(vl.plugin, "varnish", sizeof(vl.plugin));
- if (plugin_instance != NULL)
- sstrncpy (vl.plugin_instance, plugin_instance,
- sizeof (vl.plugin_instance));
+ ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
+ "%s-%s", plugin_instance, category);
+
+ sstrncpy (vl.type, type, sizeof (vl.type));
- sstrncpy(vl.type, type, sizeof(vl.type));
if (type_instance != NULL)
- sstrncpy(vl.type_instance, type_instance,
- sizeof(vl.type_instance));
+ sstrncpy (vl.type_instance, type_instance,
+ sizeof (vl.type_instance));
- return (plugin_dispatch_values(&vl));
+ return (plugin_dispatch_values (&vl));
} /* }}} int varnish_submit */
static int varnish_submit_gauge (const char *plugin_instance, /* {{{ */
- const char *type, const char *type_instance,
+ const char *category, const char *type, const char *type_instance,
uint64_t gauge_value)
{
value_t value;
value.gauge = (gauge_t) gauge_value;
- return (varnish_submit (plugin_instance, type, type_instance, value));
+ return (varnish_submit (plugin_instance, category, type, type_instance, value));
} /* }}} int varnish_submit_gauge */
static int varnish_submit_derive (const char *plugin_instance, /* {{{ */
- const char *type, const char *type_instance,
+ const char *category, const char *type, const char *type_instance,
uint64_t derive_value)
{
value_t value;
value.derive = (derive_t) derive_value;
- return (varnish_submit (plugin_instance, type, type_instance, value));
+ return (varnish_submit (plugin_instance, category, type, type_instance, value));
} /* }}} int varnish_submit_derive */
-static void varnish_monitor(const user_config_t *conf, struct varnish_stats *VSL_stats) /* {{{ */
+static void varnish_monitor (const user_config_t *conf, /* {{{ */
+ const c_varnish_stats_t *stats)
{
- if(conf->collect_cache)
+ if (conf->collect_cache)
{
/* Cache hits */
- varnish_submit_derive (conf->instance, "cache_result", "hit" , VSL_stats->cache_hit);
+ varnish_submit_derive (conf->instance, "cache", "cache_result", "hit", stats->cache_hit);
/* Cache misses */
- varnish_submit_derive (conf->instance, "cache_result", "miss" , VSL_stats->cache_miss);
+ varnish_submit_derive (conf->instance, "cache", "cache_result", "miss", stats->cache_miss);
/* Cache hits for pass */
- varnish_submit_derive (conf->instance, "cache_result", "hitpass", VSL_stats->cache_hitpass);
+ varnish_submit_derive (conf->instance, "cache", "cache_result", "hitpass", stats->cache_hitpass);
}
- if(conf->collect_connections)
+ if (conf->collect_connections)
{
/* Client connections accepted */
- varnish_submit_derive (conf->instance, "connections", "client-accepted", VSL_stats->client_conn);
+ varnish_submit_derive (conf->instance, "connections", "connections", "accepted", stats->client_conn);
/* Connection dropped, no sess */
- varnish_submit_derive (conf->instance, "connections", "client-dropped" , VSL_stats->client_drop);
+ varnish_submit_derive (conf->instance, "connections", "connections", "dropped" , stats->client_drop);
/* Client requests received */
- varnish_submit_derive (conf->instance, "connections", "client-received", VSL_stats->client_req);
+ varnish_submit_derive (conf->instance, "connections", "connections", "received", stats->client_req);
}
- if(conf->collect_esi)
+ if (conf->collect_esi)
{
- /* Objects ESI parsed (unlock) */
- varnish_submit_derive (conf->instance, "total_operations", "esi-parsed", VSL_stats->esi_parse);
/* ESI parse errors (unlock) */
- varnish_submit_derive (conf->instance, "total_operations", "esi-error", VSL_stats->esi_errors);
+ varnish_submit_derive (conf->instance, "esi", "total_operations", "error", stats->esi_errors);
+#if HAVE_VARNISH_V2
+ /* Objects ESI parsed (unlock) */
+ varnish_submit_derive (conf->instance, "esi", "total_operations", "parsed", stats->esi_parse);
+#endif
}
- if(conf->collect_backend)
+ if (conf->collect_backend)
{
/* Backend conn. success */
- varnish_submit_derive (conf->instance, "connections", "backend-success" , VSL_stats->backend_conn);
+ varnish_submit_derive (conf->instance, "backend", "connections", "success" , stats->backend_conn);
/* Backend conn. not attempted */
- varnish_submit_derive (conf->instance, "connections", "backend-not-attempted", VSL_stats->backend_unhealthy);
+ varnish_submit_derive (conf->instance, "backend", "connections", "not-attempted", stats->backend_unhealthy);
/* Backend conn. too many */
- varnish_submit_derive (conf->instance, "connections", "backend-too-many" , VSL_stats->backend_busy);
+ varnish_submit_derive (conf->instance, "backend", "connections", "too-many" , stats->backend_busy);
/* Backend conn. failures */
- varnish_submit_derive (conf->instance, "connections", "backend-failures" , VSL_stats->backend_fail);
+ varnish_submit_derive (conf->instance, "backend", "connections", "failures" , stats->backend_fail);
/* Backend conn. reuses */
- varnish_submit_derive (conf->instance, "connections", "backend-reuses" , VSL_stats->backend_reuse);
+ varnish_submit_derive (conf->instance, "backend", "connections", "reuses" , stats->backend_reuse);
/* Backend conn. was closed */
- varnish_submit_derive (conf->instance, "connections", "backend-was-closed" , VSL_stats->backend_toolate);
+ varnish_submit_derive (conf->instance, "backend", "connections", "was-closed" , stats->backend_toolate);
/* Backend conn. recycles */
- varnish_submit_derive (conf->instance, "connections", "backend-recycled" , VSL_stats->backend_recycle);
+ varnish_submit_derive (conf->instance, "backend", "connections", "recycled" , stats->backend_recycle);
+#if HAVE_VARNISH_V2
/* Backend conn. unused */
- varnish_submit_derive (conf->instance, "connections", "backend-unused" , VSL_stats->backend_unused);
+ varnish_submit_derive (conf->instance, "backend", "connections", "unused" , stats->backend_unused);
+#endif
}
- if(conf->collect_fetch)
+ if (conf->collect_fetch)
{
/* Fetch head */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-head" , VSL_stats->fetch_head);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "head" , stats->fetch_head);
/* Fetch with length */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-length" , VSL_stats->fetch_length);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "length" , stats->fetch_length);
/* Fetch chunked */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-chunked" , VSL_stats->fetch_chunked);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "chunked" , stats->fetch_chunked);
/* Fetch EOF */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-eof" , VSL_stats->fetch_eof);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "eof" , stats->fetch_eof);
/* Fetch bad headers */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-bad_headers", VSL_stats->fetch_bad);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "bad_headers", stats->fetch_bad);
/* Fetch wanted close */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-close" , VSL_stats->fetch_close);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "close" , stats->fetch_close);
/* Fetch pre HTTP/1.1 closed */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-oldhttp" , VSL_stats->fetch_oldhttp);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "oldhttp" , stats->fetch_oldhttp);
/* Fetch zero len */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-zero" , VSL_stats->fetch_zero);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "zero" , stats->fetch_zero);
/* Fetch failed */
- varnish_submit_derive (conf->instance, "http_requests", "fetch-failed" , VSL_stats->fetch_failed);
+ varnish_submit_derive (conf->instance, "fetch", "http_requests", "failed" , stats->fetch_failed);
}
- if(conf->collect_hcb)
+ if (conf->collect_hcb)
{
/* HCB Lookups without lock */
- varnish_submit_derive (conf->instance, "cache_operation", "lookup_nolock", VSL_stats->hcb_nolock);
+ varnish_submit_derive (conf->instance, "hcb", "cache_operation", "lookup_nolock", stats->hcb_nolock);
/* HCB Lookups with lock */
- varnish_submit_derive (conf->instance, "cache_operation", "lookup_lock", VSL_stats->hcb_lock);
+ varnish_submit_derive (conf->instance, "hcb", "cache_operation", "lookup_lock", stats->hcb_lock);
/* HCB Inserts */
- varnish_submit_derive (conf->instance, "cache_operation", "insert", VSL_stats->hcb_insert);
+ varnish_submit_derive (conf->instance, "hcb", "cache_operation", "insert", stats->hcb_insert);
}
- if(conf->collect_shm)
+ if (conf->collect_shm)
{
/* SHM records */
- varnish_submit_derive (conf->instance, "total_operations", "shmlog-records" , VSL_stats->shm_records);
+ varnish_submit_derive (conf->instance, "shm", "total_operations", "records" , stats->shm_records);
/* SHM writes */
- varnish_submit_derive (conf->instance, "total_operations", "shmlog-writes" , VSL_stats->shm_writes);
+ varnish_submit_derive (conf->instance, "shm", "total_operations", "writes" , stats->shm_writes);
/* SHM flushes due to overflow */
- varnish_submit_derive (conf->instance, "total_operations", "shmlog-flushes" , VSL_stats->shm_flushes);
+ varnish_submit_derive (conf->instance, "shm", "total_operations", "flushes" , stats->shm_flushes);
/* SHM MTX contention */
- varnish_submit_derive (conf->instance, "total_operations", "shmlog-contention", VSL_stats->shm_cont);
+ varnish_submit_derive (conf->instance, "shm", "total_operations", "contention", stats->shm_cont);
/* SHM cycles through buffer */
- varnish_submit_derive (conf->instance, "total_operations", "shmlog-cycles" , VSL_stats->shm_cycles);
+ varnish_submit_derive (conf->instance, "shm", "total_operations", "cycles" , stats->shm_cycles);
}
- if(conf->collect_sm)
+#if HAVE_VARNISH_V2
+ if (conf->collect_sm)
{
/* allocator requests */
- varnish_submit_derive (conf->instance, "total_requests", "storage-file", VSL_stats->sm_nreq);
+ varnish_submit_derive (conf->instance, "sm", "total_requests", "nreq", stats->sm_nreq);
/* outstanding allocations */
- varnish_submit_gauge (conf->instance, "requests", "storage-file-outstanding", VSL_stats->sm_nobj);
+ varnish_submit_gauge (conf->instance, "sm", "requests", "outstanding", stats->sm_nobj);
/* bytes allocated */
- varnish_submit_gauge (conf->instance, "bytes", "storage-file-allocated", VSL_stats->sm_balloc);
+ varnish_submit_derive (conf->instance, "sm", "total_bytes", "allocated", stats->sm_balloc);
/* bytes free */
- varnish_submit_gauge (conf->instance, "bytes", "storage-file-free", VSL_stats->sm_bfree);
+ varnish_submit_derive (conf->instance, "sm", "total_bytes", "free", stats->sm_bfree);
}
- if(conf->collect_sma)
+ if (conf->collect_sma)
{
/* SMA allocator requests */
- varnish_submit_derive (conf->instance, "total_requests", "storage-mem", VSL_stats->sma_nreq);
+ varnish_submit_derive (conf->instance, "sma", "total_requests", "nreq", stats->sma_nreq);
/* SMA outstanding allocations */
- varnish_submit_gauge (conf->instance, "requests", "storage-mem-outstanding", VSL_stats->sma_nobj);
+ varnish_submit_gauge (conf->instance, "sma", "requests", "outstanding", stats->sma_nobj);
/* SMA outstanding bytes */
- varnish_submit_gauge (conf->instance, "bytes", "storage-mem-outstanding", VSL_stats->sma_nbytes);
+ varnish_submit_gauge (conf->instance, "sma", "bytes", "outstanding", stats->sma_nbytes);
/* SMA bytes allocated */
- varnish_submit_gauge (conf->instance, "bytes", "storage-mem-allocated", VSL_stats->sma_balloc);
+ varnish_submit_derive (conf->instance, "sma", "total_bytes", "allocated", stats->sma_balloc);
/* SMA bytes free */
- varnish_submit_gauge (conf->instance, "bytes", "storage-mem-free" , VSL_stats->sma_bfree);
+ varnish_submit_derive (conf->instance, "sma", "total_bytes", "free" , stats->sma_bfree);
}
+#endif
- if(conf->collect_sms)
+ if (conf->collect_sms)
{
/* SMS allocator requests */
- varnish_submit_derive (conf->instance, "total_requests", "storage-synth", VSL_stats->sms_nreq);
+ varnish_submit_derive (conf->instance, "sms", "total_requests", "allocator", stats->sms_nreq);
/* SMS outstanding allocations */
- varnish_submit_gauge (conf->instance, "requests", "storage-synth-outstanding", VSL_stats->sms_nobj);
+ varnish_submit_gauge (conf->instance, "sms", "requests", "outstanding", stats->sms_nobj);
/* SMS outstanding bytes */
- varnish_submit_gauge (conf->instance, "bytes", "storage-synth-outstanding", VSL_stats->sms_nbytes);
+ varnish_submit_gauge (conf->instance, "sms", "bytes", "outstanding", stats->sms_nbytes);
/* SMS bytes allocated */
- varnish_submit_gauge (conf->instance, "bytes", "storage-synth-allocated", VSL_stats->sms_balloc);
+ varnish_submit_derive (conf->instance, "sms", "total_bytes", "allocated", stats->sms_balloc);
/* SMS bytes freed */
- varnish_submit_gauge (conf->instance, "bytes", "storage-synth-free", VSL_stats->sms_bfree);
+ varnish_submit_derive (conf->instance, "sms", "total_bytes", "free", stats->sms_bfree);
}
- if(conf->collect_totals)
+ if (conf->collect_totals)
{
/* Total Sessions */
- varnish_submit_derive (conf->instance, "total_counters", "sessions", VSL_stats->s_sess);
+ varnish_submit_derive (conf->instance, "totals", "total_sessions", "sessions", stats->s_sess);
/* Total Requests */
- varnish_submit_derive (conf->instance, "total_requests", "requests", VSL_stats->s_req);
+ varnish_submit_derive (conf->instance, "totals", "total_requests", "requests", stats->s_req);
/* Total pipe */
- varnish_submit_derive (conf->instance, "total_operations", "pipe", VSL_stats->s_pipe);
+ varnish_submit_derive (conf->instance, "totals", "total_operations", "pipe", stats->s_pipe);
/* Total pass */
- varnish_submit_derive (conf->instance, "total_operations", "pass", VSL_stats->s_pass);
+ varnish_submit_derive (conf->instance, "totals", "total_operations", "pass", stats->s_pass);
/* Total fetch */
- varnish_submit_derive (conf->instance, "total_operations", "fetches", VSL_stats->s_fetch);
+ varnish_submit_derive (conf->instance, "totals", "total_operations", "fetches", stats->s_fetch);
/* Total header bytes */
- varnish_submit_derive (conf->instance, "total_bytes", "header-bytes", VSL_stats->s_hdrbytes);
+ varnish_submit_derive (conf->instance, "totals", "total_bytes", "header-bytes", stats->s_hdrbytes);
/* Total body byte */
- varnish_submit_derive (conf->instance, "total_bytes", "body-bytes", VSL_stats->s_bodybytes);
+ varnish_submit_derive (conf->instance, "totals", "total_bytes", "body-bytes", stats->s_bodybytes);
+ }
+
+ if (conf->collect_workers)
+ {
+ /* worker threads */
+ varnish_submit_gauge (conf->instance, "workers", "threads", "worker", stats->n_wrk);
+ /* worker threads created */
+ varnish_submit_derive (conf->instance, "workers", "total_threads", "created", stats->n_wrk_create);
+ /* worker threads not created */
+ varnish_submit_derive (conf->instance, "workers", "total_threads", "failed", stats->n_wrk_failed);
+ /* worker threads limited */
+ varnish_submit_derive (conf->instance, "workers", "total_threads", "limited", stats->n_wrk_max);
+ /* dropped work requests */
+ varnish_submit_derive (conf->instance, "workers", "total_requests", "dropped", stats->n_wrk_drop);
+#ifdef HAVE_VARNISH_V2
+ /* queued work requests */
+ varnish_submit_derive (conf->instance, "workers", "total_requests", "queued", stats->n_wrk_queue);
+ /* overflowed work requests */
+ varnish_submit_derive (conf->instance, "workers", "total_requests", "overflowed", stats->n_wrk_overflow);
+#endif
}
} /* }}} void varnish_monitor */
-static int varnish_read(user_data_t *ud) /* {{{ */
+#if HAVE_VARNISH_V3
+static int varnish_read (user_data_t *ud) /* {{{ */
+{
+ struct VSM_data *vd;
+ const c_varnish_stats_t *stats;
+
+ user_config_t *conf;
+
+ if ((ud == NULL) || (ud->data == NULL))
+ return (EINVAL);
+
+ conf = ud->data;
+
+ vd = VSM_New();
+ VSC_Setup(vd);
+
+ if (conf->instance != NULL)
+ {
+ int status;
+
+ status = VSM_n_Arg (vd, conf->instance);
+ if (status < 0)
+ {
+ ERROR ("varnish plugin: VSM_n_Arg (\"%s\") failed "
+ "with status %i.",
+ conf->instance, status);
+ return (-1);
+ }
+ }
+
+ if (VSC_Open (vd, /* diag = */ 1))
+ {
+ ERROR ("varnish plugin: Unable to load statistics.");
+
+ return (-1);
+ }
+
+ stats = VSC_Main(vd);
+
+ varnish_monitor (conf, stats);
+ VSM_Close (vd);
+
+ return (0);
+} /* }}} */
+#else /* if HAVE_VARNISH_V2 */
+static int varnish_read (user_data_t *ud) /* {{{ */
{
- struct varnish_stats *VSL_stats;
+ const c_varnish_stats_t *stats;
+
user_config_t *conf;
if ((ud == NULL) || (ud->data == NULL))
conf = ud->data;
- VSL_stats = VSL_OpenStats(conf->instance);
- if (VSL_stats == NULL)
+ stats = VSL_OpenStats (conf->instance);
+ if (stats == NULL)
{
- ERROR("Varnish plugin : unable to load statistics");
+ ERROR ("Varnish plugin : unable to load statistics");
return (-1);
}
- varnish_monitor(conf, VSL_stats);
+ varnish_monitor (conf, stats);
- return (0);
+ return (0);
} /* }}} */
+#endif
static void varnish_config_free (void *ptr) /* {{{ */
{
conf->collect_fetch = 0;
conf->collect_hcb = 0;
conf->collect_shm = 1;
+#if HAVE_VARNISH_V2
conf->collect_sm = 0;
conf->collect_sma = 0;
+#endif
conf->collect_sms = 0;
conf->collect_totals = 0;
-
+
return (0);
} /* }}} int varnish_config_apply_default */
cf_util_get_boolean (child, &conf->collect_hcb);
else if (strcasecmp ("CollectSHM", child->key) == 0)
cf_util_get_boolean (child, &conf->collect_shm);
- else if (strcasecmp ("CollectSMA", child->key) == 0)
- cf_util_get_boolean (child, &conf->collect_sma);
else if (strcasecmp ("CollectSMS", child->key) == 0)
cf_util_get_boolean (child, &conf->collect_sms);
+#if HAVE_VARNISH_V2
+ else if (strcasecmp ("CollectSMA", child->key) == 0)
+ cf_util_get_boolean (child, &conf->collect_sma);
else if (strcasecmp ("CollectSM", child->key) == 0)
cf_util_get_boolean (child, &conf->collect_sm);
+#endif
else if (strcasecmp ("CollectTotals", child->key) == 0)
cf_util_get_boolean (child, &conf->collect_totals);
+ else if (strcasecmp ("CollectWorkers", child->key) == 0)
+ cf_util_get_boolean (child, &conf->collect_workers);
else
{
WARNING ("Varnish plugin: Ignoring unknown "
- "configuration option: \"%s\"",
+ "configuration option: \"%s\". Did "
+ "you forget to add an <Instance /> "
+ "block around the configuration?",
child->key);
}
}
&& !conf->collect_fetch
&& !conf->collect_hcb
&& !conf->collect_shm
- && !conf->collect_sma
&& !conf->collect_sms
+#if HAVE_VARNISH_V2
+ && !conf->collect_sma
&& !conf->collect_sm
- && !conf->collect_totals)
+#endif
+ && !conf->collect_totals
+ && !conf->collect_workers)
{
WARNING ("Varnish plugin: No metric has been configured for "
"instance \"%s\". Disabling this instance.",
void module_register (void) /* {{{ */
{
- plugin_register_complex_config("varnish", varnish_config);
+ plugin_register_complex_config ("varnish", varnish_config);
plugin_register_init ("varnish", varnish_init);
} /* }}} */
projects / collectd.git / blobdiff