X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvarnish.c;h=de60e39c7b21759f0fdefb062d3d74475df90fed;hb=3faf514fd9b869cadda0f895e14e5036313c7781;hp=c7db753b8e2cd9b112042610f5cd103203e97c66;hpb=8c31f919ee0986666e49a29f5cffb150c51ca208;p=collectd.git diff --git a/src/varnish.c b/src/varnish.c index c7db753b..de60e39c 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 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,7 +18,9 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Jerome Renard + * Jérôme Renard + * Marc Fournier + * Florian octo Forster **/ /** @@ -58,13 +62,13 @@ * 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 @@ -75,13 +79,13 @@ * n_objsendfile Objects sent with sendfile N * n_objwrite Objects sent with write N * n_objoverflow Objects overflowing workspace N - * s_sess Total Sessions N - * s_req Total Requests N - * s_pipe Total pipe N - * s_pass Total pass N - * s_fetch Total fetch N - * s_hdrbytes Total header bytes N - * s_bodybytes Total body bytes 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 @@ -130,163 +134,275 @@ #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; - _Bool monitor_cache; - _Bool monitor_connections; - _Bool monitor_esi; - _Bool monitor_backend; - _Bool monitor_fetch; - _Bool monitor_hcb; - _Bool monitor_shm; - _Bool monitor_sma; - _Bool monitor_sms; - _Bool monitor_sm; + _Bool collect_cache; + _Bool collect_connections; + _Bool collect_esi; + _Bool collect_backend; + _Bool collect_fetch; + _Bool collect_hcb; + _Bool collect_shm; + _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)); - sstrncpy(vl.plugin, "varnish", sizeof(vl.plugin)); - if (plugin_instance != NULL) - sstrncpy (vl.plugin_instance, plugin_instance, - sizeof (vl.plugin_instance)); + 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->monitor_cache) + if (conf->collect_cache) + { + /* Cache hits */ + varnish_submit_derive (conf->instance, "cache", "cache_result", "hit", stats->cache_hit); + /* Cache misses */ + 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", stats->cache_hitpass); + } + + if (conf->collect_connections) + { + /* Client connections accepted */ + varnish_submit_derive (conf->instance, "connections", "connections", "accepted", stats->client_conn); + /* Connection dropped, no sess */ + varnish_submit_derive (conf->instance, "connections", "connections", "dropped" , stats->client_drop); + /* Client requests received */ + varnish_submit_derive (conf->instance, "connections", "connections", "received", stats->client_req); + } + + if (conf->collect_esi) { - varnish_submit_derive (conf->instance, "varnish_cache_ratio", "cache_hit" , VSL_stats->cache_hit); /* Cache hits */ - varnish_submit_derive (conf->instance, "varnish_cache_ratio", "cache_miss" , VSL_stats->cache_miss); /* Cache misses */ - varnish_submit_derive (conf->instance, "varnish_cache_ratio", "cache_hitpass", VSL_stats->cache_hitpass); /* Cache hits for pass */ + /* ESI parse errors (unlock) */ + 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->monitor_connections) + if (conf->collect_backend) { - varnish_submit_derive (conf->instance, "varnish_connections", "client_connections-accepted", VSL_stats->client_conn); /* Client connections accepted */ - varnish_submit_derive (conf->instance, "varnish_connections", "client_connections-dropped" , VSL_stats->client_drop); /* Connection dropped, no sess */ - varnish_submit_derive (conf->instance, "varnish_connections", "client_connections-received", VSL_stats->client_req); /* Client requests received */ + /* Backend conn. success */ + varnish_submit_derive (conf->instance, "backend", "connections", "success" , stats->backend_conn); + /* Backend conn. not attempted */ + 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" , stats->backend_busy); + /* Backend conn. failures */ + varnish_submit_derive (conf->instance, "backend", "connections", "failures" , stats->backend_fail); + /* Backend conn. reuses */ + varnish_submit_derive (conf->instance, "backend", "connections", "reuses" , stats->backend_reuse); + /* Backend conn. was closed */ + varnish_submit_derive (conf->instance, "backend", "connections", "was-closed" , stats->backend_toolate); + /* Backend conn. recycles */ + 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" , stats->backend_unused); +#endif } - if(conf->monitor_esi) + if (conf->collect_fetch) { - varnish_submit_derive (conf->instance, "varnish_esi", "esi_parsed", VSL_stats->esi_parse); /* Objects ESI parsed (unlock) */ - varnish_submit_derive (conf->instance, "varnish_esi", "esi_errors", VSL_stats->esi_errors); /* ESI parse errors (unlock) */ + /* 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" , stats->fetch_length); + /* 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" , stats->fetch_eof); + /* Fetch bad headers */ + 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" , stats->fetch_close); + /* Fetch pre HTTP/1.1 closed */ + varnish_submit_derive (conf->instance, "fetch", "http_requests", "oldhttp" , stats->fetch_oldhttp); + /* Fetch zero len */ + varnish_submit_derive (conf->instance, "fetch", "http_requests", "zero" , stats->fetch_zero); + /* Fetch failed */ + varnish_submit_derive (conf->instance, "fetch", "http_requests", "failed" , stats->fetch_failed); } - if(conf->monitor_backend) + if (conf->collect_hcb) { - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-success" , VSL_stats->backend_conn); /* Backend conn. success */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-not-attempted", VSL_stats->backend_unhealthy); /* Backend conn. not attempted */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-too-many" , VSL_stats->backend_busy); /* Backend conn. too many */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-failures" , VSL_stats->backend_fail); /* Backend conn. failures */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-reuses" , VSL_stats->backend_reuse); /* Backend conn. reuses */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-was-closed" , VSL_stats->backend_toolate); /* Backend conn. was closed */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-recycles" , VSL_stats->backend_recycle); /* Backend conn. recycles */ - varnish_submit_derive (conf->instance, "varnish_backend_connections", "backend_connections-unused" , VSL_stats->backend_unused); /* Backend conn. unused */ + /* HCB Lookups without lock */ + 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", stats->hcb_lock); + /* HCB Inserts */ + varnish_submit_derive (conf->instance, "hcb", "cache_operation", "insert", stats->hcb_insert); } - if(conf->monitor_fetch) + if (conf->collect_shm) { - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_head" , VSL_stats->fetch_head); /* Fetch head */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_length" , VSL_stats->fetch_length); /* Fetch with length */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_chunked" , VSL_stats->fetch_chunked); /* Fetch chunked */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_eof" , VSL_stats->fetch_eof); /* Fetch EOF */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_bad-headers", VSL_stats->fetch_bad); /* Fetch bad headers */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_close" , VSL_stats->fetch_close); /* Fetch wanted close */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_oldhttp" , VSL_stats->fetch_oldhttp); /* Fetch pre HTTP/1.1 closed */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_zero" , VSL_stats->fetch_zero); /* Fetch zero len */ - varnish_submit_derive (conf->instance, "varnish_fetch", "fetch_failed" , VSL_stats->fetch_failed); /* Fetch failed */ + /* 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" , stats->shm_writes); + /* SHM flushes due to overflow */ + varnish_submit_derive (conf->instance, "shm", "total_operations", "flushes" , stats->shm_flushes); + /* SHM MTX contention */ + 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" , stats->shm_cycles); } - if(conf->monitor_hcb) +#if HAVE_VARNISH_V2 + if (conf->collect_sm) { - varnish_submit_derive (conf->instance, "varnish_hcb", "hcb_nolock", VSL_stats->hcb_nolock); /* HCB Lookups without lock */ - varnish_submit_derive (conf->instance, "varnish_hcb", "hcb_lock" , VSL_stats->hcb_lock); /* HCB Lookups with lock */ - varnish_submit_derive (conf->instance, "varnish_hcb", "hcb_insert", VSL_stats->hcb_insert); /* HCB Inserts */ + /* allocator requests */ + varnish_submit_derive (conf->instance, "sm", "total_requests", "nreq", stats->sm_nreq); + /* outstanding allocations */ + varnish_submit_gauge (conf->instance, "sm", "requests", "outstanding", stats->sm_nobj); + /* bytes allocated */ + varnish_submit_derive (conf->instance, "sm", "total_bytes", "allocated", stats->sm_balloc); + /* bytes free */ + varnish_submit_derive (conf->instance, "sm", "total_bytes", "free", stats->sm_bfree); } - if(conf->monitor_shm) + if (conf->collect_sma) { - varnish_submit_derive (conf->instance, "varnish_shm", "shm_records" , VSL_stats->shm_records); /* SHM records */ - varnish_submit_derive (conf->instance, "varnish_shm", "shm_writes" , VSL_stats->shm_writes); /* SHM writes */ - varnish_submit_derive (conf->instance, "varnish_shm", "shm_flushes" , VSL_stats->shm_flushes); /* SHM flushes due to overflow */ - varnish_submit_derive (conf->instance, "varnish_shm", "shm_contention", VSL_stats->shm_cont); /* SHM MTX contention */ - varnish_submit_derive (conf->instance, "varnish_shm", "shm_cycles" , VSL_stats->shm_cycles); /* SHM cycles through buffer */ + /* SMA allocator requests */ + varnish_submit_derive (conf->instance, "sma", "total_requests", "nreq", stats->sma_nreq); + /* SMA outstanding allocations */ + varnish_submit_gauge (conf->instance, "sma", "requests", "outstanding", stats->sma_nobj); + /* SMA outstanding bytes */ + varnish_submit_gauge (conf->instance, "sma", "bytes", "outstanding", stats->sma_nbytes); + /* SMA bytes allocated */ + varnish_submit_derive (conf->instance, "sma", "total_bytes", "allocated", stats->sma_balloc); + /* SMA bytes free */ + varnish_submit_derive (conf->instance, "sma", "total_bytes", "free" , stats->sma_bfree); } +#endif - if(conf->monitor_sm) + if (conf->collect_sms) { - varnish_submit_derive (conf->instance, "varnish_sm", "sm_nreq" , VSL_stats->sm_nreq); /* allocator requests */ - varnish_submit_gauge (conf->instance, "varnish_sm", "sm_nobj" , VSL_stats->sm_nobj); /* outstanding allocations */ - varnish_submit_gauge (conf->instance, "varnish_sm", "sm_balloc", VSL_stats->sm_balloc); /* bytes allocated */ - varnish_submit_gauge (conf->instance, "varnish_sm", "sm_bfree" , VSL_stats->sm_bfree); /* bytes free */ + /* SMS allocator requests */ + varnish_submit_derive (conf->instance, "sms", "total_requests", "allocator", stats->sms_nreq); + /* SMS outstanding allocations */ + varnish_submit_gauge (conf->instance, "sms", "requests", "outstanding", stats->sms_nobj); + /* SMS outstanding bytes */ + varnish_submit_gauge (conf->instance, "sms", "bytes", "outstanding", stats->sms_nbytes); + /* SMS bytes allocated */ + varnish_submit_derive (conf->instance, "sms", "total_bytes", "allocated", stats->sms_balloc); + /* SMS bytes freed */ + varnish_submit_derive (conf->instance, "sms", "total_bytes", "free", stats->sms_bfree); } - if(conf->monitor_sma) + if (conf->collect_totals) { - varnish_submit_derive (conf->instance, "varnish_sma", "sma_req" , VSL_stats->sma_nreq); /* SMA allocator requests */ - varnish_submit_gauge (conf->instance, "varnish_sma", "sma_nobj" , VSL_stats->sma_nobj); /* SMA outstanding allocations */ - varnish_submit_gauge (conf->instance, "varnish_sma", "sma_nbytes", VSL_stats->sma_nbytes); /* SMA outstanding bytes */ - varnish_submit_gauge (conf->instance, "varnish_sma", "sma_balloc", VSL_stats->sma_balloc); /* SMA bytes allocated */ - varnish_submit_gauge (conf->instance, "varnish_sma", "sma_bfree" , VSL_stats->sma_bfree); /* SMA bytes free */ + /* Total Sessions */ + varnish_submit_derive (conf->instance, "totals", "total_sessions", "sessions", stats->s_sess); + /* Total Requests */ + varnish_submit_derive (conf->instance, "totals", "total_requests", "requests", stats->s_req); + /* Total pipe */ + varnish_submit_derive (conf->instance, "totals", "total_operations", "pipe", stats->s_pipe); + /* Total pass */ + varnish_submit_derive (conf->instance, "totals", "total_operations", "pass", stats->s_pass); + /* Total 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", stats->s_hdrbytes); + /* Total body byte */ + varnish_submit_derive (conf->instance, "totals", "total_bytes", "body-bytes", stats->s_bodybytes); } - if(conf->monitor_sms) + if (conf->collect_workers) { - varnish_submit_derive (conf->instance, "varnish_sms", "sms_nreq" , VSL_stats->sms_nreq); /* SMS allocator requests */ - varnish_submit_gauge (conf->instance, "varnish_sms", "sms_nobj" , VSL_stats->sms_nobj); /* SMS outstanding allocations */ - varnish_submit_gauge (conf->instance, "varnish_sms", "sms_nbytes", VSL_stats->sms_nbytes); /* SMS outstanding bytes */ - varnish_submit_gauge (conf->instance, "varnish_sms", "sms_balloc", VSL_stats->sms_balloc); /* SMS bytes allocated */ - varnish_submit_gauge (conf->instance, "varnish_sms", "sms_bfree" , VSL_stats->sms_bfree); /* SMS bytes freed */ + /* 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 varnish_stats *VSL_stats; + struct VSM_data *vd; + const c_varnish_stats_t *stats; + user_config_t *conf; if ((ud == NULL) || (ud->data == NULL)) @@ -294,18 +410,52 @@ 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 (VSM_n_Arg(vd, conf->instance) == -1) { - ERROR("Varnish plugin : unable to load statistics"); + ERROR ("Varnish plugin : unable to load statistics from instance"); + return (-1); + } + if (VSC_Open (vd, /* diag = */ 1)) + { + ERROR ("varnish plugin: Unable to load statistics."); return (-1); } - varnish_monitor(conf, VSL_stats); + stats = VSC_Main(vd); - return (0); + 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, stats); + + return (0); +} /* }}} */ +#endif static void varnish_config_free (void *ptr) /* {{{ */ { @@ -318,6 +468,28 @@ static void varnish_config_free (void *ptr) /* {{{ */ sfree (conf); } /* }}} */ +static int varnish_config_apply_default (user_config_t *conf) /* {{{ */ +{ + if (conf == NULL) + return (EINVAL); + + conf->collect_backend = 1; + conf->collect_cache = 1; + conf->collect_connections = 1; + conf->collect_esi = 0; + 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 */ + static int varnish_init (void) /* {{{ */ { user_config_t *conf; @@ -333,10 +505,8 @@ static int varnish_init (void) /* {{{ */ /* Default settings: */ conf->instance = NULL; - conf->monitor_cache = 1; - conf->monitor_backend = 1; - conf->monitor_connections = 1; - conf->monitor_shm = 1; + + varnish_config_apply_default (conf); ud.data = conf; ud.free_func = varnish_config_free; @@ -363,6 +533,8 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ memset (conf, 0, sizeof (*conf)); conf->instance = NULL; + varnish_config_apply_default (conf); + if (ci->values_num == 1) { int status; @@ -393,25 +565,31 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("CollectCache", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_cache); + cf_util_get_boolean (child, &conf->collect_cache); else if (strcasecmp ("CollectConnections", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_connections); + cf_util_get_boolean (child, &conf->collect_connections); else if (strcasecmp ("CollectESI", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_esi); + cf_util_get_boolean (child, &conf->collect_esi); else if (strcasecmp ("CollectBackend", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_backend); + cf_util_get_boolean (child, &conf->collect_backend); else if (strcasecmp ("CollectFetch", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_fetch); + cf_util_get_boolean (child, &conf->collect_fetch); else if (strcasecmp ("CollectHCB", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_hcb); + cf_util_get_boolean (child, &conf->collect_hcb); else if (strcasecmp ("CollectSHM", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_shm); - else if (strcasecmp ("CollectSMA", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_sma); + cf_util_get_boolean (child, &conf->collect_shm); else if (strcasecmp ("CollectSMS", child->key) == 0) - cf_util_get_boolean (child, &conf->monitor_sms); + 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->monitor_sm); + 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 " @@ -420,16 +598,20 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */ } } - if (!conf->monitor_cache - && !conf->monitor_connections - && !conf->monitor_esi - && !conf->monitor_backend - && !conf->monitor_fetch - && !conf->monitor_hcb - && !conf->monitor_shm - && !conf->monitor_sma - && !conf->monitor_sms - && !conf->monitor_sm) + if (!conf->collect_cache + && !conf->collect_connections + && !conf->collect_esi + && !conf->collect_backend + && !conf->collect_fetch + && !conf->collect_hcb + && !conf->collect_shm + && !conf->collect_sms +#if HAVE_VARNISH_V2 + && !conf->collect_sma + && !conf->collect_sm +#endif + && !conf->collect_totals + && !conf->collect_workers) { WARNING ("Varnish plugin: No metric has been configured for " "instance \"%s\". Disabling this instance.", @@ -477,7 +659,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); } /* }}} */