Fix build for all OS after #8424 #8717
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ph
approved these changes
Oct 23, 2018
|
Just to clarify my previous comment, adding platform specific code should be for something that would yield simplicity benefits, hidding system calls / hidding libraries. My worries here is to add complexity and maintenance. |
|
SGTM, let me do the change, as this is only in master (not backported to 6.x yet) |
exekias
added
the
needs_backport
ph
approved these changes
Oct 24, 2018
exekias
removed
the
needs_backport
|
Added to #8718 |
exekias
added a commit
to exekias/beats
that referenced
this pull request
Oct 24, 2018
* Fix build for all OS after elastic#8424 * Apply PR comments
exekias
added a commit
that referenced
this pull request
Oct 26, 2018
… CRI log processing (#8718) * Reduce casting between []byte and string in CRI log processing (#8424) * Reduce casting between []byte and string in CRI log processing * Refactor CRI and json-file detection * Improve handling of new lines in linux/windows CRI logs. * Move new line removal to OS specific functions. * Add option to force CRI log parsing, otherwise autodetect log type. * Fixed unit tests and new line removal * Fixed new line removal * Added unit tests to check Forced CRI flag (cherry picked from commit 3f7d6a6) * Add CHANGELOG and docs for CRI force flag (#8699) (cherry picked from commit 06ec3b9) * Fix conflicting paths * Fix build for all OS after #8424 (#8717) * Fix build for all OS after #8424 * Apply PR comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the right build flags for docker JSON platform specific code