From 4dc28cfec5e0fbb3bb317a5f09ae684e8c6f1eac Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 23 Jan 2023 18:00:37 +0200 Subject: [PATCH] [v9.3.x] Elasticsearch: Fix failing requests when using SigV4 (#61933) Elasticsearch: Fix failing requests when using SigV4 (#61923) fix setting of `es` servicename (cherry picked from commit c5610450b2f04a48859f2d77c65083692988f7be) Co-authored-by: Sven Grossmann --- pkg/tsdb/elasticsearch/elasticsearch.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go index 6dc8eef3538..67453a5f123 100644 --- a/pkg/tsdb/elasticsearch/elasticsearch.go +++ b/pkg/tsdb/elasticsearch/elasticsearch.go @@ -73,16 +73,16 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst return nil, fmt.Errorf("error getting http options: %w", err) } - httpCli, err := httpClientProvider.New(httpCliOpts) - if err != nil { - return nil, err - } - // Set SigV4 service namespace if httpCliOpts.SigV4 != nil { httpCliOpts.SigV4.Service = "es" } + httpCli, err := httpClientProvider.New(httpCliOpts) + if err != nil { + return nil, err + } + version, err := coerceVersion(jsonData["esVersion"]) if err != nil { return nil, fmt.Errorf("elasticsearch version is required, err=%v", err)