From 2fa4c7622c02e022128dd65056dc074134f3afa3 Mon Sep 17 00:00:00 2001 From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com> Date: Wed, 8 Jul 2020 23:33:56 -0400 Subject: [PATCH] [SECURITY] Alerts back to Detections (#71142) * part I to rename alerts back to detections * part 2 to rename alerts to detections * update imports * fix layout container event type * Detection Alerts * fix type/UT/cypress --- .../security_solution/common/constants.ts | 4 ++-- .../common/types/timeline/index.ts | 8 +++---- .../cypress/integration/alerts.spec.ts | 8 +++---- .../alerts_detection_rules.spec.ts | 4 ++-- .../alerts_detection_rules_custom.spec.ts | 6 ++--- .../alerts_detection_rules_export.spec.ts | 4 ++-- .../alerts_detection_rules_ml.spec.ts | 4 ++-- .../alerts_detection_rules_prebuilt.spec.ts | 6 ++--- .../integration/alerts_timeline.spec.ts | 4 ++-- .../cypress/integration/navigation.spec.ts | 18 +++++++------- .../integration/url_compatibility.spec.ts | 4 ++-- .../cypress/screens/kibana_navigation.ts | 3 ++- .../cypress/screens/security_header.ts | 2 +- .../cypress/urls/navigation.ts | 2 +- .../public/app/home/home_navigations.tsx | 12 +++++----- .../cases/components/all_cases/index.tsx | 2 +- .../components/alerts_viewer/translations.ts | 2 +- .../events_viewer/events_viewer.test.tsx | 4 ++-- .../components/events_viewer/index.test.tsx | 4 ++-- .../common/components/events_viewer/index.tsx | 2 +- .../exceptions/add_exception_modal/index.tsx | 4 ++-- .../components/exceptions/builder/index.tsx | 2 +- .../exceptions/edit_exception_modal/index.tsx | 4 ++-- .../exceptions/use_add_exception.test.tsx | 2 +- .../exceptions/use_add_exception.tsx | 4 ++-- ...tch_or_create_rule_exception_list.test.tsx | 6 ++--- ...se_fetch_or_create_rule_exception_list.tsx | 7 ++++-- .../components/generic_downloader/index.tsx | 2 +- .../common/components/header_global/index.tsx | 8 +++---- .../components/import_data_modal/index.tsx | 2 +- .../navigation/breadcrumbs/index.ts | 6 ++--- .../components/navigation/index.test.tsx | 20 ++++++++-------- .../common/components/navigation/types.ts | 2 +- .../common/components/top_n/index.test.tsx | 2 +- .../public/common/components/top_n/index.tsx | 3 ++- .../common/components/url_state/constants.ts | 4 ++-- .../common/components/url_state/helpers.ts | 4 ++-- .../components/url_state/index.test.tsx | 2 +- .../common/components/url_state/types.ts | 4 ++-- .../components/url_state/use_url_state.tsx | 2 +- .../public/common/mock/timeline_results.ts | 2 +- .../alerts_histogram.test.tsx | 0 .../alerts_histogram.tsx | 0 .../alerts_histogram_panel/config.ts | 0 .../alerts_histogram_panel/helpers.test.tsx | 0 .../alerts_histogram_panel/helpers.tsx | 0 .../alerts_histogram_panel/index.test.tsx | 2 +- .../alerts_histogram_panel/index.tsx | 4 ++-- .../alerts_histogram_panel/translations.ts | 2 +- .../alerts_histogram_panel/types.ts | 0 .../components/alerts_info/index.tsx | 0 .../components/alerts_info/query.dsl.ts | 0 .../components/alerts_info/types.ts | 0 .../components/alerts_table/actions.test.tsx | 0 .../components/alerts_table/actions.tsx | 0 .../alerts_filter_group/index.test.tsx | 0 .../alerts_filter_group/index.tsx | 0 .../alerts_utility_bar/index.test.tsx | 0 .../alerts_table/alerts_utility_bar/index.tsx | 0 .../alerts_utility_bar/translations.ts | 0 .../alerts_table/default_config.test.tsx | 0 .../alerts_table/default_config.tsx | 0 .../components/alerts_table/helpers.test.ts | 0 .../components/alerts_table/helpers.ts | 0 .../components/alerts_table/index.test.tsx | 0 .../components/alerts_table/index.tsx | 6 ++--- .../components/alerts_table/translations.ts | 7 ------ .../components/alerts_table/types.ts | 0 .../index.test.tsx | 0 .../detection_engine_header_page/index.tsx | 0 .../translations.ts | 0 .../no_api_integration_callout/index.test.tsx | 0 .../no_api_integration_callout/index.tsx | 0 .../translations.ts | 0 .../no_write_alerts_callout/index.test.tsx | 0 .../no_write_alerts_callout/index.tsx | 0 .../no_write_alerts_callout/translations.ts | 0 .../rules/accordion_title/index.test.tsx | 0 .../rules/accordion_title/index.tsx | 0 .../rules/add_item_form/index.test.tsx | 0 .../components/rules/add_item_form/index.tsx | 0 .../rules/all_rules_tables/index.test.tsx | 0 .../rules/all_rules_tables/index.tsx | 0 .../anomaly_threshold_slider/index.test.tsx | 0 .../rules/anomaly_threshold_slider/index.tsx | 0 .../description_step/actions_description.tsx | 0 .../assets/list_tree_icon.svg | 0 .../rules/description_step/helpers.test.tsx | 0 .../rules/description_step/helpers.tsx | 0 .../rules/description_step/index.test.tsx | 0 .../rules/description_step/index.tsx | 0 .../ml_job_description.test.tsx | 0 .../description_step/ml_job_description.tsx | 0 .../description_step/throttle_description.tsx | 0 .../rules/description_step/translations.tsx | 0 .../rules/description_step/types.ts | 0 .../components/rules/mitre/helpers.test.tsx | 0 .../components/rules/mitre/helpers.ts | 0 .../components/rules/mitre/index.test.tsx | 0 .../components/rules/mitre/index.tsx | 0 .../components/rules/mitre/translations.ts | 0 .../rules/ml_job_select/index.test.tsx | 0 .../components/rules/ml_job_select/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/rules/next_step/index.test.tsx | 0 .../components/rules/next_step/index.tsx | 0 .../rules/optional_field_label/index.test.tsx | 0 .../rules/optional_field_label/index.tsx | 0 .../rules/pick_timeline/index.test.tsx | 0 .../components/rules/pick_timeline/index.tsx | 0 .../load_empty_prompt.test.tsx | 0 .../pre_packaged_rules/load_empty_prompt.tsx | 2 +- .../rules/pre_packaged_rules/translations.ts | 0 .../update_callout.test.tsx | 0 .../pre_packaged_rules/update_callout.tsx | 0 .../components/rules/query_bar/index.test.tsx | 0 .../components/rules/query_bar/index.tsx | 0 .../rules/query_bar/translations.tsx | 0 .../rules/read_only_callout/index.test.tsx | 0 .../rules/read_only_callout/index.tsx | 0 .../rules/read_only_callout/translations.ts | 0 .../rules/risk_score_mapping/index.tsx | 0 .../rules/risk_score_mapping/translations.tsx | 0 .../rules/rule_actions_field/index.test.tsx | 0 .../rules/rule_actions_field/index.tsx | 0 .../rules/rule_actions_field/translations.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../rule_actions_overflow/index.test.tsx | 0 .../rules/rule_actions_overflow/index.tsx | 2 +- .../rule_actions_overflow/translations.ts | 0 .../rules/rule_status/helpers.test.tsx | 0 .../components/rules/rule_status/helpers.ts | 2 +- .../rules/rule_status/index.test.tsx | 0 .../components/rules/rule_status/index.tsx | 5 +--- .../rules/rule_status/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../rules/rule_switch/index.test.tsx | 0 .../components/rules/rule_switch/index.tsx | 2 +- .../rules/schedule_item_form/index.test.tsx | 0 .../rules/schedule_item_form/index.tsx | 0 .../rules/schedule_item_form/translations.ts | 0 .../rules/select_rule_type/index.test.tsx | 0 .../rules/select_rule_type/index.tsx | 0 .../rules/select_rule_type/translations.ts | 0 .../rules/severity_badge/index.test.tsx | 0 .../components/rules/severity_badge/index.tsx | 0 .../rules/severity_mapping/index.tsx | 0 .../rules/severity_mapping/translations.tsx | 0 .../rules/status_icon/index.test.tsx | 0 .../components/rules/status_icon/index.tsx | 0 .../components/rules/step_about_rule/data.tsx | 0 .../rules/step_about_rule/default_value.ts | 0 .../rules/step_about_rule/index.test.tsx | 0 .../rules/step_about_rule/index.tsx | 0 .../rules/step_about_rule/schema.tsx | 0 .../rules/step_about_rule/translations.ts | 0 .../step_about_rule_details/index.test.tsx | 0 .../rules/step_about_rule_details/index.tsx | 0 .../step_about_rule_details/translations.ts | 0 .../rules/step_content_wrapper/index.test.tsx | 0 .../rules/step_content_wrapper/index.tsx | 0 .../rules/step_define_rule/index.test.tsx | 0 .../rules/step_define_rule/index.tsx | 2 +- .../rules/step_define_rule/schema.tsx | 0 .../rules/step_define_rule/translations.tsx | 0 .../rules/step_define_rule/types.ts | 0 .../rules/step_panel/index.test.tsx | 0 .../components/rules/step_panel/index.tsx | 0 .../rules/step_rule_actions/index.test.tsx | 0 .../rules/step_rule_actions/index.tsx | 2 +- .../rules/step_rule_actions/schema.test.tsx | 0 .../rules/step_rule_actions/schema.tsx | 0 .../rules/step_rule_actions/translations.tsx | 0 .../rules/step_rule_actions/utils.test.ts | 0 .../rules/step_rule_actions/utils.ts | 0 .../rules/step_schedule_rule/index.test.tsx | 0 .../rules/step_schedule_rule/index.tsx | 0 .../rules/step_schedule_rule/schema.tsx | 0 .../rules/step_schedule_rule/translations.tsx | 0 .../throttle_select_field/index.test.tsx | 0 .../rules/throttle_select_field/index.tsx | 0 .../components/user_info/index.test.tsx | 0 .../components/user_info/index.tsx | 0 .../detection_engine/alerts/__mocks__/api.ts | 0 .../detection_engine/alerts/api.test.ts | 0 .../containers/detection_engine/alerts/api.ts | 0 .../detection_engine/alerts/mock.ts | 0 .../detection_engine/alerts/translations.ts | 0 .../detection_engine/alerts/types.ts | 0 .../alerts/use_privilege_user.test.tsx | 0 .../alerts/use_privilege_user.tsx | 0 .../alerts/use_query.test.tsx | 0 .../detection_engine/alerts/use_query.tsx | 0 .../alerts/use_signal_index.test.tsx | 0 .../alerts/use_signal_index.tsx | 0 .../detection_engine/rules/__mocks__/api.ts | 0 .../detection_engine/rules/api.test.ts | 0 .../containers/detection_engine/rules/api.ts | 0 .../rules/fetch_index_patterns.test.tsx | 0 .../rules/fetch_index_patterns.tsx | 0 .../detection_engine/rules/index.ts | 0 .../containers/detection_engine/rules/mock.ts | 0 .../rules/persist_rule.test.tsx | 0 .../detection_engine/rules/persist_rule.tsx | 0 .../detection_engine/rules/translations.ts | 0 .../detection_engine/rules/types.ts | 0 .../rules/use_pre_packaged_rules.test.tsx | 0 .../rules/use_pre_packaged_rules.tsx | 0 .../detection_engine/rules/use_rule.test.tsx | 0 .../detection_engine/rules/use_rule.tsx | 0 .../rules/use_rule_status.test.tsx | 0 .../rules/use_rule_status.tsx | 0 .../detection_engine/rules/use_rules.test.tsx | 0 .../detection_engine/rules/use_rules.tsx | 0 .../detection_engine/rules/use_tags.test.tsx | 0 .../detection_engine/rules/use_tags.tsx | 0 .../public/{alerts => detections}/index.ts | 6 ++--- .../mitre/mitre_tactics_techniques.ts | 0 .../{alerts => detections}/mitre/types.ts | 0 .../detection_engine.test.tsx | 0 .../detection_engine/detection_engine.tsx | 6 ++--- .../detection_engine_no_signal_index.test.tsx | 0 .../detection_engine_no_signal_index.tsx | 0 ...ction_engine_user_unauthenticated.test.tsx | 0 .../detection_engine_user_unauthenticated.tsx | 0 .../pages/detection_engine/index.test.tsx | 0 .../pages/detection_engine/index.tsx | 0 .../rules/all/__mocks__/mock.ts | 4 ++-- .../detection_engine/rules/all/actions.tsx | 2 +- .../rules/all/batch_actions.tsx | 2 +- .../rules/all/columns.test.tsx | 0 .../detection_engine/rules/all/columns.tsx | 2 +- .../rules/all/helpers.test.tsx | 2 +- .../detection_engine/rules/all/helpers.ts | 2 +- .../detection_engine/rules/all/index.test.tsx | 2 +- .../detection_engine/rules/all/index.tsx | 4 ++-- .../detection_engine/rules/all/reducer.ts | 2 +- .../rules_table_filters.test.tsx | 0 .../rules_table_filters.tsx | 4 ++-- .../tags_filter_popover.test.tsx | 0 .../tags_filter_popover.tsx | 0 .../rules/create/helpers.test.ts | 2 +- .../detection_engine/rules/create/helpers.ts | 2 +- .../rules/create/index.test.tsx | 0 .../detection_engine/rules/create/index.tsx | 6 ++--- .../rules/create/translations.ts | 0 .../rules/details/failure_history.test.tsx | 4 ++-- .../rules/details/failure_history.tsx | 5 +--- .../rules/details/index.test.tsx | 0 .../detection_engine/rules/details/index.tsx | 10 ++++---- .../details/status_failed_callout.test.tsx | 0 .../rules/details/status_failed_callout.tsx | 0 .../rules/details/translations.ts | 0 .../rules/edit/index.test.tsx | 0 .../detection_engine/rules/edit/index.tsx | 6 ++--- .../rules/edit/translations.ts | 0 .../detection_engine/rules/helpers.test.tsx | 2 +- .../pages/detection_engine/rules/helpers.tsx | 2 +- .../detection_engine/rules/index.test.tsx | 4 ++-- .../pages/detection_engine/rules/index.tsx | 13 ++++------ .../detection_engine/rules/translations.ts | 4 ++-- .../pages/detection_engine/rules/types.ts | 0 .../detection_engine/rules/utils.test.ts | 2 +- .../pages/detection_engine/rules/utils.ts | 12 +++++----- .../pages/detection_engine/translations.ts | 2 +- .../pages/detection_engine/types.ts | 0 .../public/{alerts => detections}/routes.tsx | 0 .../security_solution/public/helpers.ts | 2 +- .../alerts_by_category/index.test.tsx | 2 +- .../components/signals_by_category/index.tsx | 6 ++--- .../public/overview/pages/translations.ts | 9 +------ .../security_solution/public/plugin.tsx | 24 +++++++++---------- .../security_solution/public/sub_plugins.ts | 6 ++--- .../renderers/formatted_field_helpers.tsx | 6 ++--- .../components/timeline/index.test.tsx | 4 ++-- .../timelines/components/timeline/index.tsx | 2 +- .../timeline/search_or_filter/pick_events.tsx | 6 ++--- .../timeline/search_or_filter/translations.ts | 6 ++--- .../public/timelines/containers/api.test.ts | 2 +- .../public/timelines/containers/api.ts | 2 +- .../public/timelines/containers/index.tsx | 2 +- .../security_solution/server/plugin.ts | 2 +- 282 files changed, 205 insertions(+), 223 deletions(-) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/alerts_histogram.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/alerts_histogram.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/config.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/helpers.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/helpers.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/index.test.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/index.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/translations.ts (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_histogram_panel/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_info/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_info/query.dsl.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_info/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/actions.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/actions.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/alerts_filter_group/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/alerts_filter_group/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/alerts_utility_bar/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/alerts_utility_bar/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/alerts_utility_bar/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/default_config.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/default_config.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/helpers.test.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/helpers.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/index.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/translations.ts (96%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/alerts_table/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/detection_engine_header_page/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/detection_engine_header_page/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/detection_engine_header_page/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/no_api_integration_callout/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/no_api_integration_callout/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/no_api_integration_callout/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/no_write_alerts_callout/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/no_write_alerts_callout/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/no_write_alerts_callout/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/accordion_title/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/accordion_title/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/add_item_form/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/add_item_form/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/all_rules_tables/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/all_rules_tables/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/anomaly_threshold_slider/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/anomaly_threshold_slider/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/actions_description.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/assets/list_tree_icon.svg (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/helpers.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/helpers.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/ml_job_description.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/ml_job_description.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/throttle_description.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/description_step/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/mitre/helpers.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/mitre/helpers.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/mitre/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/mitre/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/mitre/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/ml_job_select/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/ml_job_select/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/next_step/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/next_step/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/next_step/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/optional_field_label/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/optional_field_label/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pick_timeline/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pick_timeline/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pre_packaged_rules/load_empty_prompt.tsx (97%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pre_packaged_rules/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pre_packaged_rules/update_callout.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/pre_packaged_rules/update_callout.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/query_bar/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/query_bar/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/query_bar/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/read_only_callout/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/read_only_callout/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/read_only_callout/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/risk_score_mapping/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/risk_score_mapping/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_field/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_field/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_field/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_overflow/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_overflow/index.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_actions_overflow/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_status/helpers.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_status/helpers.ts (85%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_status/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_status/index.tsx (96%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_status/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_switch/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_switch/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/rule_switch/index.tsx (97%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/schedule_item_form/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/schedule_item_form/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/schedule_item_form/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/select_rule_type/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/select_rule_type/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/select_rule_type/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/severity_badge/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/severity_badge/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/severity_mapping/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/severity_mapping/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/status_icon/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/status_icon/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule/data.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule/default_value.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule/schema.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule_details/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule_details/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_about_rule_details/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_content_wrapper/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_content_wrapper/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_define_rule/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_define_rule/index.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_define_rule/schema.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_define_rule/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_define_rule/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_panel/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_panel/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/index.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/schema.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/schema.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/utils.test.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_rule_actions/utils.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_schedule_rule/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_schedule_rule/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_schedule_rule/schema.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/step_schedule_rule/translations.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/throttle_select_field/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/rules/throttle_select_field/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/user_info/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/components/user_info/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/__mocks__/api.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/api.test.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/api.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/mock.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/use_privilege_user.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/use_privilege_user.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/use_query.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/use_query.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/use_signal_index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/alerts/use_signal_index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/__mocks__/api.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/api.test.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/api.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/fetch_index_patterns.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/fetch_index_patterns.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/index.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/mock.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/persist_rule.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/persist_rule.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_pre_packaged_rules.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_rule.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_rule.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_rule_status.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_rule_status.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_rules.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_rules.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_tags.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/containers/detection_engine/rules/use_tags.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/index.ts (90%) rename x-pack/plugins/security_solution/public/{alerts => detections}/mitre/mitre_tactics_techniques.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/mitre/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/detection_engine.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/detection_engine.tsx (97%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/detection_engine_no_signal_index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/detection_engine_no_signal_index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/detection_engine_user_unauthenticated.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/index.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/__mocks__/mock.ts (96%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/actions.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/batch_actions.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/columns.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/columns.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/helpers.test.tsx (97%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/helpers.ts (94%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/index.test.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/index.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/reducer.ts (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx (95%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/create/helpers.test.ts (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/create/helpers.ts (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/create/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/create/index.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/create/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/failure_history.test.tsx (82%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/failure_history.tsx (95%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/index.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/status_failed_callout.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/status_failed_callout.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/details/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/edit/index.test.tsx (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/edit/index.tsx (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/edit/translations.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/helpers.test.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/helpers.tsx (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/index.test.tsx (86%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/index.tsx (95%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/translations.ts (99%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/utils.test.ts (90%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/rules/utils.ts (87%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/translations.ts (98%) rename x-pack/plugins/security_solution/public/{alerts => detections}/pages/detection_engine/types.ts (100%) rename x-pack/plugins/security_solution/public/{alerts => detections}/routes.tsx (100%) diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts index bf9cf7486810d..3b5b5958c879f 100644 --- a/x-pack/plugins/security_solution/common/constants.ts +++ b/x-pack/plugins/security_solution/common/constants.ts @@ -36,7 +36,7 @@ export const NO_ALERT_INDEX = 'no-alert-index-049FC71A-4C2C-446F-9901-37XMC5024C export const ENDPOINT_METADATA_INDEX = 'metrics-endpoint.metadata-*'; export enum SecurityPageName { - alerts = 'alerts', + detections = 'detections', overview = 'overview', hosts = 'hosts', network = 'network', @@ -46,7 +46,7 @@ export enum SecurityPageName { } export const APP_OVERVIEW_PATH = `${APP_PATH}/overview`; -export const APP_ALERTS_PATH = `${APP_PATH}/alerts`; +export const APP_DETECTIONS_PATH = `${APP_PATH}/detections`; export const APP_HOSTS_PATH = `${APP_PATH}/hosts`; export const APP_NETWORK_PATH = `${APP_PATH}/network`; export const APP_TIMELINES_PATH = `${APP_PATH}/timelines`; diff --git a/x-pack/plugins/security_solution/common/types/timeline/index.ts b/x-pack/plugins/security_solution/common/types/timeline/index.ts index 2cf5930a83bee..d05c44601e1f2 100644 --- a/x-pack/plugins/security_solution/common/types/timeline/index.ts +++ b/x-pack/plugins/security_solution/common/types/timeline/index.ts @@ -229,8 +229,8 @@ export interface SavedTimelineNote extends runtimeTypes.TypeOf { context('Closing alerts', () => { beforeEach(() => { esArchiverLoad('alerts'); - loginAndWaitForPage(ALERTS_URL); + loginAndWaitForPage(DETECTIONS_URL); }); it('Closes and opens alerts', () => { @@ -162,7 +162,7 @@ describe.skip('Alerts', () => { context('Opening alerts', () => { beforeEach(() => { esArchiverLoad('closed_alerts'); - loginAndWaitForPage(ALERTS_URL); + loginAndWaitForPage(DETECTIONS_URL); }); it('Open one alert when more than one closed alerts are selected', () => { @@ -208,7 +208,7 @@ describe.skip('Alerts', () => { context('Marking alerts as in-progress', () => { beforeEach(() => { esArchiverLoad('alerts'); - loginAndWaitForPage(ALERTS_URL); + loginAndWaitForPage(DETECTIONS_URL); }); it('Mark one alert in progress when more than one open alerts are selected', () => { diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts index 5cad0b9c3260c..20cf624b3360d 100644 --- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts @@ -26,7 +26,7 @@ import { import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver'; import { loginAndWaitForPageWithoutDateRange } from '../tasks/login'; -import { ALERTS_URL } from '../urls/navigation'; +import { DETECTIONS_URL } from '../urls/navigation'; describe('Alerts detection rules', () => { before(() => { @@ -38,7 +38,7 @@ describe('Alerts detection rules', () => { }); it('Sorts by activated rules', () => { - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts index 1b1bae37f4fbb..ff60e417b3808 100644 --- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts @@ -62,7 +62,7 @@ import { import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver'; import { loginAndWaitForPageWithoutDateRange } from '../tasks/login'; -import { ALERTS_URL } from '../urls/navigation'; +import { DETECTIONS_URL } from '../urls/navigation'; describe.skip('Detection rules, custom', () => { before(() => { @@ -74,7 +74,7 @@ describe.skip('Detection rules, custom', () => { }); it('Creates and activates a new custom rule', () => { - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); @@ -169,7 +169,7 @@ describe.skip('Detection rules, custom', () => { describe('Deletes custom rules', () => { beforeEach(() => { esArchiverLoad('custom_rules'); - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts index fdab3016de8de..eb8448233c624 100644 --- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts @@ -13,7 +13,7 @@ import { exportFirstRule } from '../tasks/alerts_detection_rules'; import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver'; import { loginAndWaitForPageWithoutDateRange } from '../tasks/login'; -import { ALERTS_URL } from '../urls/navigation'; +import { DETECTIONS_URL } from '../urls/navigation'; const EXPECTED_EXPORTED_RULE_FILE_PATH = 'cypress/test_files/expected_rules_export.ndjson'; @@ -32,7 +32,7 @@ describe('Export rules', () => { }); it('Exports a custom rule', () => { - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts index 19957a53dd701..b6b30ef550eb1 100644 --- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts @@ -58,7 +58,7 @@ import { import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver'; import { loginAndWaitForPageWithoutDateRange } from '../tasks/login'; -import { ALERTS_URL } from '../urls/navigation'; +import { DETECTIONS_URL } from '../urls/navigation'; describe('Detection rules, machine learning', () => { before(() => { @@ -70,7 +70,7 @@ describe('Detection rules, machine learning', () => { }); it('Creates and activates a new ml rule', () => { - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts index d3cbb05d7fc17..986a7c7177a79 100644 --- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts @@ -31,7 +31,7 @@ import { import { esArchiverLoadEmptyKibana, esArchiverUnloadEmptyKibana } from '../tasks/es_archiver'; import { loginAndWaitForPageWithoutDateRange } from '../tasks/login'; -import { ALERTS_URL } from '../urls/navigation'; +import { DETECTIONS_URL } from '../urls/navigation'; import { totalNumberOfPrebuiltRules } from '../objects/rule'; @@ -48,7 +48,7 @@ describe('Alerts rules, prebuilt rules', () => { const expectedNumberOfRules = totalNumberOfPrebuiltRules; const expectedElasticRulesBtnText = `Elastic rules (${expectedNumberOfRules})`; - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); @@ -73,7 +73,7 @@ describe('Deleting prebuilt rules', () => { const expectedElasticRulesBtnText = `Elastic rules (${expectedNumberOfRules})`; esArchiverLoadEmptyKibana(); - loginAndWaitForPageWithoutDateRange(ALERTS_URL); + loginAndWaitForPageWithoutDateRange(DETECTIONS_URL); waitForAlertsPanelToBeLoaded(); waitForAlertsIndexToBeCreated(); goToManageAlertsDetectionRules(); diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts index 10dc4fdd44486..2fed23755963b 100644 --- a/x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts @@ -15,12 +15,12 @@ import { import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver'; import { loginAndWaitForPage } from '../tasks/login'; -import { ALERTS_URL } from '../urls/navigation'; +import { DETECTIONS_URL } from '../urls/navigation'; describe('Alerts timeline', () => { beforeEach(() => { esArchiverLoad('timeline_alerts'); - loginAndWaitForPage(ALERTS_URL); + loginAndWaitForPage(DETECTIONS_URL); }); afterEach(() => { diff --git a/x-pack/plugins/security_solution/cypress/integration/navigation.spec.ts b/x-pack/plugins/security_solution/cypress/integration/navigation.spec.ts index 7864160d5bca0..e4f0ec2c4828f 100644 --- a/x-pack/plugins/security_solution/cypress/integration/navigation.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/navigation.spec.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ import { - ALERTS, CASES, + DETECTIONS, HOSTS, MANAGEMENT, NETWORK, @@ -17,7 +17,7 @@ import { loginAndWaitForPage } from '../tasks/login'; import { navigateFromHeaderTo } from '../tasks/security_header'; import { - ALERTS_URL, + DETECTIONS_URL, CASES_URL, HOSTS_URL, KIBANA_HOME, @@ -28,8 +28,8 @@ import { } from '../urls/navigation'; import { openKibanaNavigation, navigateFromKibanaCollapsibleTo } from '../tasks/kibana_navigation'; import { - ALERTS_PAGE, CASES_PAGE, + DETECTIONS_PAGE, HOSTS_PAGE, ADMINISTRATION_PAGE, NETWORK_PAGE, @@ -47,9 +47,9 @@ describe('top-level navigation common to all pages in the Security app', () => { cy.url().should('include', OVERVIEW_URL); }); - it('navigates to the Alerts page', () => { - navigateFromHeaderTo(ALERTS); - cy.url().should('include', ALERTS_URL); + it('navigates to the Detections page', () => { + navigateFromHeaderTo(DETECTIONS); + cy.url().should('include', DETECTIONS_URL); }); it('navigates to the Hosts page', () => { @@ -90,9 +90,9 @@ describe('Kibana navigation to all pages in the Security app ', () => { cy.url().should('include', OVERVIEW_URL); }); - it('navigates to the Alerts page', () => { - navigateFromKibanaCollapsibleTo(ALERTS_PAGE); - cy.url().should('include', ALERTS_URL); + it('navigates to the Detections page', () => { + navigateFromKibanaCollapsibleTo(DETECTIONS_PAGE); + cy.url().should('include', DETECTIONS_URL); }); it('navigates to the Hosts page', () => { diff --git a/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts b/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts index 911fd7e0f3483..205a49fc771cf 100644 --- a/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts +++ b/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts @@ -9,9 +9,9 @@ import { loginAndWaitForPage } from '../tasks/login'; import { DETECTIONS } from '../urls/navigation'; describe('URL compatibility', () => { - it('Redirects to Alerts from old Detections URL', () => { + it('Redirects to Detection alerts from old Detections URL', () => { loginAndWaitForPage(DETECTIONS); - cy.url().should('include', '/security/alerts'); + cy.url().should('include', '/security/detections'); }); }); diff --git a/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts b/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts index eeec19fa3dd1e..68352c6e584cc 100644 --- a/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts +++ b/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts @@ -4,7 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -export const ALERTS_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Alerts"]'; +export const DETECTIONS_PAGE = + '[data-test-subj="collapsibleNavGroup-security"] [title="Detections"]'; export const CASES_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Cases"]'; diff --git a/x-pack/plugins/security_solution/cypress/screens/security_header.ts b/x-pack/plugins/security_solution/cypress/screens/security_header.ts index 17d8aed1c2d21..20fcae60415ae 100644 --- a/x-pack/plugins/security_solution/cypress/screens/security_header.ts +++ b/x-pack/plugins/security_solution/cypress/screens/security_header.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -export const ALERTS = '[data-test-subj="navigation-alerts"]'; +export const DETECTIONS = '[data-test-subj="navigation-detections"]'; export const BREADCRUMBS = '[data-test-subj="breadcrumbs"] a'; diff --git a/x-pack/plugins/security_solution/cypress/urls/navigation.ts b/x-pack/plugins/security_solution/cypress/urls/navigation.ts index e53dac157eed7..b53b06db5beda 100644 --- a/x-pack/plugins/security_solution/cypress/urls/navigation.ts +++ b/x-pack/plugins/security_solution/cypress/urls/navigation.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -export const ALERTS_URL = 'app/security/alerts'; +export const DETECTIONS_URL = 'app/security/detections'; export const CASES_URL = '/app/security/cases'; export const DETECTIONS = '/app/siem#/detections'; export const HOSTS_URL = '/app/security/hosts/allHosts'; diff --git a/x-pack/plugins/security_solution/public/app/home/home_navigations.tsx b/x-pack/plugins/security_solution/public/app/home/home_navigations.tsx index d7acda4988570..543a4634ceecc 100644 --- a/x-pack/plugins/security_solution/public/app/home/home_navigations.tsx +++ b/x-pack/plugins/security_solution/public/app/home/home_navigations.tsx @@ -9,7 +9,7 @@ import { SecurityPageName } from '../types'; import { SiemNavTab } from '../../common/components/navigation/types'; import { APP_OVERVIEW_PATH, - APP_ALERTS_PATH, + APP_DETECTIONS_PATH, APP_HOSTS_PATH, APP_NETWORK_PATH, APP_TIMELINES_PATH, @@ -25,12 +25,12 @@ export const navTabs: SiemNavTab = { disabled: false, urlKey: 'overview', }, - [SecurityPageName.alerts]: { - id: SecurityPageName.alerts, - name: i18n.ALERTS, - href: APP_ALERTS_PATH, + [SecurityPageName.detections]: { + id: SecurityPageName.detections, + name: i18n.DETECTION_ENGINE, + href: APP_DETECTIONS_PATH, disabled: false, - urlKey: 'alerts', + urlKey: 'detections', }, [SecurityPageName.hosts]: { id: SecurityPageName.hosts, diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx index 2de957039efe6..bf134a02dd822 100644 --- a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx +++ b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx @@ -26,7 +26,7 @@ import { Case, DeleteCase, FilterOptions, SortFieldCase } from '../../containers import { useGetCases, UpdateCase } from '../../containers/use_get_cases'; import { useGetCasesStatus } from '../../containers/use_get_cases_status'; import { useDeleteCases } from '../../containers/use_delete_cases'; -import { EuiBasicTableOnChange } from '../../../alerts/pages/detection_engine/rules/types'; +import { EuiBasicTableOnChange } from '../../../detections/pages/detection_engine/rules/types'; import { Panel } from '../../../common/components/panel'; import { UtilityBar, diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/translations.ts b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/translations.ts index 8403050a13114..b1ab509417fe5 100644 --- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/translations.ts +++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/translations.ts @@ -30,7 +30,7 @@ export const ALERTS_TABLE_TITLE = i18n.translate( export const ALERTS_GRAPH_TITLE = i18n.translate( 'xpack.securitySolution.alertsView.alertsGraphTitle', { - defaultMessage: 'External alert count', + defaultMessage: 'External alert trend', } ); diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx index ec56751b4cbd2..2a079ce015f0d 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx @@ -14,13 +14,13 @@ import { wait } from '../../lib/helpers'; import { mockEventViewerResponse } from './mock'; import { StatefulEventsViewer } from '.'; import { defaultHeaders } from './default_headers'; -import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../../detections/containers/detection_engine/rules/fetch_index_patterns'; import { mockBrowserFields } from '../../containers/source/mock'; import { eventsDefaultModel } from './default_model'; import { useMountAppended } from '../../utils/use_mount_appended'; const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock; -jest.mock('../../../alerts/containers/detection_engine/rules/fetch_index_patterns'); +jest.mock('../../../detections/containers/detection_engine/rules/fetch_index_patterns'); mockUseFetchIndexPatterns.mockImplementation(() => [ { browserFields: mockBrowserFields, diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx index edab0e3a98456..a5f4dc0c5ed6f 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx @@ -14,12 +14,12 @@ import { useMountAppended } from '../../utils/use_mount_appended'; import { mockEventViewerResponse } from './mock'; import { StatefulEventsViewer } from '.'; -import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../../detections/containers/detection_engine/rules/fetch_index_patterns'; import { mockBrowserFields } from '../../containers/source/mock'; import { eventsDefaultModel } from './default_model'; const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock; -jest.mock('../../../alerts/containers/detection_engine/rules/fetch_index_patterns'); +jest.mock('../../../detections/containers/detection_engine/rules/fetch_index_patterns'); mockUseFetchIndexPatterns.mockImplementation(() => [ { browserFields: mockBrowserFields, diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx index 1645db371802c..02b3571421f67 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx @@ -21,7 +21,7 @@ import { OnChangeItemsPerPage } from '../../../timelines/components/timeline/eve import { Filter } from '../../../../../../../src/plugins/data/public'; import { useUiSetting } from '../../lib/kibana'; import { EventsViewer } from './events_viewer'; -import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../../detections/containers/detection_engine/rules/fetch_index_patterns'; import { InspectButtonContainer } from '../inspect'; export interface OwnProps { diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx index 5221e170574b3..be89aa8e33718 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx @@ -34,7 +34,7 @@ import { errorToToaster, displaySuccessToast, useStateToaster } from '../../toas import { ExceptionBuilder } from '../builder'; import { Loader } from '../../loader'; import { useAddOrUpdateException } from '../use_add_exception'; -import { useSignalIndex } from '../../../../alerts/containers/detection_engine/alerts/use_signal_index'; +import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index'; import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list'; import { AddExceptionComments } from '../add_exception_comments'; import { @@ -44,7 +44,7 @@ import { entryHasListType, entryHasNonEcsType, } from '../helpers'; -import { useFetchIndexPatterns } from '../../../../alerts/containers/detection_engine/rules'; +import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules'; export interface AddExceptionOnClick { ruleName: string; diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/builder/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/builder/index.tsx index c6376c34c768f..e25e896ecc7a3 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/builder/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/builder/index.tsx @@ -8,7 +8,7 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import styled from 'styled-components'; import { ExceptionListItemComponent } from './exception_item'; -import { useFetchIndexPatterns } from '../../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules/fetch_index_patterns'; import { ExceptionListItemSchema, NamespaceType, diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx index 4bec5778cd775..aa36b65e04b69 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx @@ -21,8 +21,8 @@ import { EuiText, } from '@elastic/eui'; import { alertsIndexPattern } from '../../../../../common/endpoint/constants'; -import { useFetchIndexPatterns } from '../../../../alerts/containers/detection_engine/rules'; -import { useSignalIndex } from '../../../../alerts/containers/detection_engine/alerts/use_signal_index'; +import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules'; +import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index'; import { ExceptionListItemSchema, CreateExceptionListItemSchema, diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx index b167807a6edaa..018ca1d29c369 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx @@ -7,7 +7,7 @@ import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks'; import { KibanaServices } from '../../../common/lib/kibana'; -import * as alertsApi from '../../../alerts/containers/detection_engine/alerts/api'; +import * as alertsApi from '../../../detections/containers/detection_engine/alerts/api'; import * as listsApi from '../../../../../lists/public/exceptions/api'; import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock'; import { getCreateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/create_exception_list_item_schema.mock'; diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx index 2d793c89e48f1..267a9afd9cf6d 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx @@ -14,8 +14,8 @@ import { CreateExceptionListItemSchema, UpdateExceptionListItemSchema, } from '../../../lists_plugin_deps'; -import { updateAlertStatus } from '../../../alerts/containers/detection_engine/alerts/api'; -import { getUpdateAlertsQuery } from '../../../alerts/components/alerts_table/actions'; +import { updateAlertStatus } from '../../../detections/containers/detection_engine/alerts/api'; +import { getUpdateAlertsQuery } from '../../../detections/components/alerts_table/actions'; import { formatExceptionItemForUpdate } from './helpers'; /** diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx index 1a031abc56f35..afc3568fd6c65 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx @@ -6,10 +6,10 @@ import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks'; -import * as rulesApi from '../../../alerts/containers/detection_engine/rules/api'; +import * as rulesApi from '../../../detections/containers/detection_engine/rules/api'; import * as listsApi from '../../../../../lists/public/exceptions/api'; import { getExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock'; -import { savedRuleMock } from '../../../alerts/containers/detection_engine/rules/mock'; +import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock'; import { createKibanaCoreStartMock } from '../../mock/kibana_core'; import { ExceptionListType } from '../../../lists_plugin_deps'; import { ListArray } from '../../../../common/detection_engine/schemas/types'; @@ -21,7 +21,7 @@ import { } from './use_fetch_or_create_rule_exception_list'; const mockKibanaHttpService = createKibanaCoreStartMock().http; -jest.mock('../../../alerts/containers/detection_engine/rules/api'); +jest.mock('../../../detections/containers/detection_engine/rules/api'); describe('useFetchOrCreateRuleExceptionList', () => { let fetchRuleById: jest.SpyInstance>; diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx index 5000a79287fc0..245ce192b3cfa 100644 --- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx +++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx @@ -11,9 +11,12 @@ import { ExceptionListSchema, CreateExceptionListSchema, } from '../../../../../lists/common/schemas'; -import { Rule } from '../../../alerts/containers/detection_engine/rules/types'; +import { Rule } from '../../../detections/containers/detection_engine/rules/types'; import { List, ListArray } from '../../../../common/detection_engine/schemas/types'; -import { fetchRuleById, patchRule } from '../../../alerts/containers/detection_engine/rules/api'; +import { + fetchRuleById, + patchRule, +} from '../../../detections/containers/detection_engine/rules/api'; import { fetchExceptionListById, addExceptionList } from '../../../lists_plugin_deps'; export type ReturnUseFetchOrCreateRuleExceptionList = [boolean, ExceptionListSchema | null]; diff --git a/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx b/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx index 2e8d5f77afc83..33e26cd4db035 100644 --- a/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx @@ -9,7 +9,7 @@ import styled from 'styled-components'; import { isFunction } from 'lodash/fp'; import * as i18n from './translations'; -import { ExportDocumentsProps } from '../../../alerts/containers/detection_engine/rules'; +import { ExportDocumentsProps } from '../../../detections/containers/detection_engine/rules'; import { useStateToaster, errorToToaster } from '../toasters'; const InvisibleAnchor = styled.a` diff --git a/x-pack/plugins/security_solution/public/common/components/header_global/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_global/index.tsx index 17fdf2163b58e..ba4f782499802 100644 --- a/x-pack/plugins/security_solution/public/common/components/header_global/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/header_global/index.tsx @@ -19,7 +19,7 @@ import * as i18n from './translations'; import { useWithSource } from '../../containers/source'; import { useGetUrlSearch } from '../navigation/use_get_url_search'; import { useKibana } from '../../lib/kibana'; -import { APP_ID, ADD_DATA_PATH, APP_ALERTS_PATH } from '../../../../common/constants'; +import { APP_ID, ADD_DATA_PATH, APP_DETECTIONS_PATH } from '../../../../common/constants'; import { LinkAnchor } from '../links'; const Wrapper = styled.header` @@ -60,7 +60,7 @@ export const HeaderGlobal = React.memo(({ hideDetectionEngine - + @@ -70,7 +70,7 @@ export const HeaderGlobal = React.memo(({ hideDetectionEngine display="condensed" navTabs={ hideDetectionEngine - ? pickBy((_, key) => key !== SecurityPageName.alerts, navTabs) + ? pickBy((_, key) => key !== SecurityPageName.detections, navTabs) : navTabs } /> @@ -86,7 +86,7 @@ export const HeaderGlobal = React.memo(({ hideDetectionEngine - {indicesExist && window.location.pathname.includes(APP_ALERTS_PATH) && ( + {indicesExist && window.location.pathname.includes(APP_DETECTIONS_PATH) && ( diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx index a42628cecff8e..d5d670b4c03ff 100644 --- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx @@ -24,7 +24,7 @@ import React, { useCallback, useState } from 'react'; import { ImportDataResponse, ImportDataProps, -} from '../../../alerts/containers/detection_engine/rules'; +} from '../../../detections/containers/detection_engine/rules'; import { displayErrorToast, displaySuccessToast, diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts index 5c1c68b802726..dc5324adbac7d 100644 --- a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts +++ b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts @@ -13,7 +13,7 @@ import { StartServices } from '../../../../types'; import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../../hosts/pages/details/utils'; import { getBreadcrumbs as getIPDetailsBreadcrumbs } from '../../../../network/pages/ip_details'; import { getBreadcrumbs as getCaseDetailsBreadcrumbs } from '../../../../cases/pages/utils'; -import { getBreadcrumbs as getDetectionRulesBreadcrumbs } from '../../../../alerts/pages/detection_engine/rules/utils'; +import { getBreadcrumbs as getDetectionRulesBreadcrumbs } from '../../../../detections/pages/detection_engine/rules/utils'; import { getBreadcrumbs as getTimelinesBreadcrumbs } from '../../../../timelines/pages'; import { SecurityPageName } from '../../../../app/types'; import { @@ -59,7 +59,7 @@ const isCaseRoutes = (spyState: RouteSpyState): spyState is RouteSpyState => spyState != null && spyState.pageName === SecurityPageName.case; const isAlertsRoutes = (spyState: RouteSpyState) => - spyState != null && spyState.pageName === SecurityPageName.alerts; + spyState != null && spyState.pageName === SecurityPageName.detections; export const getBreadcrumbsForRoute = ( object: RouteSpyState & TabNavigationProps, @@ -103,7 +103,7 @@ export const getBreadcrumbsForRoute = ( ]; } if (isAlertsRoutes(spyState) && object.navTabs) { - const tempNav: SearchNavTab = { urlKey: 'alerts', isDetailPage: false }; + const tempNav: SearchNavTab = { urlKey: 'detections', isDetailPage: false }; let urlStateKeys = [getOr(tempNav, spyState.pageName, object.navTabs)]; if (spyState.tabName != null) { urlStateKeys = [...urlStateKeys, getOr(tempNav, spyState.tabName, object.navTabs)]; diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx index 2ad83d37576b1..229e2d2402298 100644 --- a/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx @@ -92,12 +92,12 @@ describe('SIEM Navigation', () => { { detailName: undefined, navTabs: { - alerts: { + detections: { disabled: false, - href: '/app/security/alerts', - id: 'alerts', - name: 'Alerts', - urlKey: 'alerts', + href: '/app/security/detections', + id: 'detections', + name: 'Detections', + urlKey: 'detections', }, case: { disabled: false, @@ -197,12 +197,12 @@ describe('SIEM Navigation', () => { filters: [], flowTarget: undefined, navTabs: { - alerts: { + detections: { disabled: false, - href: '/app/security/alerts', - id: 'alerts', - name: 'Alerts', - urlKey: 'alerts', + href: '/app/security/detections', + id: 'detections', + name: 'Detections', + urlKey: 'detections', }, case: { disabled: false, diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/types.ts b/x-pack/plugins/security_solution/public/common/components/navigation/types.ts index 80302be18355c..0489ebba738c8 100644 --- a/x-pack/plugins/security_solution/public/common/components/navigation/types.ts +++ b/x-pack/plugins/security_solution/public/common/components/navigation/types.ts @@ -45,7 +45,7 @@ export type SiemNavTabKey = | SecurityPageName.overview | SecurityPageName.hosts | SecurityPageName.network - | SecurityPageName.alerts + | SecurityPageName.detections | SecurityPageName.timelines | SecurityPageName.case | SecurityPageName.management; diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx index da6ec784af6d4..c8232b0c3b3cb 100644 --- a/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx @@ -364,7 +364,7 @@ describe('StatefulTopN', () => { field={field} indexPattern={mockIndexPattern} indexToAdd={null} - timelineId={TimelineId.alertsPage} + timelineId={TimelineId.detectionsPage} toggleTopN={jest.fn()} onFilterAdded={jest.fn()} value={value} diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx index 0b2f1f1e35cc7..807f1839973fa 100644 --- a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx @@ -132,7 +132,8 @@ const StatefulTopNComponent: React.FC = ({ } data-test-subj="top-n" defaultView={ - timelineId === TimelineId.alertsPage || timelineId === TimelineId.alertsRulesDetailsPage + timelineId === TimelineId.detectionsPage || + timelineId === TimelineId.detectionsRulesDetailsPage ? 'alert' : options[0].value } diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/constants.ts b/x-pack/plugins/security_solution/public/common/components/url_state/constants.ts index 71faec88e85a0..1faff2594ce80 100644 --- a/x-pack/plugins/security_solution/public/common/components/url_state/constants.ts +++ b/x-pack/plugins/security_solution/public/common/components/url_state/constants.ts @@ -8,7 +8,7 @@ export enum CONSTANTS { appQuery = 'query', caseDetails = 'case.details', casePage = 'case.page', - alertsPage = 'alerts.page', + detectionsPage = 'detections.page', filters = 'filters', hostsDetails = 'hosts.details', hostsPage = 'hosts.page', @@ -25,7 +25,7 @@ export enum CONSTANTS { export type UrlStateType = | 'case' - | 'alerts' + | 'detections' | 'host' | 'network' | 'overview' diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts index 7f4267bc5e2b3..6febf95aae01d 100644 --- a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts +++ b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts @@ -90,8 +90,8 @@ export const getUrlType = (pageName: string): UrlStateType => { return 'host'; } else if (pageName === SecurityPageName.network) { return 'network'; - } else if (pageName === SecurityPageName.alerts) { - return 'alerts'; + } else if (pageName === SecurityPageName.detections) { + return 'detections'; } else if (pageName === SecurityPageName.timelines) { return 'timeline'; } else if (pageName === SecurityPageName.case) { diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/url_state/index.test.tsx index 20374affbdf89..eeeaacc25a15e 100644 --- a/x-pack/plugins/security_solution/public/common/components/url_state/index.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/url_state/index.test.tsx @@ -193,7 +193,7 @@ describe('UrlStateContainer', () => { wrapper.update(); await wait(); - if (CONSTANTS.alertsPage === page) { + if (CONSTANTS.detectionsPage === page) { expect(mockSetRelativeRangeDatePicker.mock.calls[3][0]).toEqual({ from: 11223344556677, fromStr: 'now-1d/d', diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/types.ts b/x-pack/plugins/security_solution/public/common/components/url_state/types.ts index 8ca43cb576d32..8881a82e5cd1c 100644 --- a/x-pack/plugins/security_solution/public/common/components/url_state/types.ts +++ b/x-pack/plugins/security_solution/public/common/components/url_state/types.ts @@ -32,7 +32,7 @@ export const ALL_URL_STATE_KEYS: KeyUrlState[] = [ ]; export const URL_STATE_KEYS: Record = { - alerts: [ + detections: [ CONSTANTS.appQuery, CONSTANTS.filters, CONSTANTS.savedQuery, @@ -80,7 +80,7 @@ export const URL_STATE_KEYS: Record = { export type LocationTypes = | CONSTANTS.caseDetails | CONSTANTS.casePage - | CONSTANTS.alertsPage + | CONSTANTS.detectionsPage | CONSTANTS.hostsDetails | CONSTANTS.hostsPage | CONSTANTS.networkDetails diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/use_url_state.tsx b/x-pack/plugins/security_solution/public/common/components/url_state/use_url_state.tsx index 221df436402dd..c97be1fdfb99b 100644 --- a/x-pack/plugins/security_solution/public/common/components/url_state/use_url_state.tsx +++ b/x-pack/plugins/security_solution/public/common/components/url_state/use_url_state.tsx @@ -203,7 +203,7 @@ export const useUrlStateHooks = ({ } }); } else if (pathName !== prevProps.pathName) { - handleInitialize(type, pageName === SecurityPageName.alerts); + handleInitialize(type, pageName === SecurityPageName.detections); } // eslint-disable-next-line react-hooks/exhaustive-deps }, [isInitializing, history, pathName, pageName, prevProps, urlState]); diff --git a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts index 4eb66acdfad65..5248136437d7d 100644 --- a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts +++ b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts @@ -10,7 +10,7 @@ import { TimelineType, TimelineStatus } from '../../../common/types/timeline'; import { OpenTimelineResult } from '../../timelines/components/open_timeline/types'; import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../../graphql/types'; import { allTimelinesQuery } from '../../timelines/containers/all/index.gql_query'; -import { CreateTimelineProps } from '../../alerts/components/alerts_table/types'; +import { CreateTimelineProps } from '../../detections/components/alerts_table/types'; import { TimelineModel } from '../../timelines/store/timeline/model'; import { timelineDefaults } from '../../timelines/store/timeline/defaults'; export interface MockedProvidedQuery { diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/alerts_histogram.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/alerts_histogram.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/alerts_histogram.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/alerts_histogram.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/alerts_histogram.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/alerts_histogram.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/alerts_histogram.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/alerts_histogram.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/config.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/config.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/config.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/config.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/helpers.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/helpers.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/helpers.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/helpers.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/helpers.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/helpers.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/index.test.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/index.test.tsx index 2923446b8322d..59d97480418b7 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/index.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/index.test.tsx @@ -73,7 +73,7 @@ describe('AlertsHistogramPanel', () => { preventDefault: jest.fn(), }); - expect(mockNavigateToApp).toBeCalledWith('securitySolution:alerts', { path: '' }); + expect(mockNavigateToApp).toBeCalledWith('securitySolution:detections', { path: '' }); }); }); }); diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/index.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/index.tsx index 533a9d51a9bcd..ba12499b8f20e 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/index.tsx @@ -123,7 +123,7 @@ export const AlertsHistogramPanel = memo( ); const kibana = useKibana(); const { navigateToApp } = kibana.services.application; - const { formatUrl, search: urlSearch } = useFormatUrl(SecurityPageName.alerts); + const { formatUrl, search: urlSearch } = useFormatUrl(SecurityPageName.detections); const totalAlerts = useMemo( () => @@ -146,7 +146,7 @@ export const AlertsHistogramPanel = memo( const goToDetectionEngine = useCallback( (ev) => { ev.preventDefault(); - navigateToApp(`${APP_ID}:${SecurityPageName.alerts}`, { + navigateToApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getDetectionEngineUrl(urlSearch), }); }, diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/translations.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/translations.ts similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/translations.ts index 6eaa0ba3fc4ec..e7c08914964a4 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/translations.ts @@ -92,7 +92,7 @@ export const TOP = (fieldName: string) => export const HISTOGRAM_HEADER = i18n.translate( 'xpack.securitySolution.detectionEngine.alerts.histogram.headerTitle', { - defaultMessage: 'Alert count', + defaultMessage: 'Trend', } ); diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_histogram_panel/types.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_histogram_panel/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_info/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_info/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_info/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_info/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_info/query.dsl.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_info/query.dsl.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_info/query.dsl.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_info/query.dsl.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_info/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_info/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_info/types.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_info/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_filter_group/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_filter_group/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_filter_group/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_filter_group/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_utility_bar/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_utility_bar/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_utility_bar/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_utility_bar/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_utility_bar/translations.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/alerts_utility_bar/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/default_config.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/default_config.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/default_config.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/default_config.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/helpers.test.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.test.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/helpers.test.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.test.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/helpers.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/helpers.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx index 6cbf69f409dc4..81aebe95930ac 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx @@ -13,7 +13,7 @@ import { Dispatch } from 'redux'; import { Status } from '../../../../common/detection_engine/schemas/common/schemas'; import { Filter, esQuery } from '../../../../../../../src/plugins/data/public'; import { TimelineIdLiteral } from '../../../../common/types/timeline'; -import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/fetch_index_patterns'; import { StatefulEventsViewer } from '../../../common/components/events_viewer'; import { HeaderSection } from '../../../common/components/header_section'; import { combineQueries } from '../../../timelines/components/timeline/helpers'; @@ -375,7 +375,7 @@ export const AlertsTableComponent: React.FC = ({ loadingText: i18n.LOADING_ALERTS, selectAll: canUserCRUD ? selectAll : false, timelineRowActions: () => [getInvestigateInResolverAction({ dispatch, timelineId })], - title: i18n.ALERTS_TABLE_TITLE, + title: '', }); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); @@ -408,7 +408,7 @@ export const AlertsTableComponent: React.FC = ({ if (loading || isEmpty(signalsIndex)) { return ( - + ); diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/translations.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts similarity index 96% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts index c9cf4e484910c..0f55469bbfda2 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts @@ -10,13 +10,6 @@ export const PAGE_TITLE = i18n.translate('xpack.securitySolution.detectionEngine defaultMessage: 'Detection engine', }); -export const ALERTS_TABLE_TITLE = i18n.translate( - 'xpack.securitySolution.detectionEngine.alerts.tableTitle', - { - defaultMessage: 'Alert list', - } -); - export const ALERTS_DOCUMENT_TYPE = i18n.translate( 'xpack.securitySolution.detectionEngine.alerts.documentTypeTitle', { diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/alerts_table/types.ts rename to x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/detection_engine_header_page/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/detection_engine_header_page/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/detection_engine_header_page/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/detection_engine_header_page/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/detection_engine_header_page/index.tsx b/x-pack/plugins/security_solution/public/detections/components/detection_engine_header_page/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/detection_engine_header_page/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/detection_engine_header_page/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/detection_engine_header_page/translations.ts b/x-pack/plugins/security_solution/public/detections/components/detection_engine_header_page/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/detection_engine_header_page/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/detection_engine_header_page/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/no_api_integration_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/no_api_integration_callout/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/no_api_integration_callout/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/no_api_integration_callout/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/no_api_integration_callout/index.tsx b/x-pack/plugins/security_solution/public/detections/components/no_api_integration_callout/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/no_api_integration_callout/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/no_api_integration_callout/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/no_api_integration_callout/translations.ts b/x-pack/plugins/security_solution/public/detections/components/no_api_integration_callout/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/no_api_integration_callout/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/no_api_integration_callout/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/no_write_alerts_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/no_write_alerts_callout/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/no_write_alerts_callout/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/no_write_alerts_callout/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/no_write_alerts_callout/index.tsx b/x-pack/plugins/security_solution/public/detections/components/no_write_alerts_callout/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/no_write_alerts_callout/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/no_write_alerts_callout/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/no_write_alerts_callout/translations.ts b/x-pack/plugins/security_solution/public/detections/components/no_write_alerts_callout/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/no_write_alerts_callout/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/no_write_alerts_callout/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/accordion_title/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/accordion_title/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/accordion_title/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/accordion_title/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/add_item_form/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/add_item_form/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/add_item_form/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/add_item_form/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/all_rules_tables/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/all_rules_tables/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/all_rules_tables/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/all_rules_tables/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/anomaly_threshold_slider/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/anomaly_threshold_slider/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/anomaly_threshold_slider/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/anomaly_threshold_slider/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/actions_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/actions_description.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/assets/list_tree_icon.svg b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/assets/list_tree_icon.svg similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/assets/list_tree_icon.svg rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/assets/list_tree_icon.svg diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/helpers.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/helpers.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/ml_job_description.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/ml_job_description.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/ml_job_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/ml_job_description.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/throttle_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/throttle_description.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/throttle_description.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/throttle_description.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/description_step/types.ts b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/description_step/types.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/mitre/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/helpers.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/mitre/helpers.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/mitre/helpers.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/mitre/helpers.ts b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/helpers.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/mitre/helpers.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/mitre/helpers.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/mitre/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/mitre/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/mitre/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/mitre/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/mitre/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/mitre/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/mitre/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/ml_job_select/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/ml_job_select/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/ml_job_select/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/ml_job_select/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/next_step/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/next_step/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/security_solution/public/detections/components/rules/next_step/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/next_step/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/next_step/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/next_step/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/next_step/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/optional_field_label/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/optional_field_label/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/optional_field_label/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/optional_field_label/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pick_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pick_timeline/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pick_timeline/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pick_timeline/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx similarity index 97% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx index d82b930210ecd..f93f380469622 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx @@ -36,7 +36,7 @@ const PrePackagedRulesPromptComponent: React.FC = ( const handlePreBuiltCreation = useCallback(() => { createPrePackagedRules(); }, [createPrePackagedRules]); - const { formatUrl } = useFormatUrl(SecurityPageName.alerts); + const { formatUrl } = useFormatUrl(SecurityPageName.detections); const goToCreateRule = useCallback( (ev) => { diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/update_callout.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/update_callout.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/update_callout.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/pre_packaged_rules/update_callout.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/update_callout.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/query_bar/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/query_bar/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/query_bar/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/query_bar/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/query_bar/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/query_bar/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/read_only_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/read_only_callout/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/read_only_callout/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/read_only_callout/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/read_only_callout/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/read_only_callout/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/read_only_callout/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/read_only_callout/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/read_only_callout/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/read_only_callout/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/read_only_callout/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/read_only_callout/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/risk_score_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/risk_score_mapping/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/risk_score_mapping/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/risk_score_mapping/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_field/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_field/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_field/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_field/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx index a5d0382ef8c8c..cf7a485c59cb3 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx @@ -16,7 +16,7 @@ import styled from 'styled-components'; import { noop } from 'lodash/fp'; import { useHistory } from 'react-router-dom'; -import { Rule, exportRules } from '../../../../alerts/containers/detection_engine/rules'; +import { Rule, exportRules } from '../../../containers/detection_engine/rules'; import * as i18n from './translations'; import * as i18nActions from '../../../pages/detection_engine/rules/translations'; import { displaySuccessToast, useStateToaster } from '../../../../common/components/toasters'; diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_actions_overflow/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/helpers.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/helpers.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_status/helpers.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/helpers.ts b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/helpers.ts similarity index 85% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/helpers.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_status/helpers.ts index 88fca3d95604e..e99894afeb63c 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/helpers.ts +++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { RuleStatusType } from '../../../../alerts/containers/detection_engine/rules'; +import { RuleStatusType } from '../../../containers/detection_engine/rules'; export const getStatusColor = (status: RuleStatusType | string | null) => status == null diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_status/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/index.tsx similarity index 96% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_status/index.tsx index 53be48bc98850..0ddf4d06fb0fc 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/index.tsx @@ -15,10 +15,7 @@ import { import React, { memo, useCallback, useEffect, useState } from 'react'; import deepEqual from 'fast-deep-equal'; -import { - useRuleStatus, - RuleInfoStatus, -} from '../../../../alerts/containers/detection_engine/rules'; +import { useRuleStatus, RuleInfoStatus } from '../../../containers/detection_engine/rules'; import { FormattedDate } from '../../../../common/components/formatted_date'; import { getEmptyTagValue } from '../../../../common/components/empty_value'; import { getStatusColor } from './helpers'; diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/rule_status/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_status/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_status/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx similarity index 97% rename from x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx index c85676ce51052..73d66bf024a62 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/rule_switch/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx @@ -16,7 +16,7 @@ import styled from 'styled-components'; import React, { useCallback, useState, useEffect } from 'react'; import * as i18n from '../../../pages/detection_engine/rules/translations'; -import { enableRules } from '../../../../alerts/containers/detection_engine/rules'; +import { enableRules } from '../../../containers/detection_engine/rules'; import { enableRulesAction } from '../../../pages/detection_engine/rules/all/actions'; import { Action } from '../../../pages/detection_engine/rules/all/reducer'; import { useStateToaster, displayErrorToast } from '../../../../common/components/toasters'; diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/schedule_item_form/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/schedule_item_form/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/schedule_item_form/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/schedule_item_form/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/schedule_item_form/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/schedule_item_form/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/select_rule_type/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/select_rule_type/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/select_rule_type/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/select_rule_type/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/select_rule_type/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/select_rule_type/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/severity_badge/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/severity_badge/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/severity_badge/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/severity_badge/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/severity_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/severity_mapping/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/severity_mapping/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/severity_mapping/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/status_icon/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/status_icon/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/status_icon/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/status_icon/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/data.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/data.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/data.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/data.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/default_value.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/default_value.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/default_value.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/default_value.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/schema.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/schema.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/schema.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule_details/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule_details/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule_details/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule_details/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule_details/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule_details/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule_details/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule_details/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule_details/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule_details/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_about_rule_details/translations.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule_details/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_content_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_content_wrapper/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_content_wrapper/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_content_wrapper/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx index b56e1794eef63..864f953bff1e1 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx @@ -13,7 +13,7 @@ import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; import { isMlRule } from '../../../../../common/machine_learning/helpers'; import { hasMlAdminPermissions } from '../../../../../common/machine_learning/has_ml_admin_permissions'; import { IIndexPattern } from '../../../../../../../../src/plugins/data/public'; -import { useFetchIndexPatterns } from '../../../../alerts/containers/detection_engine/rules'; +import { useFetchIndexPatterns } from '../../../containers/detection_engine/rules'; import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations'; import { useMlCapabilities } from '../../../../common/components/ml_popover/hooks/use_ml_capabilities'; import { useUiSetting$ } from '../../../../common/lib/kibana'; diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/schema.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/types.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_define_rule/types.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_panel/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_panel/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx index 061b8b0f8c36e..7005bfb25f4a6 100644 --- a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx @@ -88,7 +88,7 @@ const StepRuleActionsComponent: FC = ({ // TO DO need to make sure that logic is still valid const kibanaAbsoluteUrl = useMemo(() => { - const url = application.getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + const url = application.getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { absolute: true, }); if (url != null && url.includes('app/security/alerts')) { diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/schema.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/schema.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/schema.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/utils.test.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/utils.test.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/utils.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_rule_actions/utils.ts rename to x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/schema.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/schema.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/schema.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/translations.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/step_schedule_rule/translations.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/translations.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/throttle_select_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/throttle_select_field/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/rules/throttle_select_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/rules/throttle_select_field/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/user_info/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/user_info/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/components/user_info/index.tsx b/x-pack/plugins/security_solution/public/detections/components/user_info/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/components/user_info/index.tsx rename to x-pack/plugins/security_solution/public/detections/components/user_info/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/__mocks__/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/__mocks__/api.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/__mocks__/api.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/__mocks__/api.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/api.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/api.test.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/api.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/mock.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/mock.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/mock.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/mock.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/translations.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/translations.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/types.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/types.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_privilege_user.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_privilege_user.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_privilege_user.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_privilege_user.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_privilege_user.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_privilege_user.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_privilege_user.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_privilege_user.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_query.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_query.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_query.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_query.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_query.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_query.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_query.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_query.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_signal_index.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_signal_index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_signal_index.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_signal_index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_signal_index.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_signal_index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/alerts/use_signal_index.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_signal_index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/__mocks__/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/__mocks__/api.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/__mocks__/api.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/__mocks__/api.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/api.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.test.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/api.test.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.test.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/api.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/fetch_index_patterns.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/fetch_index_patterns.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/fetch_index_patterns.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/fetch_index_patterns.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/fetch_index_patterns.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/fetch_index_patterns.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/fetch_index_patterns.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/fetch_index_patterns.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/index.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/index.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/index.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/index.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/mock.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/mock.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/mock.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/mock.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/persist_rule.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/persist_rule.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/persist_rule.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/persist_rule.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/persist_rule.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/persist_rule.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/persist_rule.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/persist_rule.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/translations.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/translations.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/types.ts rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_pre_packaged_rules.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_pre_packaged_rules.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule_status.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_status.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule_status.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_status.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule_status.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_status.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rule_status.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_status.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rules.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rules.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rules.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rules.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rules.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rules.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_rules.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rules.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_tags.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_tags.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_tags.test.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_tags.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_tags.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_tags.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/containers/detection_engine/rules/use_tags.tsx rename to x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_tags.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/index.ts b/x-pack/plugins/security_solution/public/detections/index.ts similarity index 90% rename from x-pack/plugins/security_solution/public/alerts/index.ts rename to x-pack/plugins/security_solution/public/detections/index.ts index a2e377a732936..d043127a3098b 100644 --- a/x-pack/plugins/security_solution/public/alerts/index.ts +++ b/x-pack/plugins/security_solution/public/detections/index.ts @@ -11,11 +11,11 @@ import { AlertsRoutes } from './routes'; import { SecuritySubPlugin } from '../app/types'; const ALERTS_TIMELINE_IDS: TimelineIdLiteral[] = [ - TimelineId.alertsRulesDetailsPage, - TimelineId.alertsPage, + TimelineId.detectionsRulesDetailsPage, + TimelineId.detectionsPage, ]; -export class Alerts { +export class Detections { public setup() {} public start(storage: Storage): SecuritySubPlugin { diff --git a/x-pack/plugins/security_solution/public/alerts/mitre/mitre_tactics_techniques.ts b/x-pack/plugins/security_solution/public/detections/mitre/mitre_tactics_techniques.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/mitre/mitre_tactics_techniques.ts rename to x-pack/plugins/security_solution/public/detections/mitre/mitre_tactics_techniques.ts diff --git a/x-pack/plugins/security_solution/public/alerts/mitre/types.ts b/x-pack/plugins/security_solution/public/detections/mitre/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/mitre/types.ts rename to x-pack/plugins/security_solution/public/detections/mitre/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx similarity index 97% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx index b39d51e2de95f..11f738320db6e 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx @@ -56,7 +56,7 @@ export const DetectionEnginePageComponent: React.FC = ({ } = useUserInfo(); const history = useHistory(); const [lastAlerts] = useAlertInfo({}); - const { formatUrl } = useFormatUrl(SecurityPageName.alerts); + const { formatUrl } = useFormatUrl(SecurityPageName.detections); const updateDateRangeCallback = useCallback( ({ x }) => { @@ -146,7 +146,7 @@ export const DetectionEnginePageComponent: React.FC = ({ /> = ({ )} - + ); }; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_no_signal_index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_signal_index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_no_signal_index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_signal_index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_no_signal_index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_signal_index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_no_signal_index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_no_signal_index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine_user_unauthenticated.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/__mocks__/mock.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts similarity index 96% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/__mocks__/mock.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts index f1416bfbc41b5..2b86abf4255c6 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/__mocks__/mock.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts @@ -5,9 +5,9 @@ */ import { esFilters } from '../../../../../../../../../../src/plugins/data/public'; -import { Rule, RuleError } from '../../../../../../alerts/containers/detection_engine/rules'; +import { Rule, RuleError } from '../../../../../containers/detection_engine/rules'; import { AboutStepRule, ActionsStepRule, DefineStepRule, ScheduleStepRule } from '../../types'; -import { FieldValueQueryBar } from '../../../../../../alerts/components/rules/query_bar'; +import { FieldValueQueryBar } from '../../../../../components/rules/query_bar'; export const mockQueryBar: FieldValueQueryBar = { query: { diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/actions.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx index 5169ff009d63c..bad99039d0398 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/actions.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx @@ -12,7 +12,7 @@ import { duplicateRules, enableRules, Rule, -} from '../../../../../alerts/containers/detection_engine/rules'; +} from '../../../../containers/detection_engine/rules'; import { getEditRuleUrl } from '../../../../../common/components/link_to/redirect_to_detection_engine'; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/batch_actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/batch_actions.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx index 2c94588ce128a..71cfbbf552d84 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/batch_actions.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx @@ -15,7 +15,7 @@ import { exportRulesAction, } from './actions'; import { ActionToaster, displayWarningToast } from '../../../../../common/components/toasters'; -import { Rule } from '../../../../../alerts/containers/detection_engine/rules'; +import { Rule } from '../../../../containers/detection_engine/rules'; import * as detectionI18n from '../../translations'; interface GetBatchItems { diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/columns.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/columns.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/columns.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/columns.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx index 030f510b7aa37..ea36a0cb0b48d 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/columns.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx @@ -19,7 +19,7 @@ import * as H from 'history'; import React, { Dispatch } from 'react'; import { isMlRule } from '../../../../../../common/machine_learning/helpers'; -import { Rule, RuleStatus } from '../../../../../alerts/containers/detection_engine/rules'; +import { Rule, RuleStatus } from '../../../../containers/detection_engine/rules'; import { getEmptyTagValue } from '../../../../../common/components/empty_value'; import { FormattedDate } from '../../../../../common/components/formatted_date'; import { getRuleDetailsUrl } from '../../../../../common/components/link_to/redirect_to_detection_engine'; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.test.tsx similarity index 97% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/helpers.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.test.tsx index 7350cec0115fb..062d7967bf301 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/helpers.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.test.tsx @@ -7,7 +7,7 @@ import { bucketRulesResponse, showRulesTable } from './helpers'; import { mockRule, mockRuleError } from './__mocks__/mock'; import uuid from 'uuid'; -import { Rule, RuleError } from '../../../../../alerts/containers/detection_engine/rules'; +import { Rule, RuleError } from '../../../../containers/detection_engine/rules'; describe('AllRulesTable Helpers', () => { const mockRule1: Readonly = mockRule(uuid.v4()); diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/helpers.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts similarity index 94% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/helpers.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts index 632d03cebef71..0ebeb84d57468 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/helpers.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts @@ -7,7 +7,7 @@ import { BulkRuleResponse, RuleResponseBuckets, -} from '../../../../../alerts/containers/detection_engine/rules'; +} from '../../../../containers/detection_engine/rules'; /** * Separates rules/errors from bulk rules API response (create/update/delete) diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx index ae5c129befa5d..45e609e38202a 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/index.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx @@ -80,7 +80,7 @@ jest.mock('./reducer', () => { }; }); -jest.mock('../../../../../alerts/containers/detection_engine/rules', () => { +jest.mock('../../../../containers/detection_engine/rules', () => { return { useRules: jest.fn().mockReturnValue([ false, diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx index 65f7bb63c74e4..85dce907084e8 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx @@ -24,7 +24,7 @@ import { Rule, PaginationOptions, exportRules, -} from '../../../../../alerts/containers/detection_engine/rules'; +} from '../../../../containers/detection_engine/rules'; import { HeaderSection } from '../../../../../common/components/header_section'; import { UtilityBar, @@ -142,7 +142,7 @@ export const AllRules = React.memo( const [, dispatchToaster] = useStateToaster(); const mlCapabilities = useMlCapabilities(); const [allRulesTab, setAllRulesTab] = useState(AllRulesTabs.rules); - const { formatUrl } = useFormatUrl(SecurityPageName.alerts); + const { formatUrl } = useFormatUrl(SecurityPageName.detections); // TODO: Refactor license check + hasMlAdminPermissions to common check const hasMlPermissions = diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/reducer.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/reducer.ts similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/reducer.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/reducer.ts index 3fe17fcaeeb9c..ff9b41bed06f5 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/reducer.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/reducer.ts @@ -9,7 +9,7 @@ import { FilterOptions, PaginationOptions, Rule, -} from '../../../../../alerts/containers/detection_engine/rules'; +} from '../../../../containers/detection_engine/rules'; type LoadingRuleAction = 'duplicate' | 'enable' | 'disable' | 'export' | 'delete' | null; export interface State { diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx similarity index 95% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx index c65271c3cc014..0f201fcbaa441 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx @@ -16,8 +16,8 @@ import { import { isEqual } from 'lodash/fp'; import * as i18n from '../../translations'; -import { FilterOptions } from '../../../../../../alerts/containers/detection_engine/rules'; -import { useTags } from '../../../../../../alerts/containers/detection_engine/rules/use_tags'; +import { FilterOptions } from '../../../../../containers/detection_engine/rules'; +import { useTags } from '../../../../../containers/detection_engine/rules/use_tags'; import { TagsFilterPopover } from './tags_filter_popover'; interface RulesTableFiltersProps { diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/helpers.test.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/helpers.test.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts index bbfbbaae058d4..f402303c4c621 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/helpers.test.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NewRule } from '../../../../../alerts/containers/detection_engine/rules'; +import { NewRule } from '../../../../containers/detection_engine/rules'; import { DefineStepRuleJson, ScheduleStepRuleJson, diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/helpers.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/helpers.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts index b7cf94bb4f319..8331346b19ac9 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/helpers.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts @@ -12,7 +12,7 @@ import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../common/const import { transformAlertToRuleAction } from '../../../../../../common/detection_engine/transform_actions'; import { RuleType } from '../../../../../../common/detection_engine/types'; import { isMlRule } from '../../../../../../common/machine_learning/helpers'; -import { NewRule } from '../../../../../alerts/containers/detection_engine/rules'; +import { NewRule } from '../../../../containers/detection_engine/rules'; import { AboutStepRule, diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx index 4be408039d6f6..6475b6f6b6b54 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx @@ -9,7 +9,7 @@ import React, { useCallback, useRef, useState, useMemo } from 'react'; import { useHistory } from 'react-router-dom'; import styled, { StyledComponent } from 'styled-components'; -import { usePersistRule } from '../../../../../alerts/containers/detection_engine/rules'; +import { usePersistRule } from '../../../../containers/detection_engine/rules'; import { getRulesUrl, @@ -293,7 +293,7 @@ const CreateRulePageComponent: React.FC = () => { backOptions={{ href: getRulesUrl(), text: i18n.BACK_TO_RULES, - pageId: SecurityPageName.alerts, + pageId: SecurityPageName.detections, }} border isLoading={isLoading || loading} @@ -438,7 +438,7 @@ const CreateRulePageComponent: React.FC = () => { - + ); }; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/create/translations.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/failure_history.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/failure_history.test.tsx similarity index 82% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/failure_history.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/failure_history.test.tsx index fc16bcd96f766..c44f1bf780944 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/failure_history.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/failure_history.test.tsx @@ -9,8 +9,8 @@ import { shallow } from 'enzyme'; import { TestProviders } from '../../../../../common/mock'; import { FailureHistory } from './failure_history'; -import { useRuleStatus } from '../../../../../alerts/containers/detection_engine/rules'; -jest.mock('../../../../../alerts/containers/detection_engine/rules'); +import { useRuleStatus } from '../../../../containers/detection_engine/rules'; +jest.mock('../../../../containers/detection_engine/rules'); describe('FailureHistory', () => { beforeAll(() => { diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/failure_history.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/failure_history.tsx similarity index 95% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/failure_history.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/failure_history.tsx index 1030aaa30d752..610b7e32cec5f 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/failure_history.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/failure_history.tsx @@ -15,10 +15,7 @@ import { } from '@elastic/eui'; import React, { memo } from 'react'; -import { - useRuleStatus, - RuleInfoStatus, -} from '../../../../../alerts/containers/detection_engine/rules'; +import { useRuleStatus, RuleInfoStatus } from '../../../../containers/detection_engine/rules'; import { HeaderSection } from '../../../../../common/components/header_section'; import * as i18n from './translations'; import { FormattedDate } from '../../../../../common/components/formatted_date'; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx index bb6ef92a059cb..6ab08d94fa781 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx @@ -33,7 +33,7 @@ import { } from '../../../../../common/components/link_to/redirect_to_detection_engine'; import { SiemSearchBar } from '../../../../../common/components/search_bar'; import { WrapperPage } from '../../../../../common/components/wrapper_page'; -import { useRule } from '../../../../../alerts/containers/detection_engine/rules'; +import { useRule } from '../../../../containers/detection_engine/rules'; import { useWithSource } from '../../../../../common/containers/source'; import { SpyRoute } from '../../../../../common/utils/route/spy_routes'; @@ -130,7 +130,7 @@ export const RuleDetailsPageComponent: FC = ({ const [lastAlerts] = useAlertInfo({ ruleId }); const mlCapabilities = useMlCapabilities(); const history = useHistory(); - const { formatUrl } = useFormatUrl(SecurityPageName.alerts); + const { formatUrl } = useFormatUrl(SecurityPageName.detections); // TODO: Refactor license check + hasMlAdminPermissions to common check const hasMlPermissions = @@ -302,7 +302,7 @@ export const RuleDetailsPageComponent: FC = ({ backOptions={{ href: getRulesUrl(), text: i18n.BACK_TO_RULES, - pageId: SecurityPageName.alerts, + pageId: SecurityPageName.detections, }} border subtitle={subTitle} @@ -424,7 +424,7 @@ export const RuleDetailsPageComponent: FC = ({ {ruleId != null && ( = ({ )} - + ); }; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/status_failed_callout.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/status_failed_callout.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/status_failed_callout.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/status_failed_callout.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/status_failed_callout.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/status_failed_callout.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/status_failed_callout.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/status_failed_callout.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/details/translations.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx index ba7444d8e8a52..777f7766993d0 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx @@ -19,7 +19,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { FC, memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useParams, useHistory } from 'react-router-dom'; -import { useRule, usePersistRule } from '../../../../../alerts/containers/detection_engine/rules'; +import { useRule, usePersistRule } from '../../../../containers/detection_engine/rules'; import { WrapperPage } from '../../../../../common/components/wrapper_page'; import { getRuleDetailsUrl, @@ -380,7 +380,7 @@ const EditRulePageComponent: FC = () => { backOptions={{ href: getRuleDetailsUrl(ruleId ?? ''), text: `${i18n.BACK_TO} ${rule?.name ?? ''}`, - pageId: SecurityPageName.alerts, + pageId: SecurityPageName.detections, }} isLoading={isLoading} title={i18n.PAGE_TITLE} @@ -446,7 +446,7 @@ const EditRulePageComponent: FC = () => { - + ); }; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/translations.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/edit/translations.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/translations.ts diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/helpers.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx index b467f3334508d..f8969f06c8ef6 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/helpers.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx @@ -18,7 +18,7 @@ import { } from './helpers'; import { mockRuleWithEverything, mockRule } from './all/__mocks__/mock'; import { esFilters } from '../../../../../../../../src/plugins/data/public'; -import { Rule } from '../../../../alerts/containers/detection_engine/rules'; +import { Rule } from '../../../containers/detection_engine/rules'; import { AboutStepRule, AboutStepRuleDetails, diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/helpers.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx index 2a792f7d35eaa..bf49ed5be90fb 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/helpers.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx @@ -14,7 +14,7 @@ import { RuleAlertAction, RuleType } from '../../../../../common/detection_engin import { isMlRule } from '../../../../../common/machine_learning/helpers'; import { transformRuleToAlertAction } from '../../../../../common/detection_engine/transform_actions'; import { Filter } from '../../../../../../../../src/plugins/data/public'; -import { Rule } from '../../../../alerts/containers/detection_engine/rules'; +import { Rule } from '../../../containers/detection_engine/rules'; import { FormData, FormHook, FormSchema } from '../../../../shared_imports'; import { AboutStepRule, diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx similarity index 86% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/index.test.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx index 7e6cd48ddc003..f0ad670ddb665 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/index.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx @@ -9,7 +9,7 @@ import { shallow } from 'enzyme'; import { RulesPage } from './index'; import { useUserInfo } from '../../../components/user_info'; -import { usePrePackagedRules } from '../../../../alerts/containers/detection_engine/rules'; +import { usePrePackagedRules } from '../../../containers/detection_engine/rules'; jest.mock('react-router-dom', () => { const original = jest.requireActual('react-router-dom'); @@ -24,7 +24,7 @@ jest.mock('react-router-dom', () => { jest.mock('../../../../common/components/link_to'); jest.mock('../../../components/user_info'); -jest.mock('../../../../alerts/containers/detection_engine/rules'); +jest.mock('../../../containers/detection_engine/rules'); describe('RulesPage', () => { beforeAll(() => { diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx similarity index 95% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/index.tsx rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx index 7684f710952e6..9cbc0e2aabfbe 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx @@ -8,10 +8,7 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import React, { useCallback, useRef, useState } from 'react'; import { useHistory } from 'react-router-dom'; -import { - usePrePackagedRules, - importRules, -} from '../../../../alerts/containers/detection_engine/rules'; +import { usePrePackagedRules, importRules } from '../../../containers/detection_engine/rules'; import { getDetectionEngineUrl, getCreateRuleUrl, @@ -66,7 +63,7 @@ const RulesPageComponent: React.FC = () => { rulesNotInstalled, rulesNotUpdated ); - const { formatUrl } = useFormatUrl(SecurityPageName.alerts); + const { formatUrl } = useFormatUrl(SecurityPageName.detections); const handleRefreshRules = useCallback(async () => { if (refreshRulesData.current != null) { @@ -126,8 +123,8 @@ const RulesPageComponent: React.FC = () => { @@ -203,7 +200,7 @@ const RulesPageComponent: React.FC = () => { /> - + ); }; diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts similarity index 99% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/translations.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts index eee2aa9ff40cc..050c281d09350 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts @@ -6,10 +6,10 @@ import { i18n } from '@kbn/i18n'; -export const BACK_TO_ALERTS = i18n.translate( +export const BACK_TO_DETECTIONS = i18n.translate( 'xpack.securitySolution.detectionEngine.rules.backOptionsHeader', { - defaultMessage: 'Back to alerts', + defaultMessage: 'Back to detections', } ); diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/types.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/utils.test.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.test.ts similarity index 90% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/utils.test.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.test.ts index 91de1467a8310..32f96b519acc5 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/utils.test.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.test.ts @@ -23,6 +23,6 @@ describe('getBreadcrumbs', () => { [], getUrlForAppMock ) - ).toEqual([{ href: 'securitySolution:alerts', text: 'Alerts' }]); + ).toEqual([{ href: 'securitySolution:detections', text: 'Detection alerts' }]); }); }); diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts similarity index 87% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/utils.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts index 203a93acd849c..75d1df9406d25 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/rules/utils.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts @@ -28,7 +28,7 @@ const getTabBreadcrumb = (pathname: string, search: string[], getUrlForApp: GetU if (tabPath === 'alerts') { return { text: i18nDetections.ALERT, - href: getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + href: getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getDetectionEngineTabUrl(tabPath, !isEmpty(search[0]) ? search[0] : ''), }), }; @@ -37,7 +37,7 @@ const getTabBreadcrumb = (pathname: string, search: string[], getUrlForApp: GetU if (tabPath === 'rules') { return { text: i18nRules.PAGE_TITLE, - href: getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + href: getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getRulesUrl(!isEmpty(search[0]) ? search[0] : ''), }), }; @@ -58,7 +58,7 @@ export const getBreadcrumbs = ( let breadcrumb = [ { text: i18nDetections.PAGE_TITLE, - href: getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + href: getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { path: !isEmpty(search[0]) ? search[0] : '', }), }, @@ -75,7 +75,7 @@ export const getBreadcrumbs = ( ...breadcrumb, { text: params.state.ruleName, - href: getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + href: getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getRuleDetailsUrl(params.detailName, !isEmpty(search[0]) ? search[0] : ''), }), }, @@ -87,7 +87,7 @@ export const getBreadcrumbs = ( ...breadcrumb, { text: i18nRules.ADD_PAGE_TITLE, - href: getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + href: getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getCreateRuleUrl(!isEmpty(search[0]) ? search[0] : ''), }), }, @@ -99,7 +99,7 @@ export const getBreadcrumbs = ( ...breadcrumb, { text: i18nRules.EDIT_PAGE_TITLE, - href: getUrlForApp(`${APP_ID}:${SecurityPageName.alerts}`, { + href: getUrlForApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getEditRuleUrl(params.detailName, !isEmpty(search[0]) ? search[0] : ''), }), }, diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/translations.ts similarity index 98% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/translations.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/translations.ts index 8e91d9848d1ed..bfe5dfc012530 100644 --- a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/translations.ts @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n'; export const PAGE_TITLE = i18n.translate( 'xpack.securitySolution.detectionEngine.detectionsPageTitle', { - defaultMessage: 'Alerts', + defaultMessage: 'Detection alerts', } ); diff --git a/x-pack/plugins/security_solution/public/alerts/pages/detection_engine/types.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/types.ts similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/pages/detection_engine/types.ts rename to x-pack/plugins/security_solution/public/detections/pages/detection_engine/types.ts diff --git a/x-pack/plugins/security_solution/public/alerts/routes.tsx b/x-pack/plugins/security_solution/public/detections/routes.tsx similarity index 100% rename from x-pack/plugins/security_solution/public/alerts/routes.tsx rename to x-pack/plugins/security_solution/public/detections/routes.tsx diff --git a/x-pack/plugins/security_solution/public/helpers.ts b/x-pack/plugins/security_solution/public/helpers.ts index 0dd66d06b78be..53fe185ef9a65 100644 --- a/x-pack/plugins/security_solution/public/helpers.ts +++ b/x-pack/plugins/security_solution/public/helpers.ts @@ -60,7 +60,7 @@ export const manageOldSiemRoutes = async (coreStart: CoreStart) => { }); break; case 'detections': - application.navigateToApp(`${APP_ID}:${SecurityPageName.alerts}`, { + application.navigateToApp(`${APP_ID}:${SecurityPageName.detections}`, { replace: true, path, }); diff --git a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx index 1aa114608b479..d2d9861e0ae1a 100644 --- a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx @@ -62,7 +62,7 @@ describe('Alerts by category', () => { test('it renders the expected title', () => { expect(wrapper.find('[data-test-subj="header-section-title"]').text()).toEqual( - 'External alert count' + 'External alert trend' ); }); diff --git a/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx b/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx index 8b62df60b257f..2fddb996ccef3 100644 --- a/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx +++ b/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx @@ -6,9 +6,9 @@ import React, { useCallback } from 'react'; -import { AlertsHistogramPanel } from '../../../alerts/components/alerts_histogram_panel'; -import { alertsHistogramOptions } from '../../../alerts/components/alerts_histogram_panel/config'; -import { useSignalIndex } from '../../../alerts/containers/detection_engine/alerts/use_signal_index'; +import { AlertsHistogramPanel } from '../../../detections/components/alerts_histogram_panel'; +import { alertsHistogramOptions } from '../../../detections/components/alerts_histogram_panel/config'; +import { useSignalIndex } from '../../../detections/containers/detection_engine/alerts/use_signal_index'; import { SetAbsoluteRangeDatePicker } from '../../../network/pages/types'; import { Filter, IIndexPattern, Query } from '../../../../../../../src/plugins/data/public'; import { InputsModelId } from '../../../common/store/inputs/constants'; diff --git a/x-pack/plugins/security_solution/public/overview/pages/translations.ts b/x-pack/plugins/security_solution/public/overview/pages/translations.ts index bf13a57f0b642..f62c643e9eae6 100644 --- a/x-pack/plugins/security_solution/public/overview/pages/translations.ts +++ b/x-pack/plugins/security_solution/public/overview/pages/translations.ts @@ -6,13 +6,6 @@ import { i18n } from '@kbn/i18n'; -export const ALERTS_GRAPH_TITLE = i18n.translate( - 'xpack.securitySolution.overview.alertsGraphTitle', - { - defaultMessage: 'External alert count', - } -); - export const EVENTS = i18n.translate('xpack.securitySolution.overview.eventsTitle', { defaultMessage: 'Event count', }); @@ -47,7 +40,7 @@ export const RECENT_TIMELINES = i18n.translate( ); export const ALERT_COUNT = i18n.translate('xpack.securitySolution.overview.signalCountTitle', { - defaultMessage: 'Alert count', + defaultMessage: 'Detection alert trend', }); export const TOP = (fieldName: string) => diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx index 2b7fc160110f5..6096a9b0e0bb8 100644 --- a/x-pack/plugins/security_solution/public/plugin.tsx +++ b/x-pack/plugins/security_solution/public/plugin.tsx @@ -34,7 +34,7 @@ import { import { APP_ID, APP_ICON, - APP_ALERTS_PATH, + APP_DETECTIONS_PATH, APP_HOSTS_PATH, APP_OVERVIEW_PATH, APP_NETWORK_PATH, @@ -53,7 +53,7 @@ import { HOSTS, NETWORK, TIMELINES, - ALERTS, + DETECTION_ENGINE, CASE, ADMINISTRATION, } from './app/home/translations'; @@ -145,17 +145,17 @@ export class Plugin implements IPlugin { const [ { coreStart, store, services, storage }, { renderApp, composeLibs }, - { alertsSubPlugin }, + { detectionsSubPlugin }, ] = await Promise.all([ mountSecurityFactory(), this.downloadAssets(), @@ -166,7 +166,7 @@ export class Plugin implements IPlugin = ({ }) => { const ruleName = `${value}`; const ruleId = linkValue; - const { search } = useFormatUrl(SecurityPageName.alerts); + const { search } = useFormatUrl(SecurityPageName.detections); const { navigateToApp, getUrlForApp } = useKibana().services.application; const content = truncate ? {value} : value; const goToRuleDetails = useCallback( (ev) => { ev.preventDefault(); - navigateToApp(`${APP_ID}:${SecurityPageName.alerts}`, { + navigateToApp(`${APP_ID}:${SecurityPageName.detections}`, { path: getRuleDetailsUrl(ruleId ?? '', search), }); }, @@ -70,7 +70,7 @@ export const RenderRuleName: React.FC = ({ > diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx index 296b24cff43ad..c88f36a2fb16b 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx @@ -13,7 +13,7 @@ import useResizeObserver from 'use-resize-observer/polyfilled'; import { useSignalIndex, ReturnSignalIndex, -} from '../../../alerts/containers/detection_engine/alerts/use_signal_index'; +} from '../../../detections/containers/detection_engine/alerts/use_signal_index'; import { mocksSource } from '../../../common/containers/source/mock'; import { wait } from '../../../common/lib/helpers'; import { defaultHeaders, mockTimelineData, TestProviders } from '../../../common/mock'; @@ -40,7 +40,7 @@ jest.mock('use-resize-observer/polyfilled'); mockUseResizeObserver.mockImplementation(() => ({})); const mockUseSignalIndex: jest.Mock = useSignalIndex as jest.Mock; -jest.mock('../../../alerts/containers/detection_engine/alerts/use_signal_index'); +jest.mock('../../../detections/containers/detection_engine/alerts/use_signal_index'); jest.mock('react-router-dom', () => { const original = jest.requireActual('react-router-dom'); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx index 35622eddc359c..93ccf6992d1f5 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx @@ -10,7 +10,7 @@ import deepEqual from 'fast-deep-equal'; import { NO_ALERT_INDEX } from '../../../../common/constants'; import { useWithSource } from '../../../common/containers/source'; -import { useSignalIndex } from '../../../alerts/containers/detection_engine/alerts/use_signal_index'; +import { useSignalIndex } from '../../../detections/containers/detection_engine/alerts/use_signal_index'; import { inputsModel, inputsSelectors, State } from '../../../common/store'; import { timelineActions, timelineSelectors } from '../../store/timeline'; import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model'; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx index 794a751501e09..fc2bd1c21abdc 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx @@ -38,8 +38,8 @@ const WarningEuiHealth = styled(EuiHealth)` const PickEventContainer = styled.div` .euiSuperSelect { - width: 155px; - max-width: 155px; + width: 170px; + max-width: 170px; button.euiSuperSelectControl { padding-top: 3px; } @@ -61,7 +61,7 @@ export const eventTypeOptions: EventTypeOptionItem[] = [ }, { value: 'alert', - inputDisplay: {i18n.ALERT_EVENT}, + inputDisplay: {i18n.DETECTION_ALERTS_EVENT}, }, ]; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/translations.ts index 7271c599302c5..7fa520a2d8df4 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/translations.ts +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/translations.ts @@ -84,9 +84,9 @@ export const RAW_EVENT = i18n.translate( } ); -export const ALERT_EVENT = i18n.translate( - 'xpack.securitySolution.timeline.searchOrFilter.eventTypeAlertEvent', +export const DETECTION_ALERTS_EVENT = i18n.translate( + 'xpack.securitySolution.timeline.searchOrFilter.eventTypeDetectionAlertsEvent', { - defaultMessage: 'Alert events', + defaultMessage: 'Detection Alerts', } ); diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts index 089a428f7dfaf..42c01da7e23c9 100644 --- a/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts +++ b/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts @@ -7,7 +7,7 @@ import * as api from './api'; import { KibanaServices } from '../../common/lib/kibana'; import { TimelineType, TimelineStatus } from '../../../common/types/timeline'; import { TIMELINE_DRAFT_URL, TIMELINE_URL } from '../../../common/constants'; -import { ImportDataProps } from '../../alerts/containers/detection_engine/rules/types'; +import { ImportDataProps } from '../../detections/containers/detection_engine/rules/types'; jest.mock('../../common/lib/kibana', () => { return { diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts index ff252ea93039d..72e1f1d4de32d 100644 --- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts +++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts @@ -30,7 +30,7 @@ import { createToasterPlainError } from '../../cases/containers/utils'; import { ImportDataProps, ImportDataResponse, -} from '../../alerts/containers/detection_engine/rules'; +} from '../../detections/containers/detection_engine/rules'; interface RequestPostTimeline { timeline: TimelineInput; diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx index 6a6d74cc91508..164d34db16d87 100644 --- a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx @@ -29,7 +29,7 @@ import { EventType } from '../../timelines/store/timeline/model'; import { timelineQuery } from './index.gql_query'; import { timelineActions } from '../../timelines/store/timeline'; -const timelineIds = [TimelineId.alertsPage, TimelineId.alertsRulesDetailsPage]; +const timelineIds = [TimelineId.detectionsPage, TimelineId.detectionsRulesDetailsPage]; export interface TimelineArgs { events: TimelineItem[]; diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts index 568aa0e85de93..c2b2f2534b087 100644 --- a/x-pack/plugins/security_solution/server/plugin.ts +++ b/x-pack/plugins/security_solution/server/plugin.ts @@ -72,7 +72,7 @@ export interface PluginStart {} const securitySubPlugins = [ APP_ID, `${APP_ID}:${SecurityPageName.overview}`, - `${APP_ID}:${SecurityPageName.alerts}`, + `${APP_ID}:${SecurityPageName.detections}`, `${APP_ID}:${SecurityPageName.hosts}`, `${APP_ID}:${SecurityPageName.network}`, `${APP_ID}:${SecurityPageName.timelines}`,