From ea46beaf2371adb77d1fc18f5d71fce8f272811a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 3 Jun 2021 09:58:16 +0200 Subject: [PATCH 1/3] Make filestream input GA --- filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl | 2 +- filebeat/docs/inputs/input-filestream.asciidoc | 2 -- filebeat/filebeat.reference.yml | 2 +- filebeat/input/filestream/input.go | 2 +- x-pack/filebeat/filebeat.reference.yml | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl b/filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl index 4986887155df..c5f22eaaad2c 100644 --- a/filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl +++ b/filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl @@ -11,7 +11,7 @@ filebeat.inputs: # # Possible options are: # * log: Reads every line of the log file (default) -# * filestream: Improved version of log input. Experimental. +# * filestream: Improved version of log input # * stdin: Reads the standard in #------------------------------ Log input -------------------------------- diff --git a/filebeat/docs/inputs/input-filestream.asciidoc b/filebeat/docs/inputs/input-filestream.asciidoc index 6634b97ac6ff..d43e39928c44 100644 --- a/filebeat/docs/inputs/input-filestream.asciidoc +++ b/filebeat/docs/inputs/input-filestream.asciidoc @@ -3,8 +3,6 @@ [id="{beatname_lc}-input-{type}"] === filestream input -beta[] - ++++ filestream ++++ diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 09d1c85e51b9..9710b7a61112 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -418,7 +418,7 @@ filebeat.inputs: # # Possible options are: # * log: Reads every line of the log file (default) -# * filestream: Improved version of log input. Experimental. +# * filestream: Improved version of log input # * stdin: Reads the standard in #------------------------------ Log input -------------------------------- diff --git a/filebeat/input/filestream/input.go b/filebeat/input/filestream/input.go index 90563b2e309c..8294baa85d2d 100644 --- a/filebeat/input/filestream/input.go +++ b/filebeat/input/filestream/input.go @@ -64,7 +64,7 @@ type filestream struct { func Plugin(log *logp.Logger, store loginp.StateStore) input.Plugin { return input.Plugin{ Name: pluginName, - Stability: feature.Beta, + Stability: feature.Stable, Deprecated: false, Info: "filestream input", Doc: "The filestream input collects logs from the local filestream service", diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index 3a89edfe1aa4..f712a3f7e0e5 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -2442,7 +2442,7 @@ filebeat.inputs: # # Possible options are: # * log: Reads every line of the log file (default) -# * filestream: Improved version of log input. Experimental. +# * filestream: Improved version of log input # * stdin: Reads the standard in #------------------------------ Log input -------------------------------- From c5148216aa9c1fc320cd3d1f3f00acc05980abe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 3 Jun 2021 10:03:14 +0200 Subject: [PATCH 2/3] add changelog entry --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index a636265ece85..c9ecd14422bc 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -811,6 +811,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Update PanOS module to parse HIP Match logs. {issue}24350[24350] {pull}25686[25686] - Enhance GCP module to populate orchestrator.* fields for GKE / K8S logs {pull}25368[25368] - http_endpoint: Support multiple documents in a single request by POSTing an array or NDJSON format. {pull}25764[25764] +- Make `filestream` input GA. {pull}26127[26127] *Heartbeat* From 426c13b87c846143c8989fd015a5205c7f5bf40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Mon, 7 Jun 2021 17:50:02 +0200 Subject: [PATCH 3/3] overwrite config --- filebeat/_meta/config/filebeat.inputs.yml.tmpl | 2 +- filebeat/filebeat.yml | 2 +- x-pack/filebeat/filebeat.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/filebeat/_meta/config/filebeat.inputs.yml.tmpl b/filebeat/_meta/config/filebeat.inputs.yml.tmpl index 70d52cbb9c6a..2555aa26577b 100644 --- a/filebeat/_meta/config/filebeat.inputs.yml.tmpl +++ b/filebeat/_meta/config/filebeat.inputs.yml.tmpl @@ -50,7 +50,7 @@ filebeat.inputs: # Note: After is the equivalent to previous and before is the equivalent to to next in Logstash #multiline.match: after -# filestream is an experimental input. It is going to replace log input in the future. +# filestream is an input for collecting log messages from files. It is going to replace log input in the future. - type: filestream # Change to true to enable this input configuration. diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml index 390305dd34bf..87521d1df447 100644 --- a/filebeat/filebeat.yml +++ b/filebeat/filebeat.yml @@ -62,7 +62,7 @@ filebeat.inputs: # Note: After is the equivalent to previous and before is the equivalent to to next in Logstash #multiline.match: after -# filestream is an experimental input. It is going to replace log input in the future. +# filestream is an input for collecting log messages from files. It is going to replace log input in the future. - type: filestream # Change to true to enable this input configuration. diff --git a/x-pack/filebeat/filebeat.yml b/x-pack/filebeat/filebeat.yml index 390305dd34bf..87521d1df447 100644 --- a/x-pack/filebeat/filebeat.yml +++ b/x-pack/filebeat/filebeat.yml @@ -62,7 +62,7 @@ filebeat.inputs: # Note: After is the equivalent to previous and before is the equivalent to to next in Logstash #multiline.match: after -# filestream is an experimental input. It is going to replace log input in the future. +# filestream is an input for collecting log messages from files. It is going to replace log input in the future. - type: filestream # Change to true to enable this input configuration.