From 0cca23d3ed290fe51a58eef3f9d618c43b2ed030 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Tue, 21 Jul 2020 22:53:42 +0200 Subject: [PATCH 1/2] DigitalOcean, Docker Swarm: properly load files Signed-off-by: Julien Pivotto --- config/config.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/config.go b/config/config.go index 11667a826..f8866ff5d 100644 --- a/config/config.go +++ b/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) } From c7013c0d4ebf5a8a56d269939fa60c2f240f086a Mon Sep 17 00:00:00 2001 From: beorn7 Date: Wed, 22 Jul 2020 17:44:53 +0200 Subject: [PATCH 2/2] Cut final v2.20.0 Signed-off-by: beorn7 --- CHANGELOG.md | 10 ++-------- VERSION | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 946cffa46..a2d89a13c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,4 @@ -## 2.20.0-rc.1 / 2020-07-20 - -* [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 +## 2.20.0 / 2020-07-22 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 diff --git a/VERSION b/VERSION index 6dc61cf46..7329e21c3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.20.0-rc.1 +2.20.0