diff --git a/docs/index.asciidoc b/docs/index.asciidoc index fcdb9cc..79e72f1 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -98,6 +98,9 @@ TIP: Set the `target` option to avoid potential schema conflicts. This plugin supports the following configuration options plus the <> and the <> described later. +NOTE: As of version `5.0.0` of this plugin, a number of previously deprecated settings related to SSL have been removed. +Please check out <> for details. + [cols="<,<,<",options="header",] |======================================================================= |Setting |Input type|Required @@ -610,54 +613,21 @@ option when authenticating to the Elasticsearch server. If set to an empty string authentication will be disabled. -[id="plugins-{type}s-{plugin}-removed-options"] -==== Elasticsearch Input Removed configuration options +[id="plugins-{type}s-{plugin}-obsolete-options"] +==== Elasticsearch Input Obsolete Configuration Options -The following configurations will be removed in version 5.0.0. +WARNING: As of version `5.0.0` of this plugin, some configuration options have been replaced. +The plugin will fail to start if it contains any of these obsolete options. -WARNING: These options have been deprecated and will be removed in version 5.0.0. Please use their replacements instead. -[cols="<,<,<",options="header",] +[cols="<,<",options="header",] |======================================================================= -|Setting|Input type|Replaced by -| <> |a valid filesystem path|<> -| <> |<>|<> -| <> |<>|<> +|Setting|Replaced by +| ca_file | <> +| ssl | <> +| ssl_certificate_verification | <> |======================================================================= -[id="plugins-{type}s-{plugin}-ca_file"] -===== `ca_file` -deprecated[4.17.0, Will be removed in 5.0.0, replaced by <>] - -This setting will be removed in 5.0.0. Please use <> instead. - -* Value type is <> -* There is no default value for this setting. - -SSL Certificate Authority file in PEM encoded format, must also include any chain certificates as necessary. - -[id="plugins-{type}s-{plugin}-ssl"] -===== `ssl` -deprecated[4.17.0, Will be removed in 5.0.0, replaced by <>] - -This setting will be removed in 5.0.0. Please use <> instead. - -* Value type is <> -* Default value is `false` - -If enabled, SSL will be used when communicating with the Elasticsearch -server (i.e. HTTPS will be used instead of plain HTTP). - - -[id="plugins-{type}s-{plugin}-ssl_certificate_verification"] -===== `ssl_certificate_verification` -deprecated[4.17.0, Will be removed in 5.0.0, replaced by <>] - -This setting will be removed in 5.0.0. Please use <> instead. - - -* Value type is <> -* Default value is `true` Option to validate the server's certificate. Disabling this severely compromises security. When certificate validation is disabled, this plugin implicitly trusts the machine diff --git a/lib/logstash/inputs/elasticsearch.rb b/lib/logstash/inputs/elasticsearch.rb index ee175c0..cbf9222 100644 --- a/lib/logstash/inputs/elasticsearch.rb +++ b/lib/logstash/inputs/elasticsearch.rb @@ -231,7 +231,6 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base config :ssl_truststore_password, :validate => :password # The JKS truststore to validate the server's certificate. - # Use either `:ssl_truststore_path` config :ssl_truststore_path, :validate => :path # The format of the truststore file. It must be either jks or pkcs12