From cac03cc7fee9b4aa8c10d4ec38b6128389039d40 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 27 Sep 2021 09:18:35 -0400 Subject: [PATCH] Elasticsearch/Prometheus: Set correct service namespace for SigV4 (#39439) (#39652) Makes sure to set the SigV4 service namespace for Elasticsearch and Prometheus. Fixes #38440 (cherry picked from commit 45a844e77ee667265a8f27bfa683d8ea8196336d) Co-authored-by: Marcus Efraimsson --- pkg/tsdb/elasticsearch/elasticsearch.go | 5 +++++ pkg/tsdb/prometheus/prometheus.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go index 6dde9658266..e641550d7b0 100644 --- a/pkg/tsdb/elasticsearch/elasticsearch.go +++ b/pkg/tsdb/elasticsearch/elasticsearch.go @@ -84,6 +84,11 @@ func newInstanceSettings() datasource.InstanceFactoryFunc { return nil, fmt.Errorf("error getting http options: %w", err) } + // Set SigV4 service namespace + if httpCliOpts.SigV4 != nil { + httpCliOpts.SigV4.Service = "es" + } + version, err := coerceVersion(jsonData["esVersion"]) if err != nil { diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go index 786c0a81631..e4a786a22cb 100644 --- a/pkg/tsdb/prometheus/prometheus.go +++ b/pkg/tsdb/prometheus/prometheus.go @@ -93,6 +93,11 @@ func newInstanceSettings() datasource.InstanceFactoryFunc { return nil, fmt.Errorf("error getting http options: %w", err) } + // Set SigV4 service namespace + if httpCliOpts.SigV4 != nil { + httpCliOpts.SigV4.Service = "aps" + } + httpMethod, ok := jsonData["httpMethod"].(string) if !ok { httpMethod = defaultHttpMethod