Make the Syslog input GA (#26293) (#26352)

(cherry picked from commit 4684ac7) Co-authored-by: Fae Charlton <fae.charlton@elastic.co>
elastic · Jun 17, 2021 · 8847d2c · 8847d2c
1 parent d8326cb
commit 8847d2c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 15 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -579,6 +579,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add `preserve_original_event` option to `o365audit` input. {pull}26273[26273]
 - Add `log.flags` to events created by the `aws-s3` input. {pull}26267[26267]
 - Add `include_s3_metadata` config option to the `aws-s3` input for including object metadata in events. {pull}26267[26267]
+- RFC 5424 and UNIX socket support in the Syslog input are now GA {pull}26293[26293]
+
 
 *Heartbeat*
 

diff --git a/filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl b/filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl
@@ -488,7 +488,6 @@ filebeat.inputs:
     #max_message_size: 10KiB
 
 # Accept RFC5424 formatted syslog event via TCP.
-# RFC5424 support is in beta.
 #- type: syslog
   #enabled: false
   #format: rfc5424

diff --git a/filebeat/docs/inputs/input-syslog.asciidoc b/filebeat/docs/inputs/input-syslog.asciidoc
@@ -7,7 +7,7 @@
 <titleabbrev>Syslog</titleabbrev>
 ++++
 
-The `syslog` input reads Syslog events as specified by RFC 3164 and RFC 5424, over TCP, UDP, or a Unix stream socket. RFC 5424 support is currently in beta.
+The `syslog` input reads Syslog events as specified by RFC 3164 and RFC 5424, over TCP, UDP, or a Unix stream socket.
 
 Example configurations:
 
@@ -45,7 +45,7 @@ The `syslog` input configuration includes format, protocol specific options, and
 
 ===== `format`
 
-The syslog variant to use, `rfc3164` or `rfc5424`. To automatically detect the format from the log entries, set this option to `auto`. The default is `rfc3164`. The `rfc5424` and `auto` options are currently in beta.
+The syslog variant to use, `rfc3164` or `rfc5424`. To automatically detect the format from the log entries, set this option to `auto`. The default is `rfc3164`.
 
 ===== Protocol `udp`:
 
@@ -57,8 +57,6 @@ include::../inputs/input-common-tcp-options.asciidoc[]
 
 ===== Protocol `unix`:
 
-beta[]
-
 include::../inputs/input-common-unix-options.asciidoc[]
 
 [id="{beatname_lc}-input-{type}-common-options"]

diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml
@@ -895,7 +895,6 @@ filebeat.inputs:
     #max_message_size: 10KiB
 
 # Accept RFC5424 formatted syslog event via TCP.
-# RFC5424 support is in beta.
 #- type: syslog
   #enabled: false
   #format: rfc5424

diff --git a/filebeat/input/syslog/config.go b/filebeat/input/syslog/config.go
@@ -30,7 +30,6 @@ import (
 	"github.com/elastic/beats/v7/filebeat/inputsource/udp"
 	"github.com/elastic/beats/v7/filebeat/inputsource/unix"
 	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
@@ -119,8 +118,6 @@ func factory(
 
 		return tcp.New(&config.Config, factory)
 	case unix.Name:
-		cfgwarn.Beta("Syslog Unix socket support is beta.")
-
 		config := defaultUnix()
 		if err := cfg.Unpack(&config); err != nil {
 			return nil, err

diff --git a/filebeat/input/syslog/input.go b/filebeat/input/syslog/input.go
@@ -30,7 +30,6 @@ import (
 	"github.com/elastic/beats/v7/filebeat/inputsource"
 	"github.com/elastic/beats/v7/libbeat/beat"
 	"github.com/elastic/beats/v7/libbeat/common"
-	"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
@@ -123,10 +122,6 @@ func NewInput(
 		return nil, err
 	}
 
-	if config.Format != syslogFormatRFC3164 {
-		cfgwarn.Beta("Syslog RFC 5424 format is enabled")
-	}
-
 	forwarder := harvester.NewForwarder(out)
 	cb := GetCbByConfig(config, forwarder, log)
 	server, err := factory(cb, config.Protocol)

diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml
@@ -2918,7 +2918,6 @@ filebeat.inputs:
     #max_message_size: 10KiB
 
 # Accept RFC5424 formatted syslog event via TCP.
-# RFC5424 support is in beta.
 #- type: syslog
   #enabled: false
   #format: rfc5424