IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(elasticsearch): mavg naming -> pipeline agg

Browse Source
This commit is contained in:
carl bergquist 2015-12-10 17:12:52 +01:00
parent c8c9e0a7e7
commit 005e14a060
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/metric_agg.js
View File

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

2
public/app/plugins/datasource/elasticsearch/query_def.js
View File

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

8
public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts
View File

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