Skip to content

Commit

Permalink
Review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
faec committed Jan 8, 2024
1 parent a8d4f04 commit fb15ecd
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
3 changes: 3 additions & 0 deletions libbeat/docs/queueconfig.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ queue.mem:
You can specify the following options in the `queue.mem` section of the +{beatname_lc}.yml+ config file:

[float]
[[queue-mem-events-option]]
===== `events`

Number of events the queue can store. This value should be evenly divisible by `flush.min_events` to
Expand All @@ -69,6 +70,7 @@ avoid sending partial batches to the output.
The default value is 3200 events.

[float]
[[queue-mem-flush-min-events-option]]
===== `flush.min_events`

Minimum number of events required for publishing. If this value is set to 0 or 1, events are
Expand All @@ -80,6 +82,7 @@ sent by the output.
The default value is 1600.

[float]
[[queue-mem-flush-timeout-option]]
===== `flush.timeout`

Maximum wait time for `flush.min_events` to be fulfilled. If set to 0s, events are available to the
Expand Down
29 changes: 20 additions & 9 deletions libbeat/outputs/elasticsearch/docs/elasticsearch.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ output.elasticsearch:
In the previous example, the Elasticsearch nodes are available at `https://10.45.3.2:9220/elasticsearch` and
`https://10.45.3.1:9230/elasticsearch`.

[[compression-level-option]]
===== `compression_level`

The gzip compression level. Setting this value to `0` disables compression.
Expand All @@ -114,6 +115,7 @@ Configure escaping of HTML in strings. Set to `true` to enable escaping.
The default value is `false`.


[[worker-option]]
===== `worker`

The number of workers per configured host publishing events to Elasticsearch. This
Expand Down Expand Up @@ -659,6 +661,7 @@ The default is 3.
endif::[]


[[bulk-max-size-option]]
===== `bulk_max_size`

The maximum number of events to bulk in a single Elasticsearch bulk API index request. The default is 1600.
Expand Down Expand Up @@ -691,6 +694,7 @@ default is `1s`.
The maximum number of seconds to wait before attempting to connect to
Elasticsearch after a network error. The default is `60s`.

[[idle-connection-timeout-option]]
===== `idle_connection_timeout`

The maximum amount of time an idle connection will remain idle before closing itself.
Expand Down Expand Up @@ -770,51 +774,58 @@ output.elasticsearch:
preset: balanced
------------------------------------------------------------------------------

Performance presets apply a set of configuration overrides based on a desired performance goal. If set, a performance preset will override other configuration flags to match the recommended settings for that preset. Valid options are `balanced` (good starting point for general efficiency), `throughput` (good for high data volumes, may increase cpu and memory requirements), `scale` (reduces ambient resource use in large low-throughput deployments), `latency` (minimize the time for fresh data to become visible in Elasticsearch), and `custom` (apply user configuration directly with no overrides). The default if unspecified is `custom`.
Performance presets apply a set of configuration overrides based on a desired performance goal. If set, a performance preset will override other configuration flags to match the recommended settings for that preset. Valid options are:
* `balanced` (good starting point for general efficiency)
* `throughput` (good for high data volumes, may increase cpu and memory requirements)
* `scale` (reduces ambient resource use in large low-throughput deployments)
* `latency` (minimize the time for fresh data to become visible in Elasticsearch)
* `custom` (apply user configuration directly with no overrides)

Presets represent current recommendations based on the intended goal; their internal effect may change between versions. Currently the presets have the following effects:
The default if unspecified is `custom`.

Presets represent current recommendations based on the intended goal; their effect may change between versions to better suit those goals. Currently the presets have the following effects:

[cols="2,1,1,1,1"]
|===
|preset |balanced |throughput |scale |latency

|`bulk_max_size`
|<<bulk-max-size-option,`bulk_max_size`>>
|1600
|1600
|1600
|50

|`worker`
|<<worker-option,`worker`>>
|1
|4
|1
|1

|`queue.mem.events`
|<<queue-mem-events-option,`queue.mem.events`>>
|3200
|12800
|3200
|4100

|`queue.mem.flush.min_events`
|<<queue-mem-flush-min-events-option,`queue.mem.flush.min_events`>>
|1600
|1600
|1600
|2050

|`queue.mem.flush.timeout`
|<<queue-mem-flush-timeout-option,`queue.mem.flush.timeout`>>
|`10s`
|`5s`
|`20s`
|`1s`

|`compression_level`
|<<compression-level-option,`compression_level`>>
|1
|1
|1
|1

|`idle_connection_timeout`
|<<idle-connection-timeout-option,`idle_connection_timeout`>>
|`3s`
|`15s`
|`1s`
Expand Down

0 comments on commit fb15ecd

Please sign in to comment.