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): add pipeline settings

Browse Source
This commit is contained in:
Carl Bergquist 2015-12-10 13:34:49 +01:00
parent 2d2ad8b237
commit 85094fc74d
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,15 @@ function (angular, _, queryDef) {
$scope.metricAggTypes = queryDef.metricAggTypes;
$scope.extendedStats = queryDef.extendedStats;
$scope.pipelineSettings = [];
$scope.pipelineAggOptions = [];
$scope.init = function() {
$scope.agg = metricAggs[$scope.index];
$scope.validateModel();
$scope.updatePipelineAggOptions();
$scope.pipelineSettings = queryDef.getPipelineSettings($scope.agg);
};
$scope.updatePipelineAggOptions = function() {

13
public/app/plugins/datasource/elasticsearch/partials/metricAgg.html
View File

@ -45,6 +45,19 @@
</ul>
<div class="clearfix"></div>
</div>
<div ng-if="agg.pipelineAgg !== undefined">
<div class="tight-form" ng-repeat="setting in agg.pipelineSettings">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
{{stat.text}}
</li>
<li class="tight-form-item last">
<editor-checkbox text="" model="agg.meta.{{stat.value}}" change="onChange()"></editor-checkbox>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<div class="tight-form last" ng-if="agg.type === 'percentiles'">
<ul class="tight-form-list">
<li class="tight-form-item">

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

@ -70,6 +70,19 @@ function (_) {
pipelineAggs: ['moving_avg', 'derivative'],
pipelineSettings: {
'moving_avg' : ['model', 'gap_policy', 'window', 'minimize'],
'derivative': []
},
getPipelineSettings: function(metric) {
if (this.isPipelineAgg(metric) === false) {
return [];
}
return this.pipelineSettings[metric.type];
},
isPipelineAgg: function(metric) {
if (metric.type) {
return this.pipelineAggs.indexOf(metric.type) > -1;