From 141f22bedfe00ce067dad7c48ba893b19e933a6c Mon Sep 17 00:00:00 2001 From: carl bergquist Date: Fri, 11 Dec 2015 09:44:37 +0100 Subject: [PATCH] feat(elasticsearch): display more info in options --- public/app/plugins/datasource/elasticsearch/metric_agg.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js index f5272e29632..4c340a8c1ff 100644 --- a/public/app/plugins/datasource/elasticsearch/metric_agg.js +++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js @@ -40,12 +40,17 @@ function (angular, _, queryDef) { if (queryDef.isPipelineAgg($scope.agg.type)) { $scope.agg.pipelineAgg = $scope.agg.pipelineAgg || 'select metric'; $scope.agg.field = $scope.agg.pipelineAgg; - $scope.settingsLinkText = 'Options'; _.each(queryDef.getPipelineOptions($scope.agg), function(opt) { $scope.agg.settings[opt.text] = $scope.agg.settings[opt.text] || opt.default; }); + var appliedAgg = _.findWhere(metricAggs, { id: $scope.agg.pipelineAgg }); + if (appliedAgg) { + $scope.settingsLinkText = 'Options: Based on => ' + queryDef.describeMetric(appliedAgg); + } else { + $scope.settingsLinkText = 'Options'; + } } else if (!$scope.agg.field) { $scope.agg.field = 'select field'; }