From 8847d2cb6aaae2ab64ffd7807a1bdba841189815 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:10:54 -0400 Subject: [PATCH] Make the Syslog input GA (#26293) (#26352) (cherry picked from commit 4684ac7ed3da20ecc533af492862cdb029f5cb3a) Co-authored-by: Fae Charlton --- CHANGELOG.next.asciidoc | 2 ++ filebeat/_meta/config/filebeat.inputs.reference.yml.tmpl | 1 - filebeat/docs/inputs/input-syslog.asciidoc | 6 ++---- filebeat/filebeat.reference.yml | 1 - filebeat/input/syslog/config.go | 3 --- filebeat/input/syslog/input.go | 5 ----- x-pack/filebeat/filebeat.reference.yml | 1 - 7 files changed, 4 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 0de988bc537..7e31f71e69e 100644 --- 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 index c5f22eaaad2..19176bfc39e 100644 --- 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 index 1553d89e396..a1146afab71 100644 --- a/filebeat/docs/inputs/input-syslog.asciidoc +++ b/filebeat/docs/inputs/input-syslog.asciidoc @@ -7,7 +7,7 @@ Syslog ++++ -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 index 67dadff1f27..61db757a930 100644 --- 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 index 4df453ca626..08bc5f166d7 100644 --- 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 index 0a15bec9196..6e66e1e0c72 100644 --- 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 index 95886aa2579..e3b47550bb8 100644 --- 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