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

Jump to bottom

[logging] Upgrade ECS to 1.12 #113583

Merged
merged 7 commits into from
Oct 1, 2021
Merged

[logging] Upgrade ECS to 1.12 #113583

merged 7 commits into from
Oct 1, 2021

Conversation

lukeelmers
Copy link
Member

@lukeelmers lukeelmers commented Sep 30, 2021 •
edited
Loading

Part of #112175

Summary

I'm splitting the work outlined in #112175 into two parts:

  • Part 1 (this PR): Upgrade ECS types to 1.12.0. Will be backported to 7.x to coincide with the 7.16 stack release.
  • Part 2 (next PR): Upgrade ECS types to make breaking changes for 8.0.0[1]. Will not be backported.

[1] Starting in 8.0, ECS will be aligning their versioning with stack releases, hence the jump from 1.12 to 8.0

Notes for reviewers

  • Fortunately there wasn't any runtime code that needed to be modified here, other than the ECS version we include in the LogMeta. What this will do is simply ensure that any future LogMeta which might be added in 7.16 adheres to ECS 1.12.
  • I did each version jump as a separate commit, which may make reviewing easier (1.9 -> 1.10 -> 1.11 -> 1.12).

Testing

@lukeelmers lukeelmers added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Feature:Logging v7.16.0 labels Sep 30, 2021
@lukeelmers lukeelmers self-assigned this Sep 30, 2021
@lukeelmers lukeelmers marked this pull request as ready for review October 1, 2021 01:47
@lukeelmers lukeelmers requested review from a team as code owners October 1, 2021 01:47
lukeelmers
lukeelmers commented Oct 1, 2021
View reviewed changes
x-pack/plugins/security/server/audit/audit_events.ts
@@ -10,7 +10,7 @@ import type { EcsEventOutcome, EcsEventType, KibanaRequest, LogMeta } from 'src/
import type { AuthenticationResult } from '../authentication/authentication_result';

/**
* Audit event schema using ECS format: https://www.elastic.co/guide/en/ecs/1.9/index.html
* Audit event schema using ECS format: https://www.elastic.co/guide/en/ecs/1.12/index.html
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elastic/kibana-security Sorry for the codeowners ping for changing one line of commented code... but it was really gonna irritate me to not have this updated too 😛

@lukeelmers lukeelmers added the Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc label Oct 1, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

@lukeelmers lukeelmers added the auto-backport Deprecated - use backport:version if exact versions are needed label Oct 1, 2021
jportner
jportner approved these changes Oct 1, 2021
View reviewed changes
Copy link
Contributor

@jportner jportner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🌮

mshustov
mshustov approved these changes Oct 1, 2021
View reviewed changes
packages/kbn-logging/src/ecs/elf.ts
*
* @internal
*/
export interface EcsElf {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More like

download

Copy link
Member Author

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...

src/core/server/logging/layouts/json_layout.test.ts Show resolved Hide resolved
@lukeelmers
Copy link
Member Author

@elasticmachine merge upstream

@lukeelmers lukeelmers enabled auto-merge (squash) October 1, 2021 14:54
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @lukeelmers

@lukeelmers lukeelmers merged commit b58e721 into elastic:master Oct 1, 2021
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 1, 2021
@lukeelmers @kibanamachine
[logging] Upgrade ECS to 1.12 (elastic#113583)
eeb4881
@kibanamachine kibanamachine mentioned this pull request Oct 1, 2021
Merged
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.x

This backport PR will be merged automatically after passing CI.

@lukeelmers lukeelmers deleted the feat/upgrade-ecs branch October 1, 2021 18:03
@lukeelmers lukeelmers mentioned this pull request Oct 1, 2021
Merged
kibanamachine added a commit that referenced this pull request Oct 1, 2021
@kibanamachine @lukeelmers
[logging] Upgrade ECS to 1.12 (#113583) (#113651)
b91f8c8 
Co-authored-by: Luke Elmers <luke.elmers@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pgayvallet pgayvallet pgayvallet left review comments

@mshustov mshustov mshustov approved these changes

@jportner jportner jportner approved these changes

Assignees

@lukeelmers lukeelmers

Labels
auto-backport Deprecated - use backport:version if exact versions are needed Feature:Logging release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.16.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lukeelmers @elasticmachine @kibanamachine @pgayvallet @mshustov @jportner