Cache metrics server (#1746)

* plugin/cache: per server metrics

Use per server metrics in the cache plugin as well. This required
some plumbing changes. Also use request.Request more.

* fix cherry-pick

1 files changed, 1 insertions, 10 deletions

diff --git a/plugin/cache/setup.go b/plugin/cache/setup.go
index 57233bd66..17a588885 100644
--- a/plugin/cache/setup.go
+++ b/plugin/cache/setup.go
@@ -36,21 +36,12 @@ func setup(c *caddy.Controller) error {
 	c.OnStartup(func() error {
 		once.Do(func() {
 			metrics.MustRegister(c,
-				cacheSize, cacheCapacity,
-				cacheHits, cacheMisses,
+				cacheSize, cacheHits, cacheMisses,
 				cachePrefetches, cacheDrops)
 		})
 		return nil
 	})
 
-	// Initialize all counters and gauges.
-	cacheSize.WithLabelValues(Success)
-	cacheSize.WithLabelValues(Denial)
-	cacheCapacity.WithLabelValues(Success).Set(float64(ca.pcap))
-	cacheCapacity.WithLabelValues(Denial).Set(float64(ca.ncap))
-	cacheHits.WithLabelValues(Success)
-	cacheHits.WithLabelValues(Denial)
-
 	return nil
 }