mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-12-04 09:01:02 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
merge release 3.7 branch before 3.7.3 to main
This commit is contained in:
George Krajcsovits 2025-10-29 15:02:02 +01:00 committed by GitHub
commit 976728a1d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml vendored
View File

@ -1,3 +1,5 @@
scrape_configs: scrape_configs:
- job_name: too_long_scrape_interval_test - job_name: too_long_scrape_interval_test
scrape_interval: 10m scrape_interval: 10m
rule_files:
- prometheus-config.rules.good.yml

3
cmd/promtool/testdata/prometheus-config.rules.good.yml vendored Normal file
View File

@ -0,0 +1,3 @@
groups:
- name: rules
rules: []

4
web/web.go
View File

@ -418,12 +418,12 @@ func New(logger *slog.Logger, o *Options) *Handler {
readyf := h.testReady readyf := h.testReady
router.Get("/", func(w http.ResponseWriter, r *http.Request) { 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 { if !o.UseOldUI {
router.Get("/graph", func(w http.ResponseWriter, r *http.Request) { 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)
}) })
} }