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.

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

[Fleet] Fix getBulkAssets behavior with missing dashboard #205619

Merged
merged 1 commit into from
Jan 6, 2025

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented Jan 6, 2025

Summary

Fix a breaking change introduce in #182180

Resolve #190980

Bulk get assets used to filter not found dashboard, this was used for stack monitoring to display a button to add elasticsearch integration.

That PR fix that.

Screenshot 2025-01-06 at 10 33 38 AM

@nchaulet nchaulet added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Jan 6, 2025
@nchaulet nchaulet self-assigned this Jan 6, 2025
@nchaulet nchaulet requested a review from a team as a code owner January 6, 2025 15:38
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

cc @nchaulet

@nchaulet nchaulet merged commit d00a73c into elastic:main Jan 6, 2025
16 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

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

@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 Jan 6, 2025
) (#205640)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Fleet] Fix getBulkAssets behavior with missing dashboard
(#205619)](#205619)

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

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

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-06T17:59:32Z","message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"title":"[Fleet]
Fix getBulkAssets behavior with missing
dashboard","number":205619,"url":"https://github.com/elastic/kibana/pull/205619","mergeCommit":{"message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4"}},"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/205619","number":205619,"mergeCommit":{"message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4"}}]}]
BACKPORT-->

Co-authored-by: Nicolas Chaulet <[email protected]>
@consulthys
Copy link
Contributor

consulthys commented Jan 6, 2025

@nchaulet
Thanks a lot for fixing #190980 👍

8.16.3 and 8.17.1 FF is tomorrow, any chance to backport this?

@nchaulet nchaulet added the backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development label Jan 6, 2025
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16, 8.17, 8.x

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

@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
8.16
8.17
8.x Cherrypick failed because the selected commit (d00a73c) is empty. It looks like the commit was already backported in #205640

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 205619

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Jan 7, 2025
…5619) (#205658)

# Backport

This will backport the following commits from `main` to `8.16`:
- [[Fleet] Fix getBulkAssets behavior with missing dashboard
(#205619)](#205619)

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

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

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-06T17:59:32Z","message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor","backport:prev-major","v8.18.0"],"title":"[Fleet]
Fix getBulkAssets behavior with missing
dashboard","number":205619,"url":"https://github.com/elastic/kibana/pull/205619","mergeCommit":{"message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4"}},"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/205619","number":205619,"mergeCommit":{"message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/205640","number":205640,"state":"MERGED","mergeCommit":{"sha":"d4f033b7367eb340d9af567995d06d4957ddc058","message":"[8.x]
[Fleet] Fix getBulkAssets behavior with missing dashboard (#205619)
(#205640)\n\n# Backport\n\nThis will backport the following commits from
`main` to `8.x`:\n- [[Fleet] Fix getBulkAssets behavior with missing
dashboard\n(#205619)](https://github.com/elastic/kibana/pull/205619)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Nicolas\nChaulet\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2025-01-06T17:59:32Z\",\"message\":\"[Fleet]\nFix
getBulkAssets behavior with missing
dashboard\n(#205619)\",\"sha\":\"d00a73c5e59425cdd07689e35ae5424097530fd4\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:Fleet\",\"v9.0.0\",\"backport:prev-minor\"],\"title\":\"[Fleet]\nFix
getBulkAssets behavior with
missing\ndashboard\",\"number\":205619,\"url\":\"https://github.com/elastic/kibana/pull/205619\",\"mergeCommit\":{\"message\":\"[Fleet]\nFix
getBulkAssets behavior with missing
dashboard\n(#205619)\",\"sha\":\"d00a73c5e59425cdd07689e35ae5424097530fd4\"}},\"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/205619\",\"number\":205619,\"mergeCommit\":{\"message\":\"[Fleet]\nFix
getBulkAssets behavior with missing
dashboard\n(#205619)\",\"sha\":\"d00a73c5e59425cdd07689e35ae5424097530fd4\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Nicolas Chaulet <[email protected]>"}}]}] BACKPORT-->

Co-authored-by: Nicolas Chaulet <[email protected]>
Co-authored-by: Elastic Machine <[email protected]>
kibanamachine added a commit that referenced this pull request Jan 7, 2025
…5619) (#205659)

# Backport

This will backport the following commits from `main` to `8.17`:
- [[Fleet] Fix getBulkAssets behavior with missing dashboard
(#205619)](#205619)

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

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

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-06T17:59:32Z","message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor","backport:prev-major","v8.18.0"],"title":"[Fleet]
Fix getBulkAssets behavior with missing
dashboard","number":205619,"url":"https://github.com/elastic/kibana/pull/205619","mergeCommit":{"message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4"}},"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/205619","number":205619,"mergeCommit":{"message":"[Fleet]
Fix getBulkAssets behavior with missing dashboard
(#205619)","sha":"d00a73c5e59425cdd07689e35ae5424097530fd4"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/205640","number":205640,"state":"MERGED","mergeCommit":{"sha":"d4f033b7367eb340d9af567995d06d4957ddc058","message":"[8.x]
[Fleet] Fix getBulkAssets behavior with missing dashboard (#205619)
(#205640)\n\n# Backport\n\nThis will backport the following commits from
`main` to `8.x`:\n- [[Fleet] Fix getBulkAssets behavior with missing
dashboard\n(#205619)](https://github.com/elastic/kibana/pull/205619)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Nicolas\nChaulet\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2025-01-06T17:59:32Z\",\"message\":\"[Fleet]\nFix
getBulkAssets behavior with missing
dashboard\n(#205619)\",\"sha\":\"d00a73c5e59425cdd07689e35ae5424097530fd4\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:Fleet\",\"v9.0.0\",\"backport:prev-minor\"],\"title\":\"[Fleet]\nFix
getBulkAssets behavior with
missing\ndashboard\",\"number\":205619,\"url\":\"https://github.com/elastic/kibana/pull/205619\",\"mergeCommit\":{\"message\":\"[Fleet]\nFix
getBulkAssets behavior with missing
dashboard\n(#205619)\",\"sha\":\"d00a73c5e59425cdd07689e35ae5424097530fd4\"}},\"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/205619\",\"number\":205619,\"mergeCommit\":{\"message\":\"[Fleet]\nFix
getBulkAssets behavior with missing
dashboard\n(#205619)\",\"sha\":\"d00a73c5e59425cdd07689e35ae5424097530fd4\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Nicolas Chaulet <[email protected]>"}}]}] BACKPORT-->

Co-authored-by: Nicolas Chaulet <[email protected]>
Co-authored-by: Elastic Machine <[email protected]>
@consulthys
Copy link
Contributor

@nchaulet is there anything specific to do for 8.x here before FF?

@nchaulet
Copy link
Member Author

nchaulet commented Jan 7, 2025

@consulthys Looks like it's already backported to 8.x #205640

@consulthys
Copy link
Contributor

consulthys commented Jan 7, 2025

@nchaulet I guess I was thrown off by the fact that the PRs for 8.16 and 8.17 stayed opened, but now that they are merged, it's all fine. Thanks again for the work and sorry for the noise

kowalczyk-krzysztof pushed a commit to kowalczyk-krzysztof/kibana that referenced this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.16.3 v8.17.1 v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Fleet] getBulkAssets echoes whatever it receives
5 participants