mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #7225 from prometheus/release-2.18

Browse source 
[Merge without Squash] Merge release-2.18 back to master for 2.18.1 fixes.
This commit is contained in:
Julien Pivotto 2020-05-07 21:23:59 +02:00 committed by GitHub
parent b03bc16623 ecee9c8abf
commit 9e265aba10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## 2.18.1 / 2020-05-07
* [BUGFIX] TSDB: Fixed snapshot API. #7217
## 2.18.0 / 2020-05-05 ## 2.18.0 / 2020-05-05
* [CHANGE] Federation: Only use local TSDB for federation (ignore remote read). #7077 * [CHANGE] Federation: Only use local TSDB for federation (ignore remote read). #7077

2
VERSION
View file

@ -1 +1 @@
2.18.0 2.18.1

1
cmd/prometheus/main.go
View file

@ -389,6 +389,7 @@ func main() {
cfg.web.Context = ctxWeb cfg.web.Context = ctxWeb
cfg.web.TSDBRetentionDuration = cfg.tsdb.RetentionDuration cfg.web.TSDBRetentionDuration = cfg.tsdb.RetentionDuration
cfg.web.TSDBMaxBytes = cfg.tsdb.MaxBytes cfg.web.TSDBMaxBytes = cfg.tsdb.MaxBytes
cfg.web.TSDBDir = cfg.localStoragePath
cfg.web.LocalStorage = localStorage cfg.web.LocalStorage = localStorage
cfg.web.Storage = fanoutStorage cfg.web.Storage = fanoutStorage
cfg.web.QueryEngine = queryEngine cfg.web.QueryEngine = queryEngine