From 645b71e9efca534b531221e53058e3345a473dfc Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 7 May 2020 11:03:48 +0200 Subject: [PATCH 1/2] Fix snapshots (#7217) Signed-off-by: Julien Pivotto --- cmd/prometheus/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 2b7038138f..a6b5c0ec07 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -389,6 +389,7 @@ func main() { cfg.web.Context = ctxWeb cfg.web.TSDBRetentionDuration = cfg.tsdb.RetentionDuration cfg.web.TSDBMaxBytes = cfg.tsdb.MaxBytes + cfg.web.TSDBDir = cfg.localStoragePath cfg.web.LocalStorage = localStorage cfg.web.Storage = fanoutStorage cfg.web.QueryEngine = queryEngine From ecee9c8abfd118f139014cb1b174b08db3f342cf Mon Sep 17 00:00:00 2001 From: Bartlomiej Plotka Date: Thu, 7 May 2020 17:47:40 +0100 Subject: [PATCH 2/2] Cut v2.18.1 (#7222) Signed-off-by: Bartlomiej Plotka --- CHANGELOG.md | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfd1ad13c4..aec464e7fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.1 / 2020-05-07 + +* [BUGFIX] TSDB: Fixed snapshot API. #7217 + ## 2.18.0 / 2020-05-05 * [CHANGE] Federation: Only use local TSDB for federation (ignore remote read). #7077 diff --git a/VERSION b/VERSION index cf8690732f..a36e9b0906 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.18.0 +2.18.1