From 538f6b7dd1cdf12f4ba4d9bc786ecc142c215572 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Wed, 9 Sep 2020 17:39:59 +0200 Subject: [PATCH 1/2] Fix missing remote read spans (#7914) (#7916) The remote read client needs to use the nethttp.Transport wrapper in order for spans to be instrumented properly. Signed-off-by: Chris Marchbanks Co-authored-by: Chris Marchbanks --- storage/remote/client.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/storage/remote/client.go b/storage/remote/client.go index 617b7ba67..294601068 100644 --- a/storage/remote/client.go +++ b/storage/remote/client.go @@ -109,6 +109,11 @@ func newReadClient(name string, conf *ClientConfig) (ReadClient, error) { return nil, err } + t := httpClient.Transport + httpClient.Transport = &nethttp.Transport{ + RoundTripper: t, + } + return &Client{ remoteName: name, url: conf.URL, From e83ef207b6c2398919b69cd87d2693cfc2fb4127 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Fri, 11 Sep 2020 13:07:23 +0200 Subject: [PATCH 2/2] Release 2.21.0 (#7925) * Release 2.21.0 Signed-off-by: Julien Pivotto --- CHANGELOG.md | 11 ++++++----- VERSION | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 601fbbf77..3e9e29d0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,13 @@ -## 2.21.0-rc.1 / 2020-09-08 +## 2.21.0 / 2020-09-11 -This release is built with Go 1.15, which deprecates [X.509 -CommonName](https://golang.org/doc/go1.15#commonname) in TLS certificates -validation. +This release is built with Go 1.15, which deprecates [X.509 CommonName](https://golang.org/doc/go1.15#commonname) +in TLS certificates validation. In the unlikely case that you use the gRPC API v2 (which is limited to TSDB admin commands), please note that we will remove this experimental API in the next minor release 2.22. -* [CHANGE] Disable HTTP2 because of concerns with the Go HTTP/2 client. #7588 #7701 +* [CHANGE] Disable HTTP/2 because of concerns with the Go HTTP/2 client. #7588 #7701 * [CHANGE] PromQL: `query_log_file` path is now relative to the config file. #7701 * [CHANGE] Promtool: Replace the tsdb command line tool by a promtool tsdb subcommand. #6088 * [CHANGE] Rules: Label `rule_group_iterations` metric with group name. #7823 @@ -27,6 +26,7 @@ next minor release 2.22. * [BUGFIX] API: Deduplicate series in /api/v1/series. #7862 * [BUGFIX] PromQL: Drop metric name in bool comparison between two instant vectors. #7819 * [BUGFIX] PromQL: Exit with an error when time parameters can't be parsed. #7505 +* [BUGFIX] Remote read: Re-add accidentally removed tracing for remote-read requests. #7916 * [BUGFIX] Rules: Detect extra fields in rule files. #7767 * [BUGFIX] Rules: Disallow overwriting the metric name in the `labels` section of recording rules. #7787 * [BUGFIX] Rules: Keep evaluation timestamp across reloads. #7775 @@ -35,6 +35,7 @@ next minor release 2.22. * [BUGFIX] TSDB: Delete blocks atomically to prevent corruption when there is a panic/crash during deletion. #7772 * [BUGFIX] Triton SD: Fix a panic when triton_sd_config is nil. #7671 * [BUGFIX] UI: Fix react UI bug with series going on and off. #7804 +* [BUGFIX] UI: Fix styling bug for target labels with special names in React UI. #7902 * [BUGFIX] Web: Stop CMUX and GRPC servers even with stale connections, preventing the server to stop on SIGTERM. #7810 ## 2.20.1 / 2020-08-05 diff --git a/VERSION b/VERSION index db14e268e..db65e2167 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.21.0-rc.1 +2.21.0