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

[Ingest Manager] Align logging with ECS #22987

Merged

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Dec 8, 2020

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.

@michalpristas michalpristas added bug needs_backport PR is waiting to be backported to other branches. Team:Ingest Management v7.11.0 labels Dec 8, 2020
@michalpristas michalpristas self-assigned this Dec 8, 2020
@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 8, 2020
@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 #22987 opened

  • Start Time: 2020-12-08T14:28:59.855+0000

  • Duration: 24 min 15 sec

Test stats 🧪

Test Results
Failed 0
Passed 1396
Skipped 4
Total 1400

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1396
Skipped 4
Total 1400

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.

Looks good.

@michalpristas michalpristas merged commit 9d9bac4 into elastic:master Dec 9, 2020
michalpristas added a commit to michalpristas/beats that referenced this pull request Dec 9, 2020
michalpristas added a commit that referenced this pull request Dec 9, 2020
[Ingest Manager] Align logging with ECS (#22987)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug needs_backport PR is waiting to be backported to other branches. v7.11.0
Projects
None yet
3 participants