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] allow +build agent upgrade versions #192171

Merged
merged 2 commits into from
Sep 5, 2024
Merged

[Fleet] allow +build agent upgrade versions #192171

merged 2 commits into from
Sep 5, 2024

Conversation

juliaElastic
Copy link
Contributor

@juliaElastic juliaElastic commented Sep 5, 2024 •
edited by kibanamachine
Loading

Summary

Closes #191099

Show +build versions when upgrade agents

To verify:

  • enroll agent before version 8.14.3, latest fleet server
  • go to upgrade agent
  • check that +build versions are available
  • verify that the upgrade succeeds
image image

After 10m monitoring passed, the agent can be upgraded again to newer versions:
image

Checklist

@juliaElastic juliaElastic self-assigned this Sep 5, 2024
@juliaElastic
Copy link
Contributor Author

/ci

@obltmachine
Copy link

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

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

@juliaElastic juliaElastic marked this pull request as ready for review September 5, 2024 12:26
@juliaElastic juliaElastic requested a review from a team as a code owner September 5, 2024 12:26
nchaulet
nchaulet reviewed Sep 5, 2024
View reviewed changes
x-pack/plugins/fleet/server/services/agents/versions.ts
@@ -109,11 +108,10 @@ export const getAvailableVersions = async ({
// fetch from the live API more than `TIME_BETWEEN_FETCHES` milliseconds.
const apiVersions = await fetchAgentVersionsFromApi();

// Coerce each version to a semver object and compare to our `MINIMUM_SUPPORTED_VERSION` - we
// Take each version and compare to our `MINIMUM_SUPPORTED_VERSION` - we
// only want support versions in the final result. We'll also sort by newest version first.
availableVersions = uniq(
[...availableVersions, ...apiVersions]
Copy link
Member

Choose a reason for hiding this comment

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

In the version from the API it seems there are also some RC and beta versions I do not know if we want them included too

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Probably best to keep the behaviour unchanged for that now that 9.0 is approaching. Added back the coerce logic and allowing only +build versions.

@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Sep 5, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@juliaElastic juliaElastic enabled auto-merge (squash) September 5, 2024 15:00
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #33 / discover/group2/data_grid3 discover data grid sample size should use custom sample size on Dashboard when specified
  • [job] [logs] Jest Tests #1 / Severity form field renders
  • [job] [logs] Jest Integration Tests #4 / When using isolate action from response actions console and when console is closed (not terminated) and then reopened should display completion output if done (no additional API calls)

Metrics [docs]

✅ unchanged

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

cc @juliaElastic

@juliaElastic juliaElastic merged commit 1628ac3 into elastic:main Sep 5, 2024
23 of 24 checks passed
@kibanamachine kibanamachine added v8.16.0 backport:skip This commit does not require backporting labels Sep 5, 2024
@kpollich kpollich added backport:prev-major Backport to (8.x, 8.16, 8.15) the previous major branch and all later branches still in development and removed backport:skip This commit does not require backporting labels Nov 8, 2024
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.15, 8.16, 8.x

https://github.com/elastic/kibana/actions/runs/11749602145

@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.15, 8.16, 8.x

https://github.com/elastic/kibana/actions/runs/11749602143

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.15 Backport failed because of merge conflicts
❌ 8.16 Cherrypick failed because the selected commit (1628ac3) is empty. Did you already backport this commit?
❌ 8.x Cherrypick failed because the selected commit (1628ac3) is empty. Did you already backport this commit?

Manual backport

To create the backport manually run:

node scripts/backport --pr 192171

Questions ?

Please refer to the Backport tool documentation

1 similar comment
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.15 Backport failed because of merge conflicts
❌ 8.16 Cherrypick failed because the selected commit (1628ac3) is empty. Did you already backport this commit?
❌ 8.x Cherrypick failed because the selected commit (1628ac3) is empty. Did you already backport this commit?

Manual backport

To create the backport manually run:

node scripts/backport --pr 192171

Questions ?

Please refer to the Backport tool documentation

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 11, 2024
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 192171 locally

@juliaElastic juliaElastic removed backport missing Added to PRs automatically when the are determined to be missing a backport. backport:prev-major Backport to (8.x, 8.16, 8.15) the previous major branch and all later branches still in development labels Nov 12, 2024
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 13, 2024
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 192171 locally

@juliaElastic
Copy link
Contributor Author

This change is already on the 8.16, 8.x branches, no need to backport.

@juliaElastic juliaElastic added the backport:skip This commit does not require backporting label Nov 13, 2024
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nchaulet nchaulet nchaulet approved these changes

Assignees

@juliaElastic juliaElastic

Labels
backport:skip This commit does not require backporting release_note:enhancement Team:Fleet Team label for Observability Data Collection Fleet team v8.16.0 v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Fleet] Agent upgrade available version list should show +build* version
7 participants
@juliaElastic @obltmachine @elasticmachine @kibana-ci @kibanamachine @nchaulet @kpollich