Skip to content

[ML] Changes to timestamp formats #23498

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

Merged
jgowdyelastic merged 2 commits into from
Sep 26, 2018
Merged

[ML] Changes to timestamp formats #23498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a31ffe
[ML] Changes to timestamp formats
jgowdyelastic Sep 25, 2018
5f0574c
updating test snapshot
jgowdyelastic Sep 26, 2018
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
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export const ml = (kibana) => {
description: 'Machine Learning for the Elastic Stack',
icon: 'plugins/ml/ml.svg',
main: 'plugins/ml/app',
styleSheetPath: `${__dirname}/public/index.scss`,
},
styleSheetPaths: `${__dirname}/public/index.scss`,
hacks: ['plugins/ml/hacks/toggle_app_link_in_nav'],
home: ['plugins/ml/register_feature'],
},
Expand Down
244 changes: 242 additions & 2 deletions ...ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,54 @@ exports[`Overrides render overrides 1`] = `
</span>,
"value": "MMM dd HH:mm:ss,SSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss,SSSSSS
</span>,
"value": "MMM dd HH:mm:ss,SSSSSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss,SSSSSSSSS
</span>,
"value": "MMM dd HH:mm:ss,SSSSSSSSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss.SSS
</span>,
"value": "MMM dd HH:mm:ss.SSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss.SSSSSS
</span>,
"value": "MMM dd HH:mm:ss.SSSSSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss.SSSSSSSSS
</span>,
"value": "MMM dd HH:mm:ss.SSSSSSSSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss:SSS
</span>,
"value": "MMM dd HH:mm:ss:SSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss:SSSSSS
</span>,
"value": "MMM dd HH:mm:ss:SSSSSS",
},
Object {
"inputDisplay": <span>
MMM dd HH:mm:ss:SSSSSSSSS
</span>,
"value": "MMM dd HH:mm:ss:SSSSSSSSS",
},
Object {
"inputDisplay": <span>
MMM dd YYYY HH:mm:ss
Expand All @@ -136,9 +184,9 @@ exports[`Overrides render overrides 1`] = `
},
Object {
"inputDisplay": <span>
MMM dd, YYYY K:mm:ss a
MMM dd, YYYY h:mm:ss a
</span>,
"value": "MMM dd, YYYY K:mm:ss a",
"value": "MMM dd, YYYY h:mm:ss a",
},
Object {
"inputDisplay": <span>
Expand Down Expand Up @@ -170,24 +218,216 @@ exports[`Overrides render overrides 1`] = `
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSSSSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSSSSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSSSSS
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSS",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSSSSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSSSSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSSSSS Z
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSS Z",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSSSSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSSSSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSSSSSZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSSZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss,SSSSSSSSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss.SSSSSSSSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ss:SSSSSSSSSZZ
</span>,
"value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSSZZ",
},
Object {
"inputDisplay": <span>
YYYY-MM-dd HH:mm:ssZ
Expand Down
59 changes: 58 additions & 1 deletion x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,77 @@ export const TIMESTAMP_OPTIONS = [
'EEE, dd MMM YYYY HH:mm:ss ZZ',
'ISO8601',
// 'MMM d HH:mm:ss',

// 'MMM d HH:mm:ss,SSS',
// 'MMM d HH:mm:ss,SSSSSS',
// 'MMM d HH:mm:ss,SSSSSSSSS',
// 'MMM d HH:mm:ss.SSS',
// 'MMM d HH:mm:ss.SSSSSS',
// 'MMM d HH:mm:ss.SSSSSSSSS',
// 'MMM d HH:mm:ss:SSS',
// 'MMM d HH:mm:ss:SSSSSS',
// 'MMM d HH:mm:ss:SSSSSSSSS',

// 'MMM d YYYY HH:mm:ss',
'MMM dd HH:mm:ss',

'MMM dd HH:mm:ss,SSS',
'MMM dd HH:mm:ss,SSSSSS',
'MMM dd HH:mm:ss,SSSSSSSSS',
'MMM dd HH:mm:ss.SSS',
'MMM dd HH:mm:ss.SSSSSS',
'MMM dd HH:mm:ss.SSSSSSSSS',
'MMM dd HH:mm:ss:SSS',
'MMM dd HH:mm:ss:SSSSSS',
'MMM dd HH:mm:ss:SSSSSSSSS',

'MMM dd YYYY HH:mm:ss',
'MMM dd, YYYY K:mm:ss a',
'MMM dd, YYYY h:mm:ss a',
'TAI64N',
'UNIX',
'UNIX_MS',
'YYYY-MM-dd HH:mm:ss',

'YYYY-MM-dd HH:mm:ss,SSS',
'YYYY-MM-dd HH:mm:ss,SSSSSS',
'YYYY-MM-dd HH:mm:ss,SSSSSSSSS',
'YYYY-MM-dd HH:mm:ss.SSS',
'YYYY-MM-dd HH:mm:ss.SSSSSS',
'YYYY-MM-dd HH:mm:ss.SSSSSSSSS',
'YYYY-MM-dd HH:mm:ss:SSS',
'YYYY-MM-dd HH:mm:ss:SSSSSS',
'YYYY-MM-dd HH:mm:ss:SSSSSSSSS',

'YYYY-MM-dd HH:mm:ss,SSS Z',
'YYYY-MM-dd HH:mm:ss,SSSSSS Z',
'YYYY-MM-dd HH:mm:ss,SSSSSSSSS Z',
'YYYY-MM-dd HH:mm:ss.SSS Z',
'YYYY-MM-dd HH:mm:ss.SSSSSS Z',
'YYYY-MM-dd HH:mm:ss.SSSSSSSSS Z',
'YYYY-MM-dd HH:mm:ss:SSS Z',
'YYYY-MM-dd HH:mm:ss:SSSSSS Z',
'YYYY-MM-dd HH:mm:ss:SSSSSSSSS Z',

'YYYY-MM-dd HH:mm:ss,SSSZ',
'YYYY-MM-dd HH:mm:ss,SSSSSSZ',
'YYYY-MM-dd HH:mm:ss,SSSSSSSSSZ',
'YYYY-MM-dd HH:mm:ss.SSSZ',
'YYYY-MM-dd HH:mm:ss.SSSSSSZ',
'YYYY-MM-dd HH:mm:ss.SSSSSSSSSZ',
'YYYY-MM-dd HH:mm:ss:SSSZ',
'YYYY-MM-dd HH:mm:ss:SSSSSSZ',
'YYYY-MM-dd HH:mm:ss:SSSSSSSSSZ',

'YYYY-MM-dd HH:mm:ss,SSSZZ',
'YYYY-MM-dd HH:mm:ss,SSSSSSZZ',
'YYYY-MM-dd HH:mm:ss,SSSSSSSSSZZ',
'YYYY-MM-dd HH:mm:ss.SSSZZ',
'YYYY-MM-dd HH:mm:ss.SSSSSSZZ',
'YYYY-MM-dd HH:mm:ss.SSSSSSSSSZZ',
'YYYY-MM-dd HH:mm:ss:SSSZZ',
'YYYY-MM-dd HH:mm:ss:SSSSSSZZ',
'YYYY-MM-dd HH:mm:ss:SSSSSSSSSZZ',

'YYYY-MM-dd HH:mm:ssZ',
'YYYY-MM-dd HH:mm:ssZZ',
'YYYYMMddHHmmss',
Expand Down
12 changes: 3 additions & 9 deletions ...ublic/file_datavisualizer/components/file_datavisualizer_view/file_datavisualizer_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,21 +305,15 @@ function createUrlOverrides(overrides, originalSettings) {
}

function processResults(results) {
let timestampFormat = results.timestamp_format;
if (
timestampFormat === undefined &&
results.timestamp_formats !== undefined &&
results.timestamp_formats.length
) {
timestampFormat = results.timestamp_formats[0];
}
const timestampFormat = (results.joda_timestamp_formats !== undefined && results.joda_timestamp_formats.length) ?
results.joda_timestamp_formats[0] : undefined;

return {
format: results.format,
delimiter: results.delimiter,
timestampField: results.timestamp_field,
timestampFormat,
quote: '"', //results.quote,
quote: results.quote,
hasHeaderRow: results.has_header_row,
shouldTrimFields: results.should_trim_fields,
charset: results.charset,
Expand Down
Loading