Enable filestream input (elastic#21533)

kvch · web-flow · commit f4ebcf0dfc1a · 2020-10-05T19:18:35.000+02:00
The feature is enabled, but it is not yet documented.
diff --git a/filebeat/input/default-inputs/inputs.go b/filebeat/input/default-inputs/inputs.go
@@ -19,6 +19,7 @@ package inputs
 
 import (
 	"github.com/elastic/beats/v7/filebeat/beater"
+	"github.com/elastic/beats/v7/filebeat/input/filestream"
 	"github.com/elastic/beats/v7/filebeat/input/unix"
 	v2 "github.com/elastic/beats/v7/filebeat/input/v2"
 	"github.com/elastic/beats/v7/libbeat/beat"
@@ -27,13 +28,14 @@ import (
 
 func Init(info beat.Info, log *logp.Logger, components beater.StateStore) []v2.Plugin {
 	return append(
-		genericInputs(),
+		genericInputs(log, components),
 		osInputs(info, log, components)...,
 	)
 }
 
-func genericInputs() []v2.Plugin {
+func genericInputs(log *logp.Logger, components beater.StateStore) []v2.Plugin {
 	return []v2.Plugin{
+		filestream.Plugin(log, components),
 		unix.Plugin(),
 	}
 }
diff --git a/filebeat/input/filestream/fswatch.go b/filebeat/input/filestream/fswatch.go
@@ -74,7 +74,7 @@ type fileWatcher struct {
 
 func newFileWatcher(paths []string, ns *common.ConfigNamespace) (loginp.FSWatcher, error) {
 	if ns == nil {
-		return newScannerWatcher(paths, nil)
+		return newScannerWatcher(paths, common.NewConfig())
 	}
 
 	watcherType := ns.Name()

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ package inputs`
`19`	`19`
`20`	`20`	`import (`
`21`	`21`	`"github.com/elastic/beats/v7/filebeat/beater"`
	`22`	`+ "github.com/elastic/beats/v7/filebeat/input/filestream"`
`22`	`23`	`"github.com/elastic/beats/v7/filebeat/input/unix"`
`23`	`24`	`v2 "github.com/elastic/beats/v7/filebeat/input/v2"`
`24`	`25`	`"github.com/elastic/beats/v7/libbeat/beat"`
`@@ -27,13 +28,14 @@ import (`
`27`	`28`
`28`	`29`	`func Init(info beat.Info, log *logp.Logger, components beater.StateStore) []v2.Plugin {`
`29`	`30`	`return append(`
`30`		`- genericInputs(),`
	`31`	`+ genericInputs(log, components),`
`31`	`32`	`osInputs(info, log, components)...,`
`32`	`33`	`)`
`33`	`34`	`}`
`34`	`35`
`35`		`-func genericInputs() []v2.Plugin {`
	`36`	`+func genericInputs(log *logp.Logger, components beater.StateStore) []v2.Plugin {`
`36`	`37`	`return []v2.Plugin{`
	`38`	`+ filestream.Plugin(log, components),`
`37`	`39`	`unix.Plugin(),`
`38`	`40`	`}`
`39`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ type fileWatcher struct {`
`74`	`74`
`75`	`75`	`func newFileWatcher(paths []string, ns *common.ConfigNamespace) (loginp.FSWatcher, error) {`
`76`	`76`	`if ns == nil {`
`77`		`- return newScannerWatcher(paths, nil)`
	`77`	`+ return newScannerWatcher(paths, common.NewConfig())`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`watcherType := ns.Name()`