mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #2836 from brancz/cut-1.7.1

Browse source 
cut 1.7.1
This commit is contained in:
Frederic Branczyk 2017-06-12 13:41:21 +02:00 committed by GitHub
parent bfa37c8ee3 aef7104791
commit 3afb3fffa3
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## 1.7.1 / 2017-06-12
* [BUGFIX] Fix double prefix redirect.
## 1.7.0 / 2017-06-06 ## 1.7.0 / 2017-06-06
* [CHANGE] Compress remote storage requests and responses with unframed/raw snappy. * [CHANGE] Compress remote storage requests and responses with unframed/raw snappy.

2
VERSION
View file

@ -1 +1 @@
1.7.0 1.7.1

2
web/web.go
View file

@ -171,7 +171,7 @@ func New(o *Options) *Handler {
instrf := prometheus.InstrumentHandlerFunc instrf := prometheus.InstrumentHandlerFunc
router.Get("/", func(w http.ResponseWriter, r *http.Request) { router.Get("/", func(w http.ResponseWriter, r *http.Request) {
router.Redirect(w, r, path.Join(o.ExternalURL.Path, "/graph"), http.StatusFound) http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/graph"), http.StatusFound)
}) })
router.Get("/alerts", instrf("alerts", h.alerts)) router.Get("/alerts", instrf("alerts", h.alerts))