diff --git a/docs/static/ls-ls-lumberjack.asciidoc b/docs/static/ls-ls-lumberjack.asciidoc index 11e8c4fd1b7..75bb735b126 100644 --- a/docs/static/ls-ls-lumberjack.asciidoc +++ b/docs/static/ls-ls-lumberjack.asciidoc @@ -73,7 +73,7 @@ Start the downstream instance of Logstash: [source,shell] ---- -bin/logstash -e 'input { beats { codec => json port => 5000 ssl => true ssl_certificate => "lumberjack.cert" ssl_key => "lumberjack.key"} }' +bin/logstash -e 'input { beats { codec => json port => 5000 ssl_enabled => true ssl_certificate => "lumberjack.cert" ssl_key => "lumberjack.key"} }' ---- This sample command sets port 5000 to listen for incoming Beats input. diff --git a/docsk8s/quick-start/sample-configuration-files.asciidoc b/docsk8s/quick-start/sample-configuration-files.asciidoc index 8ee4eef1a1e..4b623c596a0 100644 --- a/docsk8s/quick-start/sample-configuration-files.asciidoc +++ b/docsk8s/quick-start/sample-configuration-files.asciidoc @@ -41,11 +41,11 @@ data: input { beats { port => "5044" - ssl => true + ssl_enabled => true ssl_certificate_authorities => ["/usr/share/logstash/config/ca.crt"] ssl_certificate => "/usr/share/logstash/config/server.crt" ssl_key => "/usr/share/logstash/config/server.pkcs8.key" - ssl_verify_mode => "force_peer" + ssl_client_authentication => "required" } } output { diff --git a/docsk8s/setting-up/ls-k8s-secure.asciidoc b/docsk8s/setting-up/ls-k8s-secure.asciidoc index 1fde711703b..1f61fd021d8 100644 --- a/docsk8s/setting-up/ls-k8s-secure.asciidoc +++ b/docsk8s/setting-up/ls-k8s-secure.asciidoc @@ -28,11 +28,11 @@ On {ls}, configure the server certificates to the pipeline: input { beats { port => "5044" - ssl => true + ssl_enabled => true ssl_certificate_authorities => ["/usr/share/logstash/config/ca.crt"] ssl_certificate => "/usr/share/logstash/config/server.crt" ssl_key => "/usr/share/logstash/config/server.pkcs8.key" - ssl_verify_mode => "force_peer" + ssl_client_authentication => "required" } } -- diff --git a/qa/integration/fixtures/beats_input_spec.yml b/qa/integration/fixtures/beats_input_spec.yml index 9fc49dd3d5f..abc431558d6 100644 --- a/qa/integration/fixtures/beats_input_spec.yml +++ b/qa/integration/fixtures/beats_input_spec.yml @@ -13,7 +13,7 @@ config: tls_server_auth: |- input { beats { - ssl => true + ssl_enabled => true port => 5044 ssl_certificate => '<%=options[:ssl_certificate]%>' ssl_key => '<%=options[:ssl_key]%>' @@ -23,11 +23,11 @@ config: tls_mutual_auth: |- input { beats { - ssl => true + ssl_enabled => true port => 5044 ssl_certificate => '<%=options[:ssl_certificate]%>' ssl_key => '<%=options[:ssl_key]%>' - ssl_verify_mode => "force_peer" + ssl_client_authentication => "required" ssl_certificate_authorities => '<%=options[:ssl_certificate]%>' } }