Metrics: Disable toggle. Set default port to 9090

app.go

@@ -72,7 +72,6 @@ const (
 type Config struct {
 	ServerURL                      string
 	Addr                           string
-	MetricsEnabled                 bool
 	MetricsAddr                    string
 	GRPCAddr                       string
 	GRPCAllowInsecure              bool
@@ -658,29 +657,27 @@ func (h *Headscale) Serve() error {
 	log.Info().
 		Msgf("listening and serving HTTP on: %s", h.cfg.Addr)
 
-	if h.cfg.MetricsEnabled {
-		promRouter := h.createPrometheusRouter()
+	promRouter := h.createPrometheusRouter()
 
-		promHTTPServer := &http.Server{
-			Addr:         h.cfg.MetricsAddr,
-			Handler:      promRouter,
-			ReadTimeout:  HTTPReadTimeout,
-			WriteTimeout: 0,
-		}
-
-		var promHTTPListener net.Listener
-		promHTTPListener, err = net.Listen("tcp", h.cfg.MetricsAddr)
-
-		if err != nil {
-			return fmt.Errorf("failed to bind to TCP address: %w", err)
-		}
-
-		errorGroup.Go(func() error { return promHTTPServer.Serve(promHTTPListener) })
-
-		log.Info().
-			Msgf("listening and serving metrics on: %s", h.cfg.MetricsAddr)
+	promHTTPServer := &http.Server{
+		Addr:         h.cfg.MetricsAddr,
+		Handler:      promRouter,
+		ReadTimeout:  HTTPReadTimeout,
+		WriteTimeout: 0,
 	}
 
+	var promHTTPListener net.Listener
+	promHTTPListener, err = net.Listen("tcp", h.cfg.MetricsAddr)
+
+	if err != nil {
+		return fmt.Errorf("failed to bind to TCP address: %w", err)
+	}
+
+	errorGroup.Go(func() error { return promHTTPServer.Serve(promHTTPListener) })
+
+	log.Info().
+		Msgf("listening and serving metrics on: %s", h.cfg.MetricsAddr)
+
 	return errorGroup.Wait()
 }