collectd-nagios: Implement the "-m" option (treat NaNs as critical).

[collectd.git] / src / varnish.c

diff --git a/src/varnish.c b/src/varnish.c
index 9018a0c..956d3e7 100644 (file)
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -336,7 +336,7 @@ static void varnish_monitor(const user_config_t *conf, struct varnish_stats *VSL
        if(conf->collect_totals)
        {
                /* Total Sessions */
-               varnish_submit_derive (conf->instance, "total_counters", "sessions", VSL_stats->s_sess);
+               varnish_submit_derive (conf->instance, "total_sessions", "sessions", VSL_stats->s_sess);
                /* Total Requests */
                varnish_submit_derive (conf->instance, "total_requests", "requests", VSL_stats->s_req);
                /* Total pipe */
@@ -354,19 +354,19 @@ static void varnish_monitor(const user_config_t *conf, struct varnish_stats *VSL
        if(conf->collect_workers)
        {
                /* worker threads */
-               varnish_submit_gauge ( conf->instance, "threads", "threads", VSL_stats-> n_wrk );
+               varnish_submit_gauge (conf->instance, "threads", "worker", VSL_stats->n_wrk);
                /* worker threads created */
-               varnish_submit_gauge ( conf->instance , "threads", "threads-created", VSL_stats-> n_wrk_create );
+               varnish_submit_gauge (conf->instance, "total_threads", "threads-created", VSL_stats->n_wrk_create);
                /* worker threads not created */
-               varnish_submit_gauge ( conf->instance, "threads", "threads-failed", VSL_stats-> n_wrk_failed );
+               varnish_submit_gauge (conf->instance, "total_threads", "threads-failed", VSL_stats->n_wrk_failed);
                /* worker threads limited */
-               varnish_submit_gauge ( conf->instance, "threads", "threads-limited", VSL_stats-> n_wrk_max );
+               varnish_submit_gauge (conf->instance, "total_threads", "threads-limited", VSL_stats->n_wrk_max);
                /* queued work requests */
-               varnish_submit_gauge ( conf->instance, "threads", "queued-requests", VSL_stats-> n_wrk_queue );
+               varnish_submit_gauge (conf->instance, "total_requests", "worker-queued", VSL_stats->n_wrk_queue);
                /* overflowed work requests */
-               varnish_submit_gauge ( conf->instance, "threads", "overflowed-requests", VSL_stats-> n_wrk_overflow );
+               varnish_submit_gauge (conf->instance, "total_requests", "worker-overflowed", VSL_stats->n_wrk_overflow);
                /* dropped work requests */
-               varnish_submit_gauge ( conf->instance, "threads", "dropped-requests", VSL_stats-> n_wrk_drop );
+               varnish_submit_gauge (conf->instance, "total_requests", "worker-dropped", VSL_stats->n_wrk_drop);
        }
 } /* }}} void varnish_monitor */
 
@@ -404,6 +404,26 @@ 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;
+       conf->collect_sm          = 0;
+       conf->collect_sma         = 0;
+       conf->collect_sms         = 0;
+       conf->collect_totals      = 0;
+       
+       return (0);
+} /* }}} int varnish_config_apply_default */
+
 static int varnish_init (void) /* {{{ */
 {
        user_config_t *conf;
@@ -419,10 +439,8 @@ static int varnish_init (void) /* {{{ */
 
        /* Default settings: */
        conf->instance = NULL;
-       conf->collect_cache = 1;
-       conf->collect_backend = 1;
-       conf->collect_connections = 1;
-       conf->collect_shm = 1;
+
+       varnish_config_apply_default (conf);
 
        ud.data = conf;
        ud.free_func = varnish_config_free;
@@ -449,6 +467,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;