refactor(elasticsearch): mavg naming -> pipeline agg

pull/3476/head
carl bergquist 10 years ago
parent c8c9e0a7e7
commit 005e14a060
  1. 2
      public/app/plugins/datasource/elasticsearch/metric_agg.js
  2. 2
      public/app/plugins/datasource/elasticsearch/query_def.js
  3. 8
      public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts

@ -22,7 +22,7 @@ function (angular, _, queryDef) {
};
$scope.updatePipelineAggOptions = function() {
$scope.pipelineAggOptions = queryDef.getMovingAverageOptions($scope.target);
$scope.pipelineAggOptions = queryDef.getPipelineAggOptions($scope.target);
};
$rootScope.onAppEvent('elastic-query-updated', function() {

@ -92,7 +92,7 @@ function (_) {
return false;
},
getMovingAverageOptions: function(targets) {
getPipelineAggOptions: function(targets) {
var self = this;
var result = [];
_.each(targets.metrics, function(metric) {

@ -8,9 +8,9 @@ declare var QueryDef: any;
describe('ElasticQueryDef', function() {
describe('getMovingAverageOptions', function() {
describe('getPipelineAggOptions', function() {
describe('with zero targets', function() {
var response = QueryDef.getMovingAverageOptions([]);
var response = QueryDef.getPipelineAggOptions([]);
it('should return zero', function() {
expect(response.length).to.be(0);
@ -25,7 +25,7 @@ describe('ElasticQueryDef', function() {
]
};
var response = QueryDef.getMovingAverageOptions(targets);
var response = QueryDef.getPipelineAggOptions(targets);
it('should return zero', function() {
expect(response.length).to.be(2);
@ -40,7 +40,7 @@ describe('ElasticQueryDef', function() {
]
};
var response = QueryDef.getMovingAverageOptions(targets);
var response = QueryDef.getPipelineAggOptions(targets);
it('should return zero', function() {
expect(response.length).to.be(1);

Loading…
Cancel
Save