Skip to content

Commit

Permalink
Fix installation layout docs (#2359)
Browse files Browse the repository at this point in the history
* docs: fleet.yml doesn't exist anymore in newer versions

* docs: this tip doesn't apply anymore to Fleet-managed agents

* docs: add note to users who may want to look for the plain-text version of fleet.yml

* Update docs/en/ingest-management/fleet-agent-proxy-support.asciidoc

Co-authored-by: DeDe Morton <[email protected]>

Co-authored-by: DeDe Morton <[email protected]>
(cherry picked from commit 7b2ce22)
  • Loading branch information
cleydyr authored and mergify[bot] committed Nov 17, 2022
1 parent 185cf2c commit 6e6fe7d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
2 changes: 2 additions & 0 deletions docs/en/ingest-management/fleet-agent-proxy-support.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ fleet:
id: ""
----

NOTE: When {agent} runs, the `fleet.yml` file gets encrypted and renamed to `fleet.enc`.

[discrete]
[[epr-proxy-setting]]
== Set the proxy URL of the {package-registry}
Expand Down
20 changes: 10 additions & 10 deletions docs/en/ingest-management/tab-widgets/install-layout.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{agent} program files
`/Library/Elastic/Agent/elastic-agent.yml`::
Main {agent} configuration
`/Library/Elastic/Agent/fleet.yml`::
Main {agent} {fleet} 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`::
Expand All @@ -22,8 +22,8 @@ Shell wrapper installed into PATH
{agent} program files
`/opt/Elastic/Agent/elastic-agent.yml`::
Main {agent} configuration
`/opt/Elastic/Agent/fleet.yml`::
Main {agent} {fleet} 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`::
Expand All @@ -39,8 +39,8 @@ Shell wrapper installed into PATH
{agent} program files
`C:\Program Files\Elastic\Agent\elastic-agent.yml`::
Main {agent} configuration
`C:\Program Files\Elastic\Agent\fleet.yml`::
Main {agent} {fleet} 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*`::
Expand All @@ -54,8 +54,8 @@ Log files for {beats} shippers
{agent} program files
`/etc/elastic-agent/elastic-agent.yml`::
Main {agent} configuration
`/etc/elastic-agent/fleet.yml`::
Main {agent} {fleet} 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*`::
Expand All @@ -71,8 +71,8 @@ Shell wrapper installed into PATH
{agent} program files
`/etc/elastic-agent/elastic-agent.yml`::
Main {agent} configuration
`/etc/elastic-agent/fleet.yml`::
Main {agent} {fleet} 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*`::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,6 @@ For example, if you want to include system data, make sure the *System* integrat
IMPORTANT: The *{ecloud} agent policy* is created only in {ecloud} deployments and, by default,
does not include the collection of logs of metrics.

You can collect other files to assess and pass to the Elastic team for review for some more advanced debugging cases.
These files should all be in the {agent} directory on disk: `state.yml`, `fleet.yml` and `elastic-agent.yml`.

[discrete]
=== Collect {agent} diagnostics bundle

Expand Down

0 comments on commit 6e6fe7d

Please sign in to comment.