Merge remote branch 'jeromer/master' into jr/varnish

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 00fe533..38284ed 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -849,92 +849,18 @@
 #   If you prefer defining another instance you can do
 #   so by using <Instance "myinstance">
 #   <Instance>
-#      Will monitor :
-#        - cache hits
-#        - cache misses
-#        - cache hits for pass
 #      CollectCache true
-#
-#      Will monitor:
-#        - backend connection : success
-#        - backend connection : not attempted
-#        - backend connection : too many
-#        - backend connection : failures
-#        - backend connection : reuses
-#        - backend connection : was closed
-#        - backend connection : recycles
-#        - backend connection : unused
 #      CollectBackend true
-#
-#      Will monitor :
-#        - client connections accepted
-#        - connection dropped
-#        - client requests received
 #      CollectConnections true
-#
-#      Will monitor:
-#        - SHM records
-#        - SHM writes
-#        - SHM flushes due to overflow
-#        - SHM MTX contention
-#        - SHM cycles through buffer
 #      CollectSHM true
-#
-#      Will monitor:
-#        - Objects ESI parsed
-#        - ESI parse errors
 #      CollectESI false
-#
-#      Will monitor:
-#        - fetch head
-#        - fetch with Length
-#        - fetch chunked
-#        - fetch EOF
-#        - fetch had bad headers
-#        - fetch wanted close
-#        - fetch pre HTTP/1.1 closed
-#        - fetch zero length
-#        - fetch failed
 #      CollectFetch false
-#
-#      Will monitor:
-#       - HCB lookups without lock
-#       - HCB lookups with lock
-#       - HCB inserts
 #      CollectHCB false
-#
-#      Will monitor:
-#        - SMA allocator requests
-#        - SMA outstanding allocations
-#        - SMA outstanding bytes
-#        - SMA bytes allocated
-#        - SMA bytes free
 #      CollectSMA false
-#
-#      Will monitor:
-#        - SMS allocator requests
-#        - SMS outstanding allocations
-#        - SMS outstanding bytes
-#        - SMS bytes allocated
-#        - SMS bytes freed
 #      CollectSMS false
-#
-#      Will monitor:
-#        - allocator requests
-#        - outstanding allocations
-#        - bytes allocated
-#        - bytes free
 #      CollectSM false
-#
-#      Will monitor:
-#      - Total Sessions
-#      - Total Requests
-#      - Total pipe
-#      - Total pass
-#      - Total fetch
-#      - Total header bytes
-#      - Total body bytes
 #      CollectTotals false
+#      CollectWorkers false
 #   </Instance>
 #</Plugin>
 

diff --git a/src/varnish.c b/src/varnish.c
index dc92111..c54cefc 100644 (file)
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -59,13 +59,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
@@ -146,6 +146,7 @@ struct user_config_s {
        _Bool collect_sms;
        _Bool collect_sm;
        _Bool collect_totals;
+       _Bool collect_workers;
 };
 typedef struct user_config_s user_config_t; /* }}} */
 
@@ -349,6 +350,24 @@ static void varnish_monitor(const user_config_t *conf, struct varnish_stats *VSL
                /* Total body byte */
                varnish_submit_derive (conf->instance, "total_bytes", "body-bytes", VSL_stats->s_bodybytes);
        }
+
+       if(conf->collect_workers)
+       {
+               /* worker threads */
+               varnish_submit_gauge ( conf->instance, "threads", "threads", VSL_stats-> n_wrk );
+               /* worker threads created */
+               varnish_submit_gauge ( conf->instance , "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 );
+               /* worker threads limited */
+               varnish_submit_gauge ( conf->instance, "threads", "threads-limited", VSL_stats-> n_wrk_max );
+               /* queued work requests */
+               varnish_submit_gauge ( conf->instance, "threads", "queued-requests", VSL_stats-> n_wrk_queue );
+               /* overflowed work requests */
+               varnish_submit_gauge ( conf->instance, "threads", "overflowed-requests", VSL_stats-> n_wrk_overflow );
+               /* dropped work requests */
+               varnish_submit_gauge ( conf->instance, "threads", "dropped-requests", VSL_stats-> n_wrk_drop );
+       }
 } /* }}} void varnish_monitor */
 
 static int varnish_read(user_data_t *ud) /* {{{ */
@@ -501,6 +520,8 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
                        cf_util_get_boolean (child, &conf->collect_sm);
                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 "
@@ -519,7 +540,8 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
                        && !conf->collect_sma
                        && !conf->collect_sms
                        && !conf->collect_sm
-                       && !conf->collect_totals)
+                       && !conf->collect_totals
+                       && !conf->collect_workers)
        {
                WARNING ("Varnish plugin: No metric has been configured for "
                                "instance \"%s\". Disabling this instance.",