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

[Security Solution] Fixes Preconfigured Connectors not working with Assistant #164900

Merged
merged 8 commits into from
Aug 28, 2023
Merged

[Security Solution] Fixes Preconfigured Connectors not working with Assistant #164900

merged 8 commits into from
Aug 28, 2023

Conversation

spong
Copy link
Member

@spong spong commented Aug 25, 2023 •
edited by kibanamachine
Loading

Summary

Fixes Preconfigured Connectors not working with the Assistant, and also ensures default model from connector will be used first if available (instead of defaulting to gpt-3.5-turbo).

Note how Model is not displayed even though this is an OpenAI connector:

Additionally, resolves issue with Detection Rule Assistant CTA not displaying correctly on some platforms/browsers. It now shows as a Chat button to the right of the table tabs, matching the other assistant CTA's throughout the application.

And lastly removes Beta title from callout since we're going GA in 8.10 🎉

Resolves:

Checklist

Delete any items that are not applicable to this PR.

@spong spong added bug Fixes for quality problems that affect the customer experience release_note:fix Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. Feature:Security Assistant Security Assistant v8.10.0 v8.11.0 labels Aug 25, 2023
@spong spong requested a review from andrew-goldstein August 25, 2023 20:58
@spong spong self-assigned this Aug 25, 2023
@spong spong requested a review from a team as a code owner August 25, 2023 20:58
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@spong spong requested a review from a team as a code owner August 25, 2023 21:42
@spong spong requested a review from nikitaindik August 25, 2023 21:42
dplumlee
dplumlee approved these changes Aug 25, 2023
View reviewed changes
Copy link
Contributor

@dplumlee dplumlee left a comment

Choose a reason for hiding this comment

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

rules changes lgtm!

@spong spong removed the request for review from nikitaindik August 25, 2023 21:51
@spong spong enabled auto-merge (squash) August 28, 2023 19:38
@spong spong linked an issue Aug 28, 2023 that may be closed by this pull request
[Security Solution][Browser Issue]Incorrect Elastic AI Assistant icon on Rule Page #164819
Closed
@spong spong removed a link to an issue Aug 28, 2023
[Security Solution][Browser Issue]Incorrect Elastic AI Assistant icon on Rule Page #164819
Closed
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

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
securitySolution 12.5MB 12.5MB +2.1KB

History

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

cc @spong

@spong spong merged commit 5f9651e into elastic:main Aug 28, 2023
This was referenced Aug 28, 2023
Closed
Closed
@spong spong deleted the fix-preconfigured-connectors branch August 28, 2023 20:51
@kibanamachine kibanamachine mentioned this pull request Aug 28, 2023
Merged
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.10

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

Questions ?

Please refer to the Backport tool documentation

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 28, 2023
@spong
[Security Solution] Fixes Preconfigured Connectors not working with A…
8f6bfda 
…ssistant (elastic#164900)

## Summary

Fixes Preconfigured Connectors not working with the Assistant, and also
ensures default `model` from connector will be used first if available
(instead of defaulting to `gpt-3.5-turbo`).

<p align="center">
<img width="500"
src="https://github.com/elastic/kibana/assets/2946766/637f5919-7560-40b0-a8db-681096e77ac0"
/>
</p>

Note how `Model` is not displayed even though this is an OpenAI
connector:
<p align="center">
<img width="500"
src="https://github.com/elastic/kibana/assets/2946766/2c4bbe91-2851-48d7-8bfe-20e07db52155"
/>
</p>

Additionally, resolves issue with Detection Rule Assistant CTA not
displaying correctly on some platforms/browsers. It now shows as a
`Chat` button to the right of the table tabs, matching the other
assistant CTA's throughout the application.

<p align="center">
<img width="500"
src="https://github.com/elastic/kibana/assets/2946766/9fcecd54-8e1a-423a-be05-7137632acbc4"
/>
</p>

And lastly removes `Beta` title from callout since we're going GA in
`8.10` 🎉

<p align="center">
<img width="500"
src="https://github.com/elastic/kibana/assets/2946766/5beb379a-1bc7-4afc-b4bc-09f1d6085211"
/>
</p>

Resolves:
elastic#163394 (comment)
Resolves: elastic#164819

### Checklist

Delete any items that are not applicable to this PR.

- [X] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials

(cherry picked from commit 5f9651e)
kibanamachine added a commit that referenced this pull request Aug 28, 2023
@kibanamachine @spong
[8.10] [Security Solution] Fixes Preconfigured Connectors not working…
67d543d 
… with Assistant (#164900) (#165046)

# Backport

This will backport the following commits from `main` to `8.10`:
- [[Security Solution] Fixes Preconfigured Connectors not working with
Assistant (#164900)](#164900)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Garrett
Spong","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-28T20:46:33Z","message":"[Security
Solution] Fixes Preconfigured Connectors not working with Assistant
(#164900)\n\n## Summary\r\n\r\nFixes Preconfigured Connectors not
working with the Assistant, and also\r\nensures default `model` from
connector will be used first if available\r\n(instead of defaulting to
`gpt-3.5-turbo`).\r\n\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/637f5919-7560-40b0-a8db-681096e77ac0\"\r\n/>\r\n</p>
\r\n\r\nNote how `Model` is not displayed even though this is an
OpenAI\r\nconnector:\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/2c4bbe91-2851-48d7-8bfe-20e07db52155\"\r\n/>\r\n</p>
\r\n\r\nAdditionally, resolves issue with Detection Rule Assistant CTA
not\r\ndisplaying correctly on some platforms/browsers. It now shows as
a\r\n`Chat` button to the right of the table tabs, matching the
other\r\nassistant CTA's throughout the application.\r\n\r\n<p
align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/9fcecd54-8e1a-423a-be05-7137632acbc4\"\r\n/>\r\n</p>
\r\n\r\nAnd lastly removes `Beta` title from callout since we're going
GA in\r\n`8.10` 🎉\r\n\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/5beb379a-1bc7-4afc-b4bc-09f1d6085211\"\r\n/>\r\n</p>
\r\n\r\nResolves:\r\nhttps://github.com//issues/163394#issuecomment-1693431066\r\nResolves:
https://github.com/elastic/kibana/issues/164819\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [X] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or
tutorials","sha":"5f9651e0ef99e35e9a4a3b5dfbd7e40160038f07","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:fix","Team:
SecuritySolution","Feature:Elastic AI
Assistant","v8.10.0","v8.11.0"],"number":164900,"url":"https://github.com/elastic/kibana/pull/164900","mergeCommit":{"message":"[Security
Solution] Fixes Preconfigured Connectors not working with Assistant
(#164900)\n\n## Summary\r\n\r\nFixes Preconfigured Connectors not
working with the Assistant, and also\r\nensures default `model` from
connector will be used first if available\r\n(instead of defaulting to
`gpt-3.5-turbo`).\r\n\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/637f5919-7560-40b0-a8db-681096e77ac0\"\r\n/>\r\n</p>
\r\n\r\nNote how `Model` is not displayed even though this is an
OpenAI\r\nconnector:\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/2c4bbe91-2851-48d7-8bfe-20e07db52155\"\r\n/>\r\n</p>
\r\n\r\nAdditionally, resolves issue with Detection Rule Assistant CTA
not\r\ndisplaying correctly on some platforms/browsers. It now shows as
a\r\n`Chat` button to the right of the table tabs, matching the
other\r\nassistant CTA's throughout the application.\r\n\r\n<p
align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/9fcecd54-8e1a-423a-be05-7137632acbc4\"\r\n/>\r\n</p>
\r\n\r\nAnd lastly removes `Beta` title from callout since we're going
GA in\r\n`8.10` 🎉\r\n\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/5beb379a-1bc7-4afc-b4bc-09f1d6085211\"\r\n/>\r\n</p>
\r\n\r\nResolves:\r\nhttps://github.com//issues/163394#issuecomment-1693431066\r\nResolves:
https://github.com/elastic/kibana/issues/164819\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [X] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or
tutorials","sha":"5f9651e0ef99e35e9a4a3b5dfbd7e40160038f07"}},"sourceBranch":"main","suggestedTargetBranches":["8.10"],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/164900","number":164900,"mergeCommit":{"message":"[Security
Solution] Fixes Preconfigured Connectors not working with Assistant
(#164900)\n\n## Summary\r\n\r\nFixes Preconfigured Connectors not
working with the Assistant, and also\r\nensures default `model` from
connector will be used first if available\r\n(instead of defaulting to
`gpt-3.5-turbo`).\r\n\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/637f5919-7560-40b0-a8db-681096e77ac0\"\r\n/>\r\n</p>
\r\n\r\nNote how `Model` is not displayed even though this is an
OpenAI\r\nconnector:\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/2c4bbe91-2851-48d7-8bfe-20e07db52155\"\r\n/>\r\n</p>
\r\n\r\nAdditionally, resolves issue with Detection Rule Assistant CTA
not\r\ndisplaying correctly on some platforms/browsers. It now shows as
a\r\n`Chat` button to the right of the table tabs, matching the
other\r\nassistant CTA's throughout the application.\r\n\r\n<p
align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/9fcecd54-8e1a-423a-be05-7137632acbc4\"\r\n/>\r\n</p>
\r\n\r\nAnd lastly removes `Beta` title from callout since we're going
GA in\r\n`8.10` 🎉\r\n\r\n<p align=\"center\">\r\n<img
width=\"500\"\r\nsrc=\"https://github.com/elastic/kibana/assets/2946766/5beb379a-1bc7-4afc-b4bc-09f1d6085211\"\r\n/>\r\n</p>
\r\n\r\nResolves:\r\nhttps://github.com//issues/163394#issuecomment-1693431066\r\nResolves:
https://github.com/elastic/kibana/issues/164819\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [X] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or
tutorials","sha":"5f9651e0ef99e35e9a4a3b5dfbd7e40160038f07"}}]}]
BACKPORT-->

Co-authored-by: Garrett Spong <[email protected]>
jloleysens added a commit to jloleysens/kibana that referenced this pull request Aug 29, 2023
@jloleysens
Merge branch 'main' into run-migrations-on-migrator
44333f6 
* main: (40 commits)
  Adjust migrations and elasticsearch service settings for serverless. (elastic#165050)
  [Security Solution] expandable flyout - add investigate in timeline f… (elastic#165025)
  [SecuritySolution] Hide create dashboard button from listing (elastic#164476)
  Construct HTTP log message only if needed (elastic#165057)
  [Security Solution] expandable flyout - add no data message in entities details and entities overview components (elastic#164955)
  Add functional tests for serverless security management UIs (elastic#164886)
  [api-docs] 2023-08-29 Daily api_docs build (elastic#165056)
  [Cloud Security][CIS GCP]cis gcp now use updated gcp field name + small last minute changes (elastic#164792)
  [Security Solution] Expandable flyout - update risk classification ui in entities overview (elastic#165022)
  [Security Solution] Fixes Preconfigured Connectors not working with Assistant (elastic#164900)
  [Security Solution] Coverage Overview follow-up 2 (elastic#164986)
  [DOCS] Add cross-link for other encryption key settings (elastic#165014)
  chore(slo): general enhancement (elastic#164723)
  Revert "[SOR] Allow optionally downgrading documents with a higher version model in API READ methods" (elastic#164991)
  [OAS] Add more Elasticsearch query rule examples (elastic#164386)
  [security_solution_cypress] Add support for options in EsArchiver.load (elastic#164988)
  [Event Log] Skip setting assets to hidden in serverless (elastic#164767)
  remove unneeded usages of isErrorResponse (elastic#164609)
  [Enterprise Search] Make network drive connector platinum (elastic#165007)
  [RAM] update api key to become public (elastic#164883)
  ...
This was referenced Oct 1, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dplumlee dplumlee dplumlee approved these changes

@andrew-goldstein andrew-goldstein andrew-goldstein approved these changes

Assignees

@spong spong

Labels
bug Fixes for quality problems that affect the customer experience Feature:Security Assistant Security Assistant release_note:fix Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.10.0 v8.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@spong @elasticmachine @kibana-ci @kibanamachine @andrew-goldstein @dplumlee