Commit 688c21cd by Aaron Bassett

added little workraround for graphites timezones/DST failures

parent 39e19fdf
...@@ -24,7 +24,7 @@ function (_, crypto) { ...@@ -24,7 +24,7 @@ function (_, crypto) {
default_route : '/dashboard/file/default.json', default_route : '/dashboard/file/default.json',
grafana_index : 'grafana-dash', grafana_index : 'grafana-dash',
elasticsearch_all_disabled : false, elasticsearch_all_disabled : false,
timezoneOffset : null, timezoneOffset : 'auto',
}; };
// This initializes a new hash on purpose, to avoid adding parameters to // This initializes a new hash on purpose, to avoid adding parameters to
...@@ -59,6 +59,16 @@ function (_, crypto) { ...@@ -59,6 +59,16 @@ function (_, crypto) {
}; };
} }
if (settings.timezoneOffset === 'auto' )
{
//this hack is to deal with graphites poor tz support. It doesn't like
// DST, so we're gonna make a january (non-dst) date and get its offset
var nonDSTDate = new Date(new Date().getFullYear(),0,1);
//given "Tue Apr 08 2014 08:24:50 GMT-0400 (EDT)", get "-0400"
settings.timezoneOffset = nonDSTDate.toString().split(' ')[5].substring(3);
}
_.each(settings.datasources, function(datasource, key) { _.each(settings.datasources, function(datasource, key) {
datasource.name = key; datasource.name = key;
parseBasicAuth(datasource); parseBasicAuth(datasource);
......
...@@ -38,6 +38,7 @@ function (Settings) { ...@@ -38,6 +38,7 @@ function (Settings) {
/** /**
* If your graphite server has another timezone than you & users browsers specify the offset here * If your graphite server has another timezone than you & users browsers specify the offset here
* Example: "-0500" (for UTC - 5 hours) * Example: "-0500" (for UTC - 5 hours)
* If your graphite server runs UTC, you can set this to "auto" and it will pick the right timezone for you
*/ */
timezoneOffset: null, timezoneOffset: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment