feat: add connector build_info

infrahq · Jun 28, 2022 · 9ca7448 · 9ca7448
1 parent dbb6b8b
commit 9ca7448
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/internal/connector/connector.go b/internal/connector/connector.go
@@ -21,7 +21,6 @@ import (
 	"github.com/go-playground/validator/v10"
 	"github.com/goware/urlx"
 	"github.com/infrahq/secrets"
-	"github.com/prometheus/client_golang/prometheus"
 	"gopkg.in/square/go-jose.v2"
 	"gopkg.in/square/go-jose.v2/jwt"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -509,7 +508,7 @@ func Run(ctx context.Context, options Options) error {
 	proxy := httputil.NewSingleHostReverseProxy(proxyHost)
 	proxy.Transport = proxyTransport
 
-	promRegistry := prometheus.NewRegistry()
+	promRegistry := setupMetrics()
 	metricsServer := &http.Server{
 		Addr:     ":9090",
 		Handler:  metrics.NewHandler(promRegistry),

diff --git a/internal/connector/metrics.go b/internal/connector/metrics.go
@@ -0,0 +1,26 @@
+package connector
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+
+	"github.com/infrahq/infra/internal"
+)
+
+func setupMetrics() *prometheus.Registry {
+	registry := prometheus.NewRegistry()
+	factory := promauto.With(registry)
+
+	factory.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: "build",
+		Name:      "info",
+		Help:      "Build information about Infra Connector.",
+	}, []string{"branch", "version", "commit", "date"}).With(prometheus.Labels{
+		"branch":  internal.Branch,
+		"version": internal.FullVersion(),
+		"commit":  internal.Commit,
+		"date":    internal.Date,
+	}).Set(1)
+
+	return registry
+}
diff --git a/internal/server/metrics.go b/internal/server/metrics.go
@@ -11,7 +11,7 @@ import (
 	"github.com/infrahq/infra/internal/server/models"
 )
 
-func SetupMetrics(db *gorm.DB) *prometheus.Registry {
+func setupMetrics(db *gorm.DB) *prometheus.Registry {
 	reg := prometheus.NewRegistry()
 	factory := promauto.With(reg)
 
@@ -21,7 +21,7 @@ func SetupMetrics(db *gorm.DB) *prometheus.Registry {
 		Help:      "Build information about Infra Server.",
 	}, []string{"branch", "version", "commit", "date"}).With(prometheus.Labels{
 		"branch":  internal.Branch,
-		"version": internal.Version,
+		"version": internal.FullVersion(),
 		"commit":  internal.Commit,
 		"date":    internal.Date,
 	}).Set(1)

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -225,7 +225,7 @@ func registerUIRoutes(router *gin.Engine, opts UIOptions) {
 
 func (s *Server) listen() error {
 	ginutil.SetMode()
-	promRegistry := SetupMetrics(s.db)
+	promRegistry := setupMetrics(s.db)
 	router := s.GenerateRoutes(promRegistry)
 
 	metricsServer := &http.Server{