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.

Sign up for GitHub

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

Jump to bottom

[APM] Fleet migration support for bundled APM package #153159

Merged
merged 5 commits into from
Apr 19, 2023
Merged

[APM] Fleet migration support for bundled APM package #153159

merged 5 commits into from
Apr 19, 2023

Conversation

ogupte
Copy link
Contributor

@ogupte ogupte commented Mar 12, 2023 •
edited by kibanamachine
Loading

Closes #149342.

It accomplishes this by returning the ArchivePackage, unzipped bundled package that includes most of the same fields as the RegistryPackage. These fields are used in APM to support the fleet migration workflow.

@ogupte ogupte requested review from a team as code owners March 12, 2023 06:29
@botelastic botelastic bot added Team:APM All issues that need APM UI Team support Team:Fleet Team label for Observability Data Collection Fleet team labels Mar 12, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui (Team:APM)

@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

juliaElastic
juliaElastic approved these changes Mar 13, 2023
View reviewed changes
Copy link
Contributor

@juliaElastic juliaElastic left a comment

Choose a reason for hiding this comment

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

LGTM

sorenlouv
sorenlouv approved these changes Mar 20, 2023
View reviewed changes
Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

Any chance we can have an API test for this?

@ogupte ogupte force-pushed the apm-149342-fix-fleet-migration-bundled-package-support branch from 1993af6 to cecca8e Compare April 18, 2023 05:48
sorenlouv
sorenlouv reviewed Apr 18, 2023
View reviewed changes
x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
version,
title,
policy_templates: policyTemplates,
} = packageInfo;
Copy link
Member

Choose a reason for hiding this comment

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

Is the fleet migration covered by an API test? If not, can you add one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a suite of tests for the migration check affected by the fix in this PR. The tests required a new FTR config cloud and a limited need for a new testing user apm_manage_service_account to test a specific edge case in permissions. There's still opportunity to expand these tests further beyond the migration check logic, perhaps while executing the next test plan.

@ogupte ogupte requested a review from a team as a code owner April 19, 2023 03:45
@ogupte
Copy link
Contributor Author

ogupte commented Apr 19, 2023

The migration check results now exclude messages that no longer apply when user is missing sufficient privileges. For example, if the user is not a superuser, messages about a missing cloud agent policy no longer makes sense to display:
Screenshot 2023-04-18 at 10 54 53 PM

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
fleet 996 998 +2

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
apm 3.4MB 3.4MB +4.0B
Unknown metric groups

API count

id before after diff
fleet 1101 1103 +2

ESLint disabled line counts

id before after diff
securitySolution 432 435 +3

Total ESLint disabled count

id before after diff
securitySolution 512 515 +3

History

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

@ogupte ogupte merged commit d1dff0b into elastic:main Apr 19, 2023
@ogupte ogupte removed the v8.7.1 label Apr 19, 2023
@kibanamachine kibanamachine added the backport:skip This commit does not require backporting label Apr 19, 2023
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.7 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 153159

Questions ?

Please refer to the Backport tool documentation

ogupte added a commit to ogupte/kibana that referenced this pull request Apr 19, 2023
@ogupte
[APM] Fleet migration support for bundled APM package (elastic#153159)
9785344 
Closes elastic#149342.

It accomplishes this by returning the ArchivePackage, unzipped bundled
package that includes most of the same fields as the RegistryPackage.
These fields are used in APM to support the fleet migration workflow.
@ogupte ogupte mentioned this pull request Apr 19, 2023
Merged
@ogupte ogupte added the v8.7.2 label Apr 19, 2023
ogupte added a commit that referenced this pull request Apr 19, 2023
@ogupte
[8.7][APM] Fleet migration support for bundled APM package (#153159) (#…
87e661c 
…155281)

Backport of #153159.
(cherry picked from commit
d1dff0b)

Closes #149342.

It accomplishes this by returning the ArchivePackage, unzipped bundled
package that includes most of the same fields as the RegistryPackage.
These fields are used in APM to support the fleet migration workflow.
rylnd added a commit that referenced this pull request Apr 21, 2023
@rylnd
Merge branch '8.7' into risk_score_api_8.7
c70c7ea 
* 8.7: (93 commits)
  [8.7] [Controls] Use EUI Selectable for Field search (#151231) (#155454)
  [8.7] [Synthetics] Fix  performance breakdown link from error details page (#155393) (#155427)
  [8.7] [DOCS] Remove or move book-scoped attributes (#155210) (#155426)
  [8.7] [Synthetics] add default email recovery message (#154862) (#155418)
  [8.7] [Uptime] Add both both ip filters for view host in uptime location for host and monitor (#155382) (#155399)
  [8.7] Setup Node.js environment before instrumenting Kibana with APM. (#155063) (#155300)
  [8.7] [Discover] Address react warnings for legacy table (#154579) (#155345)
  [8.7] [Fleet] Fix logs useless rerender (#155305) (#155310)
  [8.7] [kbn-failed-test-reporter-cli] truncate report message to fix github api call failure (#155141) (#155286)
  [8.7][APM] Fleet migration support for bundled APM package (#153159)  (#155281)
  [8.7] [Enterprise Search] Fix Connector scheduling show week information correctly (#155191) (#155227)
  [8.7] [Synthetics] Fix pending count in case of location filtering (#155200) (#155225)
  [8.7] [Controls] Add Expensive Queries Fallback (#155082) (#155189)
  [8.7] [data view field editor] Runtime field code editor - move state out of controller (#155107) (#155150)
  [8.7] [FullStory] Update snippet (#153570) (#155138)
  [8.7] [Security Solution][Exceptions] - Fix exception operator logic when mapping conflict (#155071) (#155094)
  [DOCS] Adds 8.7.1 release notes (#154844)
  [8.7] Sync bundled packages with Package Storage (#155042)
  [APM] plugin description (#154811)
  Update api.asciidoc (#155021)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sorenlouv sorenlouv sorenlouv approved these changes

@yngrdyn yngrdyn yngrdyn approved these changes

@jbudz jbudz jbudz approved these changes

@juliaElastic juliaElastic juliaElastic approved these changes

Assignees
No one assigned
Labels
backport:skip This commit does not require backporting release_note:fix Team:APM All issues that need APM UI Team support Team:Fleet Team label for Observability Data Collection Fleet team v8.7.2 v8.8.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Kibana APM Settings Schema page returns 500 errors.
8 participants
@ogupte @elasticmachine @kibana-ci @kibanamachine @sorenlouv @yngrdyn @jbudz @juliaElastic