clarified timezoneOffset setting

This commit is contained in:
Torkel Ödegaard
2014-04-13 15:01:06 +02:00
parent 75b2e383c2
commit 0019101f0e
2 changed files with 10 additions and 14 deletions
+1 -11
View File
@@ -24,7 +24,7 @@ function (_, crypto) {
default_route : '/dashboard/file/default.json',
grafana_index : 'grafana-dash',
elasticsearch_all_disabled : false,
timezoneOffset : 'auto',
timezoneOffset : null,
};
// This initializes a new hash on purpose, to avoid adding parameters to
@@ -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) {
datasource.name = key;
parseBasicAuth(datasource);
+9 -3
View File
@@ -36,10 +36,16 @@ function (Settings) {
default_route: '/dashboard/file/default.json',
/**
* If your graphite server has another timezone than you & users browsers specify the offset here
* 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
* If you experiance problems with zoom, it is probably caused by timezone diff between
* your browser and the graphite-web application. timezoneOffset setting can be used to have Grafana
* 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,
grafana_index: "grafana-dash",