From ba54d4223e625f9604bb7c14ad7382f1dcc094e5 Mon Sep 17 00:00:00 2001 From: Player256 Date: Mon, 25 Sep 2023 22:36:17 +0530 Subject: [PATCH 1/5] added tls_config Signed-off-by: Player256 --- cmd/thanos/query_frontend.go | 4 +++- pkg/queryfrontend/config.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/thanos/query_frontend.go b/cmd/thanos/query_frontend.go index 82c06c4b56..4bb3bf5873 100644 --- a/cmd/thanos/query_frontend.go +++ b/cmd/thanos/query_frontend.go @@ -180,7 +180,9 @@ func parseTransportConfiguration(downstreamTripperConfContentYaml []byte) (*http if err := yaml.UnmarshalStrict(downstreamTripperConfContentYaml, tripperConfig); err != nil { return nil, errors.Wrap(err, "parsing downstream tripper config YAML file") } - + if tripperConfig.TLSConfig != nil { + downstreamTripper.TLSClientConfig = tripperConfig.TLSConfig + } if tripperConfig.IdleConnTimeout > 0 { downstreamTripper.IdleConnTimeout = time.Duration(tripperConfig.IdleConnTimeout) } diff --git a/pkg/queryfrontend/config.go b/pkg/queryfrontend/config.go index a56551995c..d30ea3ea7f 100644 --- a/pkg/queryfrontend/config.go +++ b/pkg/queryfrontend/config.go @@ -4,6 +4,7 @@ package queryfrontend import ( + "crypto/tls" "strings" "time" @@ -186,6 +187,7 @@ type DownstreamTripperConfig struct { MaxIdleConns *int `yaml:"max_idle_conns"` MaxIdleConnsPerHost *int `yaml:"max_idle_conns_per_host"` MaxConnsPerHost *int `yaml:"max_conns_per_host"` + TLSConfig *tls.Config `yaml:"tls_config"` CachePathOrContent extflag.PathOrContent } From da7c4125ddb640961618c75fa84906fb9d85a4bf Mon Sep 17 00:00:00 2001 From: Player256 Date: Tue, 26 Sep 2023 14:00:23 +0530 Subject: [PATCH 2/5] changed the struct type of TLSConfig Signed-off-by: Player256 --- cmd/thanos/query_frontend.go | 8 +++++--- pkg/queryfrontend/config.go | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/thanos/query_frontend.go b/cmd/thanos/query_frontend.go index 4bb3bf5873..023d952671 100644 --- a/cmd/thanos/query_frontend.go +++ b/cmd/thanos/query_frontend.go @@ -25,6 +25,7 @@ import ( cortexvalidation "github.com/thanos-io/thanos/internal/cortex/util/validation" "github.com/thanos-io/thanos/pkg/api" "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/exthttp" "github.com/thanos-io/thanos/pkg/extkingpin" "github.com/thanos-io/thanos/pkg/extprom" extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" @@ -180,9 +181,10 @@ func parseTransportConfiguration(downstreamTripperConfContentYaml []byte) (*http if err := yaml.UnmarshalStrict(downstreamTripperConfContentYaml, tripperConfig); err != nil { return nil, errors.Wrap(err, "parsing downstream tripper config YAML file") } - if tripperConfig.TLSConfig != nil { - downstreamTripper.TLSClientConfig = tripperConfig.TLSConfig - } + _, err := exthttp.NewTLSConfig(tripperConfig.TLSConfig) + if err != nil { + downstreamTripper.TLSClientConfig, _ = exthttp.NewTLSConfig(tripperConfig.TLSConfig) + } if tripperConfig.IdleConnTimeout > 0 { downstreamTripper.IdleConnTimeout = time.Duration(tripperConfig.IdleConnTimeout) } diff --git a/pkg/queryfrontend/config.go b/pkg/queryfrontend/config.go index d30ea3ea7f..60b38a190d 100644 --- a/pkg/queryfrontend/config.go +++ b/pkg/queryfrontend/config.go @@ -4,7 +4,6 @@ package queryfrontend import ( - "crypto/tls" "strings" "time" @@ -22,6 +21,7 @@ import ( "github.com/thanos-io/thanos/internal/cortex/util/flagext" cortexvalidation "github.com/thanos-io/thanos/internal/cortex/util/validation" "github.com/thanos-io/thanos/pkg/cacheutil" + "github.com/thanos-io/thanos/pkg/exthttp" "github.com/thanos-io/thanos/pkg/model" ) @@ -187,7 +187,7 @@ type DownstreamTripperConfig struct { MaxIdleConns *int `yaml:"max_idle_conns"` MaxIdleConnsPerHost *int `yaml:"max_idle_conns_per_host"` MaxConnsPerHost *int `yaml:"max_conns_per_host"` - TLSConfig *tls.Config `yaml:"tls_config"` + TLSConfig *exthttp.TLSConfig `yaml:"tls_config"` CachePathOrContent extflag.PathOrContent } From b92b13c3ffbb226c24663265f0972daad24fe2e5 Mon Sep 17 00:00:00 2001 From: Player256 Date: Wed, 27 Sep 2023 20:54:04 +0530 Subject: [PATCH 3/5] added the entry to changelog Signed-off-by: Player256 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93b09d4732..1285b0eac4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,12 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#6605](https://github.com/thanos-io/thanos/pull/6605) Query Frontend: Support vertical sharding binary expression with metric name when no matching labels specified. - [#6308](https://github.com/thanos-io/thanos/pull/6308) Ruler: Support configuration flag that allows customizing template for alert message. +<<<<<<< HEAD - [#6749](https://github.com/thanos-io/thanos/pull/6308) Store Gateway: Added `thanos_store_index_cache_fetch_duration_seconds` histogram for tracking latency of fetching data from index cache. +======= +- [#6751](https://github.com/thanos-io/thanos/pull/6751) Query Frontend: Added TLS support in `--query-frontend.downstream-tripper-config` and `--query-frontend.downstream-tripper-config-file` +>>>>>>> fefffe47 (added the entry to changelog) ### Changed - [#6698](https://github.com/thanos-io/thanos/pull/6608) Receive: Change write log level from warn to info. From e33b9ba12e063b3ba045e3bd2557afba751f11c5 Mon Sep 17 00:00:00 2001 From: space_samurai <92082372+Player256@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:38:55 +0530 Subject: [PATCH 4/5] Update cmd/thanos/query_frontend.go Co-authored-by: Saswata Mukherjee Signed-off-by: space_samurai <92082372+Player256@users.noreply.github.com> --- cmd/thanos/query_frontend.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/thanos/query_frontend.go b/cmd/thanos/query_frontend.go index 023d952671..9f35b070cf 100644 --- a/cmd/thanos/query_frontend.go +++ b/cmd/thanos/query_frontend.go @@ -181,10 +181,13 @@ func parseTransportConfiguration(downstreamTripperConfContentYaml []byte) (*http if err := yaml.UnmarshalStrict(downstreamTripperConfContentYaml, tripperConfig); err != nil { return nil, errors.Wrap(err, "parsing downstream tripper config YAML file") } - _, err := exthttp.NewTLSConfig(tripperConfig.TLSConfig) + if tripperConfig.TLSConfig != nil { + tlsConfig, err := exthttp.NewTLSConfig(tripperConfig.TLSConfig) if err != nil { - downstreamTripper.TLSClientConfig, _ = exthttp.NewTLSConfig(tripperConfig.TLSConfig) + return nil, errors.Wrap(err, "parsing downstream tripper TLS config YAML") } + downstreamTripper.TLSClientConfig = tlsConfig + } if tripperConfig.IdleConnTimeout > 0 { downstreamTripper.IdleConnTimeout = time.Duration(tripperConfig.IdleConnTimeout) } From fa4c88d5d1bebd1ac29b59dd7b47e9e3c5b5703c Mon Sep 17 00:00:00 2001 From: Player256 Date: Fri, 29 Sep 2023 03:27:26 +0530 Subject: [PATCH 5/5] removed git artefacts Signed-off-by: Player256 --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1285b0eac4..cf84c10488 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,12 +16,9 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#6605](https://github.com/thanos-io/thanos/pull/6605) Query Frontend: Support vertical sharding binary expression with metric name when no matching labels specified. - [#6308](https://github.com/thanos-io/thanos/pull/6308) Ruler: Support configuration flag that allows customizing template for alert message. -<<<<<<< HEAD - [#6749](https://github.com/thanos-io/thanos/pull/6308) Store Gateway: Added `thanos_store_index_cache_fetch_duration_seconds` histogram for tracking latency of fetching data from index cache. - -======= - [#6751](https://github.com/thanos-io/thanos/pull/6751) Query Frontend: Added TLS support in `--query-frontend.downstream-tripper-config` and `--query-frontend.downstream-tripper-config-file` ->>>>>>> fefffe47 (added the entry to changelog) + ### Changed - [#6698](https://github.com/thanos-io/thanos/pull/6608) Receive: Change write log level from warn to info.