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] 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';