[Fleet] Fix delete by query conflict#241001
Merged
Conversation
nchaulet
added
the
Team:Fleet
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
nchaulet
added
release_note:skip
Contributor
Flaky Test Runner Stats🎉 All tests passed! - kibana-flaky-test-suite-runner#9652[✅] x-pack/platform/test/fleet_api_integration/config.space_awareness.ts: 25/25 tests passed. |
nchaulet
added
backport:version
x-pack/platform/test/fleet_api_integration/apis/space_awareness/helpers.ts
Outdated
Show resolved
Hide resolved
| q: '*', | ||
| refresh: true, | ||
| ignore_unavailable: true, | ||
| }) |
Contributor
There was a problem hiding this comment.
shouldn't we use retries here too?
…s/helpers.ts Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
Contributor
💚 Build Succeeded
Metrics [docs]
History
cc @nchaulet |
juliaElastic
approved these changes
Oct 29, 2025
Contributor
|
Starting backport for target branches: 9.1, 9.2 https://github.com/elastic/kibana/actions/runs/18900719884 |
Contributor
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
tkajtoch
pushed a commit
to tkajtoch/kibana
that referenced
this pull request
Oct 29, 2025
This was referenced Oct 29, 2025
This was referenced Oct 29, 2025
nchaulet
added a commit
to nchaulet/kibana
that referenced
this pull request
Oct 29, 2025
(cherry picked from commit 1109b60) # Conflicts: # x-pack/platform/test/fleet_api_integration/apis/space_awareness/helpers.ts
nchaulet
added a commit
to nchaulet/kibana
that referenced
this pull request
Oct 29, 2025
(cherry picked from commit 1109b60) # Conflicts: # x-pack/platform/test/fleet_api_integration/apis/space_awareness/helpers.ts
Member
Author
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
nchaulet
added a commit
that referenced
this pull request
Oct 29, 2025
# Backport This will backport the following commits from `main` to `9.1`: - [[Fleet] Fix delete by query conflict (#241001)](#241001) <!--- Backport version: 10.1.0 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2025-10-29T07:46:23Z","message":"[Fleet] Fix delete by query conflict (#241001)","sha":"1109b60f11d012f293d2a2b693c19a41c734b237","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.3.0","v9.1.7","v9.2.1"],"title":"[Fleet] Fix delete by query conflict","number":241001,"url":"https://github.com/elastic/kibana/pull/241001","mergeCommit":{"message":"[Fleet] Fix delete by query conflict (#241001)","sha":"1109b60f11d012f293d2a2b693c19a41c734b237"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","9.2"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/241001","number":241001,"mergeCommit":{"message":"[Fleet] Fix delete by query conflict (#241001)","sha":"1109b60f11d012f293d2a2b693c19a41c734b237"}},{"branch":"9.1","label":"v9.1.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
nchaulet
added a commit
that referenced
this pull request
Oct 29, 2025
# Backport This will backport the following commits from `main` to `9.2`: - [[Fleet] Fix delete by query conflict (#241001)](#241001) <!--- Backport version: 10.1.0 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2025-10-29T07:46:23Z","message":"[Fleet] Fix delete by query conflict (#241001)","sha":"1109b60f11d012f293d2a2b693c19a41c734b237","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.3.0","v9.1.7","v9.2.1"],"title":"[Fleet] Fix delete by query conflict","number":241001,"url":"https://github.com/elastic/kibana/pull/241001","mergeCommit":{"message":"[Fleet] Fix delete by query conflict (#241001)","sha":"1109b60f11d012f293d2a2b693c19a41c734b237"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","9.2"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/241001","number":241001,"mergeCommit":{"message":"[Fleet] Fix delete by query conflict (#241001)","sha":"1109b60f11d012f293d2a2b693c19a41c734b237"}},{"branch":"9.1","label":"v9.1.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
qn895
pushed a commit
to qn895/kibana
that referenced
this pull request
Oct 30, 2025
ana-davydova
pushed a commit
to ana-davydova/kibana
that referenced
this pull request
Nov 3, 2025
albertoblaz
pushed a commit
to albertoblaz/kibana
that referenced
this pull request
Nov 4, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolve #236637
Since we introduced the task to persist
lask_known_statuswe got more conflict when deleting agents, those conflicts where not handled properly that PR aims to fix that.Run the flaky test runner and it seems to fix the issue.