From d94f2bf8d5093dafe2f2fefb71983f75197a9951 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:44:40 +0200
Subject: [PATCH] [v10.2.x] Elasticsearch: Fix adhoc filters not applied in
 frontend mode (#83595)

Elasticsearch: Fix adhoc filters not applied in frontend mode (#83592)

(cherry picked from commit 411c89012febe13323e4b8aafc8d692f4460e680)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
---
 .../plugins/datasource/elasticsearch/LegacyQueryRunner.ts   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts b/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
index c70a6ee60b2..efb9d125917 100644
--- a/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
+++ b/public/app/plugins/datasource/elasticsearch/LegacyQueryRunner.ts
@@ -151,7 +151,11 @@ export class LegacyQueryRunner {
 
   query(request: DataQueryRequest<ElasticsearchQuery>): Observable<DataQueryResponse> {
     let payload = '';
-    const targets = this.datasource.interpolateVariablesInQueries(cloneDeep(request.targets), request.scopedVars);
+    const targets = this.datasource.interpolateVariablesInQueries(
+      cloneDeep(request.targets),
+      request.scopedVars,
+      request.filters
+    );
     const sentTargets: ElasticsearchQuery[] = [];
     let targetsContainsLogsQuery = targets.some((target) => hasMetricOfType(target, 'logs'));