Browse Source

Use common version for prometheus build_info

Ask Bjørn Hansen 2 years ago
parent
commit
33307690c2
1 changed files with 9 additions and 7 deletions
  1. 9 7
      server/server.go

+ 9 - 7
server/server.go

@@ -10,6 +10,7 @@ import (
 	"github.com/abh/geodns/v3/monitor"
 	"github.com/abh/geodns/v3/querylog"
 	"github.com/abh/geodns/v3/zones"
+	"go.ntppool.org/common/version"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/miekg/dns"
@@ -45,20 +46,21 @@ func NewServer(si *monitor.ServerInfo) *Server {
 	)
 	prometheus.MustRegister(queries)
 
-	buildInfo := prometheus.NewGaugeVec(
+	version.RegisterMetric("geodns", prometheus.DefaultRegisterer)
+
+	instanceInfo := prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
-			Name: "geodns_build_info",
-			Help: "GeoDNS build information (in labels)",
+			Name: "geodns_instance_info",
+			Help: "GeoDNS instance information",
 		},
-		[]string{"Version", "ID", "IP", "Group"},
+		[]string{"ID", "IP", "Group"},
 	)
-	prometheus.MustRegister(buildInfo)
-
+	prometheus.MustRegister(instanceInfo)
 	group := ""
 	if len(si.Groups) > 0 {
 		group = si.Groups[0]
 	}
-	buildInfo.WithLabelValues(si.Version, si.ID, si.IP, group).Set(1)
+	instanceInfo.WithLabelValues(si.ID, si.IP, group).Set(1)
 
 	startTime := prometheus.NewGauge(
 		prometheus.GaugeOpts{