diff --git a/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml b/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml index 0c85d13f31..fe21d21707 100644 --- 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 diff --git a/cmd/promtool/testdata/prometheus-config.rules.good.yml b/cmd/promtool/testdata/prometheus-config.rules.good.yml new file mode 100644 index 0000000000..4529a3ec86 --- /dev/null +++ b/cmd/promtool/testdata/prometheus-config.rules.good.yml @@ -0,0 +1,3 @@ +groups: + - name: rules + rules: [] diff --git a/web/web.go b/web/web.go index 93de369d31..f6f87e30fe 100644 --- 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) }) }