RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-01-11 08:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7644 from prometheus/release-2.20

Browse Source 
Merge release 2.20 into master
This commit is contained in:
Julien Pivotto 2020-07-23 09:47:47 +02:00 committed by GitHub
commit 610b622520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -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

2
VERSION
View File

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

6
config/config.go
View File

@ -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)
}