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.

Sign up for GitHub

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

Jump to bottom

[ES|QL] exclude inactive integration data stream suggestions #192953

Merged
merged 2 commits into from
Sep 16, 2024
Merged

[ES|QL] exclude inactive integration data stream suggestions #192953

merged 2 commits into from
Sep 16, 2024

Conversation

drewdaemon
Copy link
Contributor

@drewdaemon drewdaemon commented Sep 14, 2024 •
edited by kibanamachine
Loading

Summary

Close #187247

Screen.Recording.2024-09-14.at.4.03.34.PM.mov

@drewdaemon drewdaemon added release_note:fix backport:prev-major Backport to (8.x, 8.16, 8.15) the previous major branch and all later branches still in development Feature:ES|QL ES|QL related features in Kibana Team:ESQL ES|QL related features in Kibana labels Sep 14, 2024
@drewdaemon drewdaemon mentioned this pull request Sep 14, 2024
Merged
1 task
@drewdaemon drewdaemon marked this pull request as ready for review September 15, 2024 14:35
@drewdaemon drewdaemon requested a review from a team as a code owner September 15, 2024 14:35
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-esql (Team:ESQL)

@stratoula
Copy link
Contributor

/ci

@stratoula stratoula enabled auto-merge (squash) September 16, 2024 06:47
@stratoula stratoula added backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) and removed backport:prev-major Backport to (8.x, 8.16, 8.15) the previous major branch and all later branches still in development labels Sep 16, 2024
@stratoula
Copy link
Contributor

@drewdaemon I know that the backport labels are confusing but backport:prev-major that you had set backports to 8.15 which the change from the fleet team is not applied.

If we want to backport only in 8.16 the backport:prev-minor is the correct one. I changed it correctly

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Jest Tests #5 / BadArgument component should display message and help output if command is not hidden from help

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
esql 184.8KB 184.9KB +62.0B

History

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

@stratoula stratoula merged commit 462e437 into elastic:main Sep 16, 2024
21 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 16, 2024
@drewdaemon
[ES|QL] exclude inactive integration data stream suggestions (elastic…
0bac8ad 
…#192953)

## Summary

Close elastic#187247

https://github.com/user-attachments/assets/9f56d941-016a-442a-a2cb-b2240b280b54

Co-authored-by: Stratoula Kalafateli <[email protected]>
(cherry picked from commit 462e437)
@kibanamachine kibanamachine mentioned this pull request Sep 16, 2024
Merged
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.x

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

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Sep 16, 2024
@kibanamachine @drewdaemon
[8.x] [ES|QL] exclude inactive integration data stream suggestions (#…
83f9bc4 
…192953) (#192970)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[ES|QL] exclude inactive integration data stream suggestions
(#192953)](#192953)

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

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

<!--BACKPORT [{"author":{"name":"Drew
Tate","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-16T08:24:55Z","message":"[ES|QL]
exclude inactive integration data stream suggestions (#192953)\n\n##
Summary\r\n\r\nClose
https://github.com/elastic/kibana/issues/187247\r\n\r\n\r\nhttps://github.com/user-attachments/assets/9f56d941-016a-442a-a2cb-b2240b280b54\r\n\r\nCo-authored-by:
Stratoula Kalafateli
<[email protected]>","sha":"462e4378100e8d5233e7379f9244da5609b7dd2c","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:prev-minor","Feature:ES|QL","Team:ESQL"],"title":"[ES|QL]
exclude inactive integration data stream
suggestions","number":192953,"url":"https://github.com/elastic/kibana/pull/192953","mergeCommit":{"message":"[ES|QL]
exclude inactive integration data stream suggestions (#192953)\n\n##
Summary\r\n\r\nClose
https://github.com/elastic/kibana/issues/187247\r\n\r\n\r\nhttps://github.com/user-attachments/assets/9f56d941-016a-442a-a2cb-b2240b280b54\r\n\r\nCo-authored-by:
Stratoula Kalafateli
<[email protected]>","sha":"462e4378100e8d5233e7379f9244da5609b7dd2c"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/192953","number":192953,"mergeCommit":{"message":"[ES|QL]
exclude inactive integration data stream suggestions (#192953)\n\n##
Summary\r\n\r\nClose
https://github.com/elastic/kibana/issues/187247\r\n\r\n\r\nhttps://github.com/user-attachments/assets/9f56d941-016a-442a-a2cb-b2240b280b54\r\n\r\nCo-authored-by:
Stratoula Kalafateli
<[email protected]>","sha":"462e4378100e8d5233e7379f9244da5609b7dd2c"}}]}]
BACKPORT-->

Co-authored-by: Drew Tate <[email protected]>
@drewdaemon
Copy link
Contributor Author

@stratoula my backport to 8.15 was intentional. I saw that the Fleet PR was also backported to 8.15: #192631 (comment).

However, it looks like they closed their 8.15 backport so I agree that it doesn't make sense for us.

@stratoula
Copy link
Contributor

stratoula commented Sep 16, 2024 •
edited
Loading

yes this is my point, we should also check the backports and the PR labels before we add the backport labels to our PRs, here the backport didnt happen so we should not backport either (I understood why you did it, I just wanted to highlight that we need to be extra cautious with these PRs that depend on others )

@drewdaemon
Copy link
Contributor Author

drewdaemon commented Sep 16, 2024 •
edited
Loading

Ok, sorry I thought your first comment was saying I didn't understand the meaning of the backport labels.

I agree with everything you say. I think I took this:

Screenshot 2024-09-16 at 7 17 09 AM

to mean that CI was failing for their 8.15 backport but didn't think the PR was closed. I will know for next time.

Thank you for catching this!

markov00 pushed a commit to markov00/kibana that referenced this pull request Sep 18, 2024
@drewdaemon @stratoula @markov00
[ES|QL] exclude inactive integration data stream suggestions (elastic…
8dd495b 
…#192953)

## Summary

Close elastic#187247


https://github.com/user-attachments/assets/9f56d941-016a-442a-a2cb-b2240b280b54

Co-authored-by: Stratoula Kalafateli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stratoula stratoula stratoula approved these changes

Assignees
No one assigned
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) Feature:ES|QL ES|QL related features in Kibana release_note:fix Team:ESQL ES|QL related features in Kibana v8.16.0 v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[ES|QL] - only suggest active integration data streams
5 participants
@drewdaemon @elasticmachine @stratoula @kibana-ci @kibanamachine