Cherry-pick #16441 to 7.x: [Filebeat] Check expand_event_list_from_field before checking content-type #16626
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 #16441 to 7.x branch. Original message:
What does this PR do?
This PR is to fix s3 input reading json format logs. When
expand_event_list_from_field
config is given, such as cloudtrail fileset, s3 input should usejson.NewDecoder
first. If thisexpand_event_list_from_field
is not given, then check content-type and usegzip.NewReader
.Why is it important?
This will fix s3 input when using cloudtrail fileset.
Checklist
I have made corresponding changes to the documentationI have made corresponding change to the default configuration filesI have added tests that prove my fix is effective or that my feature worksRelated issues
Screenshots
When Metadata is set as below:
I was able to read the cloudtrail json.gz file as shown below in Kibana: