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

feat(elasticsearch): adds support for inline script and missing options to all elasticsearch metrics, closes #3500

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-12-11 18:20:53 +01:00
parent 0cbc493113
commit 10f66fa78f
6 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,10 +55,15 @@ function (angular, _, queryDef) {
switch($scope.agg.type) {
case 'percentiles': {
$scope.agg.settings.percents = $scope.agg.settings.percents || [25,50,75,95,99];
$scope.settingsLinkText = 'values: ' + $scope.agg.settings.percents.join(',');
$scope.settingsLinkText = 'Values: ' + $scope.agg.settings.percents.join(',');
break;
}
case 'extended_stats': {
if (_.keys($scope.agg.meta).length === 0) {
$scope.agg.meta.std_deviation_bounds_lower = true;
$scope.agg.meta.std_deviation_bounds_upper = true;
}
var stats = _.reduce($scope.agg.meta, function(memo, val, key) {
if (val) {
var def = _.findWhere($scope.extendedStats, {value: key});
@@ -66,17 +71,29 @@ function (angular, _, queryDef) {
}
return memo;
}, []);
$scope.settingsLinkText = 'Stats: ' + stats.join(', ');
if (stats.length === 0) {
$scope.agg.meta.std_deviation_bounds_lower = true;
$scope.agg.meta.std_deviation_bounds_upper = true;
}
$scope.settingsLinkText = 'Stats: ' + stats.join(', ');
break;
}
case 'raw_document': {
$scope.target.metrics = [$scope.agg];
$scope.target.bucketAggs = [];
break;
}
}
if ($scope.aggDef.supportsInlineScript) {
// I know this stores the inline script twice
// but having it like this simplifes the query_builder
var inlineScript = $scope.agg.inlineScript;
if (inlineScript) {
$scope.agg.settings.script = {inline: inlineScript};
} else {
delete $scope.agg.settings.script;
}
if ($scope.settingsLinkText === '') {
$scope.settingsLinkText = 'Options';
}
}
};