github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4705 from rashidkpc/fix/tz-detect

Browse source 
Add Olson timezone detection. Closes #3694
This commit is contained in:
Khalah Jones Golden 2015-08-19 16:15:24 -04:00
commit 654da5e492
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -97,6 +97,7 @@
"jquery": "^2.1.4",
"js-yaml": "^3.2.5",
"json-stringify-safe": "^5.0.1",
"jstimezonedetect": "^1.0.5",
"leaflet": "^0.7.3",
"less": "^2.5.1",
"less-loader": "^2.2.0",

5
src/ui/public/agg_types/buckets/date_histogram.js
View file

@ -2,11 +2,12 @@ define(function (require) {
return function DateHistogramAggType(timefilter, config, Private) {
var _ = require('lodash');
var moment = require('moment');
var tzDetect = require('jstimezonedetect').jstz;
var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
var TimeBuckets = Private(require('ui/time_buckets'));
var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
var intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
var timeZone = tzDetect.determine().name();
var tzOffset = moment().format('Z');
function getInterval(agg) {
@ -93,7 +94,7 @@ define(function (require) {
var interval = agg.buckets.getInterval();
output.bucketInterval = interval;
output.params.interval = interval.expression;
output.params.time_zone = tzOffset;
output.params.time_zone = timeZone || tzOffset;
var scaleMetrics = interval.scaled && interval.scale < 1;
if (scaleMetrics) {