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

Unify generator #3452

Merged
merged 2 commits into from
Feb 3, 2017
Merged

Unify generator #3452

merged 2 commits into from
Feb 3, 2017

Conversation

ruflin
Copy link
Contributor

@ruflin ruflin commented Jan 24, 2017

  • Use one script create generic beat or metricbeat
  • Rename generate directory to template (UPDATE: generator)
  • Share most parts of the testing makefile
  • Update docs to new logic
  • Update travis build file

@ruflin ruflin added :Generator Related to code generators for building custom Beats or modules. in progress Pull request is currently in progress. labels Jan 24, 2017
@ruflin ruflin force-pushed the unify-generator branch 2 times, most recently from 69d26a6 to a35ddc9 Compare January 25, 2017 15:40
@ruflin ruflin added review and removed in progress Pull request is currently in progress. labels Jan 25, 2017
* Use one script create generic beat or metricbeat
* Rename `generate` directory to `template`
* Share most parts of the testing makefile
* Update docs to new logic
* Update travis build file
Copy link
Contributor

@monicasarbu monicasarbu left a comment

Choose a reason for hiding this comment

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

LGTM. Only a small comment about the name of the directory template, not to be confused with something else.

@monicasarbu
Copy link
Contributor

monicasarbu commented Feb 1, 2017

@ruflin What about moving the scripts/generate.py script to the template directory to be together with the Beat templates, and rename the template directory to generator?

@ruflin
Copy link
Contributor Author

ruflin commented Feb 2, 2017

@monicasarbu I actually just did the opposite step with this PR :-) The reason I put it under script (besides that it is a script) is that I think it is unlikely that we will change the name of the folder or move the folder in the near future. This means we will not break the generator again. All the other directories (be it template or generator or xyz) do not matter to the user as it we only have to adjust it inside the script. So I think we should keep script/generate.py but I have no strong opinion about the naming of the directory. Let me know what you prefer there.

@monicasarbu
Copy link
Contributor

@ruflin That's a good point. I would say to keep the script in the script directory, and rename the directory with the templates to generator even if it contains only the templates as you will use the script anyway to generate the templates.

@ruflin
Copy link
Contributor Author

ruflin commented Feb 2, 2017

@monicasarbu renamed

@monicasarbu
Copy link
Contributor

Waiting for green

@monicasarbu monicasarbu merged commit 3e77723 into elastic:master Feb 3, 2017
@ruflin ruflin deleted the unify-generator branch February 3, 2017 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Generator Related to code generators for building custom Beats or modules. review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants