Skip to content

[Fleet] Show snapshot version in agent upgrade modal + allow custom values (but not in serverless) - #165978

Merged
joshdover merged 10 commits into
elastic:mainfrom
hop-dev:139174-agent-upgrade-version
Sep 11, 2023
Merged

joshdover merged 10 commits into
elastic:mainfrom
hop-dev:139174-agent-upgrade-version

Conversation

@hop-dev

@hop-dev hop-dev commented Sep 7, 2023 •

Copy link
Copy Markdown
Contributor

Summary

Closes #139174

  • add the current kibana version to the list of agent versions to upgrade to even if it is a snapshot (previosuly we coerced to just the version without -SNAPSHOT)
  • if serverless, only show available versions, do not include the current version
  • allow custom values to be input
  • do not allow custom values to be input in serverless

Snapshot kibana default version now includes snapshot
Screenshot 2023-09-07 at 14 54 35

Serverless (custom option not allowed)
Screenshot 2023-09-07 at 14 43 14

Non-serverless (custom option allowed)
Screenshot 2023-09-07 at 14 40 32

@hop-dev
hop-dev requested review from a team as code owners September 7, 2023 13:55
@botelastic botelastic Bot added the Team:Fleet - DEPRECATED Use Team:streams-ui label Sep 7, 2023
@elasticmachine

Copy link
Copy Markdown
Contributor

Pinging @elastic/fleet (Team:Fleet)

@hop-dev hop-dev self-assigned this Sep 7, 2023
@ghost

ghost commented Sep 7, 2023

Copy link
Copy Markdown

🤖 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!)

@hop-dev

hop-dev commented Sep 7, 2023

Copy link
Copy Markdown
Contributor Author

@criamico I added you as a reviewer as you seem to have written a lot of this code

@jlind23
jlind23 requested a review from joshdover September 7, 2023 13:58

@criamico criamico left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Code LGTM 🚢

});
});

it('should not strip -SNAPSHOT from kibana version', async () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you just specify that this happens when not in serverless? it's going to be easier for future changes.

@afharo afharo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Core changes LGTM

@jlind23

jlind23 commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

@hop-dev looking at the logs, I don't the tests errors are related though:
proc [kibana] [2023-09-07T15:52:35.016+00:00][ERROR][plugins.cloudExperiments.launch_darkly] LaunchDarklyInvalidSDKKeyError: Events cannot be posted because SDK key is invalid

@afharo do you know who can help us fix the credentials?

@hop-dev

hop-dev commented Sep 7, 2023

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@hop-dev

hop-dev commented Sep 8, 2023

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@hop-dev
hop-dev requested a review from a team as a code owner September 8, 2023 14:36
@hop-dev

hop-dev commented Sep 8, 2023

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@hop-dev

hop-dev commented Sep 8, 2023

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@kibana-ci

Copy link
Copy Markdown

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Defend Workflows Cypress Tests #2 / Form User with access can edit and delete an endpoint response action delete response action inside of a rule delete response action inside of a rule
  • [job] [logs] Defend Workflows Cypress Tests #2 / Form User with access can edit and delete an endpoint response action edit response action inside of a rule edit response action inside of a rule
  • [job] [logs] Defend Workflows Cypress Tests #2 / Form User without access can not edit, add nor delete an endpoint response action All response action controls are disabled All response action controls are disabled

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.2MB 1.2MB -34.0B

History

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

cc @hop-dev

@thomheymann thomheymann left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

security changes LGTM

@joshdover
joshdover merged commit 2384280 into elastic:main Sep 11, 2023
@kibanamachine

Copy link
Copy Markdown
Contributor

💔 All backports failed

Status Branch Result
❌ 8.10 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 165978

Questions ?

Please refer to the Backport tool documentation

@hop-dev

hop-dev commented Sep 12, 2023

Copy link
Copy Markdown
Contributor Author

💚 All backports created successfully

Status Branch Result
✅ 8.10

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

Questions ?

Please refer to the Backport tool documentation

hop-dev added a commit to hop-dev/kibana that referenced this pull request Sep 12, 2023
…alues (but not in serverless) (elastic#165978)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 2384280)

# Conflicts:
#	x-pack/plugins/fleet/cypress/tasks/integrations.ts
hop-dev added a commit that referenced this pull request Sep 13, 2023
…ustom values (but not in serverless) (#165978) (#166255)

# Backport

This will backport the following commits from `main` to `8.10`:
- [[Fleet] Show snapshot version in agent upgrade modal + allow custom
values (but not in serverless)
(#165978)](#165978)

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

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

<!--BACKPORT [{"author":{"name":"Mark
Hopkin","email":"mark.hopkin@elastic.co"},"sourceCommit":{"committedDate":"2023-09-11T10:56:39Z","message":"[Fleet]
Show snapshot version in agent upgrade modal + allow custom values (but
not in serverless) (#165978)\n\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"238428076cd07994d843f798d51238fbdbc2cf53","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.11.0"],"number":165978,"url":"https://github.com/elastic/kibana/pull/165978","mergeCommit":{"message":"[Fleet]
Show snapshot version in agent upgrade modal + allow custom values (but
not in serverless) (#165978)\n\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"238428076cd07994d843f798d51238fbdbc2cf53"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/165978","number":165978,"mergeCommit":{"message":"[Fleet]
Show snapshot version in agent upgrade modal + allow custom values (but
not in serverless) (#165978)\n\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"238428076cd07994d843f798d51238fbdbc2cf53"}}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Fleet]: Latest snapshot version not available under Agent upgrade modal for Snapshot builds.

9 participants