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

Requested Backend changes, removed link in popover description for the offset field

Browse Source
This commit is contained in:
Mattia Rossi 2018-11-27 03:42:20 -05:00
parent f6fc7f7b64
commit ce74b1ddc2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -74,8 +74,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,
see https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units for further details
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()">