Merge pull request #17426 from prometheus/krajo/merge-release-3.7-pre3-to-main

merge release 3.7 branch before 3.7.3 to main
2026-05-28 04:02:21 -04:00 · 2025-10-29 15:02:02 +01:00 · 2025-10-29 15:02:02 +01:00 · 976728a1d9
commit 976728a1d9
parent b004db49af bb8b611d2c
3 changed files with 7 additions and 2 deletions
--- a/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml
+++ b/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml
@ -1,3 +1,5 @@
 scrape_configs:
  - job_name: too_long_scrape_interval_test
    scrape_interval: 10m
+rule_files:
+  - prometheus-config.rules.good.yml
--- a/cmd/promtool/testdata/prometheus-config.rules.good.yml
+++ b/cmd/promtool/testdata/prometheus-config.rules.good.yml
@ -0,0 +1,3 @@
+groups:
+  - name: rules
+    rules: []
--- a/web/web.go
+++ b/web/web.go
@ -418,12 +418,12 @@ func New(logger *slog.Logger, o *Options) *Handler {
 	readyf := h.testReady

 	router.Get("/", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, path.Join(o.RoutePrefix, homePage), http.StatusFound)
+		http.Redirect(w, r, path.Join(o.ExternalURL.Path, homePage), http.StatusFound)
 	})

 	if !o.UseOldUI {
 		router.Get("/graph", func(w http.ResponseWriter, r *http.Request) {
-			http.Redirect(w, r, path.Join(o.RoutePrefix, "/query?"+r.URL.RawQuery), http.StatusFound)
+			http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/query?"+r.URL.RawQuery), http.StatusFound)
 		})
 	}