From 982548417681d8cf92b40eb052ede7e8b1cc7bd4 Mon Sep 17 00:00:00 2001
From: Mattia Rossi <mattia.rossi@gmail.com>
Date: Sat, 24 Nov 2018 10:48:29 -0500
Subject: [PATCH 1/3] Add support for Offset in elasticsearch datasource,
 date_histogram aggregation, fixes grafana #12653

---
 .../datasource/elasticsearch/partials/bucket_agg.html  | 10 ++++++++++
 .../plugins/datasource/elasticsearch/query_builder.ts  |  1 +
 2 files changed, 11 insertions(+)

diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index d0cf23a3d93..a6f68685681 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -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'">
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.ts b/public/app/plugins/datasource/elasticsearch/query_builder.ts
index efdeee68370..7d9490521e3 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.ts
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.ts
@@ -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';

From f6fc7f7b64f7f51e519c722459f849765f6d55fb Mon Sep 17 00:00:00 2001
From: Mattia Rossi <mattia.rossi@gmail.com>
Date: Mon, 26 Nov 2018 08:58:25 -0500
Subject: [PATCH 2/3] Requested Backend changes, added details to popover
 description for the offset field

---
 pkg/tsdb/elasticsearch/client/models.go                      | 1 +
 pkg/tsdb/elasticsearch/time_series_query.go                  | 3 +++
 .../datasource/elasticsearch/partials/bucket_agg.html        | 3 ++-
 public/app/plugins/datasource/elasticsearch/query_builder.ts | 5 ++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/client/models.go b/pkg/tsdb/elasticsearch/client/models.go
index a0d257d01a6..5307dc34b27 100644
--- a/pkg/tsdb/elasticsearch/client/models.go
+++ b/pkg/tsdb/elasticsearch/client/models.go
@@ -240,6 +240,7 @@ type DateHistogramAgg struct {
 	Missing        *string         `json:"missing,omitempty"`
 	ExtendedBounds *ExtendedBounds `json:"extended_bounds"`
 	Format         string          `json:"format"`
+	Offset         string          `json:"offset,omitempty"`
 }
 
 // FiltersAggregation represents a filters aggregation
diff --git a/pkg/tsdb/elasticsearch/time_series_query.go b/pkg/tsdb/elasticsearch/time_series_query.go
index 869e23e21ce..3e43a26089a 100644
--- a/pkg/tsdb/elasticsearch/time_series_query.go
+++ b/pkg/tsdb/elasticsearch/time_series_query.go
@@ -134,6 +134,9 @@ 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 missing, err := bucketAgg.Settings.Get("missing").String(); err == nil {
 			a.Missing = &missing
 		}
diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index a6f68685681..9d6b8196e8e 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -74,7 +74,8 @@
 			<label class="gf-form-label width-10">
 				Offset
 				<info-popover mode="right-normal">
-					Interval Offset
+					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
 				</info-popover>
 			</label>
 			<input class="gf-form-input max-width-12" type="text" ng-model="agg.settings.offset" ng-change="onChangeInternal()">
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.ts b/public/app/plugins/datasource/elasticsearch/query_builder.ts
index 7d9490521e3..c505d402874 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.ts
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.ts
@@ -71,7 +71,10 @@ 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 (settings.offset !== '') {
+      esAgg.offset = settings.offset;
+    }
 
     if (esAgg.interval === 'auto') {
       esAgg.interval = '$__interval';

From ce74b1ddc23fd3ab94dbd58064c16f85f49119a9 Mon Sep 17 00:00:00 2001
From: Mattia Rossi <mattia.rossi@gmail.com>
Date: Tue, 27 Nov 2018 03:42:20 -0500
Subject: [PATCH 3/3] Requested Backend changes, removed link in popover
 description for the offset field

---
 pkg/tsdb/elasticsearch/time_series_query.go                  | 5 +++--
 .../datasource/elasticsearch/partials/bucket_agg.html        | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/tsdb/elasticsearch/time_series_query.go b/pkg/tsdb/elasticsearch/time_series_query.go
index 3e43a26089a..a25c3cf693d 100644
--- a/pkg/tsdb/elasticsearch/time_series_query.go
+++ b/pkg/tsdb/elasticsearch/time_series_query.go
@@ -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
 		}
diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index 9d6b8196e8e..b17f03bced3 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -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()">