Migrate: Redis prospector to the input interface (#6119)

CHANGELOG.asciidoc

@@ -36,6 +36,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Renaming of the prospector type to the input type and all prospectors are now moved to the input
   folder, to maintain backward compatibility type aliasing was used to map the old type to the new
   one. This change also affect YAML configuration. {pull}6078[6078]
+- Refactor the Redis prospector to use the input interface {pull}6116[6116]
 
 *Heartbeat*
 

filebeat/input/redis/doc.go

@@ -1,4 +1,4 @@
-// Package redis package contains prospector and harvester to read the redis slow log
+// Package redis package contains input and harvester to read the redis slow log
 //
 // The redis slow log is stored in memory. The slow log can be activate on the redis command line as following:
 //

filebeat/input/redis/prospector.go → filebeat/input/redis/input.go

@@ -7,32 +7,32 @@ import (
 
 	"github.com/elastic/beats/filebeat/channel"
 	"github.com/elastic/beats/filebeat/harvester"
+	"github.com/elastic/beats/filebeat/input"
 	"github.com/elastic/beats/filebeat/input/file"
-	"github.com/elastic/beats/filebeat/prospector"
 	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 )
 
 func init() {
-	err := prospector.Register("redis", NewProspector)
+	err := input.Register("redis", NewInput)
 	if err != nil {
 		panic(err)
 	}
 }
 
-// Prospector is a prospector for redis
-type Prospector struct {
+// Input is a input for redis
+type Input struct {
 	started  bool
 	outlet   channel.Outleter
 	config   config
 	cfg      *common.Config
 	registry *harvester.Registry
 }
 
-// NewProspector creates a new redis prospector
-func NewProspector(cfg *common.Config, outletFactory channel.Factory, context prospector.Context) (prospector.Prospectorer, error) {
-	cfgwarn.Experimental("Redis slowlog prospector is enabled.")
+// NewInput creates a new redis input
+func NewInput(cfg *common.Config, outletFactory channel.Factory, context input.Context) (input.Input, error) {
+	cfgwarn.Experimental("Redis slowlog input is enabled.")
 
 	config := defaultConfig
 
@@ -46,7 +46,7 @@ func NewProspector(cfg *common.Config, outletFactory channel.Factory, context pr
 		return nil, err
 	}
 
-	p := &Prospector{
+	p := &Input{
 		started:  false,
 		outlet:   outlet,
 		config:   config,
@@ -58,13 +58,13 @@ func NewProspector(cfg *common.Config, outletFactory channel.Factory, context pr
 }
 
 // LoadStates loads the states
-func (p *Prospector) LoadStates(states []file.State) error {
+func (p *Input) LoadStates(states []file.State) error {
 	return nil
 }
 
-// Run runs the prospector
-func (p *Prospector) Run() {
-	logp.Debug("redis", "Run redis prospector with hosts: %+v", p.config.Hosts)
+// Run runs the input
+func (p *Input) Run() {
+	logp.Debug("redis", "Run redis input with hosts: %+v", p.config.Hosts)
 
 	if len(p.config.Hosts) == 0 {
 		logp.Err("No redis hosts configured")
@@ -85,14 +85,14 @@ func (p *Prospector) Run() {
 	}
 }
 
-// Stop stopps the prospector and all its harvesters
-func (p *Prospector) Stop() {
+// Stop stops the input and all its harvesters
+func (p *Input) Stop() {
 	p.registry.Stop()
 	p.outlet.Close()
 }
 
-// Wait waits for the propsector to be completed. Not implemented.
-func (p *Prospector) Wait() {}
+// Wait waits for the input to be completed. Not implemented.
+func (p *Input) Wait() {}
 
 // CreatePool creates a redis connection pool
 // NOTE: This code is copied from the redis pool handling in metricbeat

filebeat/module/redis/log/manifest.yml

@@ -11,4 +11,4 @@ var:
       - "c:/program files/Redis/logs/redis.log*"
 
 ingest_pipeline: ingest/pipeline.json
-prospector: config/log.yml
+input: config/log.yml

filebeat/module/redis/log/test/test.log-expected.json

@@ -15,6 +15,9 @@
       "prospector" : {
         "type" : "log"
       },
+      "event" : {
+        "type" : "log"
+      },
       "read_timestamp" : "2017-06-01T22:43:37.024Z",
       "source" : "/Users/tsg/src/github.com/elastic/beats/filebeat/module/redis/log/test/test.log",
       "fileset" : {
@@ -45,6 +48,9 @@
       "prospector" : {
         "type" : "log"
       },
+      "event" : {
+        "type" : "log"
+      },
       "read_timestamp" : "2017-06-01T22:43:37.024Z",
       "source" : "/Users/tsg/src/github.com/elastic/beats/filebeat/module/redis/log/test/test.log",
       "fileset" : {
@@ -77,6 +83,9 @@
       "prospector" : {
         "type" : "log"
       },
+      "event" : {
+        "type" : "log"
+      },
       "read_timestamp" : "2017-06-01T22:43:37.024Z",
       "source" : "/Users/tsg/src/github.com/elastic/beats/filebeat/module/redis/log/test/test.log",
       "fileset" : {
@@ -107,6 +116,9 @@
       "prospector" : {
         "type" : "log"
       },
+      "event" : {
+        "type" : "log"
+      },
       "read_timestamp" : "2017-06-01T22:43:37.024Z",
       "source" : "/Users/tsg/src/github.com/elastic/beats/filebeat/module/redis/log/test/test.log",
       "fileset" : {

filebeat/module/redis/slowlog/manifest.yml

@@ -8,4 +8,4 @@ var:
     default: ""
 
 ingest_pipeline: ingest/pipeline.json
-prospector: config/slowlog.yml
+input: config/slowlog.yml