improves timeseries naming for moving average series

0644bfe2 · carl bergquist · 0b285845 · 0644bfe2
Commit 0644bfe2 authored Dec 09, 2015 by carl bergquist
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

public/app/plugins/datasource/elasticsearch/elastic_response.js
+4 -1

No files found.
--- 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;
    }