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

Beatless initial PR #7837

Merged
merged 8 commits into from
Aug 6, 2018
Merged

Conversation

ph
Copy link
Contributor

@ph ph commented Aug 1, 2018

Add a new beat inside the x-pack folder under the Elastic License, this is minimal requirement changes to have a build and a test running, no functionality is in.

make check fails because of make fmt complaining about the license, to fix the issue with the check we need to get elastic/go-licenser#15 merged.

Checkout the code and running make and make test will work.

NOTES TO REVIEWERS:

  • This PR target a feature branch called feature/beatless
  • This PR doesn't include beatless in the build all package yet, we will leverage work from X-Pack binaries #7783

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.
@ph ph added the in progress Pull request is currently in progress. label Aug 1, 2018
type Config struct {
}

var DefaultConfig = Config{}

Choose a reason for hiding this comment

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

exported var DefaultConfig should have comment or be unexported

@ph ph added the Functionbeat label Aug 1, 2018
@ph ph added review and removed in progress Pull request is currently in progress. labels Aug 1, 2018
@ph ph changed the base branch from master to feature/beatless August 1, 2018 20:35
@ph ph mentioned this pull request Aug 1, 2018
@kvch kvch assigned kvch and unassigned kvch Aug 2, 2018
@kvch kvch self-requested a review August 2, 2018 08:19
@@ -0,0 +1,6 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

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

we normally don't check in index patterns.

@@ -0,0 +1 @@
{"uuid":"5c255ec6-8c55-418c-bc62-45bf3d411ed6"}
Copy link
Contributor

Choose a reason for hiding this comment

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

Data directory should be ignored.

@@ -0,0 +1,220 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

fields.yml should be ignored

@ph
Copy link
Contributor Author

ph commented Aug 2, 2018

@ruflin @kvch updated with first reviews comments.

@urso
Copy link

urso commented Aug 2, 2018

Does make check check the license header is the correct one? E.g. only AL2 license heaader outside of x-pack and not AL2 inside of x-pack directory.

@ph
Copy link
Contributor Author

ph commented Aug 2, 2018 via email

@kvch
Copy link
Contributor

kvch commented Aug 2, 2018

Could you provide an example serverless.yml file?

)

func init() {
mage.SetBuildVariableSources(mage.DefaultBeatBuildVariableSources)
Copy link
Member

Choose a reason for hiding this comment

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

Is this line required? (Since it's in our repo hopefully it just works without setting this.)

start := time.Now()
defer func() { fmt.Println("package ran for", time.Since(start)) }()

mage.UseCommunityBeatPackaging()
Copy link
Member

Choose a reason for hiding this comment

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

That's probably not right. I guess this needs something that does not exist that only loads the x-pack package specs.

@ph
Copy link
Contributor Author

ph commented Aug 3, 2018

Could you provide an example serverless.yml file?

@kvch There is no need to do that in that PR since there is no config validation, it's just the skeleton project to get going.

@ph
Copy link
Contributor Author

ph commented Aug 3, 2018

@andrewkroh I've removed the line in question, but I am pretty green with the build magefile build system so it's certainly wrong.

mage build and mage crossbuild appear to be working in the beatless directory.

@kvch
Copy link
Contributor

kvch commented Aug 3, 2018

@ph Sorry, I didn't express myself properly. Are we going to provide an example serverless.yml for users?

@ph
Copy link
Contributor Author

ph commented Aug 3, 2018

@kvch Oops sorry, Yes we will include one but since this PR doesn't have any config handling it's currently empty and is located at x-pack/beatless/beatless.yml. Just a note we have decided to go with beatless and not serverless, with all the internal name changes it is confusing.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
@ph
Copy link
Contributor Author

ph commented Aug 3, 2018

This PR need the changes of #7783 to make sure we correctly compile the new beat.

@ph
Copy link
Contributor Author

ph commented Aug 3, 2018

@andrewkroh @kvch @urso I think we can merge this as is, so I can rebase followup PRs on top of it. Concerning the development strategy I was looking into using a feature branch instead of merging directly to master until we have a working alpha. WDYT?

@urso urso merged commit c4df1be into elastic:feature/beatless Aug 6, 2018
ph added a commit that referenced this pull request Aug 23, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
ph added a commit that referenced this pull request Sep 25, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
ph added a commit that referenced this pull request Sep 28, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
ph added a commit that referenced this pull request Oct 4, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
ph added a commit that referenced this pull request Oct 18, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
ph added a commit that referenced this pull request Oct 24, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
ph added a commit that referenced this pull request Oct 24, 2018
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* Beatless initial PR

Add a new beat inside the x-pack folder under the Elastic License,
minimal requirement changes to have a build and a test running.

Main makefile exclude ASL2 for x-pack but check for Elastic.
Beats can override the license in their Makefile.
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.

6 participants