chore: /v2/metrics -> /metrics

Signed-off-by: Eoghan Lawless <[email protected]>

Author: eoghanlawless

api/openapi/openapi.yaml

@@ -618,7 +618,7 @@ paths:
         "500":
           $ref: '#/components/responses/500-InternalServerError'
 
-  /v2/metrics:
+  /metrics:
     get:
       description: Gets the Cluster Manager REST API prometheus metrics.
       security: [] # skips authentication

deployment/charts/cluster-manager/templates/metrics-service.yaml

@@ -14,9 +14,6 @@ spec:
   - path: /metrics
     port: metrics
     scheme: http
-  - path: /v2/metrics
-    port: metrics
-    scheme: http
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}

internal/rest/middleware.go

@@ -15,7 +15,7 @@ import (
 var (
 	ignoredPaths = []string{
 		"/v2/healthz",
-		"/v2/metrics",
+		"/metrics",
 	}
 )
 
@@ -35,7 +35,7 @@ func appendMiddlewares(mw ...middleware) func(http.Handler) http.Handler {
 // logger logs the request and response
 func logger(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/v2/healthz" { // reduce log spam
+		if !slices.Contains(ignoredPaths, r.URL.Path) { // reduce log spam
 			slog.Debug("received request", "method", r.Method, "path", r.URL.Path)
 		}
 		next.ServeHTTP(w, r)

internal/rest/server.go

@@ -122,7 +122,7 @@ func (s *Server) getServerHandler() (http.Handler, error) {
 	router := http.NewServeMux()
 
 	if !s.config.DisableMetrics {
-		router.Handle("/v2/metrics", promhttp.HandlerFor(metrics.GetRegistry(), promhttp.HandlerOpts{}))
+		router.Handle("/metrics", promhttp.HandlerFor(metrics.GetRegistry(), promhttp.HandlerOpts{}))
 	}
 
 	// create the openapi handler with existing router