From bfd337dd004ef837eec112ee94ba64d5e213b8b8 Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Wed, 13 May 2020 14:38:42 +0100
Subject: [PATCH] Datasource/CloudWatch: Correctly interpolate variables in
 CloudWatch Logs queries (#24619)

Closes #24603
---
 public/app/plugins/datasource/cloudwatch/datasource.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 789a3e52d98..a604974a45b 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -582,6 +582,9 @@ export class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, CloudWa
 
     if (makeReplacements) {
       requestParams.queries.forEach(query => {
+        if (query.hasOwnProperty('queryString')) {
+          query.queryString = this.replace(query.queryString, scopedVars, true);
+        }
         query.region = this.replace(query.region, scopedVars, true, 'region');
         query.region = this.getActualRegion(query.region);
       });