From b361921bb2fa8222dbd430e804243ae529273d36 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 28 Jun 2021 13:27:03 -0700
Subject: [PATCH] Live: support tempate variables in query (#36193)

---
 public/app/plugins/datasource/grafana/datasource.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 264d622ff94..5ff3617edc6 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -24,12 +24,14 @@ export class GrafanaDatasource extends DataSourceApi<GrafanaQuery> {
 
   query(request: DataQueryRequest<GrafanaQuery>): Observable<DataQueryResponse> {
     const queries: Array<Observable<DataQueryResponse>> = [];
+    const templateSrv = getTemplateSrv();
     for (const target of request.targets) {
       if (target.hide) {
         continue;
       }
       if (target.queryType === GrafanaQueryType.LiveMeasurements) {
-        let { channel, filter } = target;
+        let channel = templateSrv.replace(target.channel, request.scopedVars);
+        const { filter } = target;
 
         // Help migrate pre-release channel paths saved in dashboards
         // NOTE: this should be removed before V8 is released