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.

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

Deploy Filebeat modules in the packages #3436

Merged
merged 1 commit into from
Jan 24, 2017
Merged

Deploy Filebeat modules in the packages #3436

merged 1 commit into from
Jan 24, 2017

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Jan 22, 2017 •
edited
Loading

Uses an intermediary _meta/module.generated/ folder which is created on
make collect. This gives us the opportunity to select which files are
needed to be deployed in the package (currently everything but the _meta and
test folders).

The intermediary folder also allows us to avoid providing a custom install-home
target in Filebeat.

Part of #3159.

@tsg tsg added the review label Jan 22, 2017
@tsg
Copy link
Contributor Author

tsg commented Jan 22, 2017

jenkins, package it

@tsg tsg mentioned this pull request Jan 23, 2017
Closed
22 tasks
@ruflin
Copy link
Contributor

ruflin commented Jan 23, 2017

Could we move this into the build directory where it would be ignored automatically? Not 100% sure if we should use a . (dot) directory. I remember something that we opted for not using . for some files because it could problems on Windows. What about module.generate without the leading dot? That would be consistent with the files which are generated.

@tsg
Copy link
Contributor Author

tsg commented Jan 23, 2017

@ruflin ah, I didn't think of the build directory, I can easily do that. Then the dot is not needed, I added it to avoid the confusion.

@tsg tsg force-pushed the filebeat_modules_deploy branch from 153ae99 to 7b446f8 Compare January 23, 2017 10:19
@tsg tsg added the in progress Pull request is currently in progress. label Jan 23, 2017
@tsg
Copy link
Contributor Author

tsg commented Jan 23, 2017

Setting in progress as this seems to cause issues on local package building.

@tsg tsg removed the in progress Pull request is currently in progress. label Jan 23, 2017
@tsg
Copy link
Contributor Author

tsg commented Jan 23, 2017

Removed 'in progress' since the issue seems to exists only on my computer.

@tsg tsg added the in progress Pull request is currently in progress. label Jan 23, 2017
@ruflin
Copy link
Contributor

ruflin commented Jan 23, 2017

jenkins, package it

@tsg
Copy link
Contributor Author

tsg commented Jan 23, 2017

@ruflin I suspect the build/ directory is cleaned during packaging, because with the new version the files are not added.

Deploy Filebeat modules in the packages
284a747 
Uses an intermediary `_meta/module.generated/` folder which is created on
`make collect`. This gives us the opportunity to select which files are
needed to be deployed in the package (currently everything but the `_meta` and
`test` folders).

The intermediary folder also allows us to avoid providing a custom `install-home`
target in Filebeat.

Part of elastic#3159.
@tsg tsg force-pushed the filebeat_modules_deploy branch from 7b446f8 to 284a747 Compare January 23, 2017 13:46
@tsg
Copy link
Contributor Author

tsg commented Jan 23, 2017

jenkins, package it

@tsg
Copy link
Contributor Author

tsg commented Jan 23, 2017

I changed the temp folder to _meta/module.generated.

@tsg tsg removed the in progress Pull request is currently in progress. label Jan 23, 2017
@ruflin ruflin merged commit e75197e into elastic:master Jan 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin approved these changes

Assignees
No one assigned
Labels
review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tsg @ruflin