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

Update Filebeat's magefile.go #9700

Merged
merged 2 commits into from
Dec 20, 2018

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Dec 20, 2018

This improves and fixes a few issues.

  • Generate field docs that include fields from x-pack/filebeat.
  • Generate fields.go for each Filebeat module.
  • Add direct packaging build targets to x-pack/filebeat (packaging is no longer done via OSS filebeat).

This PR is based on #9686 so I'll rebased it after that merges. So review the last commit only a0ab47f.

@andrewkroh andrewkroh requested a review from a team as a code owner December 20, 2018 02:57
@andrewkroh andrewkroh requested a review from ruflin December 20, 2018 02:57
filebeat/scripts/mage/package.go Show resolved Hide resolved
filebeat/scripts/mage/package.go Show resolved Hide resolved
filebeat/scripts/mage/docs.go Show resolved Hide resolved
@andrewkroh andrewkroh force-pushed the feature/fb/improve-magefiles branch 3 times, most recently from 2d675d1 to a0ab47f Compare December 20, 2018 05:30
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

This is great. It will make a huge difference on how often PR's have to be rebased (or not). Thanks for taking care of this.

@@ -5,9 +5,13 @@ services:
depends_on:
- proxy_dep
env_file:
- ${PWD}/build/test.env
Copy link
Contributor

Choose a reason for hiding this comment

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

++ on getting rid of this.

Copy link
Member Author

Choose a reason for hiding this comment

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

I might bring it back as a static file someday. But for now a little duplication makes migration away from Make easier.

@@ -30,11 +30,13 @@ grouped in the following categories:
* <<exported-fields-logstash>>
* <<exported-fields-mongodb>>
* <<exported-fields-mysql>>
* <<exported-fields-netflow>>
Copy link
Contributor

Choose a reason for hiding this comment

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

I haven't checked 6.x, but are fields there showing up or does this need backport?

Copy link
Member Author

Choose a reason for hiding this comment

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

The x-pack fields aren't in the docs in 6.x. This will need a "backport" (using quotes b/c it may be easier to just copy over the parts we need since they are spread across commits in master).

@@ -0,0 +1,12 @@
filebeat.config:
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this file used during packaging?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, it gets included in the docker images as filebeat.yml.

This improves and fixes a few issues.

- Generate field docs that include fields from x-pack/filebeat.
- Generate fields.go for each Filebeat module.
- Add direct packaging build targets to x-pack/filebeat (packaging is no longer done via OSS filebeat).
@andrewkroh andrewkroh force-pushed the feature/fb/improve-magefiles branch from 43364ee to f67edfe Compare December 20, 2018 08:03
@andrewkroh andrewkroh merged commit e92c6b8 into elastic:master Dec 20, 2018
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