From 3095dabe3c70e87db882012f6aa9461466625ef1 Mon Sep 17 00:00:00 2001
From: Andrew Richards <richards.aj@gmail.com>
Date: Tue, 8 May 2018 14:17:16 +0100
Subject: [PATCH] interpolate 'field' again in Elasticsearch terms queries
 (#10026)

* interpolate 'field' again in Elasticsearch terms queries

Fix for #8662 which was regressed in commit e4950c2dc1012cb1a36cca947666244417e56194 (the field 'field' was no longer interpolated)

* remove unnecessary check for existence of field 'field'
---
 public/app/plugins/datasource/elasticsearch/datasource.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 7476a36405b..e3eccfb8029 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -395,6 +395,7 @@ export class ElasticDatasource {
     }
 
     if (query.find === 'terms') {
+      query.field = this.templateSrv.replace(query.field, {}, 'lucene');
       query.query = this.templateSrv.replace(query.query || '*', {}, 'lucene');
       return this.getTerms(query);
     }