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

Migrate S3 Input to Filebeat Input V2 #20005

Merged
merged 17 commits into from
Oct 2, 2020
Merged

Migrate S3 Input to Filebeat Input V2 #20005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1c542d9
Init moving s3 input to v2 input API
Jul 8, 2020
370db52
update s3 input import
Jul 8, 2020
e5f6c29
unused error
Jul 8, 2020
9389267
remove unused
Jul 8, 2020
609b25a
fix s3_integration_test.go
kaiyan-sheng Jul 16, 2020
0a6cdbd
Merge remote-tracking branch 'upstream/master' into filebeat-input-v2-s3
kaiyan-sheng Jul 17, 2020
fd4a664
update s3 input to check EOF err
kaiyan-sheng Jul 17, 2020
d366dfe
Merge remote-tracking branch 'upstream/master' into filebeat-input-v2-s3
kaiyan-sheng Sep 29, 2020
58489be
add setupCollector function in s3_integration_test.go
kaiyan-sheng Sep 29, 2020
0589534
Remove deleteSampleLogFile and uploadSampleLogFile functions in integ…
kaiyan-sheng Oct 1, 2020
641ee46
fix integration test
kaiyan-sheng Oct 1, 2020
35cd52e
Merge remote-tracking branch 'upstream/master' into filebeat-input-v2-s3
kaiyan-sheng Oct 1, 2020
c81faae
add changelog
kaiyan-sheng Oct 1, 2020
4b4ddc2
Replace errors.Wrap with fmt.Errorf
kaiyan-sheng Oct 2, 2020
0f3f297
remove redundent queue_url from log entries
kaiyan-sheng Oct 2, 2020
4f15c18
Use MultiErrGroup to replace bare WaitGroup
kaiyan-sheng Oct 2, 2020
170133f
Merge remote-tracking branch 'upstream/master' into filebeat-input-v2-s3
kaiyan-sheng Oct 2, 2020
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 @@ -603,6 +603,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Always attempt community_id processor on zeek module {pull}21155[21155]
- Add related.hosts ecs field to all modules {pull}21160[21160]
- Keep cursor state between httpjson input restarts {pull}20751[20751]
- Convert aws s3 to v2 input {pull}20005[20005]

*Heartbeat*

Expand Down
2 changes: 2 additions & 0 deletions x-pack/filebeat/input/default-inputs/inputs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/elastic/beats/v7/x-pack/filebeat/input/http_endpoint"
"github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson"
"github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit"
"github.com/elastic/beats/v7/x-pack/filebeat/input/s3"
)

func Init(info beat.Info, log *logp.Logger, store beater.StateStore) []v2.Plugin {
Expand All @@ -29,5 +30,6 @@ func xpackInputs(info beat.Info, log *logp.Logger, store beater.StateStore) []v2
http_endpoint.Plugin(),
httpjson.Plugin(log, store),
o365audit.Plugin(log, store),
s3.Plugin(),
}
}
Loading