Merge pull request #7225 from prometheus/release-2.18

[Merge without Squash] Merge release-2.18 back to master for 2.18.1 fixes.

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

VERSION

@@ -1 +1 @@
-2.18.0
+2.18.1

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