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] 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(',');