[Security Solution] Migrates siem-detection-engine-rule-status alertId to saved object references array #114585
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,27 +5,33 @@ | |
| * 2.0. | ||
| */ | ||
|
|
||
| import { | ||
| SavedObject, | ||
| SavedObjectsClientContract, | ||
| SavedObjectsCreateOptions, | ||
| SavedObjectsFindOptions, | ||
| SavedObjectsFindOptionsReference, | ||
| SavedObjectsFindResult, | ||
| SavedObjectsUpdateResponse, | ||
| } from 'kibana/server'; | ||
| import { get } from 'lodash'; | ||
| // eslint-disable-next-line no-restricted-imports | ||
| import { legacyRuleStatusSavedObjectType } from '../../rules/legacy_rule_status/legacy_rule_status_saved_object_mappings'; | ||
| import { IRuleStatusSOAttributes } from '../../rules/types'; | ||
|
|
||
| export interface RuleStatusSavedObjectsClient { | ||
| find: ( | ||
| options?: Omit<SavedObjectsFindOptions, 'type'> | ||
| ) => Promise<Array<SavedObjectsFindResult<IRuleStatusSOAttributes>>>; | ||
| findBulk: (ids: string[], statusesPerId: number) => Promise<FindBulkResponse>; | ||
| create: ( | ||
| attributes: IRuleStatusSOAttributes, | ||
| options?: SavedObjectsCreateOptions | ||
| ) => Promise<SavedObject<IRuleStatusSOAttributes>>; | ||
| update: ( | ||
| id: string, | ||
| attributes: Partial<IRuleStatusSOAttributes>, | ||
| options?: SavedObjectsCreateOptions | ||
| ) => Promise<SavedObjectsUpdateResponse<IRuleStatusSOAttributes>>; | ||
| delete: (id: string) => Promise<{}>; | ||
| } | ||
|
|
@@ -35,63 +41,80 @@ export interface FindBulkResponse { | |
| } | ||
|
|
||
| /** | ||
| * @deprecated Use RuleExecutionLogClient instead | ||
| */ | ||
| export const ruleStatusSavedObjectsClientFactory = ( | ||
| savedObjectsClient: SavedObjectsClientContract | ||
| ): RuleStatusSavedObjectsClient => ({ | ||
| find: async (options) => { | ||
| const result = await savedObjectsClient.find<IRuleStatusSOAttributes>({ | ||
| ...options, | ||
| type: legacyRuleStatusSavedObjectType, | ||
| }); | ||
| return result.saved_objects; | ||
| }, | ||
| findBulk: async (ids, statusesPerId) => { | ||
| if (ids.length === 0) { | ||
| return {}; | ||
| } | ||
| const references = ids.map<SavedObjectsFindOptionsReference>((alertId) => ({ | ||
| id: alertId, | ||
| type: 'alert', | ||
| })); | ||
| const order: 'desc' = 'desc'; | ||
| const aggs = { | ||
| references: { | ||
| nested: { | ||
| path: `${legacyRuleStatusSavedObjectType}.references`, | ||
| }, | ||
| aggs: { | ||
| alertIds: { | ||
| terms: { | ||
| field: `${legacyRuleStatusSavedObjectType}.references.id`, | ||
| size: ids.length, | ||
| }, | ||
| aggs: { | ||
| rule_status: { | ||
| reverse_nested: {}, | ||
|
There was a problem hiding this comment. Ended up running into issues going the two query route as well too as it wasn't possible to do a Touched base w/ @XavierM and just ended up adding support for |
||
| aggs: { | ||
| most_recent_statuses: { | ||
| top_hits: { | ||
| sort: [ | ||
| { | ||
| [`${legacyRuleStatusSavedObjectType}.statusDate`]: { | ||
spong marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| order, | ||
| }, | ||
| }, | ||
| ], | ||
| size: statusesPerId, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }; | ||
| const results = await savedObjectsClient.find({ | ||
| hasReference: references, | ||
| aggs, | ||
| type: legacyRuleStatusSavedObjectType, | ||
| perPage: 0, | ||
| }); | ||
| const buckets = get(results, 'aggregations.references.alertIds.buckets'); | ||
| return buckets.reduce((acc: Record<string, unknown>, bucket: unknown) => { | ||
| const key = get(bucket, 'key'); | ||
| const hits = get(bucket, 'rule_status.most_recent_statuses.hits.hits'); | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| acc[key] = hits.map((hit: any) => hit._source[legacyRuleStatusSavedObjectType]); | ||
| return acc; | ||
| }, {}); | ||
| }, | ||
| create: (attributes, options) => { | ||
| return savedObjectsClient.create(legacyRuleStatusSavedObjectType, attributes, options); | ||
| }, | ||
| update: (id, attributes, options) => | ||
| savedObjectsClient.update(legacyRuleStatusSavedObjectType, id, attributes, options), | ||
| delete: (id) => savedObjectsClient.delete(legacyRuleStatusSavedObjectType, id), | ||
| }); | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Create/Updateinterfaces updated to includeSavedObjectsCreateOptionsso the SOreferences[]can be supplied and the correct document is updated (otherwise we'll end up with new docs w/oreferences[]).