Skip to content

[SecuritySolution] Allow custom sorting on integration cards#195397

Merged
angorayc merged 1 commit intoelastic:mainfrom
angorayc:fleet-custom-sorting
Oct 8, 2024
Merged

[SecuritySolution] Allow custom sorting on integration cards#195397
angorayc merged 1 commit intoelastic:mainfrom
angorayc:fleet-custom-sorting

Conversation

@angorayc
Copy link
Copy Markdown
Contributor

@angorayc angorayc commented Oct 8, 2024

Part of #193131

It shows the customised cards without applying the default sorting under the recommended tab:

Added two optional props:

  1. calloutTopSpacerSize - Props to decide the size of the spacer above callout. Security Solution uses this prop to customize the size of the spacer
  2. sortByFeaturedIntegrations - Customizing whether to sort by the default featured integrations' categories. Security Solution has custom sorting logic

Featured cards:

  1. AWS
  2. GCP
  3. Azure
  4. Elastic Defend
  5. CrowdStrike (to promote our extended protections/3rd party EDR support)
  6. Wiz (or another cloud integration to promote extended protections)
  7. Network Packet Capture
  8. Osquery Manager
  9. Cloud Asset Inventory (need to confirm that's confirmed for 8.16) - Currently Not Found any integration matched
Screenshot 2024-10-08 at 13 31 12

@angorayc angorayc requested a review from criamico October 8, 2024 12:36
@angorayc angorayc added the Team:Fleet Team label for Observability Data Collection Fleet team label Oct 8, 2024
@angorayc angorayc marked this pull request as ready for review October 8, 2024 12:39
@angorayc angorayc requested a review from a team as a code owner October 8, 2024 12:39
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/fleet (Team:Fleet)

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/security-threat-hunting-explore (Team:Threat Hunting:Explore)

Copy link
Copy Markdown
Member

@criamico criamico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't test locally but it's a small enough PR that should be ok. LGTM

showMissingIntegrationMessage?: boolean;
showControls?: boolean;
showSearchTools?: boolean;
// Customizing whether to sort by the default featured integrations' categories. Security Solution has custom sorting logic
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the comments!

@angorayc angorayc enabled auto-merge (squash) October 8, 2024 13:18
@angorayc angorayc merged commit d20c579 into elastic:main Oct 8, 2024
@kibanamachine
Copy link
Copy Markdown
Contributor

Starting backport for target branches: 8.x

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

@elasticmachine
Copy link
Copy Markdown
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #8 / Dataset Quality Dataset quality handles user privileges User can read logs-* User cannot monitor any data stream Estimated data are not available due to underprivileged user

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
fleet 1287 1289 +2

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
fleet 1.7MB 1.7MB +69.0B
Unknown metric groups

API count

id before after diff
fleet 1410 1412 +2

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 8, 2024
…#195397)

Part of elastic#193131

It shows the customised cards without applying the default sorting under
the `recommended` tab:

Added two optional props:
1. `calloutTopSpacerSize` - Props to decide the size of the spacer above
callout. Security Solution uses this prop to customize the size of the
spacer
2. `sortByFeaturedIntegrations` - Customizing whether to sort by the
default featured integrations' categories. Security Solution has `custom
sorting logic`

Featured cards:

1. AWS
3. GCP
4. Azure
5. Elastic Defend
6. CrowdStrike (to promote our extended protections/3rd party EDR
support)
7. Wiz (or another cloud integration to promote extended protections)
8. Network Packet Capture
9. Osquery Manager
10. ~**Cloud Asset Inventory (need to confirm that's confirmed for
8.16)** - Currently Not Found any integration matched~

<img width="1249" alt="Screenshot 2024-10-08 at 13 31 12"
src="https://github.com/user-attachments/assets/95fb03a4-5a7b-4e8f-8b03-ee45b0e18633">

(cherry picked from commit d20c579)
@kibanamachine
Copy link
Copy Markdown
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 Oct 8, 2024
…195397) (#195428)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[SecuritySolution] Allow custom sorting on integration cards
(#195397)](#195397)

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

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

<!--BACKPORT [{"author":{"name":"Angela
Chuang","email":"6295984+angorayc@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-10-08T14:22:09Z","message":"[SecuritySolution]
Allow custom sorting on integration cards (#195397)\n\nPart of
https://github.com/elastic/kibana/pull/193131\r\n\r\nIt shows the
customised cards without applying the default sorting under\r\nthe
`recommended` tab:\r\n\r\nAdded two optional props:\r\n1.
`calloutTopSpacerSize` - Props to decide the size of the spacer
above\r\ncallout. Security Solution uses this prop to customize the size
of the\r\nspacer\r\n2. `sortByFeaturedIntegrations` - Customizing
whether to sort by the\r\ndefault featured integrations' categories.
Security Solution has `custom\r\nsorting logic`\r\n\r\nFeatured
cards:\r\n\r\n1. AWS\r\n3. GCP\r\n4. Azure\r\n5. Elastic Defend\r\n6.
CrowdStrike (to promote our extended protections/3rd party
EDR\r\nsupport)\r\n7. Wiz (or another cloud integration to promote
extended protections)\r\n8. Network Packet Capture\r\n9. Osquery
Manager\r\n10. ~**Cloud Asset Inventory (need to confirm that's
confirmed for\r\n8.16)** - Currently Not Found any integration
matched~\r\n\r\n<img width=\"1249\" alt=\"Screenshot 2024-10-08 at 13 31
12\"\r\nsrc=\"https://github.com/user-attachments/assets/95fb03a4-5a7b-4e8f-8b03-ee45b0e18633\">","sha":"d20c579304b5fd212971bd9ef80cfbbda0932d94","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","Team:Fleet","v9.0.0","Team:Threat
Hunting:Explore","v8.16.0"],"title":"[SecuritySolution] Allow custom
sorting on integration
cards","number":195397,"url":"https://github.com/elastic/kibana/pull/195397","mergeCommit":{"message":"[SecuritySolution]
Allow custom sorting on integration cards (#195397)\n\nPart of
https://github.com/elastic/kibana/pull/193131\r\n\r\nIt shows the
customised cards without applying the default sorting under\r\nthe
`recommended` tab:\r\n\r\nAdded two optional props:\r\n1.
`calloutTopSpacerSize` - Props to decide the size of the spacer
above\r\ncallout. Security Solution uses this prop to customize the size
of the\r\nspacer\r\n2. `sortByFeaturedIntegrations` - Customizing
whether to sort by the\r\ndefault featured integrations' categories.
Security Solution has `custom\r\nsorting logic`\r\n\r\nFeatured
cards:\r\n\r\n1. AWS\r\n3. GCP\r\n4. Azure\r\n5. Elastic Defend\r\n6.
CrowdStrike (to promote our extended protections/3rd party
EDR\r\nsupport)\r\n7. Wiz (or another cloud integration to promote
extended protections)\r\n8. Network Packet Capture\r\n9. Osquery
Manager\r\n10. ~**Cloud Asset Inventory (need to confirm that's
confirmed for\r\n8.16)** - Currently Not Found any integration
matched~\r\n\r\n<img width=\"1249\" alt=\"Screenshot 2024-10-08 at 13 31
12\"\r\nsrc=\"https://github.com/user-attachments/assets/95fb03a4-5a7b-4e8f-8b03-ee45b0e18633\">","sha":"d20c579304b5fd212971bd9ef80cfbbda0932d94"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195397","number":195397,"mergeCommit":{"message":"[SecuritySolution]
Allow custom sorting on integration cards (#195397)\n\nPart of
https://github.com/elastic/kibana/pull/193131\r\n\r\nIt shows the
customised cards without applying the default sorting under\r\nthe
`recommended` tab:\r\n\r\nAdded two optional props:\r\n1.
`calloutTopSpacerSize` - Props to decide the size of the spacer
above\r\ncallout. Security Solution uses this prop to customize the size
of the\r\nspacer\r\n2. `sortByFeaturedIntegrations` - Customizing
whether to sort by the\r\ndefault featured integrations' categories.
Security Solution has `custom\r\nsorting logic`\r\n\r\nFeatured
cards:\r\n\r\n1. AWS\r\n3. GCP\r\n4. Azure\r\n5. Elastic Defend\r\n6.
CrowdStrike (to promote our extended protections/3rd party
EDR\r\nsupport)\r\n7. Wiz (or another cloud integration to promote
extended protections)\r\n8. Network Packet Capture\r\n9. Osquery
Manager\r\n10. ~**Cloud Asset Inventory (need to confirm that's
confirmed for\r\n8.16)** - Currently Not Found any integration
matched~\r\n\r\n<img width=\"1249\" alt=\"Screenshot 2024-10-08 at 13 31
12\"\r\nsrc=\"https://github.com/user-attachments/assets/95fb03a4-5a7b-4e8f-8b03-ee45b0e18633\">","sha":"d20c579304b5fd212971bd9ef80cfbbda0932d94"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

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

Labels

backport This PR is a backport of another PR Team:Fleet Team label for Observability Data Collection Fleet team v8.16.0 v9.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants