-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into detection-rules/8.6-0600b575
- Loading branch information
Showing
20 changed files
with
953 additions
and
186 deletions.
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
69 changes: 69 additions & 0 deletions
69
...blic/detection_engine/rule_management_ui/components/rules_table/alternative_tour/tour.tsx
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 |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import { EuiText, EuiTourStep } from '@elastic/eui'; | ||
| import React, { useCallback, useEffect, useState } from 'react'; | ||
| import { NEW_FEATURES_TOUR_STORAGE_KEYS } from '../../../../../../common/constants'; | ||
| import { useKibana } from '../../../../../common/lib/kibana'; | ||
| import * as i18n from './translations'; | ||
|
|
||
| export interface Props { | ||
| children: React.ReactElement; | ||
| } | ||
|
|
||
| export const RulesPageTourComponent: React.FC<Props> = ({ children }) => { | ||
| const tourConfig = { | ||
| currentTourStep: 1, | ||
| isTourActive: true, | ||
| tourPopoverWidth: 300, | ||
| }; | ||
|
|
||
| const { storage } = useKibana().services; | ||
|
|
||
| const [tourState, setTourState] = useState(() => { | ||
| const restoredTourState = storage.get(NEW_FEATURES_TOUR_STORAGE_KEYS.RULE_MANAGEMENT_PAGE); | ||
|
|
||
| if (restoredTourState != null) { | ||
| return restoredTourState; | ||
| } | ||
| return tourConfig; | ||
| }); | ||
|
|
||
| const demoTourSteps = [ | ||
| { | ||
| step: 1, | ||
| title: i18n.CREATE_RULE_TOUR_TITLE, | ||
| content: <EuiText>{i18n.CREATE_RULE_TOUR_CONTENT}</EuiText>, | ||
| }, | ||
| ]; | ||
| const finishTour = useCallback(() => { | ||
| setTourState({ | ||
| ...tourState, | ||
| isTourActive: false, | ||
| }); | ||
| }, [tourState]); | ||
|
|
||
| useEffect(() => { | ||
| storage.set(NEW_FEATURES_TOUR_STORAGE_KEYS.RULE_MANAGEMENT_PAGE, tourState); | ||
| }, [tourState, storage]); | ||
|
|
||
| return ( | ||
| <EuiTourStep | ||
| content={demoTourSteps[0].content} | ||
| isStepOpen={tourState.currentTourStep === 1 && tourState.isTourActive} | ||
| minWidth={tourState.tourPopoverWidth} | ||
| onFinish={finishTour} | ||
| step={1} | ||
| stepsTotal={demoTourSteps.length} | ||
| subtitle={tourState.tourSubtitle} | ||
| title={demoTourSteps[0].title} | ||
| anchorPosition="rightUp" | ||
| > | ||
| {children} | ||
| </EuiTourStep> | ||
| ); | ||
| }; |
22 changes: 22 additions & 0 deletions
22
...tection_engine/rule_management_ui/components/rules_table/alternative_tour/translations.ts
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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import { i18n } from '@kbn/i18n'; | ||
|
|
||
| export const CREATE_RULE_TOUR_TITLE = i18n.translate( | ||
| 'xpack.securitySolution.detectionEngine.rules.tour.createRuleTourTitle', | ||
| { | ||
| defaultMessage: 'New security rule features are available', | ||
| } | ||
| ); | ||
|
|
||
| export const CREATE_RULE_TOUR_CONTENT = i18n.translate( | ||
| 'xpack.securitySolution.detectionEngine.rules.tour.createRuleTourContent', | ||
| { | ||
| defaultMessage: `Alert suppression options are now available for Custom Query rules and multiple fields can be selected in New Terms rules`, | ||
| } | ||
| ); |
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
31 changes: 31 additions & 0 deletions
31
x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/bulk_disable.ts
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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
| import { HttpSetup } from '@kbn/core/public'; | ||
| import { KueryNode } from '@kbn/es-query'; | ||
| import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; | ||
| import { BulkDisableResponse } from '../../../types'; | ||
|
|
||
| export const bulkDisableRules = async ({ | ||
| filter, | ||
| ids, | ||
| http, | ||
| }: { | ||
| filter?: KueryNode | null; | ||
| ids?: string[]; | ||
| http: HttpSetup; | ||
| }): Promise<BulkDisableResponse> => { | ||
| try { | ||
| const body = JSON.stringify({ | ||
| ids: ids?.length ? ids : undefined, | ||
| ...(filter ? { filter: JSON.stringify(filter) } : {}), | ||
| }); | ||
|
|
||
| return http.patch(`${INTERNAL_BASE_ALERTING_API_PATH}/rules/_bulk_disable`, { body }); | ||
| } catch (e) { | ||
| throw new Error(`Unable to parse bulk disable params: ${e}`); | ||
| } | ||
| }; |
31 changes: 31 additions & 0 deletions
31
x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/bulk_enable.ts
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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
| import { HttpSetup } from '@kbn/core/public'; | ||
| import { KueryNode } from '@kbn/es-query'; | ||
| import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants'; | ||
| import { BulkEnableResponse } from '../../../types'; | ||
|
|
||
| export const bulkEnableRules = async ({ | ||
| filter, | ||
| ids, | ||
| http, | ||
| }: { | ||
| filter?: KueryNode | null; | ||
| ids?: string[]; | ||
| http: HttpSetup; | ||
| }): Promise<BulkEnableResponse> => { | ||
| try { | ||
| const body = JSON.stringify({ | ||
| ids: ids?.length ? ids : undefined, | ||
| ...(filter ? { filter: JSON.stringify(filter) } : {}), | ||
| }); | ||
|
|
||
| return http.patch(`${INTERNAL_BASE_ALERTING_API_PATH}/rules/_bulk_enable`, { body }); | ||
| } catch (e) { | ||
| throw new Error(`Unable to parse bulk enable params: ${e}`); | ||
| } | ||
| }; |
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
Oops, something went wrong.