Skip to content

Commit a066c69

Browse files
colleenmcginnismergify[bot]
authored andcommitted
[docs] Fix various syntax and rendering errors (#17580)
* fix various syntax and rendering issues * more fixes (cherry picked from commit 54472f2)
1 parent 7a06c26 commit a066c69

16 files changed

+85
-72
lines changed

docs/docset.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ toc:
1212
- toc: release-notes
1313
- toc: extend
1414
subs:
15+
version: "9.0.0"
1516
logstash-ref: "https://www.elastic.co/guide/en/logstash/current"
1617
ecloud: "Elastic Cloud"
1718
esf: "Elastic Serverless Forwarder"
@@ -44,3 +45,5 @@ subs:
4445
stack-version: "9.0.0"
4546
major-version: "9.x"
4647
docker-repo: "docker.elastic.co/logstash/logstash"
48+
ess-leadin-short: "Our hosted Elasticsearch Service is available on AWS, GCP, and Azure, and you can try it for free at https://cloud.elastic.co/registration"
49+
ess-leadin: "You can run Elasticsearch on your own hardware or use our hosted Elasticsearch Service that is available on AWS, GCP, and Azure. Try the Elasticsearch Service for free: https://cloud.elastic.co/registration."

docs/reference/advanced-pipeline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ Notice that the event now contains geographic location information:
379379
Now that the web logs are broken down into specific fields, you’re ready to get your data into Elasticsearch.
380380

381381
::::{tip}
382-
{ess-leadin}
382+
{{ess-leadin}}
383383
::::
384384

385385

docs/reference/connecting-to-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Examples:
1212
* `output {elasticsearch { cloud_id => "<cloud id>" cloud_auth => "<cloud auth>" } }`
1313
* `output {elasticsearch { cloud_id => "<cloud id>" api_key => "<api key>" } }`
1414

15-
{ess-leadin-short}
15+
{{ess-leadin-short}}
1616

1717
## Cloud ID [cloud-id]
1818

docs/reference/dashboard-monitoring-with-elastic-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ A number of dashboards are included to view {{ls}} as a whole, and dashboards th
144144
From the list of assets, open the **[Metrics {{ls}}] {{ls}} overview** dashboard to view overall performance. Then follow the navigation panel to further drill down into {{ls}} performance.
145145

146146
% TO DO: Use `:class: screenshot`
147-
![The {{ls}} Overview dashboard in {{kib}} with various metrics from your monitored {ls}](images/integration-dashboard-overview.png)
147+
![The {{ls}} Overview dashboard in {{kib}} with various metrics from your monitored {{ls}}](images/integration-dashboard-overview.png)
148148

149149
You can hover over any visualization to adjust its settings, or click the **Edit** button to make changes to the dashboard. To learn more, refer to [Dashboard and visualizations](docs-content://explore-analyze/dashboards.md).

docs/reference/dir-layout.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ This is very convenient because you don’t have to create any directories to st
1515

1616
| Type | Description | Default Location | Setting |
1717
| --- | --- | --- | --- |
18-
| home | Home directory of the Logstash installation. | ``{extract.path}`- Directory created by unpacking the archive` | |
19-
| bin | Binary scripts, including `logstash` to start Logstash and `logstash-plugin` to install plugins | ``{extract.path}/bin`` | |
20-
| settings | Configuration files, including `logstash.yml` and `jvm.options` | ``{extract.path}/config`` | ``path.settings`` |
21-
| logs | Log files | ``{extract.path}/logs`` | ``path.logs`` |
22-
| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | ``{extract.path}/plugins`` | ``path.plugins`` |
23-
| data | Data files used by logstash and its plugins for any persistence needs. | ``{extract.path}/data`` | ``path.data`` |
18+
| home | Home directory of the Logstash installation. | `{extract.path}`- Directory created by unpacking the archive | |
19+
| bin | Binary scripts, including `logstash` to start Logstash and `logstash-plugin` to install plugins | `{extract.path}/bin` | |
20+
| settings | Configuration files, including `logstash.yml` and `jvm.options` | `{extract.path}/config` | `path.settings` |
21+
| logs | Log files | `{extract.path}/logs` | `path.logs` |
22+
| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | `{extract.path}/plugins` | `path.plugins` |
23+
| data | Data files used by logstash and its plugins for any persistence needs. | `{extract.path}/data` | `path.data` |
2424

2525

2626
## Directory Layout of Debian and RPM Packages [deb-layout]
@@ -29,13 +29,13 @@ The Debian package and the RPM package each place config files, logs, and the se
2929

3030
| Type | Description | Default Location | Setting |
3131
| --- | --- | --- | --- |
32-
| home | Home directory of the Logstash installation. | ``/usr/share/logstash`` | |
33-
| bin | Binary scripts including `logstash` to start Logstash and `logstash-plugin` to install plugins | ``/usr/share/logstash/bin`` | |
34-
| settings | Configuration files, including `logstash.yml` and `jvm.options` | ``/etc/logstash`` | ``path.settings`` |
35-
| conf | Logstash pipeline configuration files | ``/etc/logstash/conf.d/*.conf`` | `See `/etc/logstash/pipelines.yml`` |
36-
| logs | Log files | ``/var/log/logstash`` | ``path.logs`` |
37-
| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | ``/usr/share/logstash/plugins`` | ``path.plugins`` |
38-
| data | Data files used by logstash and its plugins for any persistence needs. | ``/var/lib/logstash`` | ``path.data`` |
32+
| home | Home directory of the Logstash installation. | `/usr/share/logstash` | |
33+
| bin | Binary scripts including `logstash` to start Logstash and `logstash-plugin` to install plugins | `/usr/share/logstash/bin` | |
34+
| settings | Configuration files, including `logstash.yml` and `jvm.options` | `/etc/logstash` | `path.settings` |
35+
| conf | Logstash pipeline configuration files | `/etc/logstash/conf.d/*.conf` | See `/etc/logstash/pipelines.yml` |
36+
| logs | Log files | `/var/log/logstash` | `path.logs` |
37+
| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | `/usr/share/logstash/plugins` | `path.plugins` |
38+
| data | Data files used by logstash and its plugins for any persistence needs. | `/var/lib/logstash` | `path.data` |
3939

4040

4141
## Directory Layout of Docker Images [docker-layout]
@@ -44,12 +44,12 @@ The Docker images are created from the `.tar.gz` packages, and follow a similar
4444

4545
| Type | Description | Default Location | Setting |
4646
| --- | --- | --- | --- |
47-
| home | Home directory of the Logstash installation. | ``/usr/share/logstash`` | |
48-
| bin | Binary scripts, including `logstash` to start Logstash and `logstash-plugin` to install plugins | ``/usr/share/logstash/bin`` | |
49-
| settings | Configuration files, including `logstash.yml` and `jvm.options` | ``/usr/share/logstash/config`` | ``path.settings`` |
50-
| conf | Logstash pipeline configuration files | ``/usr/share/logstash/pipeline`` | ``path.config`` |
51-
| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | ``/usr/share/logstash/plugins`` | ``path.plugins`` |
52-
| data | Data files used by logstash and its plugins for any persistence needs. | ``/usr/share/logstash/data`` | ``path.data`` |
47+
| home | Home directory of the Logstash installation. | `/usr/share/logstash` | |
48+
| bin | Binary scripts, including `logstash` to start Logstash and `logstash-plugin` to install plugins | `/usr/share/logstash/bin` | |
49+
| settings | Configuration files, including `logstash.yml` and `jvm.options` | `/usr/share/logstash/config` | `path.settings` |
50+
| conf | Logstash pipeline configuration files | `/usr/share/logstash/pipeline` | `path.config` |
51+
| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | `/usr/share/logstash/plugins` | `path.plugins` |
52+
| data | Data files used by logstash and its plugins for any persistence needs. | `/usr/share/logstash/data` | `path.data` |
5353

5454
::::{note}
5555
Logstash Docker containers do not create log files by default. They log to standard output.

docs/reference/first-event.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ The location of the `bin` directory varies by platform. See [Directory layout](/
3737
::::{admonition} macOS Gatekeeper warnings
3838
:class: important
3939

40-
Apple’s rollout of stricter notarization requirements affected the notarization of the 9.0.0-beta1 {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}} that interrupts it, you will need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
40+
Apple’s rollout of stricter notarization requirements affected the notarization of {{version}} {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}} that interrupts it, you will need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
4141

4242
```sh
4343
xattr -d -r com.apple.quarantine <archive-or-directory>
4444
```
4545

46-
For example, if the `.tar.gz` file was extracted to the default logstash-9.0.0-beta1 directory, the command is:
46+
For example, if the `.tar.gz` file was extracted to the default logstash-{{version}} directory, the command is:
4747

48-
```sh
49-
xattr -d -r com.apple.quarantine logstash-9.0.0-beta1
48+
```sh subs=true
49+
xattr -d -r com.apple.quarantine logstash-{{version}}
5050
```
5151

5252
Alternatively, you can add a security override if a Gatekeeper popup appears by following the instructions in the *How to open an app that hasn’t been notarized or is from an unidentified developer* section of [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491).

docs/reference/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mapped_pages:
55
- https://www.elastic.co/guide/en/serverless/current/elasticsearch-ingest-data-through-logstash.html
66
---
77

8-
# Logstash introduction [introduction]
8+
# Logstash [introduction]
99

1010
Logstash is an open source data collection engine with real-time pipelining capabilities.
1111
Logstash can dynamically unify data from disparate sources and normalize the data into destinations of your choice.

docs/reference/logstash-settings-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The `logstash.yml` file includes these settings.
5959
| `config.reload.interval` | How often in seconds Logstash checks the config files for changes. Note that the unit qualifier (`s`) is required. | `3s` |
6060
| `config.debug` | When set to `true`, shows the fully compiled configuration as a debug log message. You must also set `log.level: debug`. WARNING: The log message will include any *password* options passed to plugin configs as plaintext, and may result in plaintext passwords appearing in your logs! | `false` |
6161
| `config.support_escapes` | When set to `true`, quoted strings will process the following escape sequences: `\n` becomes a literal newline (ASCII 10). `\r` becomes a literal carriage return (ASCII 13). `\t` becomes a literal tab (ASCII 9). `\\` becomes a literal backslash `\`. `\"` becomes a literal double quotation mark. `\'` becomes a literal quotation mark. | `false` |
62-
| `config.field_reference.escape_style` | Provides a way to reference fields that contain [field reference special characters](https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html#formal-grammar-escape-sequences) `[` and `]`.<br><br>::::{note} <br>This feature is in **technical preview** and may change in the future.<br>::::<br><br><br>Current options are:<br><br>* `percent`: URI-style `%`+`HH` hexadecimal encoding of UTF-8 bytes (`[` → `%5B`; `]` → `%5D`)<br>* `ampersand`: HTML-style `&#`+`DD`+`;` encoding of decimal Unicode code-points (`[` → `&#91;`; `]` → `&#93;`)<br>* `none`: field names containing special characters *cannot* be referenced.<br> | `none` |
62+
| `config.field_reference.escape_style` | Provides a way to reference fields that contain [field reference special characters](https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html#formal-grammar-escape-sequences) `[` and `]`.<br><br>Note: This feature is in **technical preview** and may change in the future.<br><br>Current options are:<br><br>* `percent`: URI-style `%`+`HH` hexadecimal encoding of UTF-8 bytes (`[` → `%5B`; `]` → `%5D`)<br>* `ampersand`: HTML-style `&#`+`DD`+`;` encoding of decimal Unicode code-points (`[` → `&#91;`; `]` → `&#93;`)<br>* `none`: field names containing special characters *cannot* be referenced.<br> | `none` |
6363
| `queue.type` | The internal queuing model to use for event buffering. Specify `memory` for legacy in-memory based queuing, or `persisted` for disk-based ACKed queueing ([persistent queues](/reference/persistent-queues.md)). | `memory` |
6464
| `path.queue` | The directory path where the data files will be stored when persistent queues are enabled (`queue.type: persisted`). | `path.data/queue` |
6565
| `queue.page_capacity` | The size of the page data files used when persistent queues are enabled (`queue.type: persisted`). The queue data consists of append-only data files separated into pages. | 64mb |

docs/reference/running-logstash-command-line.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ mapped_pages:
88
::::{admonition} macOS Gatekeeper warnings
99
:class: important
1010

11-
Apple’s rollout of stricter notarization requirements affected the notarization of the 9.0.0-beta1 {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}} that interrupts it, you will need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
11+
Apple’s rollout of stricter notarization requirements affected the notarization of the {{version}} {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}} that interrupts it, you will need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
1212

1313
```sh
1414
xattr -d -r com.apple.quarantine <archive-or-directory>
1515
```
1616

17-
For example, if the `.tar.gz` file was extracted to the default logstash-9.0.0-beta1 directory, the command is:
17+
For example, if the `.tar.gz` file was extracted to the default logstash-{{version}} directory, the command is:
1818

19-
```sh
20-
xattr -d -r com.apple.quarantine logstash-9.0.0-beta1
19+
```sh subs=true
20+
xattr -d -r com.apple.quarantine logstash-{{version}}
2121
```
2222

2323
Alternatively, you can add a security override if a Gatekeeper popup appears by following the instructions in the *How to open an app that hasn’t been notarized or is from an unidentified developer* section of [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491).
@@ -116,7 +116,11 @@ Logstash has the following flags. You can use the `--help` flag to display this
116116

117117

118118
**`--config.debug`**
119-
: Show the fully compiled configuration as a debug log message (you must also have `--log.level=debug` enabled). WARNING: The log message will include any *password* options passed to plugin configs as plaintext, and may result in plaintext passwords appearing in your logs!
119+
: Show the fully compiled configuration as a debug log message (you must also have `--log.level=debug` enabled).
120+
121+
:::{warning}
122+
The log message will include any *password* options passed to plugin configs as plaintext, and may result in plaintext passwords appearing in your logs!
123+
:::
120124

121125
**`-i, --interactive SHELL`**
122126
: Drop to shell instead of running as normal. Valid shells are "irb" and "pry".
@@ -128,7 +132,11 @@ Logstash has the following flags. You can use the `--help` flag to display this
128132
: Check configuration for valid syntax and then exit. Note that grok patterns are not checked for correctness with this flag. Logstash can read multiple config files from a directory. If you combine this flag with `--log.level=debug`, Logstash will log the combined config file, annotating each config block with the source file it came from.
129133

130134
**`-r, --config.reload.automatic`**
131-
: Monitor configuration changes and reload whenever the configuration is changed. NOTE: Use SIGHUP to manually reload the config. The default is false.
135+
: Monitor configuration changes and reload whenever the configuration is changed.
136+
137+
:::{note}
138+
Use SIGHUP to manually reload the config. The default is false.
139+
:::
132140

133141
**`--config.reload.interval RELOAD_INTERVAL`**
134142
: How frequently to poll the configuration location for changes. The default value is "3s". Note that the unit qualifier (`s`) is required.

docs/reference/running-logstash.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ Logstash is not started automatically after installation. Starting and stopping
99

1010
As systemd is now the de-facto init system, here are some common operating systems and versions that use it. This list is intended to be informative, not exhaustive.
1111

12-
| | | |
13-
| --- | --- | --- |
14-
| Distribution | Service System | |
15-
| Ubuntu 16.04 and newer | [systemd](#running-logstash-systemd) | |
16-
| Debian 8 "jessie" and newer | [systemd](#running-logstash-systemd) | |
17-
| CentOS (and RHEL) 7 and newer | [systemd](#running-logstash-systemd) | |
12+
| Distribution | Service System |
13+
| --- | --- |
14+
| Ubuntu 16.04 and newer | [systemd](#running-logstash-systemd) |
15+
| Debian 8 "jessie" and newer | [systemd](#running-logstash-systemd) |
16+
| CentOS (and RHEL) 7 and newer | [systemd](#running-logstash-systemd) |
1817

1918
## Running Logstash by Using Systemd [running-logstash-systemd]
2019

docs/reference/secure-connection.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Security is enabled by default on the {{es}} cluster (starting in 8.0). You must
2424

2525
{{ess}} uses certificates signed by standard publicly trusted certificate authorities, and therefore setting a cacert is not necessary.
2626

27-
::::{admonition} Security to {{serverless-full}} $$$serverless$$$
27+
$$$serverless$$$
28+
29+
::::{admonition} Security to {{serverless-full}}
2830
:class: note
2931

3032
{{es-serverless}} simplifies safe, secure communication between {{ls}} and {{es}}.
@@ -39,11 +41,12 @@ For more details, check out [Grant access using API keys](#ls-api-keys).
3941

4042
::::
4143

44+
$$$hosted-ess$$$
4245

43-
::::{admonition} Security to hosted {{ess}} $$$hosted-ess$$$
46+
::::{admonition} Security to hosted {{ess}}
4447
:class: note
4548

46-
Our hosted {{ess}} on Elastic Cloud simplifies safe, secure communication between {{ls}} and {{es}}. When you configure the [{{ls}} {{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) to use [`cloud_id`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_id) with either the [`cloud_auth` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_auth) or the [`api_key` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-api_key), no additional SSL configuration steps are needed. {ess-leadin-short}
49+
Our hosted {{ess}} on Elastic Cloud simplifies safe, secure communication between {{ls}} and {{es}}. When you configure the [{{ls}} {{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) to use [`cloud_id`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_id) with either the [`cloud_auth` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_auth) or the [`api_key` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-api_key), no additional SSL configuration steps are needed. {{ess-leadin-short}}
4750

4851
Configuration example:
4952

@@ -217,7 +220,7 @@ output {
217220
218221
219222
::::{note}
220-
Hosted {{ess}} simplifies security. This configuration step is not necessary for hosted Elasticsearch Service on Elastic Cloud. {ess-leadin-short}
223+
Hosted {{ess}} simplifies security. This configuration step is not necessary for hosted Elasticsearch Service on Elastic Cloud. {{ess-leadin-short}}
221224
::::
222225
223226

docs/reference/serverless-monitoring-with-elastic-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ For the best experience with the Logstash dashboards, we recommend collecting al
6565
From the list of assets, open the **[Metrics {{ls}}] {{ls}} overview** dashboard to view overall performance. Then follow the navigation panel to further drill down into {{ls}} performance.
6666

6767
% TO DO: Use `:class: screenshot`
68-
![The {{ls}} Overview dashboard in {{kib}} with various metrics from your monitored {ls}](images/integration-dashboard-overview.png)
68+
![The {{ls}} Overview dashboard in {{kib}} with various metrics from your monitored {{ls}}](images/integration-dashboard-overview.png)
6969

7070
You can hover over any visualization to adjust its settings, or click the **Edit** button to make changes to the dashboard. To learn more, refer to [Dashboard and visualizations](docs-content://explore-analyze/dashboards.md).

0 commit comments

Comments
 (0)