Migrate: modules yaml and their json expected file to use the input and the input.type field

CHANGELOG.asciidoc

@@ -40,6 +40,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
   one. This change also affect YAML configuration. {pull}6078[6078]
 - Refactor the Redis prospector to use the input interface {pull}6116[6116]
 - Refactor the UDP prospector to use the input interface {pull}6118[6118]
+- Refactor the usage of prospector to input in the YAML reference {pull}6121[6121]
 
 *Heartbeat*
 

filebeat/filebeat.reference.yml

@@ -24,9 +24,9 @@ filebeat.modules:
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
     #var.convert_timezone: false
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Authorization logs
   #auth:
@@ -39,9 +39,9 @@ filebeat.modules:
     # Convert the timestamp to UTC. Requires Elasticsearch >= 6.1.
     #var.convert_timezone: false
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #------------------------------- Apache2 Module ------------------------------
 #- module: apache2
@@ -53,9 +53,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Error logs
   #error:
@@ -65,9 +65,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #------------------------------- Auditd Module -------------------------------
 #- module: auditd
@@ -78,9 +78,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #------------------------------- Icinga Module -------------------------------
 #- module: icinga
@@ -92,9 +92,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Debug logs
   #debug:
@@ -104,9 +104,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Startup logs
   #startup:
@@ -116,9 +116,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #-------------------------------- Kafka Module -------------------------------
 - module: kafka
@@ -162,9 +162,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Slow logs
   #slowlog:
@@ -174,9 +174,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #-------------------------------- Nginx Module -------------------------------
 #- module: nginx
@@ -200,9 +200,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #------------------------------- Osquery Module ------------------------------
 - module: osquery
@@ -228,9 +228,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 #-------------------------------- Redis Module -------------------------------
 #- module: redis
@@ -262,9 +262,9 @@ filebeat.modules:
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
 
 #=========================== Filebeat prospectors =============================

filebeat/module/apache2/_meta/config.reference.yml

@@ -7,9 +7,9 @@
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Error logs
   #error:
@@ -19,6 +19,6 @@
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:

filebeat/module/apache2/access/manifest.yml

@@ -12,7 +12,7 @@ var:
       - "C:/Program Files/Apache Software Foundation/Apache2.*/logs/access.log*"
 
 ingest_pipeline: ingest/default.json
-prospector: config/access.yml
+input: config/access.yml
 
 requires.processors:
 - name: user_agent

filebeat/module/apache2/access/test/test.log-expected.json

@@ -33,6 +33,9 @@
             },
             "prospector": {
                 "type": "log"
+            },
+            "input": {
+                "type": "log"
             }
         },
         "fields": {
@@ -89,6 +92,9 @@
             },
             "prospector": {
                 "type": "log"
+            },
+            "input": {
+                "type": "log"
             }
         },
         "fields": {
@@ -128,6 +134,9 @@
             },
             "prospector": {
                 "type": "log"
+            },
+            "input": {
+                "type": "log"
             }
         },
         "fields": {
@@ -177,6 +186,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "read_timestamp": "2017-05-29T19:34:14.378Z",
             "source": "/home/exekias/go/src/github.com/elastic/beats/filebeat/apache2.log"
         },

filebeat/module/apache2/error/manifest.yml

@@ -11,4 +11,4 @@ var:
       - "C:/Program Files/Apache Software Foundation/Apache2.*/logs/error.log*"
 
 ingest_pipeline: ingest/pipeline.json
-prospector: config/error.yml
+input: config/error.yml

filebeat/module/apache2/error/test/test.log-expected.json

@@ -23,6 +23,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "source": "module/apache2/error/test/test.log",
             "fields": {
                 "pipeline_id": "apache2-error-pipeline",
@@ -56,6 +59,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "source": "module/apache2/error/test/test.log",
             "fields": {
                 "pipeline_id": "apache2-error-pipeline",
@@ -86,6 +92,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "source": "module/apache2/error/test/test.log",
             "fields": {
                 "pipeline_id": "apache2-error-pipeline",

filebeat/module/auditd/_meta/config.reference.yml

@@ -6,6 +6,6 @@
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:

filebeat/module/auditd/log/manifest.yml

@@ -8,7 +8,7 @@ var:
     os.windows: []
 
 ingest_pipeline: ingest/pipeline.json
-prospector: config/log.yml
+input: config/log.yml
 
 requires.processors:
 - name: geoip

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

@@ -10,6 +10,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "source": "/Users/me/go/src/github.com/elastic/beats/filebeat/module/auditd/log/test/test.log",
             "fileset": {
                 "module": "auditd",
@@ -49,6 +52,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "source": "/Users/me/go/src/github.com/elastic/beats/filebeat/module/auditd/log/test/test.log",
             "fileset": {
                 "module": "auditd",

filebeat/module/icinga/_meta/config.reference.yml

@@ -7,9 +7,9 @@
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Debug logs
   #debug:
@@ -19,9 +19,9 @@
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:
 
   # Startup logs
   #startup:
@@ -31,6 +31,6 @@
     # Filebeat will choose the paths depending on your OS.
     #var.paths:
 
-    # Prospector configuration (advanced). Any prospector configuration option
+    # Input configuration (advanced). Any input configuration option
     # can be added under this section.
-    #prospector:
+    #input:

filebeat/module/icinga/debug/manifest.yml

@@ -10,4 +10,4 @@ var:
       - c:/programdata/icinga2/var/log/icinga2/debug.log*
 
 ingest_pipeline: ingest/pipeline.json
-prospector: config/debug.yml
+input: config/debug.yml

filebeat/module/icinga/debug/test/test.log-expected.json

@@ -15,6 +15,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "icinga": {
                 "debug": {
                     "severity": "debug",
@@ -53,6 +56,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "icinga": {
                 "debug": {
                     "severity": "debug",
@@ -91,6 +97,9 @@
             "prospector": {
                 "type": "log"
             },
+            "input": {
+                "type": "log"
+            },
             "icinga": {
                 "debug": {
                     "severity": "notice",

filebeat/module/icinga/main/manifest.yml

@@ -10,4 +10,4 @@ var:
       - c:/programdata/icinga2/var/log/icinga2/icinga2.log*
 
 ingest_pipeline: ingest/pipeline.json
-prospector: config/main.yml
+input: config/main.yml