Update dashboards (#20486)

CHANGELOG.md

@@ -15,6 +15,7 @@
   * **CloudWatch**: ContainerInsights metrics support. [#18971](https://github.com/grafana/grafana/pull/18971), [@francopeapea](https://github.com/francopeapea)
   * **CloudWatch**: ContainerInsights metrics support. [#18971](https://github.com/grafana/grafana/pull/18971), [@francopeapea](https://github.com/francopeapea)
   * **CloudWatch**: Support dynamic queries using dimension wildcards [#20058](https://github.com/grafana/grafana/issues/20058), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Support dynamic queries using dimension wildcards [#20058](https://github.com/grafana/grafana/issues/20058), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Stop using GetMetricStatistics and use GetMetricData for all time series requests [#20057](https://github.com/grafana/grafana/issues/20057), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Stop using GetMetricStatistics and use GetMetricData for all time series requests [#20057](https://github.com/grafana/grafana/issues/20057), [@sunker](https://github.com/sunker)
+  * **CloudWatch**: Add curated dashboards for most popular Amazon services [#20480](https://github.com/grafana/grafana/issues/20480), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Convert query editor from Angular to React [#19880](https://github.com/grafana/grafana/issues/19880), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Convert query editor from Angular to React [#19880](https://github.com/grafana/grafana/issues/19880), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Convert config editor from Angular to React [#19881](https://github.com/grafana/grafana/issues/19881), [@shavonn](https://github.com/shavonn)
   * **CloudWatch**: Convert config editor from Angular to React [#19881](https://github.com/grafana/grafana/issues/19881), [@shavonn](https://github.com/shavonn)
   * **CloudWatch**: Improved error handling when throttling occurs [#20348](https://github.com/grafana/grafana/issues/20348), [@sunker](https://github.com/sunker)
   * **CloudWatch**: Improved error handling when throttling occurs [#20348](https://github.com/grafana/grafana/issues/20348), [@sunker](https://github.com/sunker)

public/app/plugins/datasource/cloudwatch/datasource.ts

@@ -324,7 +324,10 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
   }
   }
 
 
   getRegions() {
   getRegions() {
-    return this.doMetricQueryRequest('regions', null);
+    return this.doMetricQueryRequest('regions', null).then((regions: any) => [
+      { label: 'default', value: 'default', text: 'default' },
+      ...regions,
+    ]);
   }
   }
 
 
   getNamespaces() {
   getNamespaces() {

public/app/plugins/datasource/cloudwatch/plugin.json

@@ -3,10 +3,16 @@
   "name": "CloudWatch",
   "name": "CloudWatch",
   "id": "cloudwatch",
   "id": "cloudwatch",
   "category": "cloud",
   "category": "cloud",
-
   "metrics": true,
   "metrics": true,
   "alerting": true,
   "alerting": true,
   "annotations": true,
   "annotations": true,
+  "includes": [
+    { "type": "dashboard", "name": "EC2", "path": "dashboards/ec2.json" },
+    { "type": "dashboard", "name": "EBS", "path": "dashboards/EBS.json" },
+    { "type": "dashboard", "name": "Lambda", "path": "dashboards/Lambda.json" },
+    { "type": "dashboard", "name": "Logs", "path": "dashboards/Logs.json" },
+    { "type": "dashboard", "name": "RDS", "path": "dashboards/RDS.json" }
+  ],
   "info": {
   "info": {
     "description": "Data source for Amazon AWS monitoring service",
     "description": "Data source for Amazon AWS monitoring service",
     "author": {
     "author": {