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.

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

Cherry-pick #22987 to 7.x: Align logging with ECS #23015

Merged
merged 1 commit into from
Dec 9, 2020

Conversation

michalpristas
Copy link
Contributor

Cherry-pick of PR #22987 to 7.x branch. Original message:

What does this PR do?

This PR enables ECS loggin back so log.level is reported correctly.
On top of that it drops ecs.version as ecs.version is already added by libbeat (to deal with #21616)

Without drop events contains two ecs version fields one composed another one not e.g

"ecs.version": "1.6.0",
"ecs": {
  "version": "1.6.0",
}

Why is it important?

Fixes: #22858

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 9, 2020
@botelastic
Copy link

botelastic bot commented Dec 9, 2020

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #23015 opened

  • Start Time: 2020-12-09T07:35:17.198+0000

  • Duration: 32 min 46 sec

Test stats 🧪

Test Results
Failed 0
Passed 1384
Skipped 6
Total 1390

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1384
Skipped 6
Total 1390

Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Backport looks good.

@michalpristas michalpristas merged commit 3e87e64 into elastic:7.x Dec 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants