From e86dfcf55cbb89d5879ed172c15e00021dde9cd8 Mon Sep 17 00:00:00 2001
From: Carl Bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Dec 2015 10:43:00 +0100
Subject: [PATCH 1/2] rename mavgoptions to more generic pipelineaggs

---
 .../plugins/datasource/elasticsearch/metric_agg.js   | 12 ++++++------
 .../datasource/elasticsearch/partials/metricAgg.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js
index 1d6f82a292f..471c0a17959 100644
--- a/public/app/plugins/datasource/elasticsearch/metric_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js
@@ -13,21 +13,21 @@ function (angular, _, queryDef) {
 
     $scope.metricAggTypes = queryDef.metricAggTypes;
     $scope.extendedStats = queryDef.extendedStats;
-    $scope.mavgOptions = [];
+    $scope.pipelineAggOptions = [];
 
     $scope.init = function() {
       $scope.agg = metricAggs[$scope.index];
       $scope.validateModel();
-      $scope.updateMavgOptions();
+      $scope.updatePipelineAggOptions();
     };
 
-    $scope.updateMavgOptions = function() {
-      $scope.mavgOptions = queryDef.getMovingAverageOptions($scope.target);
+    $scope.updatePipelineAggOptions = function() {
+      $scope.pipelineAggOptions = queryDef.getMovingAverageOptions($scope.target);
     };
 
     $rootScope.onAppEvent('elastic-query-updated', function() {
       $scope.index = _.indexOf(metricAggs, $scope.agg);
-      $scope.updateMavgOptions();
+      $scope.updatePipelineAggOptions();
       $scope.validateModel();
     }, $scope);
 
@@ -78,7 +78,7 @@ function (angular, _, queryDef) {
 
     $scope.toggleOptions = function() {
       $scope.showOptions = !$scope.showOptions;
-      $scope.updateMavgOptions();
+      $scope.updatePipelineAggOptions();
     };
 
     $scope.onChangeInternal = function() {
diff --git a/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html b/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html
index 7c21e64721e..0fb58cff328 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html
@@ -33,7 +33,7 @@
 					Based on
 				</li>
 				<li>
-					<metric-segment-model property="agg.pipelineAgg" options="mavgOptions" on-change="onChangeInternal()" css-class="last"></metric-segment-model>
+					<metric-segment-model property="agg.pipelineAgg" options="pipelineAggOptions" on-change="onChangeInternal()" css-class="last"></metric-segment-model>
 				</li>
 			</ul>
 			<div class="clearfix"></div>

From 9c6eb7736fd30d6db04b0c2314244f7f94adc1f0 Mon Sep 17 00:00:00 2001
From: Carl Bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Dec 2015 11:17:14 +0100
Subject: [PATCH 2/2] move pipeline options outside main switch

---
 .../plugins/datasource/elasticsearch/metric_agg.js   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js
index 471c0a17959..37fe224b586 100644
--- a/public/app/plugins/datasource/elasticsearch/metric_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js
@@ -41,13 +41,13 @@ function (angular, _, queryDef) {
         $scope.agg.field = 'select field';
       }
 
+      if (queryDef.isPipelineAgg($scope.agg)) {
+        $scope.agg.pipelineAgg = $scope.agg.pipelineAgg || 'select metric';
+        $scope.agg.field = $scope.agg.pipelineAgg;
+        $scope.settingsLinkText = 'Options';
+      }
+
       switch($scope.agg.type) {
-        case 'moving_avg': {
-          $scope.agg.pipelineAgg = $scope.agg.pipelineAgg || 'Metric to apply moving average';
-          $scope.settingsLinkText = 'Moving average options';
-          $scope.agg.field = $scope.agg.pipelineAgg;
-          break;
-        }
         case 'percentiles': {
           $scope.agg.settings.percents = $scope.agg.settings.percents || [25,50,75,95,99];
           $scope.settingsLinkText = 'values: ' + $scope.agg.settings.percents.join(',');