upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-28 04:02:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge back release-2.36 (#10850)

Browse source 
* Fix UI build (#10842)

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

* Add --lint-fatal option (#10815) (#10840)

This keeps the previous behaviour of printing details about duplicate
rules but doesn't exit with a fatal exit code unless turned on.

Signed-off-by: David Leadbeater <dgl@dgl.cx>

Co-authored-by: David Leadbeater <dgl@dgl.cx>

* Add v2.36.1 CHANGELOG and VERSION update

Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>

Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
Co-authored-by: David Leadbeater <dgl@dgl.cx>
This commit is contained in:
Julien Pivotto 2022-06-09 18:09:44 +02:00 committed by GitHub
commit a84c472745
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Changelog
## 2.36.1 / 2022-06-09
* [BUGFIX] promtool: Add --lint-fatal option #10840
## 2.36.0 / 2022-05-30
* [FEATURE] Add lowercase and uppercase relabel action. #10641

2
VERSION
View file

@ -1 +1 @@
2.36.0
2.36.1