From 520772fdf2cd8b9b3249a494539a92af4de6e04c Mon Sep 17 00:00:00 2001
From: Ivana <ivana.huckova@gmail.com>
Date: Tue, 21 Sep 2021 18:38:05 +0200
Subject: [PATCH] Pass utcOffset

---
 public/app/plugins/datasource/prometheus/datasource.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index df6ddeab804..b59347d454f 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -295,7 +295,12 @@ export class PrometheusDatasource extends DataSourceWithBackend<PromQuery, PromO
       this.access === 'proxy' && options.app === CoreApp.Explore && !options.targets.some((query) => query.exemplar);
 
     if (shouldRunBackendQuery) {
-      return super.query(options).pipe(map((response) => transformV2(response, options)));
+      const targets = options.targets.map((target) => ({
+        ...target,
+        // We need to pass utcOffsetSec to backend to calculate aligned range
+        utcOffsetSec: this.timeSrv.timeRange().to.utcOffset() * 60,
+      }));
+      return super.query({ ...options, targets }).pipe(map((response) => transformV2(response, options)));
       // Run queries trough browser/proxy
     } else {
       const start = this.getPrometheusTime(options.range.from, false);