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 pull request #14179 from mattiarossi/master

Browse Source 
Add support for offset in date histogram aggregation
This commit is contained in:
Marcus Efraimsson 2018-12-03 05:43:42 -08:00 committed by GitHub
commit acb45867f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/tsdb/elasticsearch/client/models.go
View File

@ -240,6 +240,7 @@ type DateHistogramAgg struct {
Missing *string `json:"missing,omitempty"` Missing *string `json:"missing,omitempty"`
ExtendedBounds *ExtendedBounds `json:"extended_bounds"` ExtendedBounds *ExtendedBounds `json:"extended_bounds"`
Format string `json:"format"` Format string `json:"format"`
Offset string `json:"offset,omitempty"`
} }
// FiltersAggregation represents a filters aggregation // FiltersAggregation represents a filters aggregation

4
pkg/tsdb/elasticsearch/time_series_query.go
View File

@ -134,6 +134,10 @@ func addDateHistogramAgg(aggBuilder es.AggBuilder, bucketAgg *BucketAgg, timeFro
a.Interval = "$__interval" a.Interval = "$__interval"
} }
if offset, err := bucketAgg.Settings.Get("offset").String(); err == nil {
a.Offset = offset
}
if missing, err := bucketAgg.Settings.Get("missing").String(); err == nil { if missing, err := bucketAgg.Settings.Get("missing").String(); err == nil {
a.Missing = &missing a.Missing = &missing
} }

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

@ -70,6 +70,16 @@
</label> </label>
<input class="gf-form-input max-width-12" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()"> <input class="gf-form-input max-width-12" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()">
</div> </div>
<div class="gf-form offset-width-7">
<label class="gf-form-label width-10">
Offset
<info-popover mode="right-normal">
Change the start value of each bucket by the specified positive (+) or negative offset (-) duration, such as 1h for an hour, or 1d for a day
</info-popover>
</label>
<input class="gf-form-input max-width-12" type="text" ng-model="agg.settings.offset" ng-change="onChangeInternal()">
</div>
</div> </div>
<div ng-if="agg.type === 'histogram'"> <div ng-if="agg.type === 'histogram'">

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

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