plugin/template: update metrics to include server (#1731)

Add server label to the metrics and update the README.

1 files changed, 7 insertions, 8 deletions

diff --git a/plugin/template/metrics.go b/plugin/template/metrics.go
index bc2594782..25474fc6c 100644
--- a/plugin/template/metrics.go
+++ b/plugin/template/metrics.go
@@ -10,33 +10,32 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-// Metrics for template.
 var (
-	TemplateMatchesCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	templateMatchesCount = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "template",
 		Name:      "matches_total",
 		Help:      "Counter of template regex matches.",
-	}, []string{"zone", "class", "type"})
-	TemplateFailureCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	}, []string{"server", "zone", "class", "type"})
+	templateFailureCount = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "template",
 		Name:      "template_failures_total",
 		Help:      "Counter of go template failures.",
-	}, []string{"zone", "class", "type", "section", "template"})
-	TemplateRRFailureCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	}, []string{"server", "zone", "class", "type", "section", "template"})
+	templateRRFailureCount = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "template",
 		Name:      "rr_failures_total",
 		Help:      "Counter of mis-templated RRs.",
-	}, []string{"zone", "class", "type", "section", "template"})
+	}, []string{"server", "zone", "class", "type", "section", "template"})
 )
 
 // OnStartupMetrics sets up the metrics on startup.
 func setupMetrics(c *caddy.Controller) error {
 	c.OnStartup(func() error {
 		metricsOnce.Do(func() {
-			metrics.MustRegister(c, TemplateMatchesCount, TemplateFailureCount, TemplateRRFailureCount)
+			metrics.MustRegister(c, templateMatchesCount, templateFailureCount, templateRRFailureCount)
 		})
 		return nil
 	})