From e575ee51ec79fc2e69bd2fbe5c4239c8e0cb08ad Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Sat, 14 Dec 2019 10:02:45 +0100 Subject: [PATCH] Use the same namespace for collector and version. Signed-off-by: Ben Kochie --- pkg/poller/prometheus.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/poller/prometheus.go b/pkg/poller/prometheus.go index 92563de5..a0ffb818 100644 --- a/pkg/poller/prometheus.go +++ b/pkg/poller/prometheus.go @@ -18,15 +18,16 @@ const oneDecimalPoint = 10 func (u *UnifiPoller) RunPrometheus() error { u.Logf("Exporting Measurements for Prometheus at https://%s/metrics", u.Config.HTTPListen) http.Handle("/metrics", promhttp.Handler()) + ns := strings.Replace(u.Config.Namespace, "-", "", -1) prometheus.MustRegister(promunifi.NewUnifiCollector(promunifi.UnifiCollectorCnfg{ - Namespace: strings.Replace(u.Config.Namespace, "-", "", -1), + Namespace: ns, CollectFn: u.ExportMetrics, LoggingFn: u.LogExportReport, ReportErrors: true, // XXX: Does this need to be configurable? })) version.Version = Version - prometheus.MustRegister(version.NewCollector("unifipoller")) + prometheus.MustRegister(version.NewCollector(ns)) return http.ListenAndServe(u.Config.HTTPListen, nil) }