Commit 0019101f by Torkel Ödegaard

clarified timezoneOffset setting

parent 75b2e383
...@@ -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 : 'auto', timezoneOffset : null,
}; };
// 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,16 +59,6 @@ function (_, crypto) { ...@@ -59,16 +59,6 @@ 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);
......
...@@ -36,10 +36,16 @@ function (Settings) { ...@@ -36,10 +36,16 @@ function (Settings) {
default_route: '/dashboard/file/default.json', default_route: '/dashboard/file/default.json',
/** /**
* If your graphite server has another timezone than you & users browsers specify the offset here * If you experiance problems with zoom, it is probably caused by timezone diff between
* Example: "-0500" (for UTC - 5 hours) * your browser and the graphite-web application. timezoneOffset setting can be used to have Grafana
* If your graphite server runs UTC, you can set this to "auto" and it will pick the right timezone for you * translate absolute time ranges to the graphite-web timezone.
* Example:
* If TIME_ZONE in graphite-web config file local_settings.py is set to America/New_York, then set
* timezoneOffset to "-0500" (for UTC - 5 hours)
* Example:
* If TIME_ZONE is set to UTC, set this to "0000"
*/ */
timezoneOffset: null, timezoneOffset: null,
grafana_index: "grafana-dash", grafana_index: "grafana-dash",
......
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