Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove useUTC deprecation, set default timezone to local #22696

Merged
merged 6 commits into from
Mar 29, 2019
Merged

remove useUTC deprecation, set default timezone to local #22696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5035d0
remove useUTC deprecation, set default timezone to local
jbudz Sep 4, 2018
604d9a2
Merge branch 'master' into server-tz-local
jbudz Jan 24, 2019
8565fa8
no-unused-vars
jbudz Jan 25, 2019
062f4e7
Merge branch 'master' into server-tz-local
jbudz Feb 25, 2019
acfcd79
Merge branch 'master' into server-tz-local
jbudz Mar 26, 2019
ca5511f
rm set, unset import
jbudz Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/migration/migrate_8_0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@ The following section is re-used in the Installation and Upgrade Guide
////
// tag::notable-breaking-changes[]

[float]
=== Default logging timezone is now the system's timezone
*Details:* In prior releases the timezone used in logs defaulted to UTC. We now use the host machine's timezone by default.

*Impact:* To restore the previous behavior, in kibana.yml set `logging.timezone: UTC`.

// end::notable-breaking-changes[]
2 changes: 1 addition & 1 deletion src/legacy/server/config/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export default () => Joi.object({
then: Joi.default(!process.stdout.isTTY),
otherwise: Joi.default(true)
}),
timezone: Joi.string().allow(false).default('UTC')
timezone: Joi.string()
}).default(),

ops: Joi.object({
Expand Down
13 changes: 1 addition & 12 deletions src/legacy/server/config/transform_deprecations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
* under the License.
*/

import _, { set } from 'lodash';
import _ from 'lodash';
import { createTransform, Deprecations } from '../../deprecation';
import { unset } from '../../utils';

const { rename, unused } = Deprecations;

Expand All @@ -46,15 +45,6 @@ const rewriteBasePath = (settings, log) => {
}
};

const loggingTimezone = (settings, log) => {
if (_.has(settings, 'logging.useUTC')) {
const timezone = settings.logging.useUTC ? 'UTC' : false;
set('logging.timezone', timezone);
unset(settings, 'logging.useUTC');
log(`Config key "logging.useUTC" is deprecated. It has been replaced with "logging.timezone"`);
}
};

const deprecations = [
//server
unused('server.xsrf.token'),
Expand All @@ -66,7 +56,6 @@ const deprecations = [
rename('optimize.lazyProxyTimeout', 'optimize.watchProxyTimeout'),
savedObjectsIndexCheckTimeout,
rewriteBasePath,
loggingTimezone,
];

export const transformDeprecations = createTransform(deprecations);