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

Enable monitoring buffer for elastic-agent (#30471) #211

Merged
merged 10 commits into from
Mar 23, 2022

Conversation

narph
Copy link
Contributor

@narph narph commented Mar 17, 2022

Backport from elastic/beats#30559

  • Enable monitoring buffer for elastic-agent

  • Add diagnostics collect support

  • Fix typos

  • Fix issues

  • Fix metrics collection

  • Add CHANGELOG

  • Update x-pack/elastic-agent/CHANGELOG.next.asciidoc

Co-authored-by: Bryan Clement bclement01@gmail.com

  • Remove unused config

  • changelog order

Co-authored-by: Bryan Clement bclement01@gmail.com
(cherry picked from commit 0099f5cf517ee03c88c2c33909a178c04329840e)

* Enable monitoring buffer for elastic-agent

* Add diagnostics collect support

* Fix typos

* Fix issues

* Fix metrics collection

* Add CHANGELOG

* Update x-pack/elastic-agent/CHANGELOG.next.asciidoc

Co-authored-by: Bryan Clement <bclement01@gmail.com>

* Remove unused config

* changelog order

Co-authored-by: Bryan Clement <bclement01@gmail.com>
(cherry picked from commit 0099f5cf517ee03c88c2c33909a178c04329840e)
@mergify mergify bot assigned narph Mar 17, 2022
@mergify
Copy link
Contributor

mergify bot commented Mar 17, 2022

This pull request does not have a backport label. Could you fix it @narph? 🙏
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 8./d branch. /d is the digit

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 17, 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-03-23T08:35:25.064+0000

  • Duration: 33 min 48 sec

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

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

@narph narph added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team ci:end-to-end Enable the e2e-testing labels Mar 17, 2022
Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

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

The linter warning are valid, we didn't have a linter on beats before that went in, sorry @narph :(


func zipMetrics(zw *zip.Writer, metrics *proto.ProcMetricsResponse) error {
zf, err := zw.Create("metrics/")
if err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is interesting, I believe this is a real bug, I don't think you need to create zw.Create() with only the metrics/

Copy link
Contributor

Choose a reason for hiding this comment

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

The documentation for zip states that adding a trailing slash creates a directory: https://pkg.go.dev/archive/zip#Writer.Create

@mergify
Copy link
Contributor

mergify bot commented Mar 18, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b backport-30471 upstream/backport-30471
git merge upstream/main
git push upstream backport-30471

@mergify
Copy link
Contributor

mergify bot commented Mar 22, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b backport-30471 upstream/backport-30471
git merge upstream/main
git push upstream backport-30471

@narph narph requested a review from ph March 22, 2022 12:24
@narph
Copy link
Contributor Author

narph commented Mar 22, 2022

@ph most of this PR changes are already merged in d108e49

@mergify
Copy link
Contributor

mergify bot commented Mar 22, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b backport-30471 upstream/backport-30471
git merge upstream/main
git push upstream backport-30471

@narph narph requested review from michel-laterman and a team March 23, 2022 09:05
@narph narph merged commit a04919a into elastic:main Mar 23, 2022
@narph narph deleted the backport-30471 branch March 23, 2022 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip ci:end-to-end Enable the e2e-testing 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.

4 participants