From bd48c06f9509a19fc20a4482cfe065fe81285e61 Mon Sep 17 00:00:00 2001 From: Sven Grossmann Date: Tue, 6 Feb 2024 07:11:54 +0100 Subject: [PATCH] Elasticsearch: Set middlewares from Grafana's `httpClientProvider` (#81814) Elasticsearch: Set middlewares from httpClientProvider --- pkg/tsdb/elasticsearch/elasticsearch.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go index 31a907cc2fb..a60af5d9793 100644 --- a/pkg/tsdb/elasticsearch/elasticsearch.go +++ b/pkg/tsdb/elasticsearch/elasticsearch.go @@ -16,6 +16,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend/datasource" + sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt" exphttpclient "github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource/httpclient" @@ -88,6 +89,8 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst httpCliOpts.SigV4.Service = "es" } + // set the default middlewars from the httpClientProvider + httpCliOpts.Middlewares = httpClientProvider.(*sdkhttpclient.Provider).Opts.Middlewares // enable experimental http client to support errors with source httpCli, err := exphttpclient.New(httpCliOpts) if err != nil {