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 beats #1177

Merged
merged 8 commits into from
Jul 24, 2018
Merged

Update beats #1177

merged 8 commits into from
Jul 24, 2018

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Jul 24, 2018

No description provided.

@jalvz jalvz closed this Jul 24, 2018
@jalvz jalvz reopened this Jul 24, 2018
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

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

I think you are missing @govendor fetch github.com/elastic/beats/libbeat/scripts/cmd/global_fields@$(BEATS_VERSION) in the update_betas cmd in the Makefile

@@ -1269,130 +1268,3 @@ Kubernetes container image

--

[[exported-fields-system]]
Copy link
Contributor

Choose a reason for hiding this comment

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

Still wondering why this gets removed, but we can have a look as a follow-up task.

@@ -0,0 +1,216 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

@jalvz jalvz force-pushed the update-beats branch 2 times, most recently from 729df54 to 8a6294b Compare July 24, 2018 13:55
@jalvz
Copy link
Contributor Author

jalvz commented Jul 24, 2018

jenkins retest this please

@@ -99,6 +99,10 @@ func Update() error {
return sh.Run("make", "update")
}

func Fields() error {
return mage.GenerateFieldsYAML(".")
Copy link
Member

Choose a reason for hiding this comment

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

I think this should be model rather than ..

(I think the docs that I wrote in GenerateFieldsYAML are not 100% accurate w.r.t. how it searches for fields.yml files because I didn't fully understand the subtleties of how global_fields/main.go searches.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that won't skip _meta/fields.common.yml?

Copy link
Member

Choose a reason for hiding this comment

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

_meta/fields.common.yml will still be included. The args to GenerateFieldsYAML are extra module directories to collect fields.yml.

Copy link
Contributor

Choose a reason for hiding this comment

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

We will do a follow up fix then.

@jalvz jalvz merged commit 0b9e678 into elastic:master Jul 24, 2018
simitt added a commit to simitt/apm-server that referenced this pull request Jul 24, 2018
@simitt simitt mentioned this pull request Jul 24, 2018
simitt added a commit that referenced this pull request Jul 24, 2018
* Fix scripts for updating beats.

Follow up to PR #1177

* Update beats framework to 2a3aabc
@jalvz jalvz deleted the update-beats branch July 26, 2018 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants