Skip to content

Commit

Permalink
updated docs for main (#1548)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Oct 3, 2023
1 parent d9234bd commit fb13aa3
Show file tree
Hide file tree
Showing 13 changed files with 589 additions and 45 deletions.
10 changes: 5 additions & 5 deletions docs/plugins/filters/elasticsearch.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v3.15.3
:release_date: 2023-09-08
:changelog_url: https://github.com/logstash-plugins/logstash-filter-elasticsearch/blob/v3.15.3/CHANGELOG.md
:version: v3.16.1
:release_date: 2023-09-29
:changelog_url: https://github.com/logstash-plugins/logstash-filter-elasticsearch/blob/v3.16.1/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down Expand Up @@ -143,7 +143,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
| <<plugins-{type}s-{plugin}-query_template>> |<<string,string>>|No
| <<plugins-{type}s-{plugin}-result_size>> |<<number,number>>|No
| <<plugins-{type}s-{plugin}-retry_on_failure>> |<<number,number>>|No
| <<plugins-{type}s-{plugin}-retry_on_status>> |<<number,number list>>|No
| <<plugins-{type}s-{plugin}-retry_on_status>> |<<array,array>>|No
| <<plugins-{type}s-{plugin}-sort>> |<<string,string>>|No
| <<plugins-{type}s-{plugin}-ssl>> |<<boolean,boolean>>|__Deprecated__
| <<plugins-{type}s-{plugin}-ssl_certificate>> |<<path,path>>|No
Expand Down Expand Up @@ -355,7 +355,7 @@ When enabled, retry requests that result in connection errors or an HTTP status
[id="plugins-{type}s-{plugin}-retry_on_status"]
===== `retry_on_status`

* Value type is <<number,number list>>
* Value type is <<array,array>>
* Default value is an empty list `[]`

Which HTTP Status codes to consider for retries (in addition to connection errors) when using <<plugins-{type}s-{plugin}-retry_on_failure>>,
Expand Down
6 changes: 3 additions & 3 deletions docs/plugins/filters/jdbc_static.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v5.4.5
:release_date: 2023-09-04
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.5/CHANGELOG.md
:version: v5.4.6
:release_date: 2023-10-03
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.6/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down
6 changes: 3 additions & 3 deletions docs/plugins/filters/jdbc_streaming.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v5.4.5
:release_date: 2023-09-04
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.5/CHANGELOG.md
:version: v5.4.6
:release_date: 2023-10-03
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.6/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down
6 changes: 3 additions & 3 deletions docs/plugins/inputs/elasticsearch.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v4.17.2
:release_date: 2023-06-02
:changelog_url: https://github.com/logstash-plugins/logstash-input-elasticsearch/blob/v4.17.2/CHANGELOG.md
:version: v4.18.0
:release_date: 2023-09-29
:changelog_url: https://github.com/logstash-plugins/logstash-input-elasticsearch/blob/v4.18.0/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down
6 changes: 3 additions & 3 deletions docs/plugins/inputs/imap.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v3.2.0
:release_date: 2021-12-06
:changelog_url: https://github.com/logstash-plugins/logstash-input-imap/blob/v3.2.0/CHANGELOG.md
:version: v3.2.1
:release_date: 2023-10-03
:changelog_url: https://github.com/logstash-plugins/logstash-input-imap/blob/v3.2.1/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down
6 changes: 3 additions & 3 deletions docs/plugins/inputs/jdbc.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v5.4.5
:release_date: 2023-09-04
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.5/CHANGELOG.md
:version: v5.4.6
:release_date: 2023-10-03
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.6/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down
237 changes: 233 additions & 4 deletions docs/plugins/inputs/logstash.asciidoc
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
:integration: logstash
:plugin: logstash
:type: input
:default_plugin: 0
:default_plugin: 1
:no_codec:

///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v0.0.3
:release_date: 2023-11-01
:changelog_url: https://github.com/logstash-plugins/logstash-integration-logstash/blob/v0.0.3/CHANGELOG.md
:version: v0.0.5
:release_date: 2023-10-03
:changelog_url: https://github.com/logstash-plugins/logstash-integration-logstash/blob/v0.0.5/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand All @@ -20,3 +21,231 @@ END - GENERATED VARIABLES, DO NOT EDIT!

include::{include_path}/plugin_header-integration.asciidoc[]

==== Description

Listen for events that are sent by a {logstash-ref}/plugins-outputs-logstash.html[Logstash output plugin] in a pipeline that may be in another process or on another host.
The upstream output must have a TCP route to the port (defaults to 9800) on an interface that this plugin is bound to.

NOTE: Sending events to this input by _any_ means other than `plugins-outputs-logstash` is neither advised nor supported.
We will maintain cross-compatibility with any two supported versions of output/input pair and reserve the right to change details such as protocol and encoding.

[id="plugins-{type}s-{plugin}-minimum-config"]
===== Minimum Configuration
[cols="3a,2a"]
|=======================================================================================================================
|SSL Enabled |SSL Disabled

|

[source]
----
input {
logstash {
ssl_keystore_path
=> "/path/to/logstash.p12"
ssl_keystore_password
=> "${PASS}"
}
}
----

|

[source]
----
input {
logstash {
ssl_enabled => false
}
}
----

|=======================================================================================================================


[id="plugins-{type}s-{plugin}-config-binding"]
===== Configuration Concepts

This input plugin needs to be configured to bind to a TCP <<plugins-{type}s-{plugin}-port>>, and can be constrained to bind to a particular interface by providing the IP to <<plugins-{type}s-{plugin}-host>>.

[id="plugins-{type}s-{plugin}-config-ssl-identity"]
===== Security: SSL Identity

Unless SSL is disabled, this plugin needs to be configured with identity material:

* JKS- or PKCS12-formatted Keystore (see <<plugins-{type}s-{plugin}-ssl_keystore_path>>)
* PKCS8-formatted Certificate/Key pair (see <<plugins-{type}s-{plugin}-ssl_certificate>>)

[id="plugins-{type}s-{plugin}-config-ssl-trust"]
===== Security: SSL Trust

When communicating over SSL, this plugin can be configured to either request or require that connecting clients present their own identity claims with <<plugins-{type}s-{plugin}-ssl_client_authentication>>.

Certificates that are presented by clients are validated by default using the system trust store to ensure that they are currently-valid and trusted, and that the client can prove possession of its associated private key.
You can provide an _alternate_ source of trust with:

* A PEM-formatted list of trusted certificate authorities (see <<plugins-{type}s-{plugin}-ssl_certificate_authorities>>)

NOTE: Client-certificate verification does _not_ verify identity claims on the presented certificate, such as whether the certificate includes a Subject Alt Name matching the IP address from which the client is connecting.

[id="plugins-{type}s-{plugin}-config-credentials"]
===== Security: Credentials

You can also configure this plugin to require a specific username/password be provided by configuring <<plugins-{type}s-{plugin}-username>> and <<plugins-{type}s-{plugin}-password>>.
Doing so requires connecting `logstash-output` plugin clients to provide matching `username` and `password`.

NOTE: when SSL is disabled, data and credentials will be received in clear-text.

[id="plugins-{type}s-{plugin}-options"]
==== Logstash Input Configuration Options

This plugin supports the following configuration options plus the <<plugins-{type}s-{plugin}-common-options>> described later.

[cols="<,<,<",options="header",]
|=======================================================================
|Setting |Input type |Required
| <<plugins-{type}s-{plugin}-host>> |<<string,string>> |No
| <<plugins-{type}s-{plugin}-password>> |<<password,password>>|No
| <<plugins-{type}s-{plugin}-port>> |<<number,number>> |No
| <<plugins-{type}s-{plugin}-ssl_certificate>> | <<path,path>>|No
| <<plugins-{type}s-{plugin}-ssl_certificate_authorities>> |<<array,array>>|No
| <<plugins-{type}s-{plugin}-ssl_client_authentication>> | <<string,string>>, one of `["none", "optional", "required"]`|No
| <<plugins-{type}s-{plugin}-ssl_enabled>> |<<boolean,boolean>>|No
| <<plugins-{type}s-{plugin}-ssl_key>> | <<path,path>>|No
| <<plugins-{type}s-{plugin}-ssl_keystore_password>> | <<password,password>>|No
| <<plugins-{type}s-{plugin}-ssl_keystore_path>> | <<path,path>>|No
| <<plugins-{type}s-{plugin}-ssl_key_passphrase>> | <<password,password>>|No
| <<plugins-{type}s-{plugin}-username>> |<<string,string>>|No
|=======================================================================

Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
input plugins.

&nbsp;

[id="plugins-{type}s-{plugin}-host"]
===== `host`

* Value type is a <<string,string>> ip address
* Default value is `0.0.0.0` (all interfaces)

Specify which interface to listen on by providing its ip address.
By default, this input listens on all available interfaces.

[id="plugins-{type}s-{plugin}-password"]
===== `password`

* Value type is <<password,password>>
* There is no default value for this setting.

Password for password-based authentication.
Requires <<plugins-{type}s-{plugin}-username>>.

[id="plugins-{type}s-{plugin}-port"]
===== `port`

* Value type is a <<number,number>> port
* Default value is 9800

Specify which port to listen on.

[id="plugins-{type}s-{plugin}-ssl_certificate"]
===== `ssl_certificate`

* Value type is <<path,path>>
* There is no default value for this setting.
* When present, <<plugins-{type}s-{plugin}-ssl_key>> and <<plugins-{type}s-{plugin}-ssl_key_passphrase>> are also required.
* Cannot be combined with configurations that disable SSL.

Path to a PEM-encoded certificate or certificate chain with which to identify this plugin to connecting clients.
The certificate _SHOULD_ include identity claims about the ip address or hostname that clients use to establish a connection.

[id="plugins-{type}s-{plugin}-ssl_certificate_authorities"]
===== `ssl_certificate_authorities`

* Value type is a list of <<path,path>>s
* There is no default value for this setting.
* Cannot be combined with configurations that disable SSL.
* Cannot be combined with <<plugins-{type}s-{plugin}-ssl_client_authentication, `+ssl_client_authentication => none+`>>.

One or more PEM-encoded files defining certificate authorities for use in client authentication.
This setting can be used to _override_ the system trust store for verifying the SSL certificate presented by clients.

[id="plugins-{type}s-{plugin}-ssl_client_authentication"]
===== `ssl_client_authentication`

* Value can be any of:
** `none`: do not request client's certificate, or validate certificates that are presented
** `optional`: request client's certificate, and validate it against our trust authorities _if-and-only-if_ it is presented
** `required`: require a valid certificate from the client that is signed by a trusted certificate authority
* Default value is `"none"`

By default the server doesn't do any client authentication.
This means that connections from clients are _private_ when SSL is enabled, but that this input will allow SSL connections from _any_ client.
If you wish to configure this plugin to reject connections from untrusted hosts, you will need to configure this plugin to authenticate clients, and may also need to configure its <<plugins-{type}s-{plugin}-config-ssl-trust, source of trust>>.

[id="plugins-{type}s-{plugin}-ssl_enabled"]
===== `ssl_enabled`

* Value type is <<boolean,boolean>>
* Default value is `true`

SSL is enabled by default, which requires configuring this plugin to present its <<plugins-{type}s-{plugin}-config-ssl-identity, identity>>.

You can disable SSL with `+ssl_enabled => false+`. When disabled, setting any `ssl_*` configuration causes configuration failure.

[id="plugins-{type}s-{plugin}-ssl_key"]
===== `ssl_key`

* Value type is <<path,path>>
* There is no default value for this setting.
* Required when connection identity is configured with <<plugins-{type}s-{plugin}-ssl_certificate>>.
* Cannot be combined with configurations that disable SSL.

A path to a PEM-encoded _encrypted_ PKCS8 SSL certificate key.

[id="plugins-{type}s-{plugin}-ssl_keystore_password"]
===== `ssl_keystore_password`

* Value type is <<password,password>>
* There is no default value for this setting.
* Required when connection identity is configured with <<plugins-{type}s-{plugin}-ssl_keystore_path>>.
* Cannot be combined with configurations that disable SSL.

Password for the <<plugins-{type}s-{plugin}-ssl_keystore_path>>

[id="plugins-{type}s-{plugin}-ssl_keystore_path"]
===== `ssl_keystore_path`

* Value type is <<path,path>>
* There is no default value for this setting.
* When present, <<plugins-{type}s-{plugin}-ssl_keystore_password>> is also required.
* Cannot be combined with configurations that disable SSL.

A path to a JKS- or PKCS12-formatted keystore with which to identify this plugin to {es}.

[id="plugins-{type}s-{plugin}-ssl_key_passphrase"]
===== `ssl_key_passphrase`

* Value type is <<password,password>>
* There is no default value for this setting.
* Required when connection identity is configured with <<plugins-{type}s-{plugin}-ssl_certificate>>.
* Cannot be combined with configurations that disable SSL.

A password or passphrase of the <<plugins-{type}s-{plugin}-ssl_key>>.

[id="plugins-{type}s-{plugin}-username"]
===== `username`

* Value type is <<string,string>>
* There is no default value for this setting.

Username for password-based authentication.
When this input plugin is configured with a `username`, it also requires a `password`, and any upstream `logstash-output` plugin must also be configured with a matching `username`/`password` pair.

NOTE: when SSL is disabled, credentials will be transmitted in clear-text.

[id="plugins-{type}s-{plugin}-common-options"]
include::{include_path}/{type}.asciidoc[]

:default_codec!:
6 changes: 3 additions & 3 deletions docs/plugins/integrations/jdbc.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
///////////////////////////////////////////
START - GENERATED VARIABLES, DO NOT EDIT!
///////////////////////////////////////////
:version: v5.4.5
:release_date: 2023-09-04
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.5/CHANGELOG.md
:version: v5.4.6
:release_date: 2023-10-03
:changelog_url: https://github.com/logstash-plugins/logstash-integration-jdbc/blob/v5.4.6/CHANGELOG.md
:include_path: ../../../../logstash/docs/include
///////////////////////////////////////////
END - GENERATED VARIABLES, DO NOT EDIT!
Expand Down
Loading

0 comments on commit fb13aa3

Please sign in to comment.