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 restart upgrade disabled condition #184586

Merged
merged 2 commits into from
Jun 3, 2024

Conversation

juliaElastic
Copy link
Contributor

@juliaElastic juliaElastic commented May 31, 2024

Summary

Closes #184212

Fix the Restart upgrade modal submit button disabled condition. It was not correct for single agent restart, the restart was disabled.

To verify:

  • enroll an agent with an older version e.g. 8.13.1
  • upgrade agent with a fictive version e.g. 8.13.5
  • update the agent doc to set the upgrade_started_at to more than 2 hours ago
  • go to Restart upgrade, the modal window show enable submit
image

Checklist

@juliaElastic juliaElastic added release_note:fix backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) labels May 31, 2024
@juliaElastic juliaElastic self-assigned this May 31, 2024
@juliaElastic juliaElastic requested a review from a team as a code owner May 31, 2024 12:44
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label May 31, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@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.
  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@juliaElastic juliaElastic enabled auto-merge (squash) May 31, 2024 14:10
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Async chunks

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

id before after diff
fleet 1.3MB 1.3MB +50.0B

History

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

cc @juliaElastic

Copy link
Contributor

@criamico criamico left a comment

Choose a reason for hiding this comment

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

LGTM

@juliaElastic juliaElastic merged commit 1750ab8 into elastic:main Jun 3, 2024
19 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 3, 2024
## Summary

Closes elastic#184212

Fix the Restart upgrade modal submit button disabled condition. It was
not correct for single agent restart, the restart was disabled.

To verify:
- enroll an agent with an older version e.g. 8.13.1
- upgrade agent with a fictive version e.g. 8.13.5
- update the agent doc to set the `upgrade_started_at` to more than 2
hours ago
- go to `Restart upgrade`, the modal window show enable submit

<img width="818" alt="image"
src="https://github.com/elastic/kibana/assets/90178898/0edbbb1a-7a51-4287-8598-0d4437bbc874">

### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

(cherry picked from commit 1750ab8)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.14

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

rohanxz pushed a commit to honeyn303/kibana that referenced this pull request Jun 4, 2024
## Summary

Closes elastic#184212

Fix the Restart upgrade modal submit button disabled condition. It was
not correct for single agent restart, the restart was disabled.

To verify:
- enroll an agent with an older version e.g. 8.13.1
- upgrade agent with a fictive version e.g. 8.13.5
- update the agent doc to set the `upgrade_started_at` to more than 2
hours ago
- go to `Restart upgrade`, the modal window show enable submit


<img width="818" alt="image"
src="https://github.com/elastic/kibana/assets/90178898/0edbbb1a-7a51-4287-8598-0d4437bbc874">


### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jun 4, 2024
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

kibanamachine added a commit that referenced this pull request Jun 5, 2024
)

# Backport

This will backport the following commits from `main` to `8.14`:
- [[Fleet] fix restart upgrade disabled condition
(#184586)](#184586)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Julia
Bardi","email":"90178898+juliaElastic@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-06-03T13:53:06Z","message":"[Fleet]
fix restart upgrade disabled condition (#184586)\n\n##
Summary\r\n\r\nCloses
https://github.com/elastic/kibana/issues/184212\r\n\r\nFix the Restart
upgrade modal submit button disabled condition. It was\r\nnot correct
for single agent restart, the restart was disabled.\r\n\r\nTo
verify:\r\n- enroll an agent with an older version e.g. 8.13.1\r\n-
upgrade agent with a fictive version e.g. 8.13.5\r\n- update the agent
doc to set the `upgrade_started_at` to more than 2\r\nhours ago\r\n- go
to `Restart upgrade`, the modal window show enable
submit\r\n\r\n\r\n<img width=\"818\"
alt=\"image\"\r\nsrc=\"https://github.com/elastic/kibana/assets/90178898/0edbbb1a-7a51-4287-8598-0d4437bbc874\">\r\n\r\n\r\n###
Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"1750ab8676dadb3d6f2f3dbfe0ee9ea95de66733","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.15.0"],"title":"[Fleet]
fix restart upgrade disabled
condition","number":184586,"url":"https://github.com/elastic/kibana/pull/184586","mergeCommit":{"message":"[Fleet]
fix restart upgrade disabled condition (#184586)\n\n##
Summary\r\n\r\nCloses
https://github.com/elastic/kibana/issues/184212\r\n\r\nFix the Restart
upgrade modal submit button disabled condition. It was\r\nnot correct
for single agent restart, the restart was disabled.\r\n\r\nTo
verify:\r\n- enroll an agent with an older version e.g. 8.13.1\r\n-
upgrade agent with a fictive version e.g. 8.13.5\r\n- update the agent
doc to set the `upgrade_started_at` to more than 2\r\nhours ago\r\n- go
to `Restart upgrade`, the modal window show enable
submit\r\n\r\n\r\n<img width=\"818\"
alt=\"image\"\r\nsrc=\"https://github.com/elastic/kibana/assets/90178898/0edbbb1a-7a51-4287-8598-0d4437bbc874\">\r\n\r\n\r\n###
Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"1750ab8676dadb3d6f2f3dbfe0ee9ea95de66733"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/184586","number":184586,"mergeCommit":{"message":"[Fleet]
fix restart upgrade disabled condition (#184586)\n\n##
Summary\r\n\r\nCloses
https://github.com/elastic/kibana/issues/184212\r\n\r\nFix the Restart
upgrade modal submit button disabled condition. It was\r\nnot correct
for single agent restart, the restart was disabled.\r\n\r\nTo
verify:\r\n- enroll an agent with an older version e.g. 8.13.1\r\n-
upgrade agent with a fictive version e.g. 8.13.5\r\n- update the agent
doc to set the `upgrade_started_at` to more than 2\r\nhours ago\r\n- go
to `Restart upgrade`, the modal window show enable
submit\r\n\r\n\r\n<img width=\"818\"
alt=\"image\"\r\nsrc=\"https://github.com/elastic/kibana/assets/90178898/0edbbb1a-7a51-4287-8598-0d4437bbc874\">\r\n\r\n\r\n###
Checklist\r\n\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"1750ab8676dadb3d6f2f3dbfe0ee9ea95de66733"}}]}]
BACKPORT-->

Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
@kibanamachine kibanamachine added v8.14.0 and removed backport missing Added to PRs automatically when the are determined to be missing a backport. labels Jun 5, 2024
@mistic
Copy link
Member

mistic commented Jun 5, 2024

This PR didn't land on time for latest v8.14.0 BC. Updating the labels.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team v8.14.1 v8.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fleet] Restart upgrade should be allowed when upgrade is in progress
7 participants