diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json b/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json
index c522f7b821e..67fdda9bd35 100644
--- a/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json
+++ b/public/app/plugins/datasource/cloudwatch/dashboards/EBS.json
@@ -1256,7 +1256,7 @@
     },
     {
       "content": "For more information, see [Amazon CloudWatch Metrics for Amazon EBS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cloudwatch_ebs.html).\n\n\n\n",
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 2,
         "w": 24,
@@ -1301,7 +1301,7 @@
           "text": "default",
           "value": "default"
         },
-        "datasource": "${DS_CLOUDWATCH}",
+        "datasource": "$datasource",
         "definition": "regions()",
         "hide": 0,
         "includeAll": false,
diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json b/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json
index 51ddb243575..9b765360365 100644
--- a/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json
+++ b/public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json
@@ -415,7 +415,7 @@
     },
     {
       "collapsed": true,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -834,7 +834,7 @@
     },
     {
       "collapsed": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -848,7 +848,7 @@
     },
     {
       "content": "For more information about the available metrics for AWS Lambda, visit the [AWS Lambda documentation](https://docs.aws.amazon.com/lambda/latest/dg/monitoring-functions-metrics.html).",
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 2,
         "w": 24,
@@ -907,7 +907,7 @@
           "text": "default",
           "value": "default"
         },
-        "datasource": "${DS_CLOUDWATCH}",
+        "datasource": "$datasource",
         "definition": "regions()",
         "hide": 0,
         "includeAll": false,
diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json b/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json
index 512f221ae12..90d211fa31f 100644
--- a/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json
+++ b/public/app/plugins/datasource/cloudwatch/dashboards/Logs.json
@@ -656,7 +656,7 @@
     },
     {
       "content": "For more information about the available metrics for Amazon CloudWatch Logs, please visit the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Monitoring-CloudWatch-Metrics.html).",
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 2,
         "w": 24,
diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json b/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json
index 812a65bd30b..b0884721b82 100644
--- a/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json
+++ b/public/app/plugins/datasource/cloudwatch/dashboards/RDS.json
@@ -66,7 +66,7 @@
   "panels": [
     {
       "collapsed": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -83,7 +83,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -182,7 +182,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -281,7 +281,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -378,7 +378,7 @@
     },
     {
       "collapsed": true,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -392,7 +392,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -491,7 +491,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -590,7 +590,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -689,7 +689,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -789,7 +789,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -888,7 +888,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -987,7 +987,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -1086,7 +1086,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -1185,7 +1185,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -1284,7 +1284,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "fill": 0,
           "fillGradient": 0,
           "gridPos": {
@@ -1384,7 +1384,7 @@
     },
     {
       "collapsed": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1398,7 +1398,7 @@
     },
     {
       "content": "For more information about the available Amazon RDS metrics, please visit the [Amazon RDS documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/MonitoringOverview.html#rds-metrics).",
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 2,
         "w": 24,
diff --git a/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json b/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json
index 3d40d88da2b..483cc283344 100644
--- a/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json
+++ b/public/app/plugins/datasource/cloudwatch/dashboards/ec2.json
@@ -66,7 +66,7 @@
   "panels": [
     {
       "collapsed": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -300,7 +300,7 @@
     },
     {
       "collapsed": true,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -711,7 +711,7 @@
     },
     {
       "collapsed": true,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -722,7 +722,7 @@
       "panels": [
         {
           "content": "",
-          "datasource": "${DS_CLOUDWATCH}",
+          "datasource": "$datasource",
           "gridPos": {
             "h": 1,
             "w": 24,
@@ -1140,7 +1140,7 @@
     },
     {
       "collapsed": true,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1455,7 +1455,7 @@
     },
     {
       "collapsed": false,
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1469,7 +1469,7 @@
     },
     {
       "content": "For more information about avaialble metrics from Amazon EC2, visit the [List of Available CloudWatch Metrics for Your EC2 Instances](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/viewing_metrics_with_cloudwatch.html) in the Amazon documentation.\n\nFor additional metrics and 1-minute granularity, enable [Detailed Monitoring](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch-new.html) for your Amazon EC2 instances.\n\nThis dashboard has been optimized for 1-minute metrics.",
-      "datasource": "${DS_CLOUDWATCH}",
+      "datasource": "$datasource",
       "gridPos": {
         "h": 4,
         "w": 24,