From 24af3593a2e6ad3c706ac6a045ae8851d2599f61 Mon Sep 17 00:00:00 2001 From: Giordano Ricci Date: Mon, 11 Oct 2021 15:53:04 +0100 Subject: [PATCH] AWS: add OpenSearch to AWS services (#40290) --- pkg/models/datasource.go | 1 + pkg/services/datasources/service.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go index 6bcf8726da1..005c4a1bbde 100644 --- a/pkg/models/datasource.go +++ b/pkg/models/datasource.go @@ -17,6 +17,7 @@ const ( DS_ACCESS_DIRECT = "direct" DS_ACCESS_PROXY = "proxy" DS_ES_OPEN_DISTRO = "grafana-es-open-distro-datasource" + DS_ES_OPENSEARCH = "grafana-opensearch-datasource" ) var ( diff --git a/pkg/services/datasources/service.go b/pkg/services/datasources/service.go index 67cdfd793a7..c0fba0cbc17 100644 --- a/pkg/services/datasources/service.go +++ b/pkg/services/datasources/service.go @@ -363,7 +363,7 @@ func (s *Service) getCustomHeaders(jsonData *simplejson.Json, decryptedValues ma func awsServiceNamespace(dsType string) string { switch dsType { - case models.DS_ES, models.DS_ES_OPEN_DISTRO: + case models.DS_ES, models.DS_ES_OPEN_DISTRO, models.DS_ES_OPENSEARCH: return "es" case models.DS_PROMETHEUS: return "aps"