Varnish plugin: Use DERIVE data sources for (most of) the worker thread statistics.

diff --git a/src/types.db b/src/types.db
index c0a30fd..143e72f 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -157,8 +157,9 @@ time_dispersion             seconds:GAUGE:-1000000:1000000
 timeleft               timeleft:GAUGE:0:3600
 time_offset            seconds:GAUGE:-1000000:1000000
 total_bytes            value:DERIVE:0:U
-total_requests         value:DERIVE:0:U
 total_operations       value:DERIVE:0:U
+total_requests         value:DERIVE:0:U
+total_threads          value:DERIVE:0:U
 total_time_in_ms       value:DERIVE:0:U
 total_values           value:DERIVE:0:U
 uptime                 value:GAUGE:0:4294967295

diff --git a/src/varnish.c b/src/varnish.c
index c54cefc..724b4fa 100644 (file)
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -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 */