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

[Fleet] Fix get file handler for bundled package #172182

Merged
merged 6 commits into from
Nov 30, 2023

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented Nov 29, 2023

Summary

Resolve #166045
That PR allow to retrieve files for bundled package that are not installed, this allow to display the APM integration on premise

Before that change

Screenshot 2023-11-29 at 11 08 12 AM

After

Screenshot 2023-11-29 at 11 06 08 AM

Manual tests instructions

  • retrieve 8.11.1 bundled packages
cd /tmp
mkdir test-8.11
cd test-8.11
wget https://artifacts.elastic.co/downloads/kibana/kibana-8.11.1-darwin-x86_64.tar.gz
tar -xvf kibana-8.11.1-darwin-x86_64.tar.gz
  • Configure kibana to use those bundled packages
    xpack.fleet.developer.bundledPackageLocation: /tmp/test-8.11/kibana-8.11.1/node_modules/@kbn/fleet-plugin/target/bundled_packages

  • Navigate to apm and check the integration is displayed http://localhost:5601/app/integrations/detail/apm/overview

Todo

  • add tests

@nchaulet nchaulet added bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team labels Nov 29, 2023
@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • /oblt-deploy-serverless : Deploy a serverless Kibana instance using the Observability test environments.
  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@nchaulet nchaulet self-assigned this Nov 29, 2023
@nchaulet nchaulet marked this pull request as ready for review November 29, 2023 19:17
@nchaulet nchaulet requested a review from a team as a code owner November 29, 2023 19:17
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

Copy link
Member

@kpollich kpollich left a comment

Choose a reason for hiding this comment

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

Code reorgnization + tests LGTM 🚀

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @nchaulet

@nchaulet nchaulet merged commit 4d52ad2 into elastic:main Nov 30, 2023
32 checks passed
@nchaulet nchaulet deleted the fix-get-bundled-file branch November 30, 2023 13:52
@kibanamachine kibanamachine added v8.12.0 backport:skip This commit does not require backporting labels Nov 30, 2023
kpollich added a commit that referenced this pull request Dec 5, 2023
kpollich added a commit to kpollich/kibana that referenced this pull request Dec 5, 2023
kobelb added a commit to kobelb/kibana that referenced this pull request Dec 5, 2023
kobelb added a commit to kobelb/kibana that referenced this pull request Dec 5, 2023
kobelb added a commit to kobelb/kibana that referenced this pull request Dec 5, 2023
kobelb added a commit that referenced this pull request Dec 5, 2023
kobelb added a commit that referenced this pull request Dec 5, 2023
nchaulet added a commit to nchaulet/kibana that referenced this pull request Dec 11, 2023
nchaulet added a commit to nchaulet/kibana that referenced this pull request Dec 22, 2023
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 22, 2023
kibanamachine added a commit that referenced this pull request Dec 22, 2023
…73058) (#173912)

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Fleet] Fix get file handler for bundled package (#172182)
(#173058)](#173058)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-12-12T16:05:46Z","message":"[Fleet]
Fix get file handler for bundled package (#172182)
(#173058)","sha":"fa3b6f4c9da88e6ddbd1fae7c502d00353c55134","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.13.0"],"number":173058,"url":"https://github.com/elastic/kibana/pull/173058","mergeCommit":{"message":"[Fleet]
Fix get file handler for bundled package (#172182)
(#173058)","sha":"fa3b6f4c9da88e6ddbd1fae7c502d00353c55134"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173058","number":173058,"mergeCommit":{"message":"[Fleet]
Fix get file handler for bundled package (#172182)
(#173058)","sha":"fa3b6f4c9da88e6ddbd1fae7c502d00353c55134"}}]}]
BACKPORT-->

Co-authored-by: Nicolas Chaulet <[email protected]>
nchaulet added a commit that referenced this pull request Dec 22, 2023
…73058) (#173911)

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Fleet] Fix get file handler for bundled package (#172182)
(#173058)](#173058)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-12-12T16:05:46Z","message":"[Fleet]
Fix get file handler for bundled package (#172182)
(#173058)","sha":"fa3b6f4c9da88e6ddbd1fae7c502d00353c55134","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.13.0"],"number":173058,"url":"https://github.com/elastic/kibana/pull/173058","mergeCommit":{"message":"[Fleet]
Fix get file handler for bundled package (#172182)
(#173058)","sha":"fa3b6f4c9da88e6ddbd1fae7c502d00353c55134"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173058","number":173058,"mergeCommit":{"message":"[Fleet]
Fix get file handler for bundled package (#172182)
(#173058)","sha":"fa3b6f4c9da88e6ddbd1fae7c502d00353c55134"}}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:skip This commit does not require backporting bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fleet][Self-Managed]: APM integration overview page fails to load, when the integration is never installed.
6 participants