From 337eaa7a2c5d621ab7335641dd033c5fa8d772c8 Mon Sep 17 00:00:00 2001
From: Timothy Sullivan <tsullivan@elastic.co>
Date: Mon, 3 Feb 2020 13:38:45 -0700
Subject: [PATCH] make timezone happen

---
 .../public/discover/np_ready/angular/discover.js     |  6 +++++-
 .../reporting/export_types/csv/server/execute_job.ts | 12 +++---------
 .../plugins/reporting/export_types/csv/types.d.ts    |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 5e99cab1b3297..cb8ef45ca7c3d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import React from 'react';
 import { Subscription } from 'rxjs';
-import moment from 'moment';
+import moment from 'moment-timezone';
 import dateMath from '@elastic/datemath';
 import { i18n } from '@kbn/i18n';
 import '../components/field_chooser/field_chooser';
@@ -353,6 +353,10 @@ function discoverController(
           objectType: 'search',
           sharingData: {
             ...sharingData,
+            timezone:
+              core.uiSettings.get('dateFormat:tz') === 'Browser'
+                ? moment.tz.guess()
+                : core.uiSettings.get('dateFormat:tz'),
             title: savedSearch.title,
           },
           isDirty: $appStatus.dirty,
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
index 9f94a755cf655..2e9442db9baa8 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
@@ -35,6 +35,7 @@ export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
     const jobLogger = logger.clone([jobId]);
 
     const {
+      timezone,
       searchRequest,
       fields,
       indexPatternSavedObject,
@@ -99,28 +100,21 @@ export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
         return fieldFormatMapFactory(indexPatternSavedObject, fieldFormats);
       })(),
       (async () => {
-        const [separator, quoteValues, timezone] = await Promise.all([
+        const [separator, quoteValues] = await Promise.all([
           uiConfig.get('csv:separator'),
           uiConfig.get('csv:quoteValues'),
-          uiConfig.get('dateFormat:tz'),
         ]);
 
-        if (timezone === 'Browser') {
-          jobLogger.warn(
-            `Kibana Advanced Setting "dateFormat:tz" is set to "Browser". Dates will be formatted as UTC to avoid ambiguity.`
-          );
-        }
-
         return {
           separator,
           quoteValues,
-          timezone,
         };
       })(),
     ]);
 
     const generateCsv = createGenerateCsv(jobLogger);
     const { content, maxSizeReached, size, csvContainsFormulas } = await generateCsv({
+      timezone,
       searchRequest,
       fields,
       metaFields,
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
index 842330fa7c93f..12a6d8f1166bd 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
@@ -94,6 +94,7 @@ export interface CsvResultFromSearch {
 }
 
 export interface GenerateCsvParams {
+  timezone?: string;
   searchRequest: SearchRequest;
   callEndpoint: EndpointCaller;
   fields: string[];
@@ -104,7 +105,6 @@ export interface GenerateCsvParams {
   settings: {
     separator: string;
     quoteValues: boolean;
-    timezone: string | null;
     maxSizeBytes: number;
     scroll: { duration: string; size: number };
     checkForFormulas?: boolean;