[Elastic Agent] Fix status and inspect command to work inside running container #25204

blakerouse · 2021-04-21T14:47:19Z

What does this PR do?

Fixes issue where the status and inspect command did not work. This has to do with how the container command must setup the paths so it works correctly in a container.

Why is it important?

So the status and the inspect command can work inside of a container, without setting a special environment for it to work.

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
~~[ ] I have made corresponding changes to the documentation~~
~~[ ] I have made corresponding change to the default configuration files~~
~~[ ] I have added tests that prove my fix is effective or that my feature works~~
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Closes elastic-agent status: elastic-agent-control.sock: connect: no such file or directory #24956

elasticmachine · 2021-04-21T14:48:27Z

Pinging @elastic/agent (Team:Agent)

elasticmachine · 2021-04-21T14:53:10Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: Pull request #25204 updated
Start Time: 2021-04-21T14:49:34.634+0000
Duration: 54 min 57 sec
Commit: 67a8cbd

Test stats 🧪

Test	Results
Failed	0
Passed	6788
Skipped	16
Total	6804

Trends 🧪

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test	Results
Failed	0
Passed	6788
Skipped	16
Total	6804

ruflin

LGTM. Did not run it locally but code change makes sense.

Would be nice to also add these kind of things to our e2e test suite or something that is closer to the PR.

ruflin · 2021-04-21T18:35:57Z

x-pack/elastic-agent/pkg/agent/cmd/container.go

+}
+
+func writeContainerPaths(original, statePath, configPath, logsPath string) error {
+	pathFile := filepath.Join(original, "container-paths.yml")


Do we need a new file for this or could we use an existing "state" file?

It is only specific to running in container mode. Being that Elastic Agent ships with pre-built binaries and the state will normally be mounted from a volume we need to do a lot to ensure that the containers paths are correct.

The code will not know the path of state.yml because that is based on the STATE_PATH adjusting that location. So we use a unique file to just do this one thing, for the status and inspect commands. All other commands should either not be used in the container or are used as children of the container command itself.

… container (#25204) * Fix status and inspect command to work inside running container. * Add changelog. (cherry picked from commit b88ad8d)

… container (#25204) (#25210) * Fix status and inspect command to work inside running container. * Add changelog. (cherry picked from commit b88ad8d) Co-authored-by: Blake Rouse <blake.rouse@elastic.co>

… container (#25204) (#25209) * Fix status and inspect command to work inside running container. * Add changelog. (cherry picked from commit b88ad8d) Co-authored-by: Blake Rouse <blake.rouse@elastic.co>

…-github-pr-comment-template * upstream/master: Add support for parsers in filestream input (elastic#24763) Skip flaky test TestFilestreamTruncate (elastic#25218) backport: Add 7.13 branch (elastic#25189) Update decode_json_fields.asciidoc (elastic#25056) [Elastic Agent] Fix status and inspect command to work inside running container (elastic#25204)

…ng-versions-stack * upstream/master: (28 commits) Add support for parsers in filestream input (elastic#24763) Skip flaky test TestFilestreamTruncate (elastic#25218) backport: Add 7.13 branch (elastic#25189) Update decode_json_fields.asciidoc (elastic#25056) [Elastic Agent] Fix status and inspect command to work inside running container (elastic#25204) Check native environment before starting (elastic#25186) Change event.code and winlog.event_id type (elastic#25176) [Ingest Manager] Proxy processes/elastic-agent to stats (elastic#25193) Update mergify backporting to 7.x and 7.13 (elastic#25196) [Heartbeat]: ensure synthetics version co* [Heartbeat]: ensure synthetics version compatability for suites * address review and fix notice * fix lowercase struct * fix version conflict and rebase * update go.* stuff to master * fix notice.txt * move validate inside sourcempatability for suites (elastic#24777) [Filebeat] Ensure Kibana audit `event.category` and `event.type` are still processed as strings. (elastic#25101) Update replace.asciidoc (elastic#25055) Fix nil panic when overwriting metadata (elastic#24741) [Filebeat] Add Malware Bazaar to Threat Intel Module (elastic#24570) Fix k8s svc selectors mapping (elastic#25169) [Ingest Manager] Make agent retry values for bootstraping configurable (elastic#25163) [Metricbeat] Remove elasticsearc.index.created from the SM code (elastic#25113) [Ingest Manager] Keep http and logging config during enroll (elastic#25132) Refactor kubernetes autodiscover to avoid skipping short-living pods (elastic#24742) [libbeat] New decode xml wineventlog processor (elastic#25115) ...

Fix status and inspect command to work inside running container.

af5f39b

blakerouse added Team:Elastic-Agent Label for the Agent team backport-v7.13.0 Automated backport with mergify backport-v7.14.0 Automated backport with mergify labels Apr 21, 2021

blakerouse self-assigned this Apr 21, 2021

botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 21, 2021

Add changelog.

67a8cbd

blakerouse marked this pull request as ready for review April 21, 2021 14:48

blakerouse added the bug label Apr 21, 2021

ruflin approved these changes Apr 21, 2021

View reviewed changes

blakerouse merged commit b88ad8d into elastic:master Apr 21, 2021

blakerouse deleted the fix-container-status-cmd branch April 21, 2021 18:43

mergify bot mentioned this pull request Apr 21, 2021

[Elastic Agent] Fix status and inspect command to work inside running container (backport #25204) #25209

Merged

mergify bot mentioned this pull request Apr 21, 2021

[Elastic Agent] Fix status and inspect command to work inside running container (backport #25204) #25210

Merged

andrewkroh mentioned this pull request Dec 9, 2021

Remove STATE_PATH from agent/fleet-server containers elastic/elastic-package#617

Merged

ycombinator mentioned this pull request Mar 3, 2023

Fix container paths config elastic/elastic-agent#2340

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Elastic Agent] Fix status and inspect command to work inside running container #25204

[Elastic Agent] Fix status and inspect command to work inside running container #25204

blakerouse commented Apr 21, 2021 •

edited

Loading

elasticmachine commented Apr 21, 2021

elasticmachine commented Apr 21, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

Trends 🧪

Test stats 🧪

ruflin left a comment

ruflin Apr 21, 2021

blakerouse Apr 21, 2021

[Elastic Agent] Fix status and inspect command to work inside running container #25204

[Elastic Agent] Fix status and inspect command to work inside running container #25204

Conversation

blakerouse commented Apr 21, 2021 • edited Loading

What does this PR do?

Why is it important?

Checklist

Related issues

elasticmachine commented Apr 21, 2021

elasticmachine commented Apr 21, 2021 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

Trends 🧪

💚 Flaky test report

Test stats 🧪

ruflin left a comment

Choose a reason for hiding this comment

ruflin Apr 21, 2021

Choose a reason for hiding this comment

blakerouse Apr 21, 2021

Choose a reason for hiding this comment

blakerouse commented Apr 21, 2021 •

edited

Loading

elasticmachine commented Apr 21, 2021 •

edited by jenkins-beats-ci bot

Loading