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

[8.9](backport #3295) Fix components in diag collection from Kibana #3302

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 28, 2023

This is an automatic backport of pull request #3295 done by Mergify.
Cherry-pick of d3d510d has failed:

On branch mergify/bp/8.9/pr-3295
Your branch is up to date with 'origin/8.9'.

You are currently cherry-picking commit d3d510dbb1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1691647290-kibana-diag-collection.yaml
	modified:   internal/pkg/agent/application/actions/handlers/handler_action_diagnostics_test.go
	modified:   internal/pkg/agent/application/actions/handlers/mocks/diagnostics_provider.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/application/actions/handlers/handler_action_diagnostics.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Fix diag collection from Kibana for components: we didn't collect components in the Handler, only in the cmd command

---------

Co-authored-by: Paolo Chila <[email protected]>
(cherry picked from commit d3d510d)

# Conflicts:
#	internal/pkg/agent/application/actions/handlers/handler_action_diagnostics.go
@mergify mergify bot requested a review from a team as a code owner August 28, 2023 16:16
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 28, 2023
@mergify mergify bot requested review from michalpristas and blakerouse and removed request for a team August 28, 2023 16:16
@elasticmachine
Copy link
Contributor

💔 Build Failed

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: 2023-08-28T16:16:29.217+0000

  • Duration: 5 min 17 sec

Steps errors 1

Expand to view the steps failures

check
  • Took 0 min 10 sec . View more details here
  • Description: make check-ci

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

@pierrehilbert
Copy link
Contributor

The component in diag is only from 8.10, closing this one.

@mergify mergify bot deleted the mergify/bp/8.9/pr-3295 branch August 28, 2023 17:50
@elasticmachine
Copy link
Contributor

💔 Build Failed

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: 2023-08-28T17:46:20.298+0000

  • Duration: 6 min 36 sec

Steps errors 1

Expand to view the steps failures

check
  • Took 1 min 58 sec . View more details here
  • Description: make check-ci

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants