From ebbc6ed21faffb7405d02efc99aec8082b1810c3 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 14 Sep 2026 20:41:44 -0700 Subject: [PATCH] s3: expose /metrics on main HTTP port Allows the admin server to scrape S3 API server metrics without a separate -metricsPort. Placed alongside /status and /healthz. --- weed/s3api/s3api_server.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index baefc8218..c12290c41 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -16,6 +16,7 @@ import ( "time" "github.com/gorilla/mux" + "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" "github.com/seaweedfs/seaweedfs/weed/cluster" @@ -33,6 +34,7 @@ import ( . "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/s3api/s3err" "github.com/seaweedfs/seaweedfs/weed/security" + stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util/chunk_cache" "github.com/seaweedfs/seaweedfs/weed/util/grace" @@ -788,6 +790,7 @@ func (s3a *S3ApiServer) registerRouter(router *mux.Router) { apiRouter.Methods(http.MethodGet, http.MethodHead).Path("/status").HandlerFunc(s3a.StatusHandler) apiRouter.Methods(http.MethodGet, http.MethodHead).Path("/healthz").HandlerFunc(s3a.StatusHandler) apiRouter.Methods(http.MethodGet, http.MethodHead).Path("/readyz").HandlerFunc(s3a.StatusHandler) + apiRouter.Methods(http.MethodGet).Path("/metrics").Handler(promhttp.HandlerFor(stats_collect.Gather, promhttp.HandlerOpts{})) // Object path pattern with (?s) flag to match newlines in object keys const objectPath = "/{object:(?s).+}"