Skip to content

Update beats framework, fix bug in template setup cmd, remove host.name. #1934

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
Merged
merged 4 commits into from
Feb 20, 2019
Merged

Update beats framework, fix bug in template setup cmd, remove host.name. #1934

merged 4 commits into from
Feb 20, 2019

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Feb 15, 2019 •
edited by alvarolobato
Loading

fixes #1922

fixes #1846

@simitt simitt requested a review from graphaelli February 15, 2019 12:29
@simitt simitt force-pushed the master-update-beats branch from 18f275c to 295e42b Compare February 15, 2019 12:54
graphaelli
graphaelli approved these changes Feb 15, 2019
View reviewed changes
Copy link
Member

@graphaelli graphaelli left a comment

Choose a reason for hiding this comment

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

the beats update looks good, left comments on the template setup tests in #1935

@simitt simitt force-pushed the master-update-beats branch from 0e1348f to 487cbe3 Compare February 18, 2019 09:28
@simitt simitt changed the title Update beats framework and fix bug in template setup cmd Update beats framework, fix bug in template setup cmd, remove host.name. Feb 18, 2019
@simitt
Copy link
Contributor Author

simitt commented Feb 18, 2019 •
edited
Loading

@graphaelli since this update also includes the AddSkipHostname possibility, I added a commit to make use of it and enable the test that checks that no host.name is added. In case this gets reverted in libbeat, we'd still have the test to ensure the host.name doesn't get re-added again.

I rebased the branch to organize the commits as they should be merged (with a rebase & merge).

@simitt simitt force-pushed the master-update-beats branch from 487cbe3 to faf3b20 Compare February 18, 2019 09:44
@simitt simitt force-pushed the master-update-beats branch from fc0f947 to 66de8b3 Compare February 18, 2019 14:33
@simitt
Copy link
Contributor Author

simitt commented Feb 19, 2019

@graphaelli I changed this after your approval, could you please re-review.

@simitt simitt merged commit 70eb4d3 into elastic:master Feb 20, 2019
@simitt simitt deleted the master-update-beats branch May 6, 2019 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@graphaelli graphaelli graphaelli approved these changes

Assignees

@simitt simitt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

apm-server setup --template installs incorrect template Ensure libbeat does not set host.name
3 participants
@simitt @graphaelli @alvarolobato