Mark redis/logstash port settings as deprecated (#9915)

The port settigns for redis/logstash have been marked as deprecated since 5.0. This change will print a deprecation warning if the settings are used. We will remove the setting in 7.0.

CHANGELOG.next.asciidoc

@@ -13,6 +13,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Dissect syntax change, use * instead of ? when working with field reference. {issue}8054[8054]
 - Fix registry handle leak on Windows (https://github.com/elastic/go-sysinfo/pull/33). {pull}9920[9920]
 - Allow to unenroll a Beat from the UI. {issue}9452[9452]
+- Port settings have been deprecated in redis/logstash output and will be removed in 7.0. {pull}9915[9915]
 
 *Auditbeat*
 

auditbeat/auditbeat.reference.yml

@@ -727,10 +727,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is auditbeat.
   #key: auditbeat

filebeat/filebeat.reference.yml

@@ -1425,10 +1425,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is filebeat.
   #key: filebeat

heartbeat/heartbeat.reference.yml

@@ -876,10 +876,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is heartbeat.
   #key: heartbeat

journalbeat/journalbeat.reference.yml

@@ -678,10 +678,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is journalbeat.
   #key: journalbeat

libbeat/_meta/config.reference.yml

@@ -620,10 +620,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is beatname.
   #key: beatname

libbeat/outputs/logstash/logstash.go

@@ -20,6 +20,7 @@ package logstash
 import (
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/outputs"
@@ -51,6 +52,10 @@ func makeLogstash(
 		return outputs.Fail(err)
 	}
 
+	if cfg.HasField("port") {
+		cfgwarn.Deprecate("7.0.0", "The Logstash outputs port setting")
+	}
+
 	hosts, err := outputs.ReadHostList(cfg)
 	if err != nil {
 		return outputs.Fail(err)

libbeat/outputs/redis/redis.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/outputs"
@@ -56,6 +57,10 @@ func makeRedis(
 		cfg.SetString("index", -1, beat.Beat)
 	}
 
+	if cfg.HasField("port") {
+		cfgwarn.Deprecate("7.0.0", "The Redis outputs port setting")
+	}
+
 	// ensure we have a `key` field in settings
 	if !cfg.HasField("key") {
 		s, err := cfg.String("index", -1)

metricbeat/metricbeat.reference.yml

@@ -1307,10 +1307,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is metricbeat.
   #key: metricbeat

packetbeat/packetbeat.reference.yml

@@ -1101,10 +1101,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is packetbeat.
   #key: packetbeat

winlogbeat/winlogbeat.reference.yml

@@ -649,10 +649,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is winlogbeat.
   #key: winlogbeat

x-pack/auditbeat/auditbeat.reference.yml

@@ -753,10 +753,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is auditbeat.
   #key: auditbeat

x-pack/filebeat/filebeat.reference.yml

@@ -1459,10 +1459,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is filebeat.
   #key: filebeat

x-pack/functionbeat/functionbeat.reference.yml

@@ -714,10 +714,6 @@ output.elasticsearch:
   # unreachable, the events are distributed to the reachable servers only.
   #hosts: ["localhost:6379"]
 
-  # The Redis port to use if hosts does not contain a port number. The default
-  # is 6379.
-  #port: 6379
-
   # The name of the Redis list or channel the events are published to. The
   # default is functionbeat.
   #key: functionbeat