Skip to content

Revert "Removed switchToModelVersionAt from SO API definition (#219029)"#220059

Merged
afharo merged 2 commits intoelastic:mainfrom
afharo:revert-19c017a
May 5, 2025
Merged

Revert "Removed switchToModelVersionAt from SO API definition (#219029)"#220059
afharo merged 2 commits intoelastic:mainfrom
afharo:revert-19c017a

Conversation

@afharo
Copy link
Copy Markdown
Member

@afharo afharo commented May 5, 2025 •
edited by kibanamachine
Loading

This reverts commit 19c017a.

Summary

Reverts #219029 as it is causing SO Migration crashes in our QA environment.

It can also be tested locally on main:

  1. On a previous version (git checkout deploy@1745820726)
  2. Start ES: yarn es serverless --projectType es
  3. Start Kibana: yarn start --serverless=es
  4. Wait for migrations to complete
  5. Stop Kibana
  6. Move back to main
  7. Start Kibana: yarn start --serverless=es
  8. Wait for the error

On main, we can see that Kibana fails to start with the fatal error:

 FATAL  Error: Unable to complete saved object migrations for the [.kibana_alerting_cases] index: Model version conflict: inconsistent higher/lower versions

In this branch, it starts successfully.

@afharo afharo requested review from a team as code owners May 5, 2025 11:29
@botelastic botelastic bot added the Team:actionable-obs Formerly "obs-ux-management", responsible for SLO, o11y alerting, significant events, & synthetics. label May 5, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 5, 2025

Pinging @elastic/obs-ux-management-team (Team:obs-ux-management)

@afharo afharo self-assigned this May 5, 2025
@afharo afharo marked this pull request as draft May 5, 2025 11:43
@afharo
Copy link
Copy Markdown
Member Author

afharo commented May 5, 2025

Moving it to draft until we confirm that this is the underlying culprit... I'm not getting the error now on main.

@kibanamachine
[CI] Auto-commit changed files from 'node scripts/jest_integration -u…
7298bce 
… src/core/server/integration_tests/ci_checks'
@afharo afharo marked this pull request as ready for review May 5, 2025 12:12
@afharo afharo added release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor labels May 5, 2025
@afharo afharo enabled auto-merge (squash) May 5, 2025 13:57
@afharo afharo merged commit 75c0f95 into elastic:main May 5, 2025
14 checks passed
@afharo afharo deleted the revert-19c017a branch May 5, 2025 14:01
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented May 5, 2025

Starting backport for target branches: 9.0

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 5, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #53 / discover - group 1 Discover CSV Export Check Available is available if new

Metrics [docs]

Unknown metric groups

API count

id before after diff
@kbn/core-saved-objects-server 573 574 +1

References to deprecated APIs

id before after diff
@kbn/core 636 638 +2

History

cc @afharo

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented May 5, 2025

💔 All backports failed

Status Branch Result
❌ 9.0 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 220059

Questions ?

Please refer to the Backport tool documentation

@afharo afharo mentioned this pull request May 6, 2025
Merged
@afharo
Copy link
Copy Markdown
Member Author

afharo commented May 6, 2025

💚 All backports created successfully

Status Branch Result
✅ 9.0

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

Questions ?

Please refer to the Backport tool documentation

afharo added a commit to afharo/kibana that referenced this pull request May 6, 2025
@afharo
Revert "Removed switchToModelVersionAt from SO API definition (elasti…
74f7cbd 
…c#219029)" (elastic#220059)

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

# Conflicts:
#	src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 6, 2025
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented May 6, 2025

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.
cc: @afharo

@kibanamachine kibanamachine mentioned this pull request May 6, 2025
Merged
4 tasks
afharo added a commit that referenced this pull request May 6, 2025
@afharo
[9.0] Revert "Removed switchToModelVersionAt from SO API definition (#…
4cb574c 
…219029)" (#220059) (#220259)

# Backport

This will backport the following commits from `main` to `9.0`:
- [Revert "Removed switchToModelVersionAt from SO API definition
(#219029)" (#220059)](#220059)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Alejandro Fernández
Haro","email":"alejandro.haro@elastic.co"},"sourceCommit":{"committedDate":"2025-05-05T14:01:45Z","message":"Revert
\"Removed switchToModelVersionAt from SO API definition (#219029)\"
(#220059)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"75c0f9543acc80e0d875e908f8c4570581393e20","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:prev-minor","Team:obs-ux-management","v9.1.0"],"title":"Revert
\"Removed switchToModelVersionAt from SO API definition
(#219029)\"","number":220059,"url":"https://github.com/elastic/kibana/pull/220059","mergeCommit":{"message":"Revert
\"Removed switchToModelVersionAt from SO API definition (#219029)\"
(#220059)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"75c0f9543acc80e0d875e908f8c4570581393e20"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/220059","number":220059,"mergeCommit":{"message":"Revert
\"Removed switchToModelVersionAt from SO API definition (#219029)\"
(#220059)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"75c0f9543acc80e0d875e908f8c4570581393e20"}}]}]
BACKPORT-->
@afharo
Copy link
Copy Markdown
Member Author

afharo commented May 7, 2025

cc @mistic, I should set v9.0.2 on this one, correct?

@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 7, 2025
akowalska622 pushed a commit to akowalska622/kibana that referenced this pull request May 29, 2025
@afharo @kibanamachine @akowalska622
Revert "Removed switchToModelVersionAt from SO API definition (elasti…
a31dd5f 
…c#219029)" (elastic#220059)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
qn895 pushed a commit to qn895/kibana that referenced this pull request Jun 3, 2025
@afharo @kibanamachine @qn895
Revert "Removed switchToModelVersionAt from SO API definition (elasti…
3a2d251 
…c#219029)" (elastic#220059)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kdelemme kdelemme kdelemme approved these changes

@legrego legrego legrego approved these changes

@jesuswr jesuswr jesuswr approved these changes

@ersin-erdal ersin-erdal ersin-erdal approved these changes

Assignees

@afharo afharo

Labels

release_note:skip Skip the PR/issue when compiling release notes Team:actionable-obs Formerly "obs-ux-management", responsible for SLO, o11y alerting, significant events, & synthetics. v9.0.1 v9.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@afharo @elasticmachine @kibanamachine @kdelemme @legrego @jesuswr @ersin-erdal