Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add beat/process config to elastic agent diagnostics collect #29902

Merged

Conversation

michel-laterman
Copy link
Contributor

@michel-laterman michel-laterman commented Jan 18, 2022

What does this PR do?

Add the configs that are output from elastic-agent inspect output to the
bundle generated by elastic-agent diagnostics collect. Files are named
as ProcID_RouteKey.

Why is it important?

Include the config that's sent from the agent to underlying processes in the diagnostic bundles to allow us to more easily debug config errors.

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.

How to test this PR locally

Start an agent.
Run elastic-agent diagnostics collect once the agent is healthy
Inspect archive's config files.

Related issues

Add the configs that are output from elastic-agent inspect output to the
bundle generated by elastic-agent diagnostics collect. Files are named
as ProcID_RouteKey.
@michel-laterman michel-laterman added enhancement Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Jan 18, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@botelastic 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 Jan 18, 2022
@mergify
Copy link
Contributor

mergify bot commented Jan 18, 2022

This pull request does not have a backport label. Could you fix it @michel-laterman? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Jan 18, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 19, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-01-20T16:47:33.573+0000

  • Duration: 96 min 38 sec

  • Commit: b82e29e

Test stats 🧪

Test Results
Failed 0
Passed 7176
Skipped 16
Total 7192

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@jlind23
Copy link
Collaborator

jlind23 commented Jan 19, 2022

@faec may help in some of your SDHs

x-pack/elastic-agent/pkg/agent/cmd/diagnostics.go Outdated Show resolved Hide resolved
x-pack/elastic-agent/pkg/agent/cmd/diagnostics.go Outdated Show resolved Hide resolved
x-pack/elastic-agent/pkg/agent/cmd/diagnostics.go Outdated Show resolved Hide resolved
x-pack/elastic-agent/pkg/agent/cmd/diagnostics.go Outdated Show resolved Hide resolved
x-pack/elastic-agent/pkg/agent/cmd/diagnostics.go Outdated Show resolved Hide resolved
Co-authored-by: Anderson Queiroz <contato@andersonq.eti.br>
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@ph
Copy link
Contributor

ph commented Jan 20, 2022

Changes LGTM, I am been trying to test locally but other stuff is block my build.

@michel-laterman michel-laterman merged commit 53c7c51 into elastic:master Jan 20, 2022
@michel-laterman michel-laterman deleted the agent-diag-process-config branch January 20, 2022 22:42
yashtewari pushed a commit to build-security/beats that referenced this pull request Jan 30, 2022
…#29902)

* Add beat/process config to elastic agent diagnostics collect

Add the configs that are output from elastic-agent inspect output to the
bundle generated by elastic-agent diagnostics collect. Files are named
as ProcID_RouteKey.

* Apply suggestions from code review

Co-authored-by: Anderson Queiroz <contato@andersonq.eti.br>

Co-authored-by: Anderson Queiroz <contato@andersonq.eti.br>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify enhancement Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

elastic-agent diagnostics: filebeat and metricbeat configuration
6 participants