Merge pull request #7644 from prometheus/release-2.20

Merge release 2.20 into master

CHANGELOG.md

@@ -1,11 +1,4 @@
-## 2.20.0-rc.1 / 2020-07-20
+## 2.20.0 / 2020-07-22
-
-* [ENHANCEMENT] SD: Improve Docker Swarm example. #7608
-* [ENHANCEMENT] SD: Enable use of Unix socket for Docker Swarm. #7604
-* [BUGFIX] SD: Don't panic on an empty Docker Swarm config. #7615
-* [BUGFIX] TSDB: Don't panic on WAL corruptions. #7550
-
-## 2.20.0-rc.0 / 2020-07-16
 
 This release changes WAL compression from opt-in to default. WAL compression will prevent a downgrade to v2.10 or earlier without deleting the WAL. Disable WAL compression explicitly by setting the command line flag `--no-storage.tsdb.wal-compression` if you require downgrading to v2.10 or earlier.
 
@@ -36,6 +29,7 @@ This release changes WAL compression from opt-in to default. WAL compression wil
 * [BUGFIX] PromQL: Fixed off-by-one error in `histogram_quantile`. #7393
 * [BUGFIX] promtool: Support extended durations in rules unit tests. #6297
 * [BUGFIX] Scrape: Fix undercounting for `scrape_samples_post_metric_relabeling` in case of errors. #7342
+* [BUGFIX] TSDB: Don't panic on WAL corruptions. #7550
 * [BUGFIX] TSDB: Avoid leaving behind empty files in `chunks_head`, causing startup failures. #7573
 * [BUGFIX] TSDB: Fixed race between compact (gc, populate) and head append causing unknown symbol error. #7560
 * [BUGFIX] TSDB: Fixed unknown symbol error during head compaction. #7526

VERSION

@@ -1 +1 @@
-2.20.0-rc.1
+2.20.0

config/config.go

@@ -179,6 +179,12 @@ func resolveFilepaths(baseDir string, cfg *Config) {
 		for _, consulcfg := range cfg.ConsulSDConfigs {
 			tlsPaths(&consulcfg.TLSConfig)
 		}
+		for _, digitaloceancfg := range cfg.DigitalOceanSDConfigs {
+			clientPaths(&digitaloceancfg.HTTPClientConfig)
+		}
+		for _, dockerswarmcfg := range cfg.DockerSwarmSDConfigs {
+			clientPaths(&dockerswarmcfg.HTTPClientConfig)
+		}
 		for _, cfg := range cfg.OpenstackSDConfigs {
 			tlsPaths(&cfg.TLSConfig)
 		}