Use browser time for display. Closes elastic#19

rashidkpc · Nov 18, 2015 · a737495 · a737495
1 parent ce3f1e7
commit a737495
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "timelion",
-  "version": "0.1.174",
+  "version": "0.1.175",
   "dependencies": {
     "body-parser": "^1.12.0",
     "boom": "^2.8.0",

diff --git a/public/app.js b/public/app.js
@@ -1,5 +1,4 @@
 var _ = require('lodash');
-
 var logoUrl = require('./logo.png');
 
 require('angularSortableView');
@@ -45,12 +44,13 @@ require('ui/routes')
   });
 
 app.controller('timelion', function (
-  $scope, $http, timefilter, AppState, courier, $route, $routeParams, kbnUrl, Notifier, config, $timeout) {
+  $scope, $http, timefilter, AppState, courier, $route, $routeParams, kbnUrl, Notifier, config, $timeout, Private) {
   timefilter.enabled = true;
   var notify = new Notifier({
     location: 'Timelion'
   });
 
+  var timezone = Private(require('plugins/timelion/services/timezone'))();
   var defaultExpression = '.es(*)';
   var savedSheet = $route.current.locals.savedSheet;
   var blankSheet = [defaultExpression];
@@ -152,7 +152,8 @@ app.controller('timelion', function (
     $http.post('/timelion/sheet', {
       sheet: $scope.state.sheet,
       time: _.extend(timefilter.time, {
-        interval: getInterval($scope.state)
+        interval: getInterval($scope.state),
+        timezone: timezone
       }),
     })
     // data, status, headers, config

diff --git a/public/directives/chart_directive.js b/public/directives/chart_directive.js
@@ -1,6 +1,6 @@
 var _ = require('lodash');
 var $ = require('jquery');
-var moment = require('moment');
+var moment = require('moment-timezone');
 
 require('flot');
 require('flotTime');
@@ -11,21 +11,24 @@ require('flotSymbol');
 
 var app = require('ui/modules').get('apps/timelion', []);
 
-app.directive('chart', function ($compile, $rootScope, timefilter, $timeout) {
+app.directive('chart', function ($compile, $rootScope, timefilter, $timeout, Private) {
   return {
     restrict: 'A',
     scope: {
       chart: '=',
       search: '='
     },
     link: function ($scope, $elem) {
+      var timezone = Private(require('plugins/timelion/services/timezone'))();
+
       var legendValueNumbers;
       var debouncedSetLegendNumbers;
       var defaultOptions = {
         canvas: true,
         xaxis: {
           mode: 'time',
           tickLength: 0,
+          timezone: 'browser'
         },
         selection: {
           mode: 'x',

diff --git a/series_functions/es.js b/series_functions/es.js
@@ -26,6 +26,7 @@ function buildRequest(config, tlConfig) {
           date_histogram: {
             field: config.timefield,
             interval: config.interval,
+            time_zone: tlConfig.time.timezone,
             extended_bounds: {
               min: tlConfig.time.from,
               max: tlConfig.time.to