Cherry-pick #17799 to 7.x: Update metricbeat to use mage for all scenarios along with Makefile shim#17951
Merged
blakerouse merged 3 commits intoelastic:7.xfrom Apr 28, 2020
Merged
Conversation
Contributor
|
Pinging @elastic/integrations-services (Team:Services) |
Contributor
|
Pinging @elastic/integrations-platforms (Team:Platforms) |
Member
|
@blakerouse I see a missmatch in the number of changed files (61 vs 62) between this one and its original, is this expected or sth went wrong? |
Contributor
Author
|
@ChrsMark No that is expected, this did not backport easily, lots of things had to be fixed. Maybe another commit needs to be backported first, and I will also look at the failures. |
kaiyan-sheng
approved these changes
Apr 24, 2020
Member
|
@blakerouse It look like the Metricbeat generator tests are failing when calling |
…him (elastic#17799) * Update metricbeat to use mage and the mage make targets. * Run update and fmt. * Remove assets.go as its no longer used. * Split apart the metricbeat tests in travis into multiple jobs to take less time and not run over the timeline. * Add back in create-metricset with mage. * Re-add test_xpack_base.py. * Add kafka to requirements.txt. * Fix kafka to work with python 3.7. * Remove the extra kafka-python from rebase on master. * Fix issues from code review. * Add back in comment from merge. * Fix comment spacing. * Fix update target in generate metricbeat. * Update magefile in metricbeat generator. * Run fmt and update. (cherry picked from commit 8786d05)
26bd6f7 to
96fdf1b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #17799 to 7.x branch. Original message:
What does this PR do?
Update's
metricbeatto usemagefor all scenarios and replaceMakefilewith themageMakefileshim.Why is it important?
While working on #17656 I ran into issues with running the integration tests because the current
Makefilewould override the usage ofdocker-composeinstead of using the logic that was already in themagework.This ensures that the same logic is used for
x-pack/metricbeatandmetricbeat.Checklist
I have made corresponding changes to the documentationI have made corresponding change to the default configuration filesI have added tests that prove my fix is effective or that my feature worksI have added an entry inCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
cd metricbeat && mage update build test