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

Prometheus: Get the utcOffset value of timezone when it's specified (#99910)

Browse Source 
* get the utcOffset value of timezone when it's specified

* Update packages/grafana-prometheus/src/datasource.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* calculate utcOffset from timezone when the request timezone is not browser

* lint

---------

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
This commit is contained in:
ismail simsek 2025-02-10 16:11:06 +01:00 committed by GitHub
parent 1b8db233a7
commit 55e7c4ae6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/grafana-prometheus/src/datasource.ts
View File

@ -1,5 +1,6 @@
// Core Grafana history https://github.com/grafana/grafana/blob/v11.0.0-preview/public/app/plugins/datasource/prometheus/datasource.ts
import { defaults } from 'lodash';
import { tz } from 'moment-timezone';
import { lastValueFrom, Observable, throwError } from 'rxjs';
import { map, tap } from 'rxjs/operators';
import semver from 'semver/preload';
@ -373,13 +374,32 @@ export class PrometheusDatasource
}
processTargetV2(target: PromQuery, request: DataQueryRequest<PromQuery>) {
// The `utcOffsetSec` parameter is required by the backend to correctly align time ranges.
// This alignment ensures that relative time ranges (e.g., "Last N hours/days/years") are adjusted
// according to the user's selected time zone, rather than defaulting to UTC.
//
// Example: If the user selects "Last 5 days," each day should begin at 00:00 in the chosen time zone,
// rather than at 00:00 UTC, ensuring an accurate breakdown.
//
// This adjustment does not apply to absolute time ranges, where users explicitly set
// the start and end timestamps.
//
// Handling `utcOffsetSec`:
// - When using the browser's time zone, the UTC offset is derived from the request range object.
// - When the user selects a custom time zone, the UTC offset must be calculated accordingly.
// More details:
// - Issue that led to the introduction of utcOffsetSec: https://github.com/grafana/grafana/issues/17278
// - Implementation PR: https://github.com/grafana/grafana/pull/17477
let utcOffset = request.range.to.utcOffset();
if (request.timezone !== 'browser') {
utcOffset = tz(request.timezone).utcOffset();
}
const processedTargets: PromQuery[] = [];
const processedTarget = {
...target,
exemplar: this.shouldRunExemplarQuery(target, request),
requestId: request.panelId + target.refId,
// We need to pass utcOffsetSec to backend to calculate aligned range
utcOffsetSec: request.range.to.utcOffset() * 60,
utcOffsetSec: utcOffset * 60,
};
if (config.featureToggles.promQLScope) {