fix(streams): Delete stream's queries and children's queries upon stream deletion#230126
Merged
kdelemme merged 5 commits intoelastic:mainfrom Aug 4, 2025
Merged
Conversation
github-actions
bot
added
the
author:obs-ux-management
kdelemme
added
release_note:skip
Contributor
Author
|
/ci |
kdelemme
changed the title
Contributor
Author
|
/ci |
Contributor
Author
|
/ci |
Contributor
|
Pinging @elastic/obs-ux-management-team (Team:obs-ux-management) |
dmlemeshko
approved these changes
Aug 1, 2025
flash1293
reviewed
Aug 1, 2025
Contributor
flash1293
left a comment
flash1293
left a comment
There was a problem hiding this comment.
Good start moving query handling into the execution plan! Left some comments
| ...delete_dot_streams_document, | ||
| ]); | ||
|
|
||
| await this.deleteQueries(delete_queries); |
Contributor
There was a problem hiding this comment.
can we add this to an existing parallel batch?
Contributor
Author
There was a problem hiding this comment.
yes sure, just don't want to do it too early in case another step fails, might do it with the previous call.
Contributor
There was a problem hiding this comment.
Since this won't be super cheap (requires at least one request to Elasticsearch to check whether queries exist), we shouldn't make it its own step if we don't have to.
Contributor
Author
There was a problem hiding this comment.
sounds good, I'll move it above
...ns/shared/streams/server/lib/streams/state_management/execution_plan/required_permissions.ts
Show resolved
Hide resolved
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]
History
cc @kdelemme |
flash1293
approved these changes
Aug 4, 2025
Contributor
flash1293
left a comment
flash1293
left a comment
There was a problem hiding this comment.
LGTM, works as expected
szaffarano
pushed a commit
to szaffarano/kibana
that referenced
this pull request
Aug 5, 2025
…eam deletion (elastic#230126) ## Summary Resolves elastic#229715 When deleting a stream we used to delete the queries attached to it but did not delete the children's stream queries. This PR handles the deletion of the queries when deleting a stream directly from the state management service for both classic and wired streams, thus deleting all children's stream queries. I'm not changing how we manage queries in this PR to keep the surface area small. ### Manual tests ``` PUT kbn:/api/streams/logs.child { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [ { "destination": "logs.child.child", "if": { "field": "foo", "operator": "eq", "value": "bar" } }, { "destination": "logs.child.child2", "if": { "always": {} } } ] } } }, "dashboards": [], "queries": [ { "id": "f744f2d0-0b17-477e-b80a-c11b98ddfc2d", "title": "logs.child.first", "kql": { "query": "message:\"test\"" } }, { "id": "2ce604e7-4156-44eb-bf3f-97ef2b333818", "title": "logs.child.second", "kql": { "query": "" } } ] } PUT kbn:/api/streams/logs.child.child { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [] } } }, "dashboards": [], "queries": [ { "id": "009a886b-9abe-4c1c-91e3-34f17691418e", "title": "logs.child.child", "kql": { "query": "" } } ] } PUT kbn:/api/streams/logs.child.child2 { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [] } } }, "dashboards": [], "queries": [ { "id": "a966e062-303d-42f5-84b0-017414ab7ef1", "title": "logs.child.child2.first", "kql": { "query": "" } }, { "id": "3a8538c0-06eb-45ec-8ee3-3b4b5363dd17", "title": "logs.child.child2.second", "kql": { "query": "" } } ] } DELETE kbn:/api/streams/logs.child ``` Assert all rules in the stack management are gone.
delanni
pushed a commit
to delanni/kibana
that referenced
this pull request
Aug 5, 2025
…eam deletion (elastic#230126) ## Summary Resolves elastic#229715 When deleting a stream we used to delete the queries attached to it but did not delete the children's stream queries. This PR handles the deletion of the queries when deleting a stream directly from the state management service for both classic and wired streams, thus deleting all children's stream queries. I'm not changing how we manage queries in this PR to keep the surface area small. ### Manual tests ``` PUT kbn:/api/streams/logs.child { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [ { "destination": "logs.child.child", "if": { "field": "foo", "operator": "eq", "value": "bar" } }, { "destination": "logs.child.child2", "if": { "always": {} } } ] } } }, "dashboards": [], "queries": [ { "id": "f744f2d0-0b17-477e-b80a-c11b98ddfc2d", "title": "logs.child.first", "kql": { "query": "message:\"test\"" } }, { "id": "2ce604e7-4156-44eb-bf3f-97ef2b333818", "title": "logs.child.second", "kql": { "query": "" } } ] } PUT kbn:/api/streams/logs.child.child { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [] } } }, "dashboards": [], "queries": [ { "id": "009a886b-9abe-4c1c-91e3-34f17691418e", "title": "logs.child.child", "kql": { "query": "" } } ] } PUT kbn:/api/streams/logs.child.child2 { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [] } } }, "dashboards": [], "queries": [ { "id": "a966e062-303d-42f5-84b0-017414ab7ef1", "title": "logs.child.child2.first", "kql": { "query": "" } }, { "id": "3a8538c0-06eb-45ec-8ee3-3b4b5363dd17", "title": "logs.child.child2.second", "kql": { "query": "" } } ] } DELETE kbn:/api/streams/logs.child ``` Assert all rules in the stack management are gone.
NicholasPeretti
pushed a commit
to NicholasPeretti/kibana
that referenced
this pull request
Aug 18, 2025
…eam deletion (elastic#230126) ## Summary Resolves elastic#229715 When deleting a stream we used to delete the queries attached to it but did not delete the children's stream queries. This PR handles the deletion of the queries when deleting a stream directly from the state management service for both classic and wired streams, thus deleting all children's stream queries. I'm not changing how we manage queries in this PR to keep the surface area small. ### Manual tests ``` PUT kbn:/api/streams/logs.child { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [ { "destination": "logs.child.child", "if": { "field": "foo", "operator": "eq", "value": "bar" } }, { "destination": "logs.child.child2", "if": { "always": {} } } ] } } }, "dashboards": [], "queries": [ { "id": "f744f2d0-0b17-477e-b80a-c11b98ddfc2d", "title": "logs.child.first", "kql": { "query": "message:\"test\"" } }, { "id": "2ce604e7-4156-44eb-bf3f-97ef2b333818", "title": "logs.child.second", "kql": { "query": "" } } ] } PUT kbn:/api/streams/logs.child.child { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [] } } }, "dashboards": [], "queries": [ { "id": "009a886b-9abe-4c1c-91e3-34f17691418e", "title": "logs.child.child", "kql": { "query": "" } } ] } PUT kbn:/api/streams/logs.child.child2 { "stream": { "description": "", "ingest": { "processing": [], "lifecycle": { "inherit": {} }, "wired": { "fields": {}, "routing": [] } } }, "dashboards": [], "queries": [ { "id": "a966e062-303d-42f5-84b0-017414ab7ef1", "title": "logs.child.child2.first", "kql": { "query": "" } }, { "id": "3a8538c0-06eb-45ec-8ee3-3b4b5363dd17", "title": "logs.child.child2.second", "kql": { "query": "" } } ] } DELETE kbn:/api/streams/logs.child ``` Assert all rules in the stack management are gone.
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
Resolves #229715
When deleting a stream we used to delete the queries attached to it but did not delete the children's stream queries.
This PR handles the deletion of the queries when deleting a stream directly from the state management service for both classic and wired streams, thus deleting all children's stream queries.
I'm not changing how we manage queries in this PR to keep the surface area small.
Manual tests
Assert all rules in the stack management are gone.