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.

Sign up for GitHub

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

[Filebeat] Support for gzipped files in S3 input #13980

Merged
merged 5 commits into from
Oct 11, 2019
Merged

[Filebeat] Support for gzipped files in S3 input #13980

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9947b0e
Added support for gzipped files in S3 bucket
darupedk Oct 9, 2019
00a58ec
Update CHANGELOG.next.asciidoc
darupedk Oct 9, 2019
5a88f12
Removed gzip config parameter
darupedk Oct 9, 2019
7ffdc45
Removed gzip config parameter from docs
darupedk Oct 9, 2019
9028f51
Changed gzip error message to include S3 object key
darupedk Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix a race condition in the TCP input when close the client socket. {pull}13038[13038]
- cisco/asa fileset: Renamed log.original to event.original and cisco.asa.list_id to cisco.asa.rule_name. {pull}13286[13286]
- cisco/asa fileset: Fix parsing of 302021 message code. {pull}13476[13476]
- Add support for gzipped files in S3 input {pull}13980[13980]

*Heartbeat*

Expand Down
12 changes: 12 additions & 0 deletions x-pack/filebeat/input/s3/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package s3

import (
"bufio"
"compress/gzip"
"context"
"crypto/sha256"
"encoding/hex"
Expand Down Expand Up @@ -433,6 +434,17 @@ func (p *s3Input) newS3BucketReader(svc s3iface.ClientAPI, s3Info s3Info) (*bufi
if resp.Body == nil {
return nil, errors.New("s3 get object response body is empty")
}

if strings.HasSuffix(s3Info.key, ".gz") {
gzipReader, err := gzip.NewReader(resp.Body)

if err != nil {
return nil, errors.New("Failed to decompress gzipped file")
kaiyan-sheng marked this conversation as resolved.
Show resolved Hide resolved
}

return bufio.NewReader(gzipReader), nil
}

return bufio.NewReader(resp.Body), nil
}

Expand Down