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

Merge branch 'master' into elastic5_support

Browse Source
This commit is contained in:
bergquist
2016-12-09 11:41:23 +01:00
parent ebec02ffae e58b6989c2
commit 619c5c4f1b
76 changed files with 1379 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,16 +57,23 @@
<label class="gf-form-label width-10">Order</label>
<metric-segment-model property="agg.settings.order" options="orderOptions" on-change="onChangeInternal()" css-class="width-12"></metric-segment-model>
</div>
<div class="gf-form offset-width-7">
<label class="gf-form-label width-10">Size</label>
<metric-segment-model property="agg.settings.size" options="sizeOptions" on-change="onChangeInternal()" css-class="width-12"></metric-segment-model>
</div>
<div class="gf-form offset-width-7">
<label class="gf-form-label width-10">Order By</label>
<metric-segment-model property="agg.settings.orderBy" options="orderByOptions" on-change="onChangeInternal()" css-class="width-12"></metric-segment-model>
</div>
<div class="gf-form offset-width-7">
<label class="gf-form-label width-10">
Missing
<info-popover mode="right-normal">
The missing parameter defines how documents that are missing a value should be treated. By default they will be ignored but it is also possible to treat them as if they had a value
</info-popover>
</label>
<input type="text" class="gf-form-input max-width-12" empty-to-null ng-model="agg.settings.missing" ng-blur="onChangeInternal()" spellcheck='false'>
</div>
</div>
<div ng-if="agg.type === 'filters'">
@@ -94,5 +101,3 @@
</div>
</div>

5
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
View File

@@ -53,6 +53,11 @@
<input type="text" class="gf-form-input max-width-12" ng-change="onChangeInternal()" ng-model="agg.settings.model" blur="onChange()" spellcheck='false'>
</div>
<div class="gf-form offset-width-7" ng-if="agg.type === 'moving_avg'">
<label class="gf-form-label width-10">Predict</label>
<input type="number" class="gf-form-input max-width-12" ng-model="agg.settings.predict" ng-blur="onChangeInternal()" spellcheck='false'>
</div>
<div class="gf-form offset-width-7" ng-if="agg.type === 'percentiles'">
<label class="gf-form-label width-10">Percentiles</label>
<input type="text" class="gf-form-input max-width-12" ng-model="agg.settings.percents" array-join ng-blur="onChange()"></input>

8
public/app/plugins/datasource/elasticsearch/query_builder.js
View File

@@ -49,6 +49,10 @@ function (queryDef) {
}
}
if (aggDef.settings.missing) {
queryNode.terms.missing = aggDef.settings.missing;
}
return queryNode;
};
@@ -65,6 +69,10 @@ function (queryDef) {
esAgg.interval = "$interval";
}
if (settings.missing) {
esAgg.missing = settings.missing;
}
return esAgg;
};

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

@@ -72,7 +72,8 @@ function (_) {
pipelineOptions: {
'moving_avg' : [
{text: 'window', default: 5},
{text: 'model', default: 'simple'}
{text: 'model', default: 'simple'},
{text: 'predict', default: 0}
],
'derivative': [
{text: 'unit', default: undefined},