From e329ebf724413f323816505f860b1d2076890696 Mon Sep 17 00:00:00 2001 From: Roberto Seldner Date: Fri, 27 Oct 2023 08:57:34 -0700 Subject: [PATCH 1/6] Update install-layout.asciidoc Updated widget to reflect the logging changes from 8.6.0 (v2 architecture) to close this issue: https://github.com/elastic/ingest-docs/issues/175 Related changes: https://github.com/elastic/elastic-agent/pull/1701 --- .../tab-widgets/install-layout.asciidoc | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc index d91e75667..59d2e6474 100644 --- a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc +++ b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc @@ -7,10 +7,8 @@ Main {agent} configuration `/Library/Elastic/Agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration -`/Library/Elastic/Agent/data/elastic-agent-*/logs/elastic-agent-json.log`:: -Log files for {agent}footnote:lognumbering[Logs file names end with a date and optional number: log-date.ndjson, log-date-1.ndjson, and so on as new files are created during rotation.] -`/Library/Elastic/Agent/data/elastic-agent-*/logs/default/*-json.log`:: -Log files for {beats} shippersfootnote:lognumbering[] +`/Library/Elastic/Agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: +Log files for {agent} and beats shippers footnote:lognumbering[Logs file names end with a date (`YYYYMMDD`) and optional number: `elastic-agent-YYYYMMDD.ndjson`, `elastic-agent-YYYYMMDD-1.ndjson`, and so on as new files are created during rotation.] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH @@ -26,10 +24,8 @@ command, use the `--base-path` CLI option to specify the custom base path. Main {agent} configuration `/opt/Elastic/Agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration -`/opt/Elastic/Agent/data/elastic-agent-*/logs/elastic-agent-json.log`:: -Log files for {agent}footnote:lognumbering[] -`/opt/Elastic/Agent/data/elastic-agent-*/logs/default/*-json.log`:: -Log files for {beats} shippers +`/opt/Elastic/Agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: +Log files for {agent} and beats shippers footnote:lognumbering[] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH @@ -45,10 +41,8 @@ command, use the `--base-path` CLI option to specify the custom base path. Main {agent} configuration `C:\Program Files\Elastic\Agent\fleet.enc`:: Main {agent} {fleet} encrypted configuration -`C:\Program Files\Elastic\Agent\data\elastic-agent-*\logs\elastic-agent-json.log`:: -Log files for {agent}footnote:lognumbering[] -`C:\Program Files\Elastic\Agent\data\elastic-agent-*\logs\default\*-json.log*`:: -Log files for {beats} shippers +`C:\Program Files\Elastic\Agent\data\elastic-agent-*\logs\elastic-agent.ndjson`:: +Log files for {agent} and beats shippers footnote:lognumbering[] You can install {agent} in a custom base path other than `C:\Program Files`. When installing {agent} with the `.\elastic-agent.exe install` command, use the `--base-path` CLI option to specify the custom base path. @@ -62,10 +56,8 @@ command, use the `--base-path` CLI option to specify the custom base path. Main {agent} configuration `/etc/elastic-agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration -`/var/lib/elastic-agent/data/elastic-agent-*/logs/elastic-agent-json.log`:: -Log files for {agent}footnote:lognumbering[] -`/var/lib/elastic-agent/data/elastic-agent-*/logs/default/*-json.log*`:: -Log files for {beats} shippers +`/var/lib/elastic-agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: +Log files for {agent} and beats shippers footnote:lognumbering[] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH @@ -79,10 +71,8 @@ Shell wrapper installed into PATH Main {agent} configuration `/etc/elastic-agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration -`/var/lib/elastic-agent/data/elastic-agent-*/logs/elastic-agent-json.log`:: -Log files for {agent}footnote:lognumbering[] -`/var/lib/elastic-agent/data/elastic-agent-*/logs/default/*-json.log*`:: -Log files for {beats} shippers +`/var/lib/elastic-agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: +Log files for {agent} and beats shippers footnote:lognumbering[] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH From 2d37f9fd6e09910a657fc58b8fe4dd27f526ea4d Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:10:42 -0500 Subject: [PATCH 2/6] Update docs/en/ingest-management/tab-widgets/install-layout.asciidoc --- docs/en/ingest-management/tab-widgets/install-layout.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc index 326ac084f..96a9934ca 100644 --- a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc +++ b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc @@ -9,7 +9,7 @@ Main {agent} configuration Main {agent} {fleet} encrypted configuration `/Library/Elastic/Agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: -Log files for {agent} and beats shippers footnote:lognumbering[Logs file names end with a date (`YYYYMMDD`) and optional number: `elastic-agent-YYYYMMDD.ndjson`, `elastic-agent-YYYYMMDD-1.ndjson`, and so on as new files are created during rotation.] +Log files for {agent} and {beats} shippers footnote:lognumbering[Logs file names end with a date (`YYYYMMDD`) and optional number: `elastic-agent-YYYYMMDD.ndjson`, `elastic-agent-YYYYMMDD-1.ndjson`, and so on as new files are created during rotation.] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH From 3064235ac4cc973c62bf29b907b8d4f177d72569 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:10:48 -0500 Subject: [PATCH 3/6] Update docs/en/ingest-management/tab-widgets/install-layout.asciidoc --- docs/en/ingest-management/tab-widgets/install-layout.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc index 96a9934ca..2db250e38 100644 --- a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc +++ b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc @@ -74,7 +74,7 @@ Main {agent} configuration `/etc/elastic-agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration `/var/lib/elastic-agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: -Log files for {agent} and beats shippers footnote:lognumbering[] +Log files for {agent} and {beats} shippers footnote:lognumbering[] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH From f3893dfee48c34f93e90c2c183b76f6ed8865791 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:10:55 -0500 Subject: [PATCH 4/6] Update docs/en/ingest-management/tab-widgets/install-layout.asciidoc --- docs/en/ingest-management/tab-widgets/install-layout.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc index 2db250e38..610c4ab7a 100644 --- a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc +++ b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc @@ -27,7 +27,7 @@ Main {agent} configuration `/opt/Elastic/Agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration `/opt/Elastic/Agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: -Log files for {agent} and beats shippers footnote:lognumbering[] +Log files for {agent} and {beats} shippers footnote:lognumbering[] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH From ea5d90660a3de15036b6798f76b08059eb1f42fe Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:11:02 -0500 Subject: [PATCH 5/6] Update docs/en/ingest-management/tab-widgets/install-layout.asciidoc --- docs/en/ingest-management/tab-widgets/install-layout.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc index 610c4ab7a..375879532 100644 --- a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc +++ b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc @@ -59,7 +59,7 @@ Main {agent} configuration `/etc/elastic-agent/fleet.enc`:: Main {agent} {fleet} encrypted configuration `/var/lib/elastic-agent/data/elastic-agent-*/logs/elastic-agent.ndjson`:: -Log files for {agent} and beats shippers footnote:lognumbering[] +Log files for {agent} and {beats} shippers footnote:lognumbering[] `/usr/bin/elastic-agent`:: Shell wrapper installed into PATH From d24c1597865be0ea0adb515f097698635ebdb243 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:11:08 -0500 Subject: [PATCH 6/6] Update docs/en/ingest-management/tab-widgets/install-layout.asciidoc --- docs/en/ingest-management/tab-widgets/install-layout.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc index 375879532..d7dad85d1 100644 --- a/docs/en/ingest-management/tab-widgets/install-layout.asciidoc +++ b/docs/en/ingest-management/tab-widgets/install-layout.asciidoc @@ -44,7 +44,7 @@ Main {agent} configuration `C:\Program Files\Elastic\Agent\fleet.enc`:: Main {agent} {fleet} encrypted configuration `C:\Program Files\Elastic\Agent\data\elastic-agent-*\logs\elastic-agent.ndjson`:: -Log files for {agent} and beats shippers footnote:lognumbering[] +Log files for {agent} and {beats} shippers footnote:lognumbering[] You can install {agent} in a custom base path other than `C:\Program Files`. When installing {agent} with the `.\elastic-agent.exe install` command, use the `--base-path` CLI option to specify the custom base path.