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

2 years ago · 411c89012f
parent 3b7e7483c8
commit 411c89012f
1 changed files with 5 additions and 1 deletions
--- 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'));