Migrate S3 Input to Filebeat Input V2 (#20005) (#21500)

*moving s3 input to v2 input API Co-authored-by: urso <[email protected]> (cherry picked from commit 7e36f5c)
elastic · Oct 5, 2020 · 8f9faab · 8f9faab
1 parent 9024ab9
commit 8f9faab
Show file tree

Hide file tree

Showing 7 changed files with 797 additions and 938 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -688,6 +688,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - 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*
 

diff --git a/x-pack/filebeat/input/default-inputs/inputs.go b/x-pack/filebeat/input/default-inputs/inputs.go
@@ -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 {
@@ -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(),
 	}
 }