IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'auto_tz' of github.com:magicrobotmonkey/grafana into magicrobotmonkey-auto_tz

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-04-13 13:45:08 +02:00
commit 75b2e383c2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/components/settings.js
View File

@ -24,7 +24,7 @@ function (_, crypto) {
default_route : '/dashboard/file/default.json',
grafana_index : 'grafana-dash',
elasticsearch_all_disabled : false,
timezoneOffset : null,
timezoneOffset : 'auto',
};
// This initializes a new hash on purpose, to avoid adding parameters to
@ -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) {
datasource.name = key;
parseBasicAuth(datasource);

1
src/config.sample.js
View File

@ -38,6 +38,7 @@ function (Settings) {
/**
* 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
*/
timezoneOffset: null,