From c925014bb5bba30330b616d8cdfe344e3543c621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 25 Jun 2014 10:09:19 -0400 Subject: [PATCH] Use unix epoch for Graphite from/to for absolute time ranges, #536 --- CHANGELOG.md | 5 +++++ src/app/services/graphite/graphiteDatasource.js | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db37fa6e000..567c44795b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +vNext + +**Changes** +- Use unix epoch for Graphite from/to for absolute time ranges (Closes #536) + # 1.6.1 (2014-06-24) **New features or improvements** diff --git a/src/app/services/graphite/graphiteDatasource.js b/src/app/services/graphite/graphiteDatasource.js index 33f809cf411..dd181ef1720 100644 --- a/src/app/services/graphite/graphiteDatasource.js +++ b/src/app/services/graphite/graphiteDatasource.js @@ -104,15 +104,7 @@ function (angular, _, $, config, kbn, moment) { } } - if (dashboard.current.timezone === 'browser') { - date = date.local(); - } - - if (config.timezoneOffset) { - date = date.zone(config.timezoneOffset); - } - - return date.format('HH:mm_YYYYMMDD'); + return date.unix(); }; GraphiteDatasource.prototype.metricFindQuery = function(filterSrv, query) {