From f2dc6c933056c4634410ee302a79efc28c0b8ba6 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 6 Jul 2022 08:11:09 +0100 Subject: [PATCH] Graphite: Use TimeRange with applied fiscalYearStartMonth (#51623) (#51774) * Parse date with fiscalYearStartMonth in graphite ds * Use precalculated timeranges * Always use precalculated values * Modify test (cherry picked from commit 5b058d617d2e74e390087866476f70d8332bed09) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com> --- public/app/plugins/datasource/graphite/datasource.test.ts | 6 +++--- public/app/plugins/datasource/graphite/datasource.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/datasource/graphite/datasource.test.ts b/public/app/plugins/datasource/graphite/datasource.test.ts index 54ce71f387a..b0c271bbdeb 100644 --- a/public/app/plugins/datasource/graphite/datasource.test.ts +++ b/public/app/plugins/datasource/graphite/datasource.test.ts @@ -113,7 +113,7 @@ describe('graphiteDatasource', () => { const query = { panelId: 3, dashboardId: 5, - range: { raw: { from: 'now-1h', to: 'now' } }, + range: { from: dateTime('2022-04-01T00:00:00'), to: dateTime('2022-07-01T00:00:00') }, targets: [{ target: 'prod1.count' }, { target: 'prod2.count' }], maxDataPoints: 500, }; @@ -157,8 +157,8 @@ describe('graphiteDatasource', () => { const params = requestOptions.data.split('&'); expect(params).toContain('target=prod1.count'); expect(params).toContain('target=prod2.count'); - expect(params).toContain('from=-1h'); - expect(params).toContain('until=now'); + expect(params).toContain('from=1648789200'); + expect(params).toContain('until=1656655200'); }); it('should exclude undefined params', () => { diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index a83b90b2380..51d0a691a57 100644 --- a/public/app/plugins/datasource/graphite/datasource.ts +++ b/public/app/plugins/datasource/graphite/datasource.ts @@ -179,8 +179,8 @@ export class GraphiteDatasource query(options: DataQueryRequest): Observable { const graphOptions = { - from: this.translateTime(options.range.raw.from, false, options.timezone), - until: this.translateTime(options.range.raw.to, true, options.timezone), + from: this.translateTime(options.range.from, false, options.timezone), + until: this.translateTime(options.range.to, true, options.timezone), targets: options.targets, format: (options as any).format, cacheTimeout: options.cacheTimeout || this.cacheTimeout,