From 1491607e8ea2c8fa9009ec692bfd00fcc1770670 Mon Sep 17 00:00:00 2001
From: Kevin Yu <kevinwcyu@users.noreply.github.com>
Date: Thu, 13 Nov 2025 08:54:00 -0800
Subject: [PATCH] CloudWatch: Add links to data source docs in the config
 editor (#113795)

* CloudWatch: Add links to data source docs in the config editor

* fix tests
---
 package.json                                  |  4 +-
 .../components/ConfigEditor/ConfigEditor.tsx  |  7 +-
 yarn.lock                                     | 66 +++++++++++++------
 3 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 0402c332903..76e6b804c52 100644
--- a/package.json
+++ b/package.json
@@ -279,7 +279,7 @@
     "@grafana/alerting": "workspace:*",
     "@grafana/api-clients": "workspace:*",
     "@grafana/assistant": "0.1.4",
-    "@grafana/aws-sdk": "0.7.1",
+    "@grafana/aws-sdk": "0.8.3",
     "@grafana/azure-sdk": "0.0.8",
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
@@ -293,7 +293,7 @@
     "@grafana/llm": "0.22.1",
     "@grafana/monaco-logql": "^0.0.8",
     "@grafana/o11y-ds-frontend": "workspace:*",
-    "@grafana/plugin-ui": "^0.10.10",
+    "@grafana/plugin-ui": "^0.11.1",
     "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
     "@grafana/scenes": "^6.46.0",
diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
index 757385c374c..88be530bdf6 100644
--- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx
@@ -12,7 +12,7 @@ import {
   DataSourceTestFailed,
   GrafanaTheme2,
 } from '@grafana/data';
-import { ConfigSection } from '@grafana/plugin-ui';
+import { ConfigSection, DataSourceDescription } from '@grafana/plugin-ui';
 import { getAppEvents, usePluginInteractionReporter, getDataSourceSrv, config } from '@grafana/runtime';
 import { Alert, Input, FieldProps, Field, Divider, useStyles2 } from '@grafana/ui';
 
@@ -94,6 +94,11 @@ export const ConfigEditor = (props: Props) => {
           {warning}
         </Alert>
       )}
+      <DataSourceDescription
+        dataSourceName="Amazon CloudWatch"
+        docsLink="https://grafana.com/docs/plugins/cloudwatch/latest/"
+      />
+      <Divider />
       <ConnectionConfig
         {...props}
         loadRegions={
diff --git a/yarn.lock b/yarn.lock
index 273fb35906e..ae1ba751b9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3071,23 +3071,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/async-query-data@npm:0.4.1":
-  version: 0.4.1
-  resolution: "@grafana/async-query-data@npm:0.4.1"
+"@grafana/async-query-data@npm:0.4.2":
+  version: 0.4.2
+  resolution: "@grafana/async-query-data@npm:0.4.2"
   dependencies:
     semver: "npm:^7.6.3"
     tslib: "npm:^2.8.0"
-  checksum: 10/f75d3114f15b91227e23fa8214ca55ec00f5b6bce0ebb977ab14ad197ae1ab46126e9fdcce9af5816774b13e2797e5e26283f6a14d3f57420a08b2ded64a6515
+  checksum: 10/e54477b1ae15a7f5944474eb50851f73ca4ee6ece10795469a82200f77feebd74596b76e47e643525e1172675cfe374705161931909c86e72ba271a6876b84e0
   languageName: node
   linkType: hard
 
-"@grafana/aws-sdk@npm:0.7.1":
-  version: 0.7.1
-  resolution: "@grafana/aws-sdk@npm:0.7.1"
+"@grafana/aws-sdk@npm:0.8.3":
+  version: 0.8.3
+  resolution: "@grafana/aws-sdk@npm:0.8.3"
   dependencies:
-    "@grafana/async-query-data": "npm:0.4.1"
-    "@grafana/plugin-ui": "npm:^0.10.1"
-  checksum: 10/3b03b2bc6a7174d7b7e8aae77d62d70e87fb694781e69c16bb75312071c2adac9c6cfa2a51c0881cc302c6630a7b94adbb2696e0dc674e43cc9de8954ac761bf
+    "@grafana/async-query-data": "npm:0.4.2"
+    "@grafana/plugin-ui": "npm:^0.11.0"
+  checksum: 10/e2b7ab725f1602831857ad63adb314ec62b9b4d08404f71ffa2ce278df0c364f5ad7a9a83f5e8d7e646922124f812cdc2a7035bff4a952a9f455eaf2c9a5992a
   languageName: node
   linkType: hard
 
@@ -3452,7 +3452,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/plugin-ui@npm:^0.10.1, @grafana/plugin-ui@npm:^0.10.10":
+"@grafana/plugin-ui@npm:^0.10.10":
   version: 0.10.10
   resolution: "@grafana/plugin-ui@npm:0.10.10"
   dependencies:
@@ -3480,6 +3480,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@grafana/plugin-ui@npm:^0.11.0, @grafana/plugin-ui@npm:^0.11.1":
+  version: 0.11.1
+  resolution: "@grafana/plugin-ui@npm:0.11.1"
+  dependencies:
+    "@emotion/css": "npm:^11.11.2"
+    "@hello-pangea/dnd": "npm:^17.0.0"
+    "@react-awesome-query-builder/ui": "npm:^6.6.4"
+    "@types/prismjs": "npm:^1.26.4"
+    lodash: "npm:^4.17.21"
+    prismjs: "npm:^1.30.0"
+    react-calendar: "npm:^4.8.0"
+    react-popper-tooltip: "npm:^4.4.2"
+    react-use: "npm:^17.3.1"
+    react-virtualized-auto-sizer: "npm:^1.0.6"
+    sql-formatter-plus: "npm:^1.3.6"
+    uuid: "npm:^11.0.0"
+  peerDependencies:
+    "@grafana/data": ">=10.4.0"
+    "@grafana/e2e-selectors": ">=10.4.0"
+    "@grafana/runtime": ">=10.4.0"
+    "@grafana/ui": ">=10.4.0"
+    react: ^18.2.0
+    react-dom: ^18.2.0
+    rxjs: ^7.8.1
+  checksum: 10/e22f79ca453338b37ce3778ee71b253aaa6dfb8e3c9e77a4f4d26e5ed6f5e618c453ebffef713e12a75d5aa63dce3209389fb38a27727882007d8ba4b6bd63c6
+  languageName: node
+  linkType: hard
+
 "@grafana/prometheus@workspace:*, @grafana/prometheus@workspace:packages/grafana-prometheus":
   version: 0.0.0-use.local
   resolution: "@grafana/prometheus@workspace:packages/grafana-prometheus"
@@ -18865,7 +18893,7 @@ __metadata:
     "@grafana/alerting": "workspace:*"
     "@grafana/api-clients": "workspace:*"
     "@grafana/assistant": "npm:0.1.4"
-    "@grafana/aws-sdk": "npm:0.7.1"
+    "@grafana/aws-sdk": "npm:0.8.3"
     "@grafana/azure-sdk": "npm:0.0.8"
     "@grafana/data": "workspace:*"
     "@grafana/e2e-selectors": "workspace:*"
@@ -18882,7 +18910,7 @@ __metadata:
     "@grafana/monaco-logql": "npm:^0.0.8"
     "@grafana/o11y-ds-frontend": "workspace:*"
     "@grafana/plugin-e2e": "npm:^3.0.1"
-    "@grafana/plugin-ui": "npm:^0.10.10"
+    "@grafana/plugin-ui": "npm:^0.11.1"
     "@grafana/prometheus": "workspace:*"
     "@grafana/runtime": "workspace:*"
     "@grafana/scenes": "npm:^6.46.0"
@@ -24305,11 +24333,11 @@ __metadata:
   linkType: hard
 
 "nanoid@npm:^5.0.9":
-  version: 5.1.6
-  resolution: "nanoid@npm:5.1.6"
+  version: 5.1.5
+  resolution: "nanoid@npm:5.1.5"
   bin:
     nanoid: bin/nanoid.js
-  checksum: 10/4109dbcf596d7f297a9b42f459b8f01694a03ebbdd2f41408d963ad54e5ec7234cbe7b4acad137751f31add11bb4fb3415a3e688082516745812811f05570014
+  checksum: 10/6de2d006b51c983be385ef7ee285f7f2a57bd96f8c0ca881c4111461644bd81fafc2544f8e07cb834ca0f3e0f3f676c1fe78052183f008b0809efe6e273119f5
   languageName: node
   linkType: hard
 
@@ -25298,14 +25326,14 @@ __metadata:
   linkType: hard
 
 "ol-mapbox-style@npm:^13.0.1":
-  version: 13.1.1
-  resolution: "ol-mapbox-style@npm:13.1.1"
+  version: 13.1.0
+  resolution: "ol-mapbox-style@npm:13.1.0"
   dependencies:
     "@maplibre/maplibre-gl-style-spec": "npm:^23.1.0"
     mapbox-to-css-font: "npm:^3.2.0"
   peerDependencies:
     ol: "*"
-  checksum: 10/9182bebfee63881465a9dbeecaeab361b70f4fe3abf406d755adde02cf50c765b6e5de072716e627b777ffb2b98fc72dde12bee470996139438a6b1133c370f3
+  checksum: 10/a6dba04dcfc9e0344fed9ad1a76b875eb1a1286d2b6c0f9d9d6004bb5376227fa7dee15bbe38966429ab479bec3109b39e92541a20e0e175e8205cc78c039ed2
   languageName: node
   linkType: hard