X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fvarnish.c;h=e2ced0e4e20e128184f56330634aa854ae9c21b1;hb=31ee0e5282b59f89ac5c9bcaebb993450e45dba1;hp=724b4faa024df5b3ecfd8b8e006fd1b432314fd3;hpb=f9dd7996a4956bd3320536999a39b4305c1ad002;p=collectd.git diff --git a/src/varnish.c b/src/varnish.c index 724b4faa..e2ced0e4 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,114 +18,11 @@ * 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 **/ -/** - * Current list of what is monitored and what is not monitored (yet) - * {{{ - * Field name Description Monitored - * ---------- ----------- --------- - * uptime Child uptime N - * client_conn Client connections accepted Y - * client_drop Connection dropped, no sess Y - * client_req Client requests received Y - * cache_hit Cache hits Y - * cache_hitpass Cache hits for pass Y - * cache_miss Cache misses Y - * backend_conn Backend conn. success Y - * backend_unhealthy Backend conn. not attempted Y - * backend_busy Backend conn. too many Y - * backend_fail Backend conn. failures Y - * backend_reuse Backend conn. reuses Y - * backend_toolate Backend conn. was closed Y - * backend_recycle Backend conn. recycles Y - * backend_unused Backend conn. unused Y - * fetch_head Fetch head Y - * fetch_length Fetch with Length Y - * fetch_chunked Fetch chunked Y - * fetch_eof Fetch EOF Y - * fetch_bad Fetch had bad headers Y - * fetch_close Fetch wanted close Y - * fetch_oldhttp Fetch pre HTTP/1.1 closed Y - * fetch_zero Fetch zero len Y - * fetch_failed Fetch failed Y - * n_sess_mem N struct sess_mem N - * n_sess N struct sess N - * n_object N struct object N - * n_vampireobject N unresurrected objects N - * n_objectcore N struct objectcore N - * n_objecthead N struct objecthead N - * n_smf N struct smf N - * 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 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 - * n_lru_saved N LRU saved objects N - * n_lru_moved N LRU moved objects N - * n_deathrow N objects on deathrow N - * losthdr HTTP header overflows N - * n_objsendfile Objects sent with sendfile N - * n_objwrite Objects sent with write N - * n_objoverflow Objects overflowing workspace N - * s_sess Total Sessions Y - * s_req Total Requests Y - * s_pipe Total pipe Y - * s_pass Total pass Y - * s_fetch Total fetch Y - * s_hdrbytes Total header bytes Y - * s_bodybytes Total body bytes Y - * sess_closed Session Closed N - * sess_pipeline Session Pipeline N - * sess_readahead Session Read Ahead N - * sess_linger Session Linger N - * sess_herd Session herd N - * shm_records SHM records Y - * shm_writes SHM writes Y - * shm_flushes SHM flushes due to overflow Y - * shm_cont SHM MTX contention Y - * shm_cycles SHM cycles through buffer Y - * sm_nreq allocator requests Y - * sm_nobj outstanding allocations Y - * sm_balloc bytes allocated Y - * sm_bfree bytes free Y - * sma_nreq SMA allocator requests Y - * sma_nobj SMA outstanding allocations Y - * sma_nbytes SMA outstanding bytes Y - * sma_balloc SMA bytes allocated Y - * sma_bfree SMA bytes free Y - * sms_nreq SMS allocator requests Y - * sms_nobj SMS outstanding allocations Y - * sms_nbytes SMS outstanding bytes Y - * sms_balloc SMS bytes allocated Y - * sms_bfree SMS bytes freed Y - * backend_req Backend requests made N - * n_vcl N vcl total N - * n_vcl_avail N vcl available N - * n_vcl_discard N vcl discarded N - * n_purge N total active purges N - * n_purge_add N new purges added N - * n_purge_retire N old purges deleted N - * n_purge_obj_test N objects tested N - * n_purge_re_test N regexps tested against N - * n_purge_dups N duplicate purges removed N - * hcb_nolock HCB Lookups without lock Y - * hcb_lock HCB Lookups with lock Y - * hcb_insert HCB Inserts Y - * esi_parse Objects ESI parsed (unlock) Y - * esi_errors ESI parse errors (unlock) Y - * }}} - */ #include "collectd.h" #include "common.h" #include "plugin.h" @@ -131,6 +30,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; @@ -139,13 +47,28 @@ struct user_config_s { _Bool collect_connections; _Bool collect_esi; _Bool collect_backend; +#ifdef HAVE_VARNISH_V3 + _Bool collect_dirdns; +#endif _Bool collect_fetch; _Bool collect_hcb; + _Bool collect_objects; +#if HAVE_VARNISH_V2 + _Bool collect_purge; +#else + _Bool collect_ban; +#endif + _Bool collect_session; _Bool collect_shm; - _Bool collect_sma; _Bool collect_sms; +#if HAVE_VARNISH_V2 _Bool collect_sm; + _Bool collect_sma; +#endif + _Bool collect_struct; _Bool collect_totals; + _Bool collect_uptime; + _Bool collect_vcl; _Bool collect_workers; }; typedef struct user_config_s user_config_t; /* }}} */ @@ -153,226 +76,438 @@ 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) - sstrncpy (vl.plugin_instance, plugin_instance, - sizeof (vl.plugin_instance)); + sstrncpy (vl.plugin, "varnish", sizeof (vl.plugin)); + + if (plugin_instance == NULL) + plugin_instance = "default"; + + 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) +#ifdef HAVE_VARNISH_V3 + if (conf->collect_dirdns) + { + /* DNS director lookups */ + varnish_submit_derive (conf->instance, "dirdns", "cache_operation", "lookups", stats->dir_dns_lookups); + /* DNS director failed lookups */ + varnish_submit_derive (conf->instance, "dirdns", "cache_result", "failed", stats->dir_dns_failed); + /* DNS director cached lookups hit */ + varnish_submit_derive (conf->instance, "dirdns", "cache_result", "hits", stats->dir_dns_hit); + /* DNS director full dnscache */ + varnish_submit_derive (conf->instance, "dirdns", "cache_result", "cache_full", stats->dir_dns_cache_full); + } +#endif + + 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); +#else + /* ESI parse warnings (unlock) */ + varnish_submit_derive (conf->instance, "esi", "total_operations", "warning", stats->esi_warnings); +#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); +#else + /* Backend conn. retry */ + varnish_submit_derive (conf->instance, "backend", "connections", "retries" , stats->backend_retry); +#endif + /* Backend requests mades */ + varnish_submit_derive (conf->instance, "backend", "http_requests", "requests" , stats->backend_req); + /* N backends */ + varnish_submit_gauge (conf->instance, "backend", "backends", "n_backends" , stats->n_backend); } - 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 HAVE_VARNISH_V3 + /* Fetch no body (1xx) */ + varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_1xx", stats->fetch_1xx); + /* Fetch no body (204) */ + varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_204", stats->fetch_204); + /* Fetch no body (304) */ + varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_304", stats->fetch_304); +#endif } - 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_objects) + { + /* N expired objects */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "expired", stats->n_expired); + /* N LRU nuked objects */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_nuked", stats->n_lru_nuked); +#if HAVE_VARNISH_V2 + /* N LRU saved objects */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_saved", stats->n_lru_saved); +#endif + /* N LRU moved objects */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_moved", stats->n_lru_moved); +#if HAVE_VARNISH_V2 + /* N objects on deathrow */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "deathrow", stats->n_deathrow); +#endif + /* HTTP header overflows */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "header_overflow", stats->losthdr); + /* Objects sent with sendfile */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "sent_sendfile", stats->n_objsendfile); + /* Objects sent with write */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "sent_write", stats->n_objwrite); + /* Objects overflowing workspace */ + varnish_submit_derive (conf->instance, "objects", "total_objects", "workspace_overflow", stats->n_objoverflow); + } + +#if HAVE_VARNISH_V2 + if (conf->collect_purge) + { + /* N total active purges */ + varnish_submit_derive (conf->instance, "purge", "total_operations", "total", stats->n_purge); + /* N new purges added */ + varnish_submit_derive (conf->instance, "purge", "total_operations", "added", stats->n_purge_add); + /* N old purges deleted */ + varnish_submit_derive (conf->instance, "purge", "total_operations", "deleted", stats->n_purge_retire); + /* N objects tested */ + varnish_submit_derive (conf->instance, "purge", "total_operations", "objects_tested", stats->n_purge_obj_test); + /* N regexps tested against */ + varnish_submit_derive (conf->instance, "purge", "total_operations", "regexps_tested", stats->n_purge_re_test); + /* N duplicate purges removed */ + varnish_submit_derive (conf->instance, "purge", "total_operations", "duplicate", stats->n_purge_dups); + } +#else + if (conf->collect_ban) + { + /* N total active bans */ + varnish_submit_derive (conf->instance, "ban", "total_operations", "total", stats->n_ban); + /* N new bans added */ + varnish_submit_derive (conf->instance, "ban", "total_operations", "added", stats->n_ban_add); + /* N old bans deleted */ + varnish_submit_derive (conf->instance, "ban", "total_operations", "deleted", stats->n_ban_retire); + /* N objects tested */ + varnish_submit_derive (conf->instance, "ban", "total_operations", "objects_tested", stats->n_ban_obj_test); + /* N regexps tested against */ + varnish_submit_derive (conf->instance, "ban", "total_operations", "regexps_tested", stats->n_ban_re_test); + /* N duplicate bans removed */ + varnish_submit_derive (conf->instance, "ban", "total_operations", "duplicate", stats->n_ban_dups); } +#endif - if(conf->collect_shm) + if (conf->collect_session) + { + /* Session Closed */ + varnish_submit_derive (conf->instance, "session", "total_operations", "closed", stats->sess_closed); + /* Session Pipeline */ + varnish_submit_derive (conf->instance, "session", "total_operations", "pipeline", stats->sess_pipeline); + /* Session Read Ahead */ + varnish_submit_derive (conf->instance, "session", "total_operations", "readahead", stats->sess_readahead); + /* Session Linger */ + varnish_submit_derive (conf->instance, "session", "total_operations", "linger", stats->sess_linger); + /* Session herd */ + varnish_submit_derive (conf->instance, "session", "total_operations", "herd", stats->sess_herd); + } + + 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_struct) + { + /* N struct sess_mem */ + varnish_submit_gauge (conf->instance, "struct", "current_sessions", "sess_mem", stats->n_sess_mem); + /* N struct sess */ + varnish_submit_gauge (conf->instance, "struct", "current_sessions", "sess", stats->n_sess); + /* N struct object */ + varnish_submit_gauge (conf->instance, "struct", "objects", "object", stats->n_object); + /* N unresurrected objects */ + varnish_submit_gauge (conf->instance, "struct", "objects", "vampireobject", stats->n_vampireobject); + /* N struct objectcore */ + varnish_submit_gauge (conf->instance, "struct", "objects", "objectcore", stats->n_objectcore); + /* N struct objecthead */ + varnish_submit_gauge (conf->instance, "struct", "objects", "objecthead", stats->n_objecthead); +#ifdef HAVE_VARNISH_V2 + /* N struct smf */ + varnish_submit_gauge (conf->instance, "struct", "objects", "smf", stats->n_smf); + /* N small free smf */ + varnish_submit_gauge (conf->instance, "struct", "objects", "smf_frag", stats->n_smf_frag); + /* N large free smf */ + varnish_submit_gauge (conf->instance, "struct", "objects", "smf_large", stats->n_smf_large); + /* N struct vbe_conn */ + varnish_submit_gauge (conf->instance, "struct", "objects", "vbe_conn", stats->n_vbe_conn); +#endif } - 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) + if (conf->collect_uptime) + { + /* Client uptime */ + varnish_submit_gauge (conf->instance, "uptime", "uptime", "client_uptime", stats->uptime); + } + + if (conf->collect_vcl) + { + /* N vcl total */ + varnish_submit_gauge (conf->instance, "vcl", "vcl", "total_vcl", stats->n_vcl); + /* N vcl available */ + varnish_submit_gauge (conf->instance, "vcl", "vcl", "avail_vcl", stats->n_vcl_avail); + /* N vcl discarded */ + varnish_submit_gauge (conf->instance, "vcl", "vcl", "discarded_vcl", stats->n_vcl_discard); + } + + if (conf->collect_workers) { /* worker threads */ - varnish_submit_gauge (conf->instance, "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, "total_threads", "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, "total_threads", "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, "total_threads", "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, "total_requests", "worker-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, "total_requests", "worker-overflowed", VSL_stats->n_wrk_overflow); - /* dropped work requests */ - varnish_submit_gauge (conf->instance, "total_requests", "worker-dropped", VSL_stats->n_wrk_drop); + varnish_submit_derive (conf->instance, "workers", "total_requests", "overflowed", stats->n_wrk_overflow); +#else + /* queued work requests */ + varnish_submit_derive (conf->instance, "workers", "total_requests", "queued", stats->n_wrk_queued); + /* work request queue length */ + varnish_submit_derive (conf->instance, "workers", "total_requests", "queue_length", stats->n_wrk_lqueue); +#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 varnish_stats *VSL_stats; + 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) /* {{{ */ +{ + const c_varnish_stats_t *stats; + user_config_t *conf; if ((ud == NULL) || (ud->data == NULL)) @@ -380,18 +515,19 @@ static int varnish_read(user_data_t *ud) /* {{{ */ 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) /* {{{ */ { @@ -412,15 +548,31 @@ static int varnish_config_apply_default (user_config_t *conf) /* {{{ */ conf->collect_backend = 1; conf->collect_cache = 1; conf->collect_connections = 1; +#ifdef HAVE_VARNISH_V3 + conf->collect_dirdns = 0; +#endif conf->collect_esi = 0; conf->collect_fetch = 0; conf->collect_hcb = 0; + conf->collect_objects = 0; +#if HAVE_VARNISH_V2 + conf->collect_purge = 0; +#else + conf->collect_ban = 0; +#endif + conf->collect_session = 0; conf->collect_shm = 1; +#if HAVE_VARNISH_V2 conf->collect_sm = 0; conf->collect_sma = 0; +#endif conf->collect_sms = 0; + conf->collect_struct = 0; conf->collect_totals = 0; - + conf->collect_uptime = 0; + conf->collect_vcl = 0; + conf->collect_workers = 0; + return (0); } /* }}} int varnish_config_apply_default */ @@ -504,28 +656,53 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ cf_util_get_boolean (child, &conf->collect_connections); else if (strcasecmp ("CollectESI", child->key) == 0) cf_util_get_boolean (child, &conf->collect_esi); +#ifdef HAVE_VARNISH_V3 + else if (strcasecmp ("CollectDirectorDNS", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_dirdns); +#endif else if (strcasecmp ("CollectBackend", child->key) == 0) cf_util_get_boolean (child, &conf->collect_backend); else if (strcasecmp ("CollectFetch", child->key) == 0) cf_util_get_boolean (child, &conf->collect_fetch); else if (strcasecmp ("CollectHCB", child->key) == 0) cf_util_get_boolean (child, &conf->collect_hcb); + else if (strcasecmp ("CollectObjects", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_objects); +#if HAVE_VARNISH_V2 + else if (strcasecmp ("CollectPurge", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_purge); +#else + else if (strcasecmp ("CollectBan", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_ban); +#endif + else if (strcasecmp ("CollectSession", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_session); 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 ("CollectStruct", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_struct); else if (strcasecmp ("CollectTotals", child->key) == 0) cf_util_get_boolean (child, &conf->collect_totals); + else if (strcasecmp ("CollectUptime", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_uptime); + else if (strcasecmp ("CollectVCL", child->key) == 0) + cf_util_get_boolean (child, &conf->collect_vcl); 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 " + "block around the configuration?", child->key); } } @@ -534,13 +711,28 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ && !conf->collect_connections && !conf->collect_esi && !conf->collect_backend +#ifdef HAVE_VARNISH_V3 + && !conf->collect_dirdns +#endif && !conf->collect_fetch && !conf->collect_hcb + && !conf->collect_objects +#if HAVE_VARNISH_V2 + && !conf->collect_purge +#else + && !conf->collect_ban +#endif + && !conf->collect_session && !conf->collect_shm - && !conf->collect_sma && !conf->collect_sms +#if HAVE_VARNISH_V2 + && !conf->collect_sma && !conf->collect_sm +#endif + && !conf->collect_struct && !conf->collect_totals + && !conf->collect_uptime + && !conf->collect_vcl && !conf->collect_workers) { WARNING ("Varnish plugin: No metric has been configured for " @@ -589,7 +781,7 @@ static int varnish_config (oconfig_item_t *ci) /* {{{ */ void module_register (void) /* {{{ */ { - plugin_register_complex_config("varnish", varnish_config); + plugin_register_complex_config ("varnish", varnish_config); plugin_register_init ("varnish", varnish_init); } /* }}} */