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

Do not build internal metrics without CGO (#6501) #6633

Merged
merged 1 commit into from
Mar 27, 2018

Conversation

kvch
Copy link
Contributor

@kvch kvch commented Mar 22, 2018

Backports the following commits to 6.2:

  • libbeat: build internal metrics on windows and linux without cgo
  • libbeat: add ephemeral id even if no internal memory metrics is reported
  • fix incorrect build tags && create common file for all platforms

PR #6501

@@ -280,6 +280,25 @@ https://github.com/elastic/beats/compare/v6.0.1...v6.1.0[View commits]
- Fix console color output for Windows. {issue}5611[5611]
- Fix logstash output debug message. {pull}5799{5799]
- Fix isolation of modules when merging local and global field settings. {issue}5795[5795]
- Fix panic when Events containing a float32 value are normalized. {pull}6129[6129]
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that the 3 phase merge did some fun stuff again :-(

@ruflin
Copy link
Contributor

ruflin commented Mar 23, 2018

Quite a few tests fail because of some nosetests issue but I can't see how they are related. Not sure if this an issue on the CI side or if there is something not working well with the 6.2 branch.

* libbeat: build internal metrics on windows and linux without cgo

* libbeat: add ephemeral id even if no internal memory metrics is reported

* fix incorrect build tags && create common file for all platforms
@kvch kvch force-pushed the backport_6501_6.2 branch from 38a28fc to 1b6f58d Compare March 26, 2018 18:43
@ruflin ruflin merged commit 6dc5f66 into elastic:6.2 Mar 27, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* libbeat: build internal metrics on windows and linux without cgo

* libbeat: add ephemeral id even if no internal memory metrics is reported

* fix incorrect build tags && create common file for all platforms
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