X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvarnish.c;h=5de3389d862eb41828b5fb73a55f1d5fe2197104;hb=44dcf2017576cbd398574ac66a732a5d2b179c3c;hp=c5a759edc95269bbd74e44d5d969c4b498a1ebab;hpb=6c6314c7ccca4dae0b9233061dbdf36040dadffe;p=collectd.git diff --git a/src/varnish.c b/src/varnish.c index c5a759ed..5de3389d 100644 --- a/src/varnish.c +++ b/src/varnish.c @@ -1,6 +1,8 @@ /** * 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 @@ -16,8 +18,9 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster - * Jerome Renard + * Jérôme Renard + * Marc Fournier + * Florian octo Forster **/ /** @@ -131,6 +134,15 @@ #include +#if HAVE_VARNISH_V3 +# include +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; @@ -142,9 +154,11 @@ struct user_config_s { _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; }; @@ -201,182 +215,194 @@ static int varnish_submit_derive (const char *plugin_instance, /* {{{ */ 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) { /* Cache hits */ - varnish_submit_derive (conf->instance, "cache", "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", "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", "cache_result", "hitpass", VSL_stats->cache_hitpass); + varnish_submit_derive (conf->instance, "cache", "cache_result", "hitpass", stats->cache_hitpass); } if (conf->collect_connections) { /* Client connections accepted */ - varnish_submit_derive (conf->instance, "connections", "connections", "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", "connections", "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", "connections", "received", VSL_stats->client_req); + varnish_submit_derive (conf->instance, "connections", "connections", "received", stats->client_req); } if (conf->collect_esi) { - /* Objects ESI parsed (unlock) */ - varnish_submit_derive (conf->instance, "esi", "total_operations", "parsed", VSL_stats->esi_parse); /* ESI parse errors (unlock) */ - varnish_submit_derive (conf->instance, "esi", "total_operations", "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) { /* Backend conn. success */ - varnish_submit_derive (conf->instance, "backend", "connections", "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, "backend", "connections", "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, "backend", "connections", "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, "backend", "connections", "failures" , VSL_stats->backend_fail); + varnish_submit_derive (conf->instance, "backend", "connections", "failures" , stats->backend_fail); /* Backend conn. reuses */ - varnish_submit_derive (conf->instance, "backend", "connections", "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, "backend", "connections", "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, "backend", "connections", "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, "backend", "connections", "unused" , VSL_stats->backend_unused); + varnish_submit_derive (conf->instance, "backend", "connections", "unused" , stats->backend_unused); +#endif } if (conf->collect_fetch) { /* Fetch head */ - varnish_submit_derive (conf->instance, "fetch", "http_requests", "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, "fetch", "http_requests", "length" , VSL_stats->fetch_length); + varnish_submit_derive (conf->instance, "fetch", "http_requests", "length" , stats->fetch_length); /* Fetch chunked */ - varnish_submit_derive (conf->instance, "fetch", "http_requests", "chunked" , VSL_stats->fetch_chunked); + varnish_submit_derive (conf->instance, "fetch", "http_requests", "chunked" , stats->fetch_chunked); /* Fetch EOF */ - varnish_submit_derive (conf->instance, "fetch", "http_requests", "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, "fetch", "http_requests", "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, "fetch", "http_requests", "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, "fetch", "http_requests", "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, "fetch", "http_requests", "zero" , VSL_stats->fetch_zero); + varnish_submit_derive (conf->instance, "fetch", "http_requests", "zero" , stats->fetch_zero); /* Fetch failed */ - varnish_submit_derive (conf->instance, "fetch", "http_requests", "failed" , VSL_stats->fetch_failed); + varnish_submit_derive (conf->instance, "fetch", "http_requests", "failed" , stats->fetch_failed); } if (conf->collect_hcb) { /* HCB Lookups without lock */ - varnish_submit_derive (conf->instance, "hcb", "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, "hcb", "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, "hcb", "cache_operation", "insert", VSL_stats->hcb_insert); + varnish_submit_derive (conf->instance, "hcb", "cache_operation", "insert", stats->hcb_insert); } if (conf->collect_shm) { /* SHM records */ - varnish_submit_derive (conf->instance, "shm", "total_operations", "records" , VSL_stats->shm_records); + varnish_submit_derive (conf->instance, "shm", "total_operations", "records" , stats->shm_records); /* SHM writes */ - varnish_submit_derive (conf->instance, "shm", "total_operations", "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, "shm", "total_operations", "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, "shm", "total_operations", "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, "shm", "total_operations", "cycles" , VSL_stats->shm_cycles); + varnish_submit_derive (conf->instance, "shm", "total_operations", "cycles" , stats->shm_cycles); } +#if HAVE_VARNISH_V2 if (conf->collect_sm) { /* allocator requests */ - varnish_submit_derive (conf->instance, "sm", "total_requests", "nreq", VSL_stats->sm_nreq); + varnish_submit_derive (conf->instance, "sm", "total_requests", "nreq", stats->sm_nreq); /* outstanding allocations */ - varnish_submit_gauge (conf->instance, "sm", "requests", "outstanding", VSL_stats->sm_nobj); + varnish_submit_gauge (conf->instance, "sm", "requests", "outstanding", stats->sm_nobj); /* bytes allocated */ - varnish_submit_gauge (conf->instance, "sm", "bytes", "allocated", VSL_stats->sm_balloc); + varnish_submit_derive (conf->instance, "sm", "total_bytes", "allocated", stats->sm_balloc); /* bytes free */ - varnish_submit_gauge (conf->instance, "sm", "bytes", "free", VSL_stats->sm_bfree); + varnish_submit_derive (conf->instance, "sm", "total_bytes", "free", stats->sm_bfree); } if (conf->collect_sma) { /* SMA allocator requests */ - varnish_submit_derive (conf->instance, "sma", "total_requests", "nreq", VSL_stats->sma_nreq); + varnish_submit_derive (conf->instance, "sma", "total_requests", "nreq", stats->sma_nreq); /* SMA outstanding allocations */ - varnish_submit_gauge (conf->instance, "sma", "requests", "outstanding", VSL_stats->sma_nobj); + varnish_submit_gauge (conf->instance, "sma", "requests", "outstanding", stats->sma_nobj); /* SMA outstanding bytes */ - varnish_submit_gauge (conf->instance, "sma", "bytes", "outstanding", VSL_stats->sma_nbytes); + varnish_submit_gauge (conf->instance, "sma", "bytes", "outstanding", stats->sma_nbytes); /* SMA bytes allocated */ - varnish_submit_gauge (conf->instance, "sma", "bytes", "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, "sma", "bytes", "free" , VSL_stats->sma_bfree); + varnish_submit_derive (conf->instance, "sma", "total_bytes", "free" , stats->sma_bfree); } +#endif if (conf->collect_sms) { /* SMS allocator requests */ - varnish_submit_derive (conf->instance, "sms", "total_requests", "allocator", VSL_stats->sms_nreq); + varnish_submit_derive (conf->instance, "sms", "total_requests", "allocator", stats->sms_nreq); /* SMS outstanding allocations */ - varnish_submit_gauge (conf->instance, "sms", "requests", "outstanding", VSL_stats->sms_nobj); + varnish_submit_gauge (conf->instance, "sms", "requests", "outstanding", stats->sms_nobj); /* SMS outstanding bytes */ - varnish_submit_gauge (conf->instance, "sms", "bytes", "outstanding", VSL_stats->sms_nbytes); + varnish_submit_gauge (conf->instance, "sms", "bytes", "outstanding", stats->sms_nbytes); /* SMS bytes allocated */ - varnish_submit_gauge (conf->instance, "sms", "bytes", "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, "sms", "bytes", "free", VSL_stats->sms_bfree); + varnish_submit_derive (conf->instance, "sms", "total_bytes", "free", stats->sms_bfree); } if (conf->collect_totals) { /* Total Sessions */ - varnish_submit_derive (conf->instance, "totals", "total_sessions", "sessions", VSL_stats->s_sess); + varnish_submit_derive (conf->instance, "totals", "total_sessions", "sessions", stats->s_sess); /* Total Requests */ - varnish_submit_derive (conf->instance, "totals", "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, "totals", "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, "totals", "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, "totals", "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, "totals", "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, "totals", "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", VSL_stats->n_wrk); + varnish_submit_gauge (conf->instance, "workers", "threads", "worker", stats->n_wrk); /* worker threads created */ - varnish_submit_gauge (conf->instance, "workers", "total_threads", "created", VSL_stats->n_wrk_create); + varnish_submit_derive (conf->instance, "workers", "total_threads", "created", stats->n_wrk_create); /* worker threads not created */ - varnish_submit_gauge (conf->instance, "workers", "total_threads", "failed", VSL_stats->n_wrk_failed); + varnish_submit_derive (conf->instance, "workers", "total_threads", "failed", stats->n_wrk_failed); /* worker threads limited */ - varnish_submit_gauge (conf->instance, "workers", "total_threads", "limited", VSL_stats->n_wrk_max); + 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_gauge (conf->instance, "workers", "total_requests", "queued", VSL_stats->n_wrk_queue); + varnish_submit_derive (conf->instance, "workers", "total_requests", "queued", stats->n_wrk_queue); /* overflowed work requests */ - varnish_submit_gauge (conf->instance, "workers", "total_requests", "overflowed", VSL_stats->n_wrk_overflow); - /* dropped work requests */ - varnish_submit_gauge (conf->instance, "workers", "total_requests", "dropped", VSL_stats->n_wrk_drop); + varnish_submit_derive (conf->instance, "workers", "total_requests", "overflowed", stats->n_wrk_overflow); +#endif } } /* }}} void varnish_monitor */ +#if HAVE_VARNISH_V3 static int varnish_read (user_data_t *ud) /* {{{ */ { - struct varnish_stats *VSL_stats; + struct VSM_data *vd; + const c_varnish_stats_t *stats; + user_config_t *conf; if ((ud == NULL) || (ud->data == NULL)) @@ -384,18 +410,62 @@ static int varnish_read (user_data_t *ud) /* {{{ */ conf = ud->data; - VSL_stats = VSL_OpenStats (conf->instance); - if (VSL_stats == NULL) + 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) /* {{{ */ +{ + const c_varnish_stats_t *stats; + + user_config_t *conf; + + if ((ud == NULL) || (ud->data == NULL)) + return (EINVAL); + + conf = ud->data; + + stats = VSL_OpenStats (conf->instance); + if (stats == NULL) { 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) /* {{{ */ { @@ -420,11 +490,13 @@ static int varnish_config_apply_default (user_config_t *conf) /* {{{ */ 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 */ @@ -516,12 +588,14 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ 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) @@ -529,7 +603,9 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ else { WARNING ("Varnish plugin: Ignoring unknown " - "configuration option: \"%s\"", + "configuration option: \"%s\". Did " + "you forget to add an " + "block around the configuration?", child->key); } } @@ -541,9 +617,11 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ && !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 +#endif && !conf->collect_totals && !conf->collect_workers) {