From 87359de4ca71c55afbfc9d0e4bbb266fbb1e2046 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 30 Nov 2021 14:01:50 -0500
Subject: [PATCH] [v8.3.x] AnnoListPanel: Fix interpolation of variables in
 tags (#42544)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: François Dautrême <4825058+francoisdtm@users.noreply.github.com>
---
 public/app/plugins/panel/annolist/AnnoListPanel.test.tsx | 2 +-
 public/app/plugins/panel/annolist/AnnoListPanel.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
index ca6201380aa..64a30151979 100644
--- a/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
+++ b/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
@@ -76,7 +76,7 @@ async function setupTestContext({
     onOptionsChange: jest.fn(),
     options,
     renderCounter: 1,
-    replaceVariables: jest.fn(),
+    replaceVariables: (str: string) => str,
     timeRange: getDefaultTimeRange(),
     timeZone: 'utc',
     title: 'Test Title',
diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
index 7b3974ba3d7..c858d51171d 100644
--- a/public/app/plugins/panel/annolist/AnnoListPanel.tsx
+++ b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
@@ -113,7 +113,7 @@ export class AnnoListPanel extends PureComponent<Props, State> {
     }
 
     if (options.tags && options.tags.length) {
-      params.tags = options.tags;
+      params.tags = options.tags.map((tag) => this.props.replaceVariables(tag));
     }
 
     if (queryTags.length) {