From 85094fc74d726b9f49041741459884973e6fe34e Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Thu, 10 Dec 2015 13:34:49 +0100 Subject: [PATCH] feat(elasticsearch): add pipeline settings --- .../plugins/datasource/elasticsearch/metric_agg.js | 3 +++ .../elasticsearch/partials/metricAgg.html | 13 +++++++++++++ .../plugins/datasource/elasticsearch/query_def.js | 13 +++++++++++++ 3 files changed, 29 insertions(+) diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js index feaa4bac0b6..6f52dc4f28d 100644 --- a/public/app/plugins/datasource/elasticsearch/metric_agg.js +++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js @@ -13,12 +13,15 @@ function (angular, _, queryDef) { $scope.metricAggTypes = queryDef.metricAggTypes; $scope.extendedStats = queryDef.extendedStats; + $scope.pipelineSettings = []; + $scope.pipelineAggOptions = []; $scope.init = function() { $scope.agg = metricAggs[$scope.index]; $scope.validateModel(); $scope.updatePipelineAggOptions(); + $scope.pipelineSettings = queryDef.getPipelineSettings($scope.agg); }; $scope.updatePipelineAggOptions = function() { diff --git a/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html b/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html index f99f46bee19..ecbfa3d7df1 100644 --- a/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html +++ b/public/app/plugins/datasource/elasticsearch/partials/metricAgg.html @@ -45,6 +45,19 @@
+
+
+
    +
  • + {{stat.text}} +
  • +
  • + +
  • +
+
+
+