-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
[logging] Upgrade ECS to 1.12 #113583
Merged
Merged
[logging] Upgrade ECS to 1.12 #113583
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b2d2f73
Upgrade ECS to 1.10.
lukeelmers 41f34ef
Upgrade ECS to 1.11.
lukeelmers 162ab85
Upgrade ECS to 1.12.
lukeelmers bc4e7f6
Update logs to 1.12.0.
lukeelmers 81352e3
Update unit tests.
lukeelmers 9b3cb97
Merge branch 'master' into feat/upgrade-ecs
kibanamachine d8205d0
Only have one assertion for the ECS version in the json layout tests.
lukeelmers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
/** | ||
* https://www.elastic.co/guide/en/ecs/1.12/ecs-data_stream.html | ||
* | ||
* @internal | ||
*/ | ||
export interface EcsDataStream { | ||
dataset?: string; | ||
namespace?: string; | ||
type?: 'logs' | 'metrics'; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
/** | ||
* https://www.elastic.co/guide/en/ecs/1.12/ecs-elf.html | ||
* | ||
* @internal | ||
*/ | ||
export interface EcsElf { | ||
architecture?: string; | ||
byte_order?: string; | ||
cpu_type?: string; | ||
creation_date?: string; | ||
exports?: Export[]; | ||
imports?: Import[]; | ||
header?: Header; | ||
sections?: Section[]; | ||
segments?: Segment[]; | ||
shared_libraries?: string[]; | ||
telfhash?: string; | ||
} | ||
|
||
interface Export { | ||
binding?: string; | ||
name?: string; | ||
section?: string; | ||
size?: string; | ||
type?: string; | ||
version?: string; | ||
visibility?: string; | ||
} | ||
|
||
interface Import { | ||
library?: string; | ||
name?: string; | ||
type?: string; | ||
version?: string; | ||
} | ||
|
||
interface Header { | ||
abi_version?: string; | ||
class?: string; | ||
data?: string; | ||
entrypoint?: number; | ||
object_version?: string; | ||
os_abi?: string; | ||
type?: string; | ||
version?: string; | ||
} | ||
|
||
interface Section { | ||
chi2?: number; | ||
entropy?: number; | ||
flags?: string; | ||
name?: string; | ||
physical_offset?: string; | ||
physical_size?: number; | ||
type?: string; | ||
virtual_address?: number; | ||
virtual_size?: number; | ||
} | ||
|
||
interface Segment { | ||
sections?: string; | ||
type?: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
import { EcsFile } from './file'; | ||
import { EcsHash } from './hash'; | ||
|
||
interface NestedFields { | ||
// Not all hash types are explicitly supported, see | ||
// https:/elastic/ecs/pull/1569 | ||
hash?: Pick<EcsHash, 'md5' | 'sha1' | 'sha256'>; | ||
} | ||
|
||
interface AttachmentNestedFields { | ||
file?: Pick<EcsFile, 'extension' | 'mime_type' | 'name' | 'size' | 'hash'>; | ||
} | ||
|
||
/** | ||
* No docs yet, see https:/elastic/ecs/pull/1569 | ||
* | ||
* @internal | ||
*/ | ||
export interface EcsEmail extends NestedFields { | ||
attachments?: Attachment[]; | ||
bcc?: string[]; | ||
cc?: string[]; | ||
content_type?: string; | ||
delivery_timestamp?: string; | ||
direction?: string; | ||
from?: string; | ||
local_id?: string; | ||
message_id?: string; | ||
origination_timestamp?: string; | ||
reply_to?: string; | ||
subject?: string; | ||
'subject.text'?: string; | ||
to?: string[]; | ||
x_mailer?: string; | ||
} | ||
|
||
// eslint-disable-next-line @typescript-eslint/no-empty-interface | ||
interface Attachment extends AttachmentNestedFields { | ||
// intentionally empty | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
More like
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should've included some Legolas asciiart in the code comments...