mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-29 20:27:33 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #4828 from brancz/cherrypick-4826

Browse source 
Cherrypick 4826
This commit is contained in:
Frederic Branczyk 2018-11-06 12:38:56 +01:00 committed by GitHub
parent bb81bac12d 742b071dd1
commit 67dc912ac8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -1,13 +1,6 @@
## 2.5.0-rc.2 / 2018-10-31 ## 2.5.0 / 2018-11-06
* [CHANGE] Group targets by scrape config instead of job name. #4806 #4526 * [CHANGE] Group targets by scrape config instead of job name. #4806 #4526
## 2.5.0-rc.1 / 2018-10-29
* [BUGFIX] Fix accidental breaking change in targets API exposition format. #4783
## 2.5.0-rc.0 / 2018-10-24
* [CHANGE] Marathon SD: Various changes to adapt to Marathon 1.5+. #4499 * [CHANGE] Marathon SD: Various changes to adapt to Marathon 1.5+. #4499
* [CHANGE] Discovery: Split `prometheus_sd_discovered_targets` metric by scrape and notify (Alertmanager SD) as well as by section in the respective configuration. #4753 * [CHANGE] Discovery: Split `prometheus_sd_discovered_targets` metric by scrape and notify (Alertmanager SD) as well as by section in the respective configuration. #4753
* [FEATURE] Add OpenMetrics support for scraping (EXPERIMENTAL). #4700 * [FEATURE] Add OpenMetrics support for scraping (EXPERIMENTAL). #4700

2
VERSION
View file

@ -1 +1 @@
2.5.0-rc.2 2.5.0