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

[Fleet][EPM] Unified install and archive #83384

Merged
merged 13 commits into from
Nov 17, 2020
Merged

[Fleet][EPM] Unified install and archive #83384

merged 13 commits into from
Nov 17, 2020

Conversation

jfsiii
Copy link
Contributor

@jfsiii jfsiii commented Nov 14, 2020 •
edited
Loading

Summary

  • Further reduce differences between installing uploaded vs registry package
  • Improve cache/store names, TS types, etc. Including key by name + version + source
  • Add a cache/store for PackageInfo (e.g. results metadata from registry's /package/version/ response)
  • Remove ensureCachedArchiveInfo

@jfsiii jfsiii mentioned this pull request Nov 14, 2020
Closed
@jfsiii jfsiii marked this pull request as ready for review November 16, 2020 15:01
@jfsiii jfsiii requested a review from a team November 16, 2020 15:01
@jfsiii jfsiii self-assigned this Nov 16, 2020
@jfsiii jfsiii added release_note:skip Skip the PR/issue when compiling release notes v7.11.0 v8.0.0 labels Nov 16, 2020
@jfsiii jfsiii linked an issue Nov 16, 2020 that may be closed by this pull request
[Fleet] Store installed packages in cluster #83426
Closed
@jfsiii jfsiii mentioned this pull request Nov 16, 2020
Closed
@jfsiii
Copy link
Contributor Author

jfsiii commented Nov 17, 2020

@elasticmachine merge upstream

@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Nov 17, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Team:Ingest Management)

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@neptunian
Copy link
Contributor

Looks good!

neptunian
neptunian reviewed Nov 17, 2020
View reviewed changes
x-pack/plugins/fleet/server/services/epm/archive/cache.ts
const sharedKey = ({ name, version, installSource }: SharedKey) =>
`${name}-${version}-${installSource}`;

export const getPackageInfo = (args: SharedKey) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if we should name this something different as we already have a getPackageInfo https://github.com/elastic/kibana/pull/83384/files#diff-baf8294e3f474e4f2436b376ab8b1c1c8a611c0d0455ff88e78563c613deeb4dL106

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 think it's ok for the names to be the same since they're in different services. I also think one might replace/wrap the other eventually. I'll leave as-is and we can rename later if we want.

@jfsiii jfsiii merged commit cf7aacc into elastic:master Nov 17, 2020
gmmorris added a commit to gmmorris/kibana that referenced this pull request Nov 17, 2020
@gmmorris
Merge branch 'master' into alerts/action-groups-as-conditions
2985ee2 
* master: (51 commits)
  [ML] Persisted URL state for the Data frame analytics jobs and models pages (elastic#83439)
  adds xpack.security.authc.selector.enabled setting (elastic#83551)
  skip flaky suite (elastic#77279)
  [ML] Improve support for script and aggregation fields in anomaly detection jobs (elastic#81923)
  [Workplace Search] Migrate SourcesLogic from ent-search (elastic#83544)
  [ML] Add UI test for feature importance features (elastic#82677)
  [Maps] Improve icons for all layer types (elastic#83503)
  Replace experimental badge with Beta (elastic#83468)
  [Fleet][EPM] Unified install and archive (elastic#83384)
  Move src/legacy/server/keystore to src/cli (elastic#83483)
  Used SO for saving the API key IDs that should be deleted (elastic#82211)
  [Uptime] Mock implementation to account for math flakiness test (elastic#83535)
  [Workplace Search] Enable check for org context based on URL (elastic#83487)
  [App Search] Added all Document related routes and logic (elastic#83324)
  [Alerting UI] Fix console error when setting connector params (elastic#83333)
  [Discover] Allow custom name for fields via index pattern field management (elastic#70039)
  [Uptime] Fix monitor list down histogram (elastic#83411)
  remove headers timeout hack, rely on nodejs timeouts (elastic#83419)
  [ML] Update console autocomplete for ML data frame evaluate API (elastic#83151)
  [Lens] Color in dimension trigger (elastic#76871)
  ...
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 19, 2020
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 83384 or prevent reminders by adding the backport:skip label.

1 similar comment
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 83384 or prevent reminders by adding the backport:skip label.

@jfsiii jfsiii mentioned this pull request Nov 20, 2020
Merged
jfsiii pushed a commit to jfsiii/kibana that referenced this pull request Nov 20, 2020
[Fleet][EPM] Unified install and archive (elastic#83384)
20fcec4 
## Summary

 * Further reduce differences between installing uploaded vs registry package
 * Improve cache/store names, TS types, etc. Including key by name + version + source
 * Add a cache/store for PackageInfo (e.g. results metadata from registry's /package/version/ response)
 * Remove ensureCachedArchiveInfo
jfsiii pushed a commit that referenced this pull request Nov 20, 2020
[Fleet][EPM] Unified install and archive (#83384) (#83944)
4ac9eff 
## Summary

 * Further reduce differences between installing uploaded vs registry package
 * Improve cache/store names, TS types, etc. Including key by name + version + source
 * Add a cache/store for PackageInfo (e.g. results metadata from registry's /package/version/ response)
 * Remove ensureCachedArchiveInfo
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neptunian neptunian neptunian approved these changes

Assignees

@jfsiii jfsiii

Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.11.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Fleet] Store installed packages in cluster
4 participants
@jfsiii @elasticmachine @kibanamachine @neptunian