From 0644bfe27cc62d9df7e903847ebc6d4970f5de4e Mon Sep 17 00:00:00 2001
From: carl bergquist <carl.bergquist@gmail.com>
Date: Wed, 9 Dec 2015 14:58:26 +0100
Subject: [PATCH] improves timeseries naming for moving average series

---
 .../app/plugins/datasource/elasticsearch/elastic_response.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.js b/public/app/plugins/datasource/elasticsearch/elastic_response.js
index a7c8e6d14bf..1994102bc82 100644
--- a/public/app/plugins/datasource/elasticsearch/elastic_response.js
+++ b/public/app/plugins/datasource/elasticsearch/elastic_response.js
@@ -197,7 +197,10 @@ function (_, queryDef) {
       });
     }
 
-    if (series.field) {
+    if (series.field && series.metric === 'moving_avg') {
+      var appliedAgg = _.findWhere(target.metrics, { id: series.field });
+      metricName += ' ' + queryDef.describeMetric(appliedAgg);
+    } else if (series.field) {
       metricName += ' ' + series.field;
     }