Support TLS for metrics endpointsid-tls-for-metrics-endpoints

Our monitoring endpoints are HTTP by default.

Let's allow configuring TLS in order to provide TLS on these
endpoints

1 files changed, 5 insertions, 12 deletions

diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go
index 8040a54..bf1fae8 100644
--- a/cmd/gitlab-sshd/main.go
+++ b/cmd/gitlab-sshd/main.go
@@ -12,9 +12,9 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/logger"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/sshd"
+	"gitlab.com/gitlab-org/gitlab-shell/internal/sshd/monitoring"
 
 	"gitlab.com/gitlab-org/labkit/log"
-	"gitlab.com/gitlab-org/labkit/monitoring"
 )
 
 var (
@@ -76,17 +76,10 @@ func main() {
 		log.WithError(err).Fatal("Failed to start GitLab built-in sshd")
 	}
 
-	// Startup monitoring endpoint.
-	if cfg.Server.WebListen != "" {
-		go func() {
-			err := monitoring.Start(
-				monitoring.WithListenerAddress(cfg.Server.WebListen),
-				monitoring.WithBuildInformation(Version, BuildTime),
-				monitoring.WithServeMux(server.MonitoringServeMux()),
-			)
-
-			log.WithError(err).Fatal("monitoring service raised an error")
-		}()
+	listenerConfigFromWebListen := config.ListenerConfig{Addr: cfg.Server.WebListen}
+	webServer := &monitoring.WebServer{ListenerConfigs: append(cfg.Server.WebListeners, listenerConfigFromWebListen)}
+	if err := webServer.Start(Version, BuildTime, server); err != nil {
+		log.WithError(err).Fatal("Failed to start monitoring server")
 	}
 
 	ctx, cancel := context.WithCancel(ctx)