From 068e6f6b94df101c0d75df2588a70ae28a2e81cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ida=20=C5=A0tambuk?= <ida.stambuk@grafana.com>
Date: Fri, 1 Mar 2024 16:56:45 +0100
Subject: [PATCH] Cloudwatch: Fix new ConfigEditor to add the custom namespace
 field  (#83762)

---
 .../components/ConfigEditor/ConfigEditor.test.tsx      |  5 +++++
 .../components/ConfigEditor/ConfigEditor.tsx           | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx
index 47cf04e059c..a83e5d70d5d 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx
@@ -216,6 +216,11 @@ describe('Render', () => {
       await waitFor(async () => expect(screen.getByText('Assume Role ARN')).toBeInTheDocument());
     });
 
+    it('should display namespace field', async () => {
+      setup();
+      await waitFor(async () => expect(screen.getByText('Namespaces of Custom Metrics')).toBeInTheDocument());
+    });
+
     it('should show a deprecation warning if `arn` auth type is used', async () => {
       setup({
         jsonData: {
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
index c9965ee2022..f6b551955da 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
@@ -107,7 +107,15 @@ export const ConfigEditor = (props: Props) => {
           })
         }
         externalId={externalId}
-      />
+      >
+        <Field label="Namespaces of Custom Metrics">
+          <Input
+            placeholder="Namespace1,Namespace2"
+            value={options.jsonData.customMetricsNamespaces || ''}
+            onChange={onUpdateDatasourceJsonDataOption(props, 'customMetricsNamespaces')}
+          />
+        </Field>
+      </ConnectionConfig>
       {config.secureSocksDSProxyEnabled && (
         <SecureSocksProxySettingsNewStyling options={options} onOptionsChange={onOptionsChange} />
       )}