X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvarnish.c;h=724b4faa024df5b3ecfd8b8e006fd1b432314fd3;hb=37e18082cfb22491138e282074c5267df48dd8de;hp=33c57ec9040170dfc95e4645442b9d5d26e4abce;hpb=d14e0f75aefc86eb465fef9ea9ffa75d051311f4;p=collectd.git

diff --git a/src/varnish.c b/src/varnish.c
index 33c57ec9..724b4faa 100644
--- 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", "worker", VSL_stats->n_wrk);
+		/* worker threads created */
+		varnish_submit_gauge (conf->instance, "total_threads", "threads-created", VSL_stats->n_wrk_create);
+		/* worker threads not created */
+		varnish_submit_gauge (conf->instance, "total_threads", "threads-failed", VSL_stats->n_wrk_failed);
+		/* worker threads limited */
+		varnish_submit_gauge (conf->instance, "total_threads", "threads-limited", VSL_stats->n_wrk_max);
+		/* queued work requests */
+		varnish_submit_gauge (conf->instance, "total_requests", "worker-queued", VSL_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);
+	}
 } /* }}} void varnish_monitor */
 
 static int varnish_read(user_data_t *ud) /* {{{ */
@@ -390,10 +409,17 @@ static int varnish_config_apply_default (user_config_t *conf) /* {{{ */
 	if (conf == NULL)
 		return (EINVAL);
 
-	conf->collect_cache = 1;
-	conf->collect_backend = 1;
+	conf->collect_backend     = 1;
+	conf->collect_cache       = 1;
 	conf->collect_connections = 1;
-	conf->collect_shm = 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 */
@@ -441,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;
@@ -492,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 "
@@ -510,9 +540,13 @@ 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)
 	{
-		varnish_config_apply_default (conf);
+		WARNING ("Varnish plugin: No metric has been configured for "
+				"instance \"%s\". Disabling this instance.",
+				(conf->instance == NULL) ? "localhost" : conf->instance);
+		return (EINVAL);
 	}
 
 	ssnprintf (callback_name, sizeof (callback_name), "varnish/%s",