Cherry-pick #8637 to 6.x: Haproxy filebeat module tcp and default formats #8690
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
jsoriano
requested changes
Oct 23, 2018
|
|
||
| - name: geoip | ||
| type: group | ||
| description: > | ||
| Contains GeoIP information gathered based on the client_ip field. | ||
| geoip contains information gathered based on the client.ip field. |
There was a problem hiding this comment.
Oh, I didn't see this in the original PR 🙁 This shouldn't have been changed, but let it for future PRs.
There was a problem hiding this comment.
Can't I change it now?
There was a problem hiding this comment.
You can, but ideally this should be fixed on master first.
There was a problem hiding this comment.
Is it ok to leave it like this? Contains GeoIP information gathered based on the client.ip field. (with client.ip instead of client_ip)
There was a problem hiding this comment.
Oh, yes, leave it like it was before, but with client.ip.
There was a problem hiding this comment.
Sure, done here #8691
jsoriano
reviewed
Oct 23, 2018
sayden
force-pushed
the
backport_8637_6.x
branch
2 times, most recently
from
e83b0c9
to
7a61c0f
Compare
sayden
force-pushed
the
backport_8637_6.x
branch
from
7a61c0f
to
21c17e2
Compare
jsoriano
approved these changes
Oct 23, 2018
|
Test is not related to filebeat. Merging |
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.
Cherry-pick of PR #8637 to 6.x branch. Original message:
Adds TCP and Default format parsing in parallel to HTTP format as described here https://cbonte.github.io/haproxy-dconv/1.7/configuration.html#8.2 So the three types of logs can be parsed even if they are mixed in the file
Merges #8428 and #8526 into a single PR because now #8526 depends on #8428