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

adds null check for response parser

Browse Source
This commit is contained in:
Carl Bergquist
2015-12-08 12:07:56 +01:00
parent 8ad10149ab
commit dd7a13930f
6 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,10 @@ function (angular, _, queryDef) {
}
switch($scope.agg.type) {
case 'moving_avg': {
$scope.agg.aggregation = $scope.agg.aggregation || 'sum';
break;
}
case 'percentiles': {
$scope.agg.settings.percents = $scope.agg.settings.percents || [25,50,75,95,99];
$scope.settingsLinkText = 'values: ' + $scope.agg.settings.percents.join(',');
@@ -79,19 +83,9 @@ function (angular, _, queryDef) {
};
$scope.getMetrics = function() {
console.log($scope.target.metrics);
var aggs = [{ text: 'Sum', type: 'sum'}, { text: 'Average', type: 'avg'}];
var mets = _.filter($scope.target.metrics, function(x) {
return x.type !== 'moving_avg';
});
mets = _.map(mets, function(m) {
return { text: m.type, type: m.id };
});
console.log(mets);
return $q.when(mets)
return $q.when(aggs)
.then(uiSegmentSrv.transformToSegments(false));
};