From d27e7666cc920c752c45caf2cfc1d28986b141ad Mon Sep 17 00:00:00 2001 From: beorn7 Date: Sat, 29 Jan 2022 16:08:32 +0100 Subject: [PATCH 1/2] Bump client_golang to 1.12.1 This pulls in a data-race fix and reduces the excessive number of histogram buckets in the Go runtime metrics. Signed-off-by: beorn7 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8992e7907..11d97be0f 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/opentracing/opentracing-go v1.2.0 github.com/pkg/errors v0.9.1 github.com/prometheus/alertmanager v0.23.0 - github.com/prometheus/client_golang v1.12.0 + github.com/prometheus/client_golang v1.12.1 github.com/prometheus/client_model v0.2.0 github.com/prometheus/common v0.32.1 github.com/prometheus/common/sigv4 v0.1.0 diff --git a/go.sum b/go.sum index 27df90f08..5d4832e5e 100644 --- a/go.sum +++ b/go.sum @@ -1145,8 +1145,8 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= -github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= From ae8603ce34d8fb1358e0e0c5231c7be25906fb78 Mon Sep 17 00:00:00 2001 From: beorn7 Date: Sat, 29 Jan 2022 16:11:12 +0100 Subject: [PATCH 2/2] Cut v2.33.0 Signed-off-by: beorn7 --- CHANGELOG.md | 9 ++------- VERSION | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e87c2d62b..8bb316df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,4 @@ -## 2.33.0-rc.1 / 2022-01-19 - -* [ENHANCEMENT] UI: Debounce search bar. #10157 -* [BUGFIX] TSDB: Fix deadlock from simultaneous GC and write. #10166 -* [BUGFIX] TSDB: Fix minor issues introduced in #10051. #10159 - -## 2.33.0-rc.0 / 2022-01-12 +## 2.33.0 / 2022-01-29 * [CHANGE] PromQL: Promote negative offset and `@` modifer to stable features. #10121 * [CHANGE] Web: Promote remote-write-receiver to stable. #10119 @@ -31,6 +25,7 @@ * [BUGFIX] UI: Fix overlapping click targets for the alert state checkboxes. #10136 * [BUGFIX] UI: Fix _Unhealthy_ filter on target page to actually display only _Unhealthy_ targets. #10103 * [BUGFIX] UI: Fix autocompletion when expression is empty. #10053 +* [BUGFIX] TSDB: Fix deadlock from simultaneous GC and write. #10166 ## 2.32.1 / 2021-12-17 diff --git a/VERSION b/VERSION index 4ae0446d4..3afbaeb2b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.33.0-rc.1 +2.33.0