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

Add logging.ecs parameter #3815

Merged
merged 4 commits into from
May 26, 2020
Merged

Add logging.ecs parameter #3815

merged 4 commits into from
May 26, 2020

Conversation

simitt
Copy link
Contributor

@simitt simitt commented May 25, 2020

Motivation/summary

* Update beats to a9be1b56a849

  • Add logging.ecs parameter to config files

Forwardport of #3749

Checklist

- [ ] I have signed the Contributor License Agreement.

I have considered changes for:

How to test these changes

see #3749

Related issues

#3155

@apmmachine
Copy link
Contributor

apmmachine commented May 25, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #3815 updated]

  • Start Time: 2020-05-25T15:27:24.363+0000

  • Duration: 47 min 8 sec

Test stats 🧪

Test Results
Failed 0
Passed 3227
Skipped 145
Total 3372

Steps errors

Expand to view the steps failures

  • Name: Test Sync
    • Description: ./script/jenkins/sync.sh

    • Duration: 3 min 49 sec

    • Start Time: 2020-05-25T15:37:59.457+0000

    • log

@codecov-commenter
Copy link

codecov-commenter commented May 25, 2020

Codecov Report

Merging #3815 into master will increase coverage by 0.08%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3815      +/-   ##
==========================================
+ Coverage   79.81%   79.89%   +0.08%     
==========================================
  Files         136      136              
  Lines        6158     6158              
==========================================
+ Hits         4915     4920       +5     
+ Misses       1243     1238       -5     
Impacted Files Coverage Δ
kibana/connecting_client.go 72.58% <0.00%> (+8.06%) ⬆️

@simitt
Copy link
Contributor Author

simitt commented May 25, 2020

I removed the beats update from this PR as the required part for the ECS logging was already in master, and the update would have contained unrelated agent.hostname changes.

@simitt simitt changed the title Update beats to a9be1b56a849 and add logging.ecs parameter ~Update beats to a9be1b56a849 and~ add logging.ecs parameter May 25, 2020
@simitt simitt changed the title ~Update beats to a9be1b56a849 and~ add logging.ecs parameter Add logging.ecs parameter May 25, 2020
@simitt simitt merged commit e5585f8 into elastic:master May 26, 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.

4 participants