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

Add support for Offset in elasticsearch datasource, date_histogram aggregation, fixes grafana #12653

Browse Source
This commit is contained in:
Mattia Rossi 2018-11-24 10:48:29 -05:00
parent efcbb92b3f
commit 9825484176
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,16 @@
</label>
<input class="gf-form-input max-width-12" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()">
</div>
<div class="gf-form offset-width-7">
<label class="gf-form-label width-10">
Offset
<info-popover mode="right-normal">
Interval Offset
</info-popover>
</label>
<input class="gf-form-input max-width-12" type="text" ng-model="agg.settings.offset" ng-change="onChangeInternal()">
</div>
</div>
<div ng-if="agg.type === 'histogram'">

1
public/app/plugins/datasource/elasticsearch/query_builder.ts
View File

@ -71,6 +71,7 @@ export class ElasticQueryBuilder {
esAgg.min_doc_count = settings.min_doc_count || 0;
esAgg.extended_bounds = { min: '$timeFrom', max: '$timeTo' };
esAgg.format = 'epoch_millis';
esAgg.offset = settings.offset || '0';
if (esAgg.interval === 'auto') {
esAgg.interval = '$__interval';