From a51d3dad4faa34684e6693e829da26003ff635c3 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 29 Jul 2022 08:41:11 -0700
Subject: [PATCH] Loki: support template variables when running stream (live)
 mode (#52973)

---
 public/app/plugins/datasource/loki/datasource.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 477eb02ed76..d0995527188 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -152,7 +152,15 @@ export class LokiDatasource
         ...fixedRequest,
         targets: streamQueries,
       };
-      return merge(...streamQueries.map((q) => doLokiChannelStream(q, this, streamRequest)));
+      return merge(
+        ...streamQueries.map((q) =>
+          doLokiChannelStream(
+            this.applyTemplateVariables(q, request.scopedVars),
+            this, // the datasource
+            streamRequest
+          )
+        )
+      );
     }
 
     if (fixedRequest.liveStreaming) {