diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 567a9c52c1e3e..4002c1a9e521f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1390,7 +1390,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/test_serverless/functional/test_suites/common/data_usage @elastic/kibana-management
/x-pack/test_serverless/functional/page_objects/svl_data_usage.ts @elastic/kibana-management
/x-pack/solutions/observability/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
-/x-pack/test/functional/es_archives/observability/ai_assistant @elastic/obs-ai-assistant
+/x-pack/solutions/observability/test/fixtures/es_archives/observability/ai_assistant @elastic/obs-ai-assistant
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/ai_assistant @elastic/obs-ai-assistant
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.index.ts @elastic/obs-ai-assistant
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts @elastic/obs-ai-assistant
@@ -1426,7 +1426,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/test/functional/page_objects/asset_details.ts @elastic/obs-ux-infra_services-team
/x-pack/test/functional/page_objects/infra_* @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/functional/page_objects/infra_* @elastic/obs-ux-infra_services-team
-/x-pack/test/functional/es_archives/infra @elastic/obs-ux-infra_services-team
+/x-pack/solutions/observability/test/fixtures/es_archives/infra @elastic/obs-ux-infra_services-team
/x-pack/test_serverless/**/test_suites/observability/infra/ @elastic/obs-ux-infra_services-team
/src/platform/test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/plugins/infra/common @elastic/obs-ux-infra_services-team
@@ -1582,7 +1582,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/solutions/observability/test/functional_with_es_ssl/config.ts @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/functional_with_es_ssl/ftr_provider_context.ts @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/functional/apps/uptime @elastic/obs-ux-management-team
-/x-pack/test/functional/es_archives/uptime @elastic/obs-ux-management-team
+/x-pack/solutions/observability/test/fixtures/es_archives/uptime @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/functional/services/uptime @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/api_integration/apis/uptime @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/api_integration/apis/synthetics @elastic/obs-ux-management-team
@@ -1595,7 +1595,6 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/src/platform/test/functional/apps/discover/observability @elastic/observability-ui
# obs-ux-logs-team
-/x-pack/test/functional/es_archives/observability_logs_explorer @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/dataset_quality @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/config.* @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/landing_page.ts @elastic/obs-ux-logs-team
@@ -2248,7 +2247,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
/x-pack/platform/test/fixtures/es_archives/actions @elastic/response-ops
/x-pack/platform/test/fixtures/es_archives/alerting @elastic/response-ops
/x-pack/platform/test/fixtures/es_archives/alerts @elastic/response-ops
-/x-pack/test/functional/es_archives/observability/alerts @elastic/response-ops
+/x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts @elastic/response-ops
/x-pack/platform/test/fixtures/es_archives/actions @elastic/response-ops
/x-pack/platform/test/fixtures/es_archives/rules_scheduled_task_id @elastic/response-ops
/x-pack/platform/test/fixtures/es_archives/alerting/8_2_0 @elastic/response-ops
@@ -2392,10 +2391,10 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
# Security Solution
/x-pack/test/functional/fixtures/kbn_archiver/security_solution/timelines/7.15.0_space @elastic/security-solution # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts#L58
-/x-pack/test/functional/es_archives/packetbeat @elastic/security-solution
+/x-pack/solutions/security/test/fixtures/es_archives/packetbeat @elastic/security-solution
/x-pack/test/security_solution_ftr @elastic/security-solution
-/x-pack/test/functional/es_archives/security_solution @elastic/security-solution
-/x-pack/test/functional/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
+/x-pack/solutions/security/test/fixtures/es_archives/security_solution @elastic/security-solution
+/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
/x-pack/solutions/security/test/functional/ @elastic/security-solution
/x-pack/solutions/security/test/functional_solution_sidenav/ @elastic/security-solution
/x-pack/test/common/utils/security_solution/index.ts @elastic/security-solution
@@ -2403,7 +2402,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
/x-pack/test/common/services/security_solution @elastic/security-solution
/x-pack/test/api_integration/services/security_solution_*.gen.ts @elastic/security-solution
/x-pack/solutions/security/test/accessibility/ @elastic/security-solution
-/x-pack/test/functional/es_archives/endpoint/ @elastic/security-solution
+/x-pack/solutions/security/test/fixtures/es_archives/endpoint/ @elastic/security-solution
/x-pack/platform/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
/x-pack/test/security_solution_api_integration @elastic/security-solution
/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
@@ -2471,8 +2470,8 @@ x-pack/test/security_solution_api_integration/test_suites/detections_response/te
x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles @elastic/security-detections-response
x-pack/test/security_solution_api_integration/test_suites/sources @elastic/security-detections-response
/x-pack/test/common/utils/security_solution/detections_response @elastic/security-detections-response
-/x-pack/test/functional/es_archives/signals @elastic/security-detections-response
-/x-pack/test/functional/es_archives/rule_keyword_family @elastic/security-detections-response
+/x-pack/solutions/security/test/fixtures/es_archives/signals @elastic/security-detections-response
+/x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family @elastic/security-detections-response
# Security Solution sub teams
@@ -2704,8 +2703,8 @@ x-pack/platform/plugins/shared/actions/server/lib/token_tracking @elastic/securi
/x-pack/solutions/security/plugins/security_solution/common/api/detection_engine/signals_migration @elastic/security-detection-engine
/x-pack/solutions/security/plugins/security_solution/common/cti @elastic/security-detection-engine
/x-pack/solutions/security/plugins/security_solution/common/field_maps @elastic/security-detection-engine
-/x-pack/test/functional/es_archives/entity/risks @elastic/security-detection-engine
-/x-pack/test/functional/es_archives/entity/host_risk @elastic/security-detection-engine
+/x-pack/solutions/security/test/fixtures/es_archives/entity/risks @elastic/security-detection-engine
+/x-pack/solutions/security/test/fixtures/es_archives/entity/host_risk @elastic/security-detection-engine
/x-pack/test/api_integration/apis/lists @elastic/security-detection-engine
/x-pack/solutions/security/plugins/security_solution/public/value_list @elastic/security-detection-engine
/x-pack/solutions/security/plugins/security_solution/public/common/components/reference_error_modal @elastic/security-detection-engine
@@ -2731,7 +2730,7 @@ x-pack/platform/plugins/shared/actions/server/lib/token_tracking @elastic/securi
/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine @elastic/security-detection-engine
/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/rule_gaps.ts @elastic/security-detection-engine
/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists @elastic/security-detection-engine
-/x-pack/test/functional/es_archives/asset_criticality @elastic/security-detection-engine
+/x-pack/solutions/security/test/fixtures/es_archives/asset_criticality @elastic/security-detection-engine
/x-pack/solutions/security/plugins/security_solution/server/usage/exceptions @elastic/security-detection-engine
/x-pack/solutions/security/plugins/security_solution/server/usage/value_lists @elastic/security-detection-engine
@@ -2844,11 +2843,8 @@ x-pack/solutions/security/plugins/security_solution/public/flyout/entity_details
x-pack/platform/plugins/shared/fleet/public/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/screens/detail/components/cloud_posture_third_party_support_callout.* @elastic/fleet @elastic/kibana-cloud-security-posture
-## Kubernetes Security tests
-x-pack/test/functional/es_archives/kubernetes_security @elastic/kibana-cloud-security-posture
-x-pack/test/kubernetes_security @elastic/kibana-cloud-security-posture
## SessionView tests
-x-pack/test/functional/es_archives/session_view @elastic/kibana-cloud-security-posture
+x-pack/solutions/security/test/fixtures/es_archives/session_view @elastic/kibana-cloud-security-posture
x-pack/solutions/security/test/session_view @elastic/kibana-cloud-security-posture # Assigned per https://github.com/elastic/kibana/blob/main/api_docs/session_view.mdx#L18
## CSP tests
x-pack/solutions/security/test/api_integration/apis/cloud_security_posture/ @elastic/kibana-cloud-security-posture
diff --git a/scripts/archive_migration_functions.sh b/scripts/archive_migration_functions.sh
index 6d4b58ca07f9b..477b13805b0be 100755
--- a/scripts/archive_migration_functions.sh
+++ b/scripts/archive_migration_functions.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# ??? Should we migrate
-# x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space
+# x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space
# ### Yes, it needs migration
# ### Saved Object type(s) that we care about:
# index-pattern
@@ -39,12 +39,26 @@ list_stragglers() {
echo
echo "### X-PACK"
+ # Search in x-pack/platform/test/fixtures/es_archives
while read -r y; do
local b=$(grep -l '"index": ".kibana' "$y")
if [ -n "$b" ]; then
echo "${b%/mappings.json}"
fi
- done <<<"$(find x-pack/test/functional/es_archives -name mappings.json)"
+ done <<<"$(find x-pack/platform/test/fixtures/es_archives -name mappings.json)"
+
+ # Also search in x-pack/solutions/{solution}/test/fixtures/es_archives for each solution
+ for solution in search security chat observability; do
+ solution_dir="x-pack/solutions/${solution}/test/fixtures/es_archives"
+ if [ -d "$solution_dir" ]; then
+ while read -r y; do
+ local b=$(grep -l '"index": ".kibana' "$y")
+ if [ -n "$b" ]; then
+ echo "${b%/mappings.json}"
+ fi
+ done <<<"$(find "$solution_dir" -name mappings.json)"
+ fi
+ done
}
diff --git a/src/dev/code_coverage/docs/team_assignment/README.md b/src/dev/code_coverage/docs/team_assignment/README.md
index 9785c9670e97c..ed1ad331a4d06 100644
--- a/src/dev/code_coverage/docs/team_assignment/README.md
+++ b/src/dev/code_coverage/docs/team_assignment/README.md
@@ -16,7 +16,7 @@ Example CODEOWNERS Block:
_notice the coverage delimiter `#CC# ...`_
```
-/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
+/x-pack/solutions/security/test/fixtures/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
/x-pack/platform/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
/x-pack/platform/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
#CC# /x-pack/legacy/plugins/siem/ @elastic/siem
diff --git a/src/platform/packages/shared/kbn-es-archiver/src/fixtures/override_saved_objects_index/exception_list.json b/src/platform/packages/shared/kbn-es-archiver/src/fixtures/override_saved_objects_index/exception_list.json
index 747d6efdeb301..1a6a2d3b0bfc4 100644
--- a/src/platform/packages/shared/kbn-es-archiver/src/fixtures/override_saved_objects_index/exception_list.json
+++ b/src/platform/packages/shared/kbn-es-archiver/src/fixtures/override_saved_objects_index/exception_list.json
@@ -10,23 +10,23 @@
"x-pack/platform/test/fixtures/es_archives/cases/migrations/7.16.0_space",
"x-pack/platform/test/fixtures/es_archives/cases/migrations/8.8.0",
"x-pack/platform/test/fixtures/es_archives/data/search_sessions",
- "x-pack/test/functional/es_archives/endpoint/telemetry/agent_only",
- "x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states",
- "x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed",
- "x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled",
- "x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled",
- "x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled",
- "x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/agent_only",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_different_states",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_installed",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_disabled",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_enabled",
+ "x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_uninstalled",
"x-pack/platform/test/fixtures/es_archives/event_log_legacy_ids",
"x-pack/platform/test/fixtures/es_archives/event_log_multiple_indicies",
"x-pack/platform/test/fixtures/es_archives/fleet/agents",
"x-pack/platform/test/fixtures/es_archives/rules_scheduled_task_id/rules",
"x-pack/platform/test/fixtures/es_archives/rules_scheduled_task_id/tasks",
- "x-pack/test/functional/es_archives/security_solution/import_rule_connector",
- "x-pack/test/functional/es_archives/security_solution/migrations",
- "x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14",
- "x-pack/test/functional/es_archives/security_solution/timelines/7.15.0",
- "x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space",
+ "x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector",
+ "x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations",
+ "x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14",
+ "x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0",
+ "x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space",
"x-pack/platform/test/fixtures/es_archives/task_manager_removed_types",
"x-pack/platform/test/fixtures/es_archives/task_manager_tasks"
]
diff --git a/x-pack/platform/test/alerting_api_integration/security_and_spaces/group3/tests/alerting/suggestions_value_alert.ts b/x-pack/platform/test/alerting_api_integration/security_and_spaces/group3/tests/alerting/suggestions_value_alert.ts
index f901066e8d359..a905a24a681d4 100644
--- a/x-pack/platform/test/alerting_api_integration/security_and_spaces/group3/tests/alerting/suggestions_value_alert.ts
+++ b/x-pack/platform/test/alerting_api_integration/security_and_spaces/group3/tests/alerting/suggestions_value_alert.ts
@@ -18,12 +18,20 @@ export default function createRuleSuggestionValuesTests({ getService }: FtrProvi
const supertest = getService('supertest');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/8.1.0');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alerts/8.1.0');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0'
+ );
});
it('Get service.name value suggestion in default space for super user', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts
index 82557e7588388..35a0974df06ca 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Global rule event log list', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/global_rule_event_log_list');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from the shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts
index 4e25562136df2..9d3afb0b2ac6f 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Rule event log list', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/rule_event_log_list');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from the shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts
index e6f5e4af81a0e..4ddb5f5c0952c 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Rule status dropdown', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/rule_status_dropdown');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from the shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_filter.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_filter.ts
index 1ca68c5e16194..42ddb98a31157 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_filter.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_filter.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Rule status filter', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/rule_status_filter');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from the shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts
index 28d45573b1387..7171bd35b98e9 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Rule tag badge', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/rule_tag_badge');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from the shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts
index 1d05e1b4aa5b3..38598d69e3086 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Rule tag filter', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/rule_tag_filter');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/examples/triggers_actions_ui_examples/rules_list.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rules_list.ts
index 7868172b106ce..ee7f6d175f0a2 100644
--- a/x-pack/platform/test/examples/triggers_actions_ui_examples/rules_list.ts
+++ b/x-pack/platform/test/examples/triggers_actions_ui_examples/rules_list.ts
@@ -16,11 +16,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Rules list', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToApp('triggersActionsUiExample/rules_list');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should load from shareable lazy loader', async () => {
diff --git a/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/get_alert_fields_by_rule_type_ids.ts b/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/get_alert_fields_by_rule_type_ids.ts
index 3e79327831cae..a2ecc8c9eb7d2 100644
--- a/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/get_alert_fields_by_rule_type_ids.ts
+++ b/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/get_alert_fields_by_rule_type_ids.ts
@@ -42,8 +42,12 @@ export default ({ getService }: FtrProviderContext) => {
let securityRuleId: string;
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/8.1.0');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0'
+ );
await installKibanaSampleData();
@@ -80,8 +84,12 @@ export default ({ getService }: FtrProviderContext) => {
.set('x-elastic-internal-origin', 'foo')
.expect(204);
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alerts/8.1.0');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0'
+ );
});
describe('Users:', () => {
diff --git a/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts b/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
index 37e8b49800018..f4540d063ad37 100644
--- a/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
+++ b/x-pack/platform/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
@@ -45,11 +45,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('logs', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should return alerts from log rules', async () => {
@@ -119,14 +123,20 @@ export default ({ getService }: FtrProviderContext) => {
];
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/8.1.0');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/alerts/8.1.0'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0'
);
});
@@ -213,11 +223,15 @@ export default ({ getService }: FtrProviderContext) => {
const apmRuleTypeIds = ['apm.transaction_error_rate', 'apm.error_rate'];
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should return alerts from apm rules', async () => {
@@ -705,11 +719,15 @@ export default ({ getService }: FtrProviderContext) => {
const apmRuleTypeIds = ['apm.transaction_error_rate', 'apm.error_rate'];
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should omit alerts when score is less than min score', async () => {
@@ -891,10 +909,14 @@ export default ({ getService }: FtrProviderContext) => {
describe('discover', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('should return alerts from .es-query rule type with consumer discover with access only to stack rules', async () => {
diff --git a/x-pack/solutions/observability/test/accessibility/apps/observability.ts b/x-pack/solutions/observability/test/accessibility/apps/observability.ts
index 2e2fadd959aaf..ba796b44cbb05 100644
--- a/x-pack/solutions/observability/test/accessibility/apps/observability.ts
+++ b/x-pack/solutions/observability/test/accessibility/apps/observability.ts
@@ -19,7 +19,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// https://github.com/elastic/kibana/issues/141724
describe.skip('Observability UI', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await PageObjects.common.navigateToApp('observability');
});
diff --git a/x-pack/solutions/observability/test/accessibility/apps/uptime.ts b/x-pack/solutions/observability/test/accessibility/apps/uptime.ts
index 1b4dafa9e97d0..679c873c101a8 100644
--- a/x-pack/solutions/observability/test/accessibility/apps/uptime.ts
+++ b/x-pack/solutions/observability/test/accessibility/apps/uptime.ts
@@ -21,7 +21,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
describe('uptime Accessibility', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
await makeChecks(es, A11Y_TEST_MONITOR_ID, 150, 1, 1000, {
tls: {
certificate_not_valid_after: moment().add(30, 'days').toISOString(),
@@ -45,7 +47,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
});
it('overview page', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_analysis_validation_log_entry_datasets.ts b/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_analysis_validation_log_entry_datasets.ts
index a2a800651272d..3b951c404e268 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_analysis_validation_log_entry_datasets.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_analysis_validation_log_entry_datasets.ts
@@ -20,10 +20,14 @@ export default function ({ getService }: FtrProviderContext) {
describe('API /infra/log_analysis/validation/log_entry_datasets', () => {
before(() =>
- esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ )
);
after(() =>
- esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ )
);
it('works', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_threshold_alert.ts b/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_threshold_alert.ts
index bd928e88072a6..02cf438f10030 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_threshold_alert.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/logs_ui/log_threshold_alert.ts
@@ -26,8 +26,16 @@ export default function ({ getService }: FtrProviderContext) {
const esClient = getService('es');
describe('Log Threshold Rule', () => {
describe('executeAlert', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/alerts_test_data'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts_test_data'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data'
+ )
+ );
describe('without group by', () => {
it('should trigger alerts below the alert limit', async () => {
@@ -372,8 +380,16 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('executeRatioAlert', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/ten_thousand_plus'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/ten_thousand_plus'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus'
+ )
+ );
describe('without group by', () => {
it('should trigger alerts below the alert limit', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/infra.ts b/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/infra.ts
index c113c437b753e..3a471d7282c48 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/infra.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/infra.ts
@@ -55,15 +55,21 @@ export default function ({ getService }: FtrProviderContext) {
describe('Host with active alerts', () => {
before(async () => {
await Promise.all([
- esArchiver.load('x-pack/test/functional/es_archives/infra/alerts'),
- esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ esArchiver.load('x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'),
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ ),
]);
});
after(async () => {
await Promise.all([
- esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts'),
- esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'
+ ),
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ ),
]);
});
diff --git a/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts b/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
index 882219a49e8e2..0b20398792286 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
@@ -81,8 +81,16 @@ export default function ({ getService }: FtrProviderContext) {
describe('Metric Threshold Alerts Executor', () => {
describe('with 10K plus docs', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/ten_thousand_plus'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/ten_thousand_plus'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus'
+ )
+ );
describe('without group by', () => {
it('should alert on document count', async () => {
const params = {
@@ -743,8 +751,16 @@ export default function ({ getService }: FtrProviderContext) {
});
});
describe('with gauge data', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/alerts_test_data'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts_test_data'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data'
+ )
+ );
describe('without groupBy', () => {
it('should alert on document count', async () => {
@@ -1176,8 +1192,16 @@ export default function ({ getService }: FtrProviderContext) {
});
});
describe('with rate data', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/alerts_test_data'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts_test_data'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data'
+ )
+ );
it('should alert on rate with long threshold', async () => {
const params = {
...baseParams,
diff --git a/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metrics_explorer.ts b/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metrics_explorer.ts
index 309d0bed4ce35..abe6d471ad28e 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metrics_explorer.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/metrics_ui/metrics_explorer.ts
@@ -21,8 +21,16 @@ export default function ({ getService }: FtrProviderContext) {
describe('Metrics Explorer API', () => {
describe('with data', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ )
+ );
it('should work for multiple metrics', async () => {
const postBody = {
diff --git a/x-pack/solutions/observability/test/api_integration/apis/uptime/get_all_pings.ts b/x-pack/solutions/observability/test/api_integration/apis/uptime/get_all_pings.ts
index 4004fa1626eb1..ffa1b1301d8a9 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/uptime/get_all_pings.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/uptime/get_all_pings.ts
@@ -16,7 +16,8 @@ export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
describe('get_all_pings', () => {
- const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
+ const archive =
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat';
before('load heartbeat data', async () => await esArchiver.load(archive));
after('unload heartbeat data', async () => await esArchiver.unload(archive));
diff --git a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/certs.ts b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/certs.ts
index 6e833255e2c4d..01536a04a2c89 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/certs.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/certs.ts
@@ -78,7 +78,9 @@ export default function ({ getService }: FtrProviderContext) {
);
});
after('unload test docs', async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
});
it('retrieves expected cert data', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/index.ts b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/index.ts
index b1d1d3774c8f8..6ed405a3e51a0 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/index.ts
@@ -39,10 +39,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
describe('with generated data', () => {
beforeEach('load heartbeat data', async () => {
- await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.loadIfNeeded(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
});
after('unload', async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
});
loadTestFile(require.resolve('./certs'));
@@ -55,12 +59,16 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
beforeEach(
'load heartbeat data',
async () =>
- await esArchiver.load('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat'
+ )
);
afterEach(
'unload',
async () =>
- await esArchiver.unload('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat'
+ )
);
loadTestFile(require.resolve('./monitor_latest_status'));
loadTestFile(require.resolve('./ping_histogram'));
diff --git a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/monitor_states_generated.ts b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
index 40a5600c8a695..5c1484777f2e7 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
@@ -25,10 +25,14 @@ export default function ({ getService }: FtrProviderContext) {
`${API_URLS.MONITOR_LIST}?dateRangeStart=${from}&dateRangeEnd=${to}&pageSize=10`;
before('load heartbeat data', () =>
- getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank')
+ getService('esArchiver').load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ )
);
after('unload heartbeat index', () =>
- getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank')
+ getService('esArchiver').unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ )
);
// In this case we don't actually have any monitors to display
@@ -134,7 +138,9 @@ export default function ({ getService }: FtrProviderContext) {
const downMonitorId = 'down-test-id';
const mixMonitorId = 'mix-test-id';
before('generate three monitors with up, down, mix state', async () => {
- await getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank');
+ await getService('esArchiver').load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
const es = getService('es');
@@ -165,7 +171,9 @@ export default function ({ getService }: FtrProviderContext) {
});
after('unload heartbeat index', () =>
- getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank')
+ getService('esArchiver').unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ )
);
it('should return all monitor when no status filter', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/ping_list.ts b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/ping_list.ts
index c5854c6d178c5..66f0fdc346597 100644
--- a/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/ping_list.ts
+++ b/x-pack/solutions/observability/test/api_integration/apis/uptime/rest/ping_list.ts
@@ -24,10 +24,14 @@ export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
describe('pingList query', () => {
before('load heartbeat data', () =>
- getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+ getService('esArchiver').load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat'
+ )
);
after('unload heartbeat index', () =>
- getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+ getService('esArchiver').unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat'
+ )
);
it('returns a list of pings for the given date range and default size', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_count.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_count.ts
index 025b3f411fc59..376d5681fb89b 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_count.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_count.ts
@@ -50,11 +50,13 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
withInternalHeaders: true,
useCookieHeader: true,
});
- await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
);
await supertestWithAdminScope.destroy();
});
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_metrics.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_metrics.ts
index 95230351f8546..4ba44d6c1031e 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_metrics.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/infra/infra_metrics.ts
@@ -69,10 +69,14 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('Fetch hosts', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ );
});
it('should return metrics for a host', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/inventory_threshold_alert.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/inventory_threshold_alert.ts
index 193ff12f136dc..84901ac69999c 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/inventory_threshold_alert.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/inventory_threshold_alert.ts
@@ -77,8 +77,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('Inventory Threshold Rule Executor', () => {
describe('CPU per Host', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
it('should work FOR LAST 1 minute', async () => {
const results = await evaluateCondition({
...baseOptions,
@@ -142,8 +150,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
});
describe('Inbound network traffic per host', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
it('should work FOR LAST 1 minute', async () => {
const results = await evaluateCondition({
...baseOptions,
@@ -318,8 +334,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
});
describe('Custom rate metric per host', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
it('should work FOR LAST 1 minute', async () => {
const results = await evaluateCondition({
...baseOptions,
@@ -476,8 +500,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
});
describe('Log rate per host', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/hosts_only'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only'
+ )
+ );
it('should work FOR LAST 1 minute', async () => {
const results = await evaluateCondition({
...baseOptions,
@@ -595,8 +627,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
});
describe('Network rate per pod', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/pods_only'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/pods_only'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only'
+ )
+ );
it('should work FOR LAST 1 minute', async () => {
const results = await evaluateCondition({
...baseOptions,
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/ip_to_hostname.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/ip_to_hostname.ts
index ae536508f9541..7983e5ad58348 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/ip_to_hostname.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/ip_to_hostname.ts
@@ -21,10 +21,14 @@ export default function ipToHostNameTest({ getService }: DeploymentAgnosticFtrPr
withInternalHeaders: true,
useCookieHeader: true,
});
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await supertestWithAdminScope.destroy();
});
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metadata.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metadata.ts
index ef7b529476f25..6432db44fa92c 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metadata.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metadata.ts
@@ -57,8 +57,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
});
describe('7.0.0', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ )
+ );
it('hosts', async () => {
const metadata = await fetchMetadata({
@@ -77,8 +85,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
});
describe('6.6.0', () => {
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker'
+ )
+ );
it('docker', async () => {
const metadata = await fetchMetadata({
@@ -99,7 +115,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('8.0.0', () => {
describe('cloud and host information', () => {
const archiveName =
- 'x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws';
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics_with_aws';
before(() => esArchiver.load(archiveName));
after(() => esArchiver.unload(archiveName));
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_overview_top.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_overview_top.ts
index a18a694bd903a..f1e11d5c1e199 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_overview_top.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_overview_top.ts
@@ -27,10 +27,14 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
withInternalHeaders: true,
useCookieHeader: true,
});
- await esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ );
await supertestWithAdminScope.destroy();
});
@@ -60,10 +64,14 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('Runtime fields calculation', () => {
before(() =>
- esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/hosts_and_network')
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_and_network'
+ )
);
after(() =>
- esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/hosts_and_network')
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_and_network'
+ )
);
it('should return correct sorted calculations', async () => {
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list.ts
index 77279e8a50c18..eb167bd41d380 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list.ts
@@ -28,12 +28,12 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
useCookieHeader: true,
});
await esArchiver.load(
- 'x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes'
);
await supertestWithAdminScope.destroy();
});
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list_chart.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list_chart.ts
index 8e2b23befe6d4..1650786cf0f06 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list_chart.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/metrics_process_list_chart.ts
@@ -28,12 +28,12 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
useCookieHeader: true,
});
await esArchiver.load(
- 'x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes'
);
await supertestWithAdminScope.destroy();
});
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/node_details.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/node_details.ts
index 607e267d22c0a..2d302fb3107a6 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/node_details.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/node_details.ts
@@ -38,10 +38,14 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
withInternalHeaders: true,
useCookieHeader: true,
});
- await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/pods_only');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/pods_only');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only'
+ );
await supertestWithAdminScope.destroy();
});
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/snapshot.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/snapshot.ts
index 21f34f9c617f3..dd8e54f655682 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/snapshot.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/snapshot.ts
@@ -46,8 +46,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('6.6.0', () => {
const { min, max } = DATES['6.6.0'].docker;
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker'
+ )
+ );
it('should basically work', async () => {
const snapshot = await fetchSnapshot({
@@ -122,10 +130,14 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('8.0.0', () => {
const { min, max } = DATES['8.0.0'].logs_and_metrics;
before(() =>
- esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ )
);
after(() =>
- esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics'
+ )
);
it("should use the id for the label when the name doesn't exist", async () => {
@@ -303,8 +315,16 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
describe('7.0.0', () => {
const { min, max } = DATES['7.0.0'].hosts;
- before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+ before(() =>
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ )
+ );
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts'
+ )
+ );
it('should basically work', async () => {
const snapshot = await fetchSnapshot({
diff --git a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/sources.ts b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/sources.ts
index 63917a4bc97b1..256cc1740002d 100644
--- a/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/sources.ts
+++ b/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/infra/sources.ts
@@ -41,11 +41,15 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
withInternalHeaders: true,
useCookieHeader: true,
});
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await kibanaServer.savedObjects.cleanStandardList();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await supertestWithAdminScope.destroy();
});
diff --git a/x-pack/test/functional/es_archives/infra/6.6.0/docker/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/6.6.0/docker/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/6.6.0/docker/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/6.6.0/docker/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/6.6.0/docker/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/7.0.0/hosts/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/7.0.0/hosts/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/7.0.0/hosts/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/7.0.0/hosts/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/7.0.0/hosts/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/hosts_and_network/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_and_network/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/hosts_and_network/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_and_network/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/hosts_and_network/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_and_network/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/hosts_and_network/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_and_network/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/hosts_only/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/hosts_only/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/hosts_only/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/hosts_only/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/hosts_only/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/metrics_hosts_processes/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_hosts_processes/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_log_rate/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_log_rate/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_log_rate/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_log_rate/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_log_rate/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_log_rate/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_log_rate/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_log_rate/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/ml_anomalies_partitioned_log_rate/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/pods_only/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/pods_only/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/pods_only/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/8.0.0/pods_only/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/alerts/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/alerts/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/alerts/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/alerts/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/alerts_test_data/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/alerts_test_data/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/alerts_test_data/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/alerts_test_data/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts_test_data/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/legacy/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/legacy/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/legacy/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/legacy/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/legacy/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/legacy/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/legacy/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/legacy/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/logs_with_nano_date/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_with_nano_date/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/logs_with_nano_date/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_with_nano_date/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/logs_with_nano_date/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_with_nano_date/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/logs_with_nano_date/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_with_nano_date/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/logs_without_epoch_millis/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_without_epoch_millis/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/logs_without_epoch_millis/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_without_epoch_millis/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/logs_without_epoch_millis/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_without_epoch_millis/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/logs_without_epoch_millis/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/logs_without_epoch_millis/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/metrics_and_logs/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/metrics_and_logs/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/metrics_and_logs/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/metrics_and_logs/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/metrics_anomalies/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_anomalies/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/metrics_anomalies/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_anomalies/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/metrics_anomalies/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_anomalies/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/metrics_anomalies/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_anomalies/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/metrics_hosts_processes/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_hosts_processes/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/metrics_hosts_processes/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_hosts_processes/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/metrics_hosts_processes/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_hosts_processes/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/metrics_hosts_processes/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_hosts_processes/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/simple_logs/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/simple_logs/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/simple_logs/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/simple_logs/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs/mappings.json
diff --git a/x-pack/test/functional/es_archives/infra/ten_thousand_plus/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/ten_thousand_plus/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus/data.json.gz
diff --git a/x-pack/test/functional/es_archives/infra/ten_thousand_plus/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/infra/ten_thousand_plus/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/infra/ten_thousand_plus/mappings.json
diff --git a/x-pack/test/functional/es_archives/observability/alerts/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/observability/alerts/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts/data.json.gz
diff --git a/x-pack/test/functional/es_archives/observability/alerts/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/observability/alerts/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts/mappings.json
diff --git a/x-pack/test/functional/es_archives/uptime/blank/data.json b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/blank/data.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank/data.json
diff --git a/x-pack/test/functional/es_archives/uptime/blank/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/blank/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank/mappings.json
diff --git a/x-pack/test/functional/es_archives/uptime/full_heartbeat/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/full_heartbeat/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat/data.json.gz
diff --git a/x-pack/test/functional/es_archives/uptime/full_heartbeat/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/full_heartbeat/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat/mappings.json
diff --git a/x-pack/test/functional/es_archives/uptime/location/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/location/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/location/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/location/data.json.gz
diff --git a/x-pack/test/functional/es_archives/uptime/location/mappings.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/location/mappings.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/location/mappings.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/location/mappings.json.gz
diff --git a/x-pack/test/functional/es_archives/uptime/pings/data.json.gz b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/pings/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/pings/data.json.gz
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/pings/data.json.gz
diff --git a/x-pack/test/functional/es_archives/uptime/pings/mappings.json b/x-pack/solutions/observability/test/fixtures/es_archives/uptime/pings/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/uptime/pings/mappings.json
rename to x-pack/solutions/observability/test/fixtures/es_archives/uptime/pings/mappings.json
diff --git a/x-pack/solutions/observability/test/functional/apps/apm/correlations/failed_transaction_correlations.ts b/x-pack/solutions/observability/test/functional/apps/apm/correlations/failed_transaction_correlations.ts
index f484cbdcd2e35..0fc5b300f5149 100644
--- a/x-pack/solutions/observability/test/functional/apps/apm/correlations/failed_transaction_correlations.ts
+++ b/x-pack/solutions/observability/test/functional/apps/apm/correlations/failed_transaction_correlations.ts
@@ -28,7 +28,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('failed transactions correlations', () => {
describe('space with no features disabled', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm'
+ );
await spacesService.create({
id: 'custom_space',
name: 'custom_space',
@@ -37,7 +39,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm'
+ );
await spacesService.delete('custom_space');
});
diff --git a/x-pack/solutions/observability/test/functional/apps/apm/correlations/latency_correlations.ts b/x-pack/solutions/observability/test/functional/apps/apm/correlations/latency_correlations.ts
index 5c55142652258..301f3042f23c6 100644
--- a/x-pack/solutions/observability/test/functional/apps/apm/correlations/latency_correlations.ts
+++ b/x-pack/solutions/observability/test/functional/apps/apm/correlations/latency_correlations.ts
@@ -28,7 +28,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('latency correlations', () => {
describe('space with no features disabled', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm'
+ );
await spacesService.delete('custom_space');
await spacesService.create({
id: 'custom_space',
@@ -38,7 +40,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/metrics_and_apm'
+ );
await spacesService.delete('custom_space');
});
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/solutions/observability/test/functional/apps/infra/feature_controls/infrastructure_security.ts
index d4e2d7fd653cd..e69153fcf9b7a 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/feature_controls/infrastructure_security.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/feature_controls/infrastructure_security.ts
@@ -83,11 +83,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('infrastructure landing page with data', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it(`shows Wafflemap`, async () => {
@@ -183,11 +187,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('infrastructure landing page with data', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it(`shows Wafflemap`, async () => {
@@ -264,11 +272,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('infrastructure landing page with data', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
});
});
@@ -317,11 +329,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('infrastructure landing page with data', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
});
});
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/hosts_view.ts b/x-pack/solutions/observability/test/functional/apps/infra/hosts_view.ts
index d58f2a0e840d3..3a50f506b17d9 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/hosts_view.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/hosts_view.ts
@@ -744,15 +744,23 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('#Page Content with alerts', () => {
before(async () => {
return Promise.all([
- esArchiver.load('x-pack/test/functional/es_archives/infra/alerts'),
- esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'
+ ),
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ ),
]);
});
after(async () => {
return Promise.all([
- esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts'),
- esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'
+ ),
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ ),
]);
});
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_categories_tab.ts b/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_categories_tab.ts
index dc5b8dacafd5c..3fc0aa1f16d5a 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_categories_tab.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_categories_tab.ts
@@ -83,11 +83,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('when indices exists', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('shows setup page when indices exist', async () => {
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_rate_tab.ts b/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_rate_tab.ts
index 97b5d1a2ce133..36f7bc380f003 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_rate_tab.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/logs/log_entry_rate_tab.ts
@@ -70,11 +70,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('when indices exists', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('shows setup page when indices exist', async () => {
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/logs/ml_job_id_formats/tests.ts b/x-pack/solutions/observability/test/functional/apps/infra/logs/ml_job_id_formats/tests.ts
index 06ea712c7ccc0..beec41cb36977 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/logs/ml_job_id_formats/tests.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/logs/ml_job_id_formats/tests.ts
@@ -35,11 +35,15 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
this.beforeAll(async () => {
// Access to ml.api has to happen inside a test or test hook
mlJobHelper = createMlJobHelper(ml.api);
- await esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
this.afterAll(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
describe('hashed format', () => {
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/metrics_anomalies.ts b/x-pack/solutions/observability/test/functional/apps/infra/metrics_anomalies.ts
index 1b8e696ad502f..2a4bd1adeb991 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/metrics_anomalies.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/metrics_anomalies.ts
@@ -73,7 +73,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('with anomalies present', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_anomalies');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_anomalies'
+ );
// create the ml jobs saved objects
await Promise.all(
ML_JOB_IDS.map((id) =>
@@ -91,7 +93,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
);
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_anomalies');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_anomalies'
+ );
});
it('renders the anomaly table with anomalies', async () => {
// if the input value is unchanged the save button won't be available
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/metrics_explorer.ts b/x-pack/solutions/observability/test/functional/apps/infra/metrics_explorer.ts
index 9edde4b8979e6..cf1fe082ba4be 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/metrics_explorer.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/metrics_explorer.ts
@@ -34,7 +34,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Basic Functionality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await pageObjects.common.navigateToApp('infraOps');
await pageObjects.infraHome.goToMetricExplorer();
await pageObjects.timePicker.setAbsoluteRange(
@@ -42,7 +44,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
END_DATE.format(timepickerFormat)
);
});
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ )
+ );
it('should render the correct page title', async () => {
const documentTitle = await browser.getTitle();
@@ -138,11 +144,17 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Saved Views', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await pageObjects.infraHome.goToMetricExplorer();
});
- after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+ after(() =>
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ )
+ );
beforeEach(async () => {
await pageObjects.infraSavedViews.clickSavedViewsButton();
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/metrics_source_configuration.ts b/x-pack/solutions/observability/test/functional/apps/infra/metrics_source_configuration.ts
index d8728fb8ab343..14feb1fb6f10e 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/metrics_source_configuration.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/metrics_source_configuration.ts
@@ -31,15 +31,19 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Infrastructure Source Configuration', function () {
before(async () =>
Promise.all([
- esArchiver.load('x-pack/test/functional/es_archives/infra/alerts'),
- esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ esArchiver.load('x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'),
+ esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ ),
kibanaServer.savedObjects.cleanStandardList(),
])
);
after(async () =>
Promise.all([
- esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts'),
- esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'),
+ esArchiver.unload('x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'),
+ esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ ),
kibanaServer.savedObjects.cleanStandardList(),
])
);
diff --git a/x-pack/solutions/observability/test/functional/apps/infra/node_details.ts b/x-pack/solutions/observability/test/functional/apps/infra/node_details.ts
index 1c9bd238d17a0..d9fade6613a62 100644
--- a/x-pack/solutions/observability/test/functional/apps/infra/node_details.ts
+++ b/x-pack/solutions/observability/test/functional/apps/infra/node_details.ts
@@ -294,7 +294,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
const ALL_ALERTS = ACTIVE_ALERTS + RECOVERED_ALERTS;
const COLUMNS = 11;
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'
+ );
await navigateToNodeDetails('demo-stack-apache-01', 'host', {
name: 'demo-stack-apache-01',
});
@@ -313,7 +315,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
name: 'host-1',
});
await pageObjects.header.waitUntilLoadingHasFinished();
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/alerts'
+ );
});
it('should show / hide alerts section with active alerts and show / hide closed section content', async () => {
@@ -481,8 +485,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
// FLAKY: https://github.com/elastic/kibana/issues/192891
describe.skip('Processes Tab', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_hosts_processes');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_hosts_processes'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await navigateToNodeDetails('Jennys-MBP.fritz.box', 'host', {
name: 'Jennys-MBP.fritz.box',
});
@@ -495,9 +503,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/infra/metrics_hosts_processes'
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_hosts_processes'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
);
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
await navigateToNodeDetails('host-1', 'host', { name: 'host-1' });
});
diff --git a/x-pack/solutions/observability/test/functional/apps/uptime/certificates.ts b/x-pack/solutions/observability/test/functional/apps/uptime/certificates.ts
index 2fbd72e841def..b2f174db4e0f3 100644
--- a/x-pack/solutions/observability/test/functional/apps/uptime/certificates.ts
+++ b/x-pack/solutions/observability/test/functional/apps/uptime/certificates.ts
@@ -10,7 +10,7 @@ import { getSha256 } from '../../../api_integration/apis/uptime/rest/helper/make
import { FtrProviderContext } from '../../ftr_provider_context';
import { UPTIME_HEARTBEAT_DATA } from './overview';
-const BLANK_INDEX_PATH = 'x-pack/test/functional/es_archives/uptime/blank';
+const BLANK_INDEX_PATH = 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank';
export default ({ getPageObjects, getService }: FtrProviderContext) => {
const { uptime } = getPageObjects(['uptime']);
diff --git a/x-pack/solutions/observability/test/functional/apps/uptime/index.ts b/x-pack/solutions/observability/test/functional/apps/uptime/index.ts
index ecc36e4822861..9f4eaa05d9afb 100644
--- a/x-pack/solutions/observability/test/functional/apps/uptime/index.ts
+++ b/x-pack/solutions/observability/test/functional/apps/uptime/index.ts
@@ -7,7 +7,7 @@
import { FtrProviderContext } from '../../ftr_provider_context';
-const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
+const ARCHIVE = 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat';
export default ({ loadTestFile, getService }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
@@ -21,10 +21,14 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
describe('with generated data', () => {
beforeEach('load heartbeat data', async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
});
afterEach('unload', async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/blank'
+ );
});
loadTestFile(require.resolve('./settings'));
diff --git a/x-pack/solutions/observability/test/functional/apps/uptime/ml_anomaly.ts b/x-pack/solutions/observability/test/functional/apps/uptime/ml_anomaly.ts
index 38b5f47011409..10f105379191c 100644
--- a/x-pack/solutions/observability/test/functional/apps/uptime/ml_anomaly.ts
+++ b/x-pack/solutions/observability/test/functional/apps/uptime/ml_anomaly.ts
@@ -12,7 +12,7 @@ export default ({ getService }: FtrProviderContext) => {
const uptime = getService('uptime');
const log = getService('log');
const esArchiver = getService('esArchiver');
- const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
+ const archive = 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat';
describe('uptime ml anomaly', function () {
this.tags(['skipFirefox']);
diff --git a/x-pack/solutions/observability/test/functional/apps/uptime/overview.ts b/x-pack/solutions/observability/test/functional/apps/uptime/overview.ts
index ecace40e6093b..b0712c3ba6523 100644
--- a/x-pack/solutions/observability/test/functional/apps/uptime/overview.ts
+++ b/x-pack/solutions/observability/test/functional/apps/uptime/overview.ts
@@ -8,7 +8,8 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
-export const UPTIME_HEARTBEAT_DATA = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
+export const UPTIME_HEARTBEAT_DATA =
+ 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat';
const DEFAULT_NAVIGATION_SEARCH = `dateRangeEnd=2019-09-11T19:40:08.078Z&dateRangeStart=2019-09-10T12:40:08.078Z`;
export default ({ getPageObjects, getService }: FtrProviderContext) => {
diff --git a/x-pack/solutions/observability/test/functional/services/observability/alerts/common.ts b/x-pack/solutions/observability/test/functional/services/observability/alerts/common.ts
index 81a19364316a5..69bc8639a0997 100644
--- a/x-pack/solutions/observability/test/functional/services/observability/alerts/common.ts
+++ b/x-pack/solutions/observability/test/functional/services/observability/alerts/common.ts
@@ -13,7 +13,7 @@ import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
import { Agent as SuperTestAgent } from 'supertest';
import { FtrProviderContext } from '../../../ftr_provider_context';
-// Based on the x-pack/test/functional/es_archives/observability/alerts archive.
+// Based on the x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts archive.
const DATE_WITH_DATA = {
rangeFrom: '2021-10-18T13:36:22.109Z',
rangeTo: '2021-10-20T13:36:22.109Z',
diff --git a/x-pack/solutions/observability/test/functional/services/observability/overview/common.ts b/x-pack/solutions/observability/test/functional/services/observability/overview/common.ts
index d4b9893f53b89..da02fc381bd66 100644
--- a/x-pack/solutions/observability/test/functional/services/observability/overview/common.ts
+++ b/x-pack/solutions/observability/test/functional/services/observability/overview/common.ts
@@ -7,7 +7,7 @@
import { FtrProviderContext } from '../../../ftr_provider_context';
-// Based on the x-pack/test/functional/es_archives/observability/alerts archive.
+// Based on the x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts archive.
const DATE_WITH_DATA = {
rangeFrom: '2021-10-18T13:36:22.109Z',
rangeTo: '2021-10-20T13:36:22.109Z',
diff --git a/x-pack/solutions/observability/test/functional_with_es_ssl/apps/uptime/index.ts b/x-pack/solutions/observability/test/functional_with_es_ssl/apps/uptime/index.ts
index 2c39ef045972f..cc1a8f93c0326 100644
--- a/x-pack/solutions/observability/test/functional_with_es_ssl/apps/uptime/index.ts
+++ b/x-pack/solutions/observability/test/functional_with_es_ssl/apps/uptime/index.ts
@@ -7,7 +7,7 @@
import { FtrProviderContext } from '../../ftr_provider_context';
-const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
+const ARCHIVE = 'x-pack/solutions/observability/test/fixtures/es_archives/uptime/full_heartbeat';
export default ({ getService, loadTestFile }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/feature_controls/observability_security.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/feature_controls/observability_security.ts
index 45869811f66c3..4172584b71b4e 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/feature_controls/observability_security.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/feature_controls/observability_security.ts
@@ -38,7 +38,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('observability cases all privileges', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.users.setTestUserRole(
observability.users.defineBasicObservabilityRole({
observabilityCasesV3: ['all'],
@@ -48,7 +50,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.users.restoreDefaultTestUserRole();
});
@@ -91,7 +95,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
describe('observability cases read-only privileges', function () {
this.tags('skipFIPS');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.users.setTestUserRole(
observability.users.defineBasicObservabilityRole({
observabilityCasesV3: ['read'],
@@ -101,7 +107,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.users.restoreDefaultTestUserRole();
});
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alert_details_page.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alert_details_page.ts
index b95861bf42bcc..2ec200e73d96e 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alert_details_page.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alert_details_page.ts
@@ -18,13 +18,21 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await observability.alerts.common.setKibanaTimeZoneToUTC();
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('should show error when the alert does not exist', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts
index 9ce962ea4f4b9..0396b98310a0e 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts
@@ -16,13 +16,21 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
this.tags('includeFirefox');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs');
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
describe('When user has all privileges for cases', () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_controls.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_controls.ts
index f793ac46807bd..e5f18b404bfd4 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_controls.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_controls.ts
@@ -23,14 +23,22 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
const retry = getService('retry');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.alerts.common.navigateToTimeWithData();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('is filtered to only show "active" alerts by default', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_summary_widget.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_summary_widget.ts
index 30423507cf3a1..8756139ec6e4d 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_summary_widget.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/alert_summary_widget.ts
@@ -22,14 +22,22 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
const observability = getService('observability');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.alerts.common.navigateToTimeWithData();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('shows number of total and active alerts when status filter is active', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold.ts
index eb8303f29cc2b..8a4939c438345 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold.ts
@@ -32,7 +32,9 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
const DATA_VIEW_2_NAME = 'test-data-view-name_2';
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
// create two data views
await observability.alerts.common.createDataView({
supertest,
@@ -53,7 +55,9 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
// This also deletes the created data views
await kibanaServer.savedObjects.cleanStandardList();
});
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold_preview_chart.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold_preview_chart.ts
index 637506c91fb90..5c6d78d5e8df7 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold_preview_chart.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/custom_threshold_preview_chart.ts
@@ -25,7 +25,9 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
const DATA_VIEW_1_NAME = 'test-data-view-name_1';
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.alerts.common.createDataView({
supertest,
name: DATA_VIEW_1_NAME,
@@ -38,7 +40,9 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
// This also deletes the created data views
await kibanaServer.savedObjects.cleanStandardList();
});
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/index.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/index.ts
index 6b257ceb4bc4a..ce0cf4bf97121 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/index.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/index.ts
@@ -84,7 +84,9 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
let customThresholdRuleId: string;
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
const setup = async () => {
await observability.alerts.common.setKibanaTimeZoneToUTC();
await observability.alerts.common.navigateToTimeWithData();
@@ -104,7 +106,9 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
useActualUrl: true,
});
@@ -114,12 +118,16 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
describe('Alerts table', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
await observability.alerts.common.navigateToTimeWithData();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
it('Renders the table', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/metric_threshold.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/metric_threshold.ts
index 52f539288db26..1f9972b2b0df1 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/metric_threshold.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/metric_threshold.ts
@@ -18,12 +18,16 @@ export default ({ getService }: FtrProviderContext) => {
const observability = getService('observability');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.alerts.common.navigateToRulesPage();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('shows the metric threshold rule in the observability section', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/pagination.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/pagination.ts
index 4f5bcade7d51f..fe46190738015 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/pagination.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/pagination.ts
@@ -22,15 +22,23 @@ export default ({ getService }: FtrProviderContext) => {
const observability = getService('observability');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.alerts.common.navigateToTimeWithData();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
// This will fail after removing workflow filter i.e. show all not only "open" https://github.com/elastic/kibana/issues/119946
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/rule_stats.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/rule_stats.ts
index ad04b5dd960cf..10d3bd01a032a 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/rule_stats.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/rule_stats.ts
@@ -27,7 +27,9 @@ export default ({ getService }: FtrProviderContext) => {
const observability = getService('observability');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
const setup = async () => {
await observability.alerts.common.setKibanaTimeZoneToUTC();
await observability.alerts.common.navigateWithoutFilter();
@@ -36,7 +38,9 @@ export default ({ getService }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
describe('Stat counters', () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts
index 5ea77239f0f06..17405150f46e2 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts
@@ -20,13 +20,21 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
const pageObjects = getPageObjects(['common', 'observability', 'timePicker']);
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
it('should read page state from URL', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/table_configuration.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/table_configuration.ts
index d5a8d27d0decf..0828a730fe627 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/table_configuration.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/alerts/table_configuration.ts
@@ -32,13 +32,21 @@ export default ({ getService }: FtrProviderContext) => {
const retry = getService('retry');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs');
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/simple_logs'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('renders correctly with a pre-existing persisted configuration', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/cases/case_details.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/cases/case_details.ts
index 392789c3604d2..144cd041d945d 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/cases/case_details.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/cases/case_details.ts
@@ -20,13 +20,21 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Observability cases', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
describe('Case detail rule link', () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/overview/alert_table.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/overview/alert_table.ts
index 95e140131b7ea..1153d3c14d46a 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/overview/alert_table.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/overview/alert_table.ts
@@ -49,12 +49,16 @@ export default ({ getService }: FtrProviderContext) => {
},
schedule: { interval: '1m' },
});
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
after(async () => {
await rulesService.api.deleteAllRules();
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
});
it('navigate and open alerts section', async () => {
diff --git a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/rules_page.ts b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/rules_page.ts
index 8f876d981a2ad..8e193de0b7db0 100644
--- a/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/rules_page.ts
+++ b/x-pack/solutions/observability/test/observability_functional/apps/observability/pages/rules_page.ts
@@ -113,8 +113,12 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
};
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await observability.alerts.common.navigateWithoutFilter();
await esClient.deleteByQuery({
index: RULE_ALERT_INDEX_PATTERN,
@@ -125,8 +129,12 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/observability/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await esClient.deleteByQuery({
index: RULE_ALERT_INDEX_PATTERN,
query: { match_all: {} },
diff --git a/x-pack/test/functional/es_archives/asset_criticality/data.json b/x-pack/solutions/security/test/fixtures/es_archives/asset_criticality/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/asset_criticality/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/asset_criticality/data.json
diff --git a/x-pack/test/functional/es_archives/asset_criticality/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/asset_criticality/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/asset_criticality/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/asset_criticality/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/metadata/api_feature/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/metadata/api_feature/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/metadata/api_feature/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/metadata/api_feature/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/pipeline/dns/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/pipeline/dns/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/pipeline/dns/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/pipeline/dns/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver/api_feature/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/api_feature/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver/api_feature/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/api_feature/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver/api_feature/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/api_feature/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver/api_feature/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/api_feature/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver/signals/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver/signals/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver/signals/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver/signals/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/winlogbeat/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/winlogbeat/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/winlogbeat/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/winlogbeat/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver_tree/alert_events/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/alert_events/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver_tree/alert_events/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/alert_events/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver_tree/events/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/events/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver_tree/events/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/events/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver_tree/functions/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/functions/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver_tree/functions/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/functions/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/resolver_tree/library_events/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/library_events/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/resolver_tree/library_events/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver_tree/library_events/data.json.gz
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/agent_only/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/agent_only/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/agent_only/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/agent_only/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_different_states/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_different_states/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_installed/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_installed/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_disabled/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_disabled/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_enabled/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_enabled/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/data.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_uninstalled/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_uninstalled/data.json
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
diff --git a/x-pack/test/functional/es_archives/entity/risks/data.json b/x-pack/solutions/security/test/fixtures/es_archives/entity/risks/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/entity/risks/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/entity/risks/data.json
diff --git a/x-pack/test/functional/es_archives/entity/risks/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/entity/risks/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/entity/risks/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/entity/risks/mappings.json
diff --git a/x-pack/test/functional/es_archives/packetbeat/default/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/default/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/default/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/default/data.json.gz
diff --git a/x-pack/test/functional/es_archives/packetbeat/default/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/default/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/default/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/default/mappings.json
diff --git a/x-pack/test/functional/es_archives/packetbeat/dns/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/dns/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/dns/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/dns/data.json.gz
diff --git a/x-pack/test/functional/es_archives/packetbeat/dns/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/dns/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/dns/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/dns/mappings.json
diff --git a/x-pack/test/functional/es_archives/packetbeat/overview/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/overview/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/overview/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/overview/data.json.gz
diff --git a/x-pack/test/functional/es_archives/packetbeat/overview/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/overview/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/overview/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/overview/mappings.json
diff --git a/x-pack/test/functional/es_archives/packetbeat/tls/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/tls/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls/data.json.gz
diff --git a/x-pack/test/functional/es_archives/packetbeat/tls/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/packetbeat/tls/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/README.md b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/README.md
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/README.md
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/README.md
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/agent/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/agent/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/agent/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/agent/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/agent/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/agent/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/agent/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/agent/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/date/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/date/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/date/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/date/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/date/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/date/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/date/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/date/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/double/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/double/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/double/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/double/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/double_as_string/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double_as_string/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/double_as_string/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double_as_string/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/double_as_string/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double_as_string/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/double_as_string/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double_as_string/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/endpoint_without_host_type/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/endpoint_without_host_type/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/endpoint_without_host_type/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/endpoint_without_host_type/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/float/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/float/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/float/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/float/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/float_as_string/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float_as_string/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/float_as_string/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float_as_string/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/float_as_string/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float_as_string/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/float_as_string/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float_as_string/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/integer/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/integer/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/integer/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/integer/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/integer_as_string/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer_as_string/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/integer_as_string/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer_as_string/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/integer_as_string/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer_as_string/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/integer_as_string/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer_as_string/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/ip/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/ip/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/ip/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/ip/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/ip_as_array/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip_as_array/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/ip_as_array/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip_as_array/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/ip_as_array/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip_as_array/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/ip_as_array/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip_as_array/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/keyword/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/keyword/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/keyword/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/keyword/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword_as_array/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword_as_array/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword_as_array/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword_as_array/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/long/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/long/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/long/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/long/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/long_as_string/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long_as_string/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/long_as_string/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long_as_string/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/long_as_string/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long_as_string/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/long_as_string/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long_as_string/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/text/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/text/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/text/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/text/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/text_as_array/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_as_array/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/text_as_array/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_as_array/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/text_as_array/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_as_array/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/text_as_array/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_as_array/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_no_spaces/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_no_spaces/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_no_spaces/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_no_spaces/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/wildcard/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/wildcard/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/wildcard/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/wildcard/data.json
diff --git a/x-pack/test/functional/es_archives/rule_exceptions/wildcard/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/wildcard/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_exceptions/wildcard/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/wildcard/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/README.md b/x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/README.md
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_keyword_family/README.md
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/README.md
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword/data.json
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword/mappings.json
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/keyword/data.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_keyword_family/keyword/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword/data.json
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/keyword/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/rule_keyword_family/keyword/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/README.md b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/README.md
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/README.md
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/README.md
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0/mappings.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0/mappings.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.17.0/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.17.0/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/mappings.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.17.0/mappings.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/mappings.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.17.0/mappings.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.0.0/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.0.0/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/mappings.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.0.0/mappings.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/mappings.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.0.0/mappings.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/mappings.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0/mappings.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/mappings.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.1.0/mappings.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.8.0/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.8.0/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.8.0/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.8.0/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/alias/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alias/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/alias/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/alias/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/anomalies/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/anomalies/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/anomalies/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/anomalies/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/attack_discovery_alerts/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/attack_discovery_alerts/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/attack_discovery_alerts/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/attack_discovery_alerts/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/attack_discovery_alerts/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/attack_discovery_alerts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/attack_discovery_alerts/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/attack_discovery_alerts/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_compliant/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ecs_compliant/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_compliant_synthetic_source/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant_synthetic_source/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ecs_compliant_synthetic_source/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant_synthetic_source/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_fields_duplicated_for_alerts/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_fields_duplicated_for_alerts/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ecs_fields_duplicated_for_alerts/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_fields_duplicated_for_alerts/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_fields_duplicated_for_alerts/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_fields_duplicated_for_alerts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ecs_fields_duplicated_for_alerts/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_fields_duplicated_for_alerts/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_non_compliant/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ecs_non_compliant/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_non_compliant_synthetic_source/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant_synthetic_source/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ecs_non_compliant_synthetic_source/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant_synthetic_source/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/entity_store/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/entity_store/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/entity_store/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/entity_store/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/entity_store/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/entity_store/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/entity_store/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/entity_store/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ignore_fields/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ignore_fields/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/ignore_fields/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/ignore_fields/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/import_rule_connector/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/import_rule_connector/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/import_rule_connector/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/import_rule_connector/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/legacy_actions/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_actions/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/legacy_actions/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_actions/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_cti_signals/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_cti_signals/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_cti_signals/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_cti_signals/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/README.md b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/matrix_dns_histogram/README.md
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/README.md
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/matrix_dns_histogram/README.md
diff --git a/x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/matrix_dns_histogram/large_dns_query/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/matrix_dns_histogram/large_dns_query/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/matrix_dns_histogram/large_dns_query/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/matrix_dns_histogram/large_dns_query/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/migrations/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/migrations/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/new_terms/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/new_terms/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/new_terms/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/new_terms/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/new_terms/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/new_terms/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/new_terms/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/new_terms/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/no_at_timestamp_field/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/no_at_timestamp_field/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/no_at_timestamp_field/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/no_at_timestamp_field/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/no_at_timestamp_field/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/no_at_timestamp_field/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/no_at_timestamp_field/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/no_at_timestamp_field/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/runtime/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/runtime/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime_conflicting_fields/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime_conflicting_fields/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime_conflicting_fields/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime_conflicting_fields/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/semantic_text_fields/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/semantic_text_fields/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/semantic_text_fields/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/semantic_text_fields/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/semantic_text_fields/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/semantic_text_fields/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/semantic_text_fields/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/semantic_text_fields/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/suppression/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/suppression/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/suppression/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/suppression/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/suppression/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/suppression/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/suppression/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/suppression/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/telemetry/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/telemetry/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/telemetry/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/telemetry/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_fallback/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_fallback/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_fallback/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_fallback/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_in_seconds/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_in_seconds/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_in_seconds/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_in_seconds/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override/data.json.gz
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_1/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_1/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_1/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_1/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_1/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_2/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_2/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_2/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_2/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_2/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_3/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_4/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_4/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_4/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_4/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_5/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_5/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_5/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_5/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_5/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_5/mappings.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_6/data.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_6/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_6/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_6/data.json
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_6/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_6/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/security_solution/timestamp_override_6/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_6/mappings.json
diff --git a/x-pack/test/functional/es_archives/session_view/alerts/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/session_view/alerts/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/alerts/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/alerts/data.json.gz
diff --git a/x-pack/test/functional/es_archives/session_view/alerts/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/alerts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/alerts/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/alerts/mappings.json
diff --git a/x-pack/test/functional/es_archives/session_view/io_events/data.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/io_events/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events/data.json
diff --git a/x-pack/test/functional/es_archives/session_view/io_events/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/io_events/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events/mappings.json
diff --git a/x-pack/test/functional/es_archives/session_view/process_events/data.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events/data.json
diff --git a/x-pack/test/functional/es_archives/session_view/process_events/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events/mappings.json
diff --git a/x-pack/test/functional/es_archives/session_view/process_events_auditbeat/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events_auditbeat/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat/data.json.gz
diff --git a/x-pack/test/functional/es_archives/session_view/process_events_auditbeat/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events_auditbeat/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat/mappings.json
diff --git a/x-pack/test/functional/es_archives/session_view/process_events_auditbeat_alerts/data.json.gz b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat_alerts/data.json.gz
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events_auditbeat_alerts/data.json.gz
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat_alerts/data.json.gz
diff --git a/x-pack/test/functional/es_archives/session_view/process_events_auditbeat_alerts/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat_alerts/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events_auditbeat_alerts/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat_alerts/mappings.json
diff --git a/x-pack/test/functional/es_archives/session_view/process_events_merged/data.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_merged/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events_merged/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_merged/data.json
diff --git a/x-pack/test/functional/es_archives/session_view/process_events_merged/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_merged/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/session_view/process_events_merged/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_merged/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/README.md b/x-pack/solutions/security/test/fixtures/es_archives/signals/README.md
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/README.md
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/README.md
diff --git a/x-pack/test/functional/es_archives/signals/index_alias_clash/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/index_alias_clash/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/index_alias_clash/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/index_alias_clash/data.json
diff --git a/x-pack/test/functional/es_archives/signals/index_alias_clash/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/index_alias_clash/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/index_alias_clash/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/index_alias_clash/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/legacy_signals_index/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/legacy_signals_index/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index/data.json
diff --git a/x-pack/test/functional/es_archives/signals/legacy_signals_index/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/legacy_signals_index/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/legacy_signals_index_non_default_space/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index_non_default_space/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/legacy_signals_index_non_default_space/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index_non_default_space/data.json
diff --git a/x-pack/test/functional/es_archives/signals/legacy_signals_index_non_default_space/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index_non_default_space/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/legacy_signals_index_non_default_space/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index_non_default_space/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/numeric_name_clash/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/numeric_name_clash/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/numeric_name_clash/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/numeric_name_clash/data.json
diff --git a/x-pack/test/functional/es_archives/signals/numeric_name_clash/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/numeric_name_clash/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/numeric_name_clash/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/numeric_name_clash/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/object_clash/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/object_clash/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/object_clash/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/object_clash/data.json
diff --git a/x-pack/test/functional/es_archives/signals/object_clash/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/object_clash/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/object_clash/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/object_clash/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/outdated_signals_index/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/outdated_signals_index/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index/data.json
diff --git a/x-pack/test/functional/es_archives/signals/outdated_signals_index/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/outdated_signals_index/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/reindexed_v8_siem_signals/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/reindexed_v8_siem_signals/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/reindexed_v8_siem_signals/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/reindexed_v8_siem_signals/data.json
diff --git a/x-pack/test/functional/es_archives/signals/reindexed_v8_siem_signals/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/reindexed_v8_siem_signals/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/reindexed_v8_siem_signals/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/reindexed_v8_siem_signals/mappings.json
diff --git a/x-pack/test/functional/es_archives/signals/severity_risk_overrides/data.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides/data.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/severity_risk_overrides/data.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides/data.json
diff --git a/x-pack/test/functional/es_archives/signals/severity_risk_overrides/mappings.json b/x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides/mappings.json
similarity index 100%
rename from x-pack/test/functional/es_archives/signals/severity_risk_overrides/mappings.json
rename to x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides/mappings.json
diff --git a/x-pack/solutions/security/test/session_view/basic/tests/get_total_io_bytes_route.ts b/x-pack/solutions/security/test/session_view/basic/tests/get_total_io_bytes_route.ts
index 2156406b60a2b..b76e7c929fc22 100644
--- a/x-pack/solutions/security/test/session_view/basic/tests/get_total_io_bytes_route.ts
+++ b/x-pack/solutions/security/test/session_view/basic/tests/get_total_io_bytes_route.ts
@@ -31,13 +31,21 @@ export default function getTotalIOBytesTests({ getService }: FtrProviderContext)
describe(`Session view - ${GET_TOTAL_IO_BYTES_ROUTE} - with a basic license`, () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/process_events');
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/io_events');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/process_events');
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/io_events');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events'
+ );
});
it(`${GET_TOTAL_IO_BYTES_ROUTE} returns a page of IO events`, async () => {
diff --git a/x-pack/solutions/security/test/session_view/basic/tests/io_events_route.ts b/x-pack/solutions/security/test/session_view/basic/tests/io_events_route.ts
index 35a5e87935611..138ebd89bebc6 100644
--- a/x-pack/solutions/security/test/session_view/basic/tests/io_events_route.ts
+++ b/x-pack/solutions/security/test/session_view/basic/tests/io_events_route.ts
@@ -30,13 +30,21 @@ export default function ioEventsTests({ getService }: FtrProviderContext) {
describe(`Session view - ${IO_EVENTS_ROUTE} - with a basic license`, () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/process_events');
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/io_events');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/process_events');
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/io_events');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events'
+ );
});
it(`${IO_EVENTS_ROUTE} fails when an invalid api version is specified`, async () => {
diff --git a/x-pack/solutions/security/test/session_view/basic/tests/process_events_route.ts b/x-pack/solutions/security/test/session_view/basic/tests/process_events_route.ts
index d66b1890f2ee2..e2a57b741865e 100644
--- a/x-pack/solutions/security/test/session_view/basic/tests/process_events_route.ts
+++ b/x-pack/solutions/security/test/session_view/basic/tests/process_events_route.ts
@@ -54,15 +54,27 @@ export default function processEventsTests({ getService }: FtrProviderContext) {
describe(`Session view - ${PROCESS_EVENTS_ROUTE} - with a basic license`, () => {
describe(`using typical process event data`, () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/process_events');
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/alerts');
- await esArchiver.load('x-pack/test/functional/es_archives/session_view/io_events');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/alerts'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/process_events');
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/alerts');
- await esArchiver.unload('x-pack/test/functional/es_archives/session_view/io_events');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/alerts'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/io_events'
+ );
});
it(`${PROCESS_EVENTS_ROUTE} fails when an invalid api version is specified`, async () => {
@@ -207,13 +219,13 @@ export default function processEventsTests({ getService }: FtrProviderContext) {
describe(`Session view - ${PROCESS_EVENTS_ROUTE} - with merged fork/exec/end events`, () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/session_view/process_events_merged'
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_merged'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/session_view/process_events_merged'
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_merged'
);
});
@@ -235,19 +247,19 @@ export default function processEventsTests({ getService }: FtrProviderContext) {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/session_view/process_events_auditbeat'
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat'
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/session_view/process_events_auditbeat_alerts'
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat_alerts'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/session_view/process_events_auditbeat'
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat'
);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/session_view/process_events_auditbeat_alerts'
+ 'x-pack/solutions/security/test/fixtures/es_archives/session_view/process_events_auditbeat_alerts'
);
});
diff --git a/x-pack/test/functional/es_archives/observability_logs_explorer/data_streams/data.json.gz b/x-pack/test/functional/es_archives/observability_logs_explorer/data_streams/data.json.gz
deleted file mode 100644
index 4e72a78a4f8b9..0000000000000
Binary files a/x-pack/test/functional/es_archives/observability_logs_explorer/data_streams/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/observability_logs_explorer/data_streams/mappings.json b/x-pack/test/functional/es_archives/observability_logs_explorer/data_streams/mappings.json
deleted file mode 100644
index ed9e5982f576f..0000000000000
--- a/x-pack/test/functional/es_archives/observability_logs_explorer/data_streams/mappings.json
+++ /dev/null
@@ -1,419 +0,0 @@
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-gaming-activity",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-gaming-activity"
- ],
- "name": "logs-gaming-activity",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-gaming-events",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-gaming-events"
- ],
- "name": "logs-gaming-events",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-gaming-scores",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-gaming-scores"
- ],
- "name": "logs-gaming-scores",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-manufacturing-downtime",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-manufacturing-downtime"
- ],
- "name": "logs-manufacturing-downtime",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-manufacturing-output",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-manufacturing-output"
- ],
- "name": "logs-manufacturing-output",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-manufacturing-quality",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-manufacturing-quality"
- ],
- "name": "logs-manufacturing-quality",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-retail-customers",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-retail-customers"
- ],
- "name": "logs-retail-customers",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-retail-inventory",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-retail-inventory"
- ],
- "name": "logs-retail-inventory",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-retail-promotions",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-retail-promotions"
- ],
- "name": "logs-retail-promotions",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
-
-{
- "type": "data_stream",
- "value": {
- "data_stream": "logs-retail-sales",
- "template": {
- "_meta": {
- "description": "Template for my time series data",
- "my-custom-meta-field": "More arbitrary metadata"
- },
- "data_stream": {
- "allow_custom_routing": false,
- "hidden": false
- },
- "index_patterns": [
- "logs-retail-sales"
- ],
- "name": "logs-retail-sales",
- "priority": 500,
- "template": {
- "mappings": {
- "properties": {
- "@timestamp": {
- "format": "date_optional_time||epoch_millis",
- "type": "date"
- },
- "data_stream": {
- "properties": {
- "namespace": {
- "type": "constant_keyword"
- }
- }
- },
- "message": {
- "type": "wildcard"
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/x-pack/test/security_solution_api_integration/es_archive_path_builder/constants.ts b/x-pack/test/security_solution_api_integration/es_archive_path_builder/constants.ts
index c2d8da5ed551e..e01be70f6cd7f 100644
--- a/x-pack/test/security_solution_api_integration/es_archive_path_builder/constants.ts
+++ b/x-pack/test/security_solution_api_integration/es_archive_path_builder/constants.ts
@@ -8,4 +8,4 @@
export const SERVERLESS_ES_ARCHIVE_PATH =
'x-pack/test/security_solution_api_integration/es_archive/serverless';
-export const ESS_ES_ARCHIVE_PATH = 'x-pack/test/functional/es_archives';
+export const ESS_ES_ARCHIVE_PATH = 'x-pack/solutions/security/test/fixtures/es_archives';
diff --git a/x-pack/test/security_solution_api_integration/es_archive_path_builder/index.ts b/x-pack/test/security_solution_api_integration/es_archive_path_builder/index.ts
index aff3c1c069a53..34610f46a4725 100644
--- a/x-pack/test/security_solution_api_integration/es_archive_path_builder/index.ts
+++ b/x-pack/test/security_solution_api_integration/es_archive_path_builder/index.ts
@@ -18,16 +18,17 @@ export class EsArchivePathBuilder {
*/
/**
- * List of archives that have been relocated to the new path.
- * Add more archive prefixes as needed.
+ * List of archive prefixes that are stored in the x-pack/platform/test directory.
+ * If the resourceUri starts with any of these prefixes and is not serverless,
+ * the path will be resolved to the platform archive location.
*/
- private static readonly RELOCATED_ARCHIVES = ['auditbeat', 'filebeat'];
+ private static readonly PLATFORM_ARCHIVES = ['auditbeat', 'filebeat'];
getPath(resourceUri: string): string {
- // Check if resourceUri matches any relocated archive prefix
+ // Check if resourceUri matches any platform archive prefix
if (
!this.isServerless &&
- EsArchivePathBuilder.RELOCATED_ARCHIVES.some((prefix) => resourceUri.startsWith(prefix))
+ EsArchivePathBuilder.PLATFORM_ARCHIVES.some((prefix) => resourceUri.startsWith(prefix))
) {
return `x-pack/platform/test/fixtures/es_archives/${resourceUri}`;
}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/add_actions.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/add_actions.ts
index aeda2fc44c948..5eba6e2790bdf 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/add_actions.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/add_actions.ts
@@ -49,15 +49,18 @@ export default ({ getService }: FtrProviderContext) => {
describe('adding actions', () => {
before(async () => {
await esArchiver.load(auditbeatPath);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/8.8.0', {
- useCreate: true,
- docsOnly: true,
- });
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0',
+ {
+ useCreate: true,
+ docsOnly: true,
+ }
+ );
});
after(async () => {
await esArchiver.unload(auditbeatPath);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/signals/severity_risk_overrides'
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides'
);
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/check_privileges.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/check_privileges.ts
index cedbf8a717c3c..249f31a2feda8 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/check_privileges.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/check_privileges.ts
@@ -34,13 +34,17 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @skipInServerless check_privileges', () => {
before(async () => {
await esArchiver.load('x-pack/platform/test/fixtures/es_archives/auditbeat/hosts');
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alias');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias'
+ );
await createAlertsIndex(supertest, log);
});
after(async () => {
await esArchiver.unload('x-pack/platform/test/fixtures/es_archives/auditbeat/hosts');
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alias');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias'
+ );
await deleteAllAlerts(supertest, log, es);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/migrations.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/migrations.ts
index 2786d622a0e28..f47efae5ddc95 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/migrations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/migrations.ts
@@ -34,13 +34,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('legacy actions', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/legacy_actions'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_actions'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/legacy_actions'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_actions'
);
});
@@ -365,11 +365,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('7.16.0', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/migrations');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/migrations');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/migrations'
+ );
});
it('migrates legacy siem-detection-engine-rule-actions to use saved object references', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/alerts_compatibility.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/alerts_compatibility.ts
index 52ee3daca6001..d1ef885a4c938 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/alerts_compatibility.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/alerts_compatibility.ts
@@ -62,14 +62,14 @@ export default ({ getService }: FtrProviderContext) => {
beforeEach(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/legacy_cti_signals'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_cti_signals'
);
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/legacy_cti_signals'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/legacy_cti_signals'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
@@ -212,13 +212,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('Query', () => {
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/7.16.0');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
+ );
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/alerts/7.16.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
@@ -569,13 +571,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('Saved Query', () => {
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/7.16.0');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
+ );
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/alerts/7.16.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
@@ -612,13 +616,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('EQL', () => {
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/7.16.0');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
+ );
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/alerts/7.16.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
@@ -655,13 +661,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('Threshold', () => {
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/7.16.0');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
+ );
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/alerts/7.16.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/7.16.0'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/create_index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/create_index.ts
index aa8abd2f33e50..7166858c9bca8 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/create_index.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/create_index.ts
@@ -31,11 +31,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('elastic admin', () => {
describe('with another index that shares index alias', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/signals/index_alias_clash');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/index_alias_clash'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/index_alias_clash');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/index_alias_clash'
+ );
});
it('should return 200 for create_index', async () => {
@@ -50,11 +54,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with an outdated alerts index', () => {
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals'
+ );
});
afterEach(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals'
+ );
});
it('should report that alerts index is outdated', async () => {
@@ -86,13 +94,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('with reIndexed from 7.xto 8.x .siem-signals index', () => {
beforeEach(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/signals/reindexed_v8_siem_signals'
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/reindexed_v8_siem_signals'
);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/signals/reindexed_v8_siem_signals'
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/reindexed_v8_siem_signals'
);
await es.indices.delete({
index: '.reindexed-v8-siem-signals-default-000002',
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/create_alerts_migrations.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/create_alerts_migrations.ts
index 12058ababe0dc..f0893a9418f55 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/create_alerts_migrations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/create_alerts_migrations.ts
@@ -58,10 +58,14 @@ export default ({ getService }: FtrProviderContext): void => {
createdMigrations = [];
legacySignalsIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ )
);
outdatedSignalsIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ )
);
await createAlertsIndex(supertest, log);
});
@@ -79,8 +83,12 @@ export default ({ getService }: FtrProviderContext): void => {
.expect(200);
}
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ );
await deleteMigrations({
kbnClient,
ids: createdMigrations.filter((m) => m?.migration_id).map((m) => m.migration_id),
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/delete_alerts_migrations.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/delete_alerts_migrations.ts
index 13c8ffc3c8ad0..f9435756bd13e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/delete_alerts_migrations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/delete_alerts_migrations.ts
@@ -48,7 +48,9 @@ export default ({ getService }: FtrProviderContext): void => {
beforeEach(async () => {
outdatedAlertsIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ )
);
await createAlertsIndex(supertest, log);
@@ -83,7 +85,9 @@ export default ({ getService }: FtrProviderContext): void => {
});
afterEach(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ );
await deleteMigrationsIfExistent({
kbnClient,
ids: [createdMigration.migration_id],
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/deprecations.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/deprecations.ts
index 6ec6d3d8aaeb1..cf4ac9e255ea9 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/deprecations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/deprecations.ts
@@ -43,12 +43,16 @@ export default ({ getService }: FtrProviderContext): void => {
describe('siem legacy indices exist', () => {
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ );
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ );
await deleteAllAlerts(supertest, log, es);
});
@@ -72,13 +76,13 @@ export default ({ getService }: FtrProviderContext): void => {
describe('multiple spaces', () => {
beforeEach(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/signals/legacy_signals_index_non_default_space'
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index_non_default_space'
);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/signals/legacy_signals_index_non_default_space'
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index_non_default_space'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/finalize_alerts_migrations.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/finalize_alerts_migrations.ts
index 00195bc813c97..12a55696d473c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/finalize_alerts_migrations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/finalize_alerts_migrations.ts
@@ -72,10 +72,14 @@ export default ({ getService }: FtrProviderContext): void => {
beforeEach(async () => {
createdMigrations = [];
legacyAlertsIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ )
);
outdatedAlertsIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ )
);
await createAlertsIndex(supertest, log);
@@ -98,8 +102,12 @@ export default ({ getService }: FtrProviderContext): void => {
.set('kbn-xsrf', 'true')
.send({ migration_ids: [createdMigration.migration_id] })
.expect(200);
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ );
await deleteMigrations({
kbnClient,
ids: createdMigrations.filter((m) => m?.migration_id).map((m) => m.migration_id),
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/get_alerts_migration_status.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/get_alerts_migration_status.ts
index 715ca428c93aa..48b2783fef41c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/get_alerts_migration_status.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/migrations/get_alerts_migration_status.ts
@@ -45,13 +45,17 @@ export default ({ getService }: FtrProviderContext): void => {
let legacyAlertsIndexName: string;
beforeEach(async () => {
legacyAlertsIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ )
);
await createAlertsIndex(supertest, log);
});
afterEach(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/legacy_signals_index'
+ );
await deleteAllAlerts(supertest, log, es);
});
@@ -68,7 +72,9 @@ export default ({ getService }: FtrProviderContext): void => {
it("returns the mappings version and a breakdown of alerts' version", async () => {
const outdatedIndexName = getIndexNameFromLoad(
- await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ )
);
const indices = await getAlertsMigrationStatus({ from: '2020-10-10' });
@@ -99,7 +105,9 @@ export default ({ getService }: FtrProviderContext): void => {
},
]);
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/outdated_signals_index'
+ );
});
it('rejects the request if the user does not have sufficient privileges', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/query_alerts_backword_compatibility.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/query_alerts_backword_compatibility.ts
index 2215fff8d99c2..0288379884f8e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/query_alerts_backword_compatibility.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/ess_specific_index_logic/query_alerts_backword_compatibility.ts
@@ -22,11 +22,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess query_alerts_backword_compatibility', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals'
+ );
await createAlertsIndex(supertest, log);
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals'
+ );
await deleteAllAlerts(supertest, log, es);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/field_aliases.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/field_aliases.ts
index 732bb54385a8a..fa3215e8fcd68 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/field_aliases.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/field_aliases.ts
@@ -31,11 +31,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Tests involving aliases of source indexes and the alerts index', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alias');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alias');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
index 63875d58f5d90..c6f162f5f55d3 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
@@ -67,7 +67,7 @@ export default ({ getService }: FtrProviderContext) => {
describe('runtime fields', () => {
beforeEach(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs',
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs',
{
useCreate: true,
docsOnly: true,
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/document_level_security.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/document_level_security.ts
index 39da7fbbf1836..0d7623ef77fa3 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/document_level_security.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/document_level_security.ts
@@ -108,7 +108,7 @@ export default ({ getService }: FtrProviderContext) => {
await deleteAllAlerts(supertest, log, es);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs',
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs',
{
useCreate: true,
docsOnly: true,
@@ -122,7 +122,7 @@ export default ({ getService }: FtrProviderContext) => {
await security.role.delete(roleToAccessSecuritySolution.name);
await security.role.delete(roleToAccessSecuritySolutionWithDls.name);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/alerts/8.8.0_multiple_docs'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0_multiple_docs'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/date.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/date.ts
index 7a911995da977..8d358feb2b647 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/date.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/date.ts
@@ -34,11 +34,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type date', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/date');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/date'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/date');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/date'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/double.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/double.ts
index 3c4b21f8ee3d5..f209695e64e41 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/double.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/double.ts
@@ -34,14 +34,20 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type double', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double');
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double_as_string');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double_as_string'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/double');
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/rule_exceptions/double_as_string'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/double_as_string'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/float.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/float.ts
index 5e42ee8a56c4d..82676426c226c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/float.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/float.ts
@@ -34,13 +34,21 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type float', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float');
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float_as_string');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float_as_string'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/float');
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/float_as_string');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/float_as_string'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/integer.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/integer.ts
index e728cfc98ee83..6da0e2723a05e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/integer.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/integer.ts
@@ -34,14 +34,20 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type integer', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer');
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer_as_string');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer_as_string'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/integer');
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/rule_exceptions/integer_as_string'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/integer_as_string'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts
index 31924284e79ed..abd63b810a1b6 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts
@@ -34,11 +34,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type ip', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/ip');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts
index c0060912d6a52..2682ff71ee2e7 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts
@@ -34,11 +34,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type ip array', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip_as_array'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/ip_as_array'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts
index 4db39a1230ad3..d81a2eeb720e1 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts
@@ -34,11 +34,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type keyword', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/keyword');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts
index 016d83e1587be..cda491c3ab6a5 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts
@@ -35,12 +35,14 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type keyword array', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword_as_array'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/keyword_as_array'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts
index 947303c0c3f7a..e93bd60dffcf7 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts
@@ -34,13 +34,21 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type long', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long');
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long_as_string');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long_as_string'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/long');
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/long_as_string');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/long_as_string'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts
index 8442106dcf6d6..e6d8549b20821 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts
@@ -35,13 +35,21 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type text', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text');
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_no_spaces'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text');
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_no_spaces'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts
index e0271b7ddb934..0b5cf46037309 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts
@@ -34,11 +34,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess Rule exception operators for data type text array', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_as_array');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_as_array'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text_as_array');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/text_as_array'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts
index 53a9cc91a6005..db46be934d9fa 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts
@@ -77,16 +77,20 @@ export default ({ getService }: FtrProviderContext) => {
describe('@serverless @serverlessQA @ess create_endpoint_exceptions', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/endpoint_without_host_type'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/agent'
);
- await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/agent');
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/endpoint_without_host_type'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_exceptions/agent'
);
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/agent');
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql.ts
index 52145721a19f2..7c0f4f913c613 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql.ts
@@ -93,17 +93,21 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await esArchiver.load(auditPath);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_6'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_6'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
});
after(async () => {
await esArchiver.unload(auditPath);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_6'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_6'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -777,11 +781,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('with host risk index', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -803,11 +807,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
@@ -886,13 +894,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('using data without a @timestamp field', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/no_at_timestamp_field'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/no_at_timestamp_field'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/no_at_timestamp_field'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/no_at_timestamp_field'
);
});
@@ -958,13 +966,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('manual rule run', () => {
beforeEach(async () => {
await stopAllManualRuns(supertest);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await stopAllManualRuns(supertest);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql_alert_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql_alert_suppression.ts
index 1195cf0ad0942..c7a3af5aba1f8 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql_alert_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/eql_alert_suppression.ts
@@ -75,11 +75,15 @@ export default ({ getService }: FtrProviderContext) => {
// NOTE: Add to second quality gate after feature is GA
describe('@ess @serverless Alert Suppression for EQL rules', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
await esDeleteAllIndices('.preview.alerts*');
});
@@ -1715,13 +1719,19 @@ export default ({ getService }: FtrProviderContext) => {
describe('alert enrichment', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/entity/risks'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('suppressed alerts are enriched with host risk score', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql.ts
index dfe8f68aa827e..657b51e10994d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql.ts
@@ -70,11 +70,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless ES|QL rule type', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -1569,13 +1573,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('identical document ids across multiple indices', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant_synthetic_source'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant_synthetic_source'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant_synthetic_source'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant_synthetic_source'
);
});
@@ -1790,11 +1794,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('alerts enrichment', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -1828,11 +1832,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
@@ -1952,13 +1960,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('non-ecs', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/ecs_non_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_non_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant'
);
});
@@ -2058,13 +2066,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('manual rule run', () => {
beforeEach(async () => {
await stopAllManualRuns(supertest);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await stopAllManualRuns(supertest);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql_suppression.ts
index 59b1ba7f54342..95f38b43fd99d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/esql_suppression.ts
@@ -65,11 +65,15 @@ export default ({ getService }: FtrProviderContext) => {
// NOTE: Add to second quality gate after feature is GA
describe('@ess @serverless ES|QL rule type, alert suppression', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -2025,11 +2029,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('alerts enrichment', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -2067,11 +2071,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ecs_field_duplication.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ecs_field_duplication.ts
index 96ab72734dd45..20801810dc996 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ecs_field_duplication.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ecs_field_duplication.ts
@@ -36,13 +36,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Source ECS fields copied to other alert fields', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/ecs_fields_duplicated_for_alerts'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_fields_duplicated_for_alerts'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_fields_duplicated_for_alerts'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_fields_duplicated_for_alerts'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ignore_fields.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ignore_fields.ts
index 76c44b438db90..c2e8fbeb1f5aa 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ignore_fields.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/ignore_fields.ts
@@ -53,11 +53,15 @@ export default ({ getService }: FtrProviderContext): void => {
const es = getService('es');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ignore_fields');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ignore_fields');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/const_keyword.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/const_keyword.ts
index 7ad48747e4e7e..de9d220ab8f98 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/const_keyword.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/const_keyword.ts
@@ -34,12 +34,14 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Rule detects against a keyword of event.dataset', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/rule_keyword_family/const_keyword'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword.ts
index a7c805b064729..a8d9aad9ce724 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword.ts
@@ -35,11 +35,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Rule detects against a keyword of event.dataset', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword_mixed_with_const.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword_mixed_with_const.ts
index b0bc2f32d3361..429d8423ce610 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword_mixed_with_const.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/keyword_family/keyword_mixed_with_const.ts
@@ -34,15 +34,21 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Rule detects against a keyword and constant_keyword of event.dataset', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword');
- await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/rule_keyword_family/const_keyword'
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/const_keyword'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/rule_keyword_family/keyword'
);
- await esArchiver.unload('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/non_ecs_fields.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/non_ecs_fields.ts
index a4c59313389e3..c8240e08e1303 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/non_ecs_fields.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/non_ecs_fields.ts
@@ -61,13 +61,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Non ECS fields in alert document source', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/ecs_non_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_non_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_non_compliant'
);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/runtime.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/runtime.ts
index 1f16dbad37ec4..009e2d358392a 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/runtime.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/runtime.ts
@@ -33,11 +33,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Tests involving runtime fields of source indexes and the alerts index', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/runtime');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/runtime');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime'
+ );
});
describe('Regular runtime field mappings', () => {
@@ -88,7 +92,7 @@ export default ({ getService }: FtrProviderContext) => {
beforeEach(async () => {
await createAlertsIndex(supertest, log);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime_conflicting_fields'
);
});
@@ -96,7 +100,7 @@ export default ({ getService }: FtrProviderContext) => {
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/runtime_conflicting_fields'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/timestamps.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/timestamps.ts
index 5b099a966ecf6..e8e92d4c13406 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/timestamps.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/timestamps.ts
@@ -49,10 +49,10 @@ export default ({ getService }: FtrProviderContext) => {
beforeEach(async () => {
await createAlertsIndex(supertest, log);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_in_seconds'
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_5'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_5'
);
});
@@ -60,10 +60,10 @@ export default ({ getService }: FtrProviderContext) => {
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_in_seconds'
);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_5'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_5'
);
});
@@ -129,16 +129,16 @@ export default ({ getService }: FtrProviderContext) => {
await deleteAllAlerts(supertest, log, es);
await createAlertsIndex(supertest, log);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_1'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_1'
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_2'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_2'
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_3'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3'
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_4'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_4'
);
});
@@ -146,16 +146,16 @@ export default ({ getService }: FtrProviderContext) => {
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_1'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_1'
);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_2'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_2'
);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_3'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3'
);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_4'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_4'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/synthetic_source.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/synthetic_source.ts
index b8fd0c554351d..942d068100901 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/synthetic_source.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/synthetic_source.ts
@@ -38,11 +38,15 @@ export default ({ getService }: FtrProviderContext) => {
const { indexListOfDocuments } = dataGeneratorFactory({ es, index, log });
before(async () => {
- await esArchiver.load(`x-pack/test/functional/es_archives/security_solution/${index}`);
+ await esArchiver.load(
+ `x-pack/solutions/security/test/fixtures/es_archives/security_solution/${index}`
+ );
});
after(async () => {
- await esArchiver.unload(`x-pack/test/functional/es_archives/security_solution/${index}`);
+ await esArchiver.unload(
+ `x-pack/solutions/security/test/fixtures/es_archives/security_solution/${index}`
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -181,11 +185,15 @@ export default ({ getService }: FtrProviderContext) => {
const timestamp = '2020-10-28T06:00:00.000Z';
before(async () => {
- await esArchiver.load(`x-pack/test/functional/es_archives/security_solution/${index}`);
+ await esArchiver.load(
+ `x-pack/solutions/security/test/fixtures/es_archives/security_solution/${index}`
+ );
});
after(async () => {
- await esArchiver.unload(`x-pack/test/functional/es_archives/security_solution/${index}`);
+ await esArchiver.unload(
+ `x-pack/solutions/security/test/fixtures/es_archives/security_solution/${index}`
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match.ts
index ca2c7573a009b..0082c856a776e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match.ts
@@ -206,14 +206,18 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA Threat match type rules', () => {
before(async () => {
await esArchiver.load(audibeatHostsPath);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(audibeatHostsPath);
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
// First 2 test creates a real rule - remaining tests use preview API
@@ -1608,11 +1612,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('alerts should be enriched', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -1652,11 +1656,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
@@ -1755,13 +1763,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@skipInServerlessMKI manual rule run', () => {
beforeEach(async () => {
await stopAllManualRuns(supertest);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await stopAllManualRuns(supertest);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
@@ -1952,12 +1962,14 @@ export default ({ getService }: FtrProviderContext) => {
const timestamp = new Date().toISOString();
beforeEach(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match_alert_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match_alert_suppression.ts
index 0f71c9e70621a..d3e99682375d6 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match_alert_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/indicator_match_alert_suppression.ts
@@ -159,11 +159,15 @@ export default ({ getService }: FtrProviderContext) => {
// NOTE: Add to second quality gate after feature is GA
describe('@ess @serverless Indicator match type rules, alert suppression', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
cases.forEach(({ eventsCount, threatsCount, title }) => {
@@ -2497,11 +2501,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('alerts should be enriched', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/entity/risks'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/entity/risks'
+ );
});
it('should be enriched with host risk score', async () => {
@@ -2566,11 +2574,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning.ts
index 101260235f454..ddba293b76321 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning.ts
@@ -90,12 +90,16 @@ export default ({ getService }: FtrProviderContext) => {
await esArchiver.load(auditPath);
await setupMlModulesWithRetry({ module: siemModule, supertest, retry });
await forceStartDatafeeds({ jobId: mlJobId, rspCode: 200, supertest });
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/anomalies');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies'
+ );
});
after(async () => {
await esArchiver.unload(auditPath);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/anomalies');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -306,11 +310,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('alerts should be be enriched', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('@skipInServerlessMKI should be enriched with host risk score', async () => {
@@ -326,11 +330,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('@skipInServerlessMKI should be enriched alert with criticality_level', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_alert_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_alert_suppression.ts
index 8ebcafcdc46b5..5cfd267981cbf 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_alert_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_alert_suppression.ts
@@ -94,13 +94,17 @@ export default ({ getService }: FtrProviderContext) => {
await esArchiver.load(auditbeatArchivePath);
await setupMlModulesWithRetry({ module: mlModuleName, retry, supertest });
await forceStartDatafeeds({ jobId: mlJobId, rspCode: 200, supertest });
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/anomalies');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies'
+ );
await deleteAllAnomalies(log, es);
});
after(async () => {
await esArchiver.load(auditbeatArchivePath);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/anomalies');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -1100,13 +1104,19 @@ export default ({ getService }: FtrProviderContext) => {
describe('with enrichments', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/entity/risks'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_manual_run.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_manual_run.ts
index ba3282b9ad734..1697043de89d1 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_manual_run.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/machine_learning_manual_run.ts
@@ -74,14 +74,18 @@ export default ({ getService }: FtrProviderContext) => {
await esArchiver.load(auditbeatArchivePath);
await executeSetupModuleRequest({ module: mlModuleName, rspCode: 200, supertest });
await forceStartDatafeeds({ jobId: mlJobId, rspCode: 200, supertest });
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/anomalies');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies'
+ );
await deleteAllAnomalies(log, es);
await stopAllManualRuns(supertest);
});
after(async () => {
await esArchiver.load(auditbeatArchivePath);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/anomalies');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/anomalies'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms.ts
index c58b43c31f8e2..42b19b478d921 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms.ts
@@ -86,12 +86,16 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @serverlessQA New terms type rules', () => {
before(async () => {
await esArchiver.load(path);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/new_terms');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/new_terms'
+ );
});
after(async () => {
await esArchiver.unload(path);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/new_terms');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/new_terms'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
@@ -934,18 +938,18 @@ export default ({ getService }: FtrProviderContext) => {
describe('timestamp override and fallback', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_fallback'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback'
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_3'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_fallback'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback'
);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_override_3'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_override_3'
);
});
@@ -1039,11 +1043,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('alerts should be be enriched', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -1064,15 +1068,21 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
);
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
});
const { indexListOfDocuments } = dataGeneratorFactory({
@@ -1124,14 +1134,16 @@ export default ({ getService }: FtrProviderContext) => {
describe('@skipInServerlessMKI manual rule run', () => {
beforeEach(async () => {
await stopAllManualRuns(supertest);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await stopAllManualRuns(supertest);
await deleteAllRules(supertest, log);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms_alert_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms_alert_suppression.ts
index c588324a69080..7f0b72b50945d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms_alert_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/new_terms_alert_suppression.ts
@@ -58,11 +58,15 @@ export default ({ getService }: FtrProviderContext) => {
// NOTE: Add to second quality gate after feature is GA
describe('@ess @serverless New terms type rules, alert suppression', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
it('should suppress an alert during real rule executions', async () => {
@@ -2251,15 +2255,19 @@ export default ({ getService }: FtrProviderContext) => {
const path = dataPathBuilder.getPath('auditbeat/hosts');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
await esArchiver.load(path);
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
await esArchiver.unload(path);
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched with host risk score', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/custom_query.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/custom_query.ts
index be30ab427215d..5cb8b617c3997 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/custom_query.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/custom_query.ts
@@ -105,11 +105,16 @@ export default ({ getService }: FtrProviderContext) => {
describe.skip('@ess @serverless @serverlessQA Query type rules', () => {
before(async () => {
await esArchiver.load(auditbeatPath);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/8.8.0', {
- useCreate: true,
- docsOnly: true,
- });
- await esArchiver.load('x-pack/test/functional/es_archives/signals/severity_risk_overrides');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alerts/8.8.0',
+ {
+ useCreate: true,
+ docsOnly: true,
+ }
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides'
+ );
});
afterEach(async () => {
@@ -118,7 +123,9 @@ export default ({ getService }: FtrProviderContext) => {
after(async () => {
await esArchiver.unload(auditbeatPath);
- await esArchiver.unload('x-pack/test/functional/es_archives/signals/severity_risk_overrides');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/signals/severity_risk_overrides'
+ );
await deleteAllAlerts(supertest, log, es, [
'.preview.alerts-security.alerts-*',
'.alerts-security.alerts-*',
@@ -270,11 +277,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('with host and user risk indices', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should have host and user risk score fields', async () => {
@@ -332,11 +339,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
@@ -551,11 +562,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with suppression enabled', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/suppression');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/suppression'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/suppression');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/suppression'
+ );
});
it('should generate only 1 alert per host name when grouping by host name', async () => {
@@ -849,13 +864,13 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
@@ -1496,13 +1511,13 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
@@ -2196,12 +2211,14 @@ export default ({ getService }: FtrProviderContext) => {
});
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
@@ -2392,13 +2409,15 @@ export default ({ getService }: FtrProviderContext) => {
beforeEach(async () => {
await stopAllManualRuns(supertest);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await stopAllManualRuns(supertest);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
@@ -2781,12 +2800,14 @@ export default ({ getService }: FtrProviderContext) => {
describe('preview logged requests', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold.ts
index 9b455583a51f6..4138d8ae4ed84 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold.ts
@@ -348,13 +348,13 @@ export default ({ getService }: FtrProviderContext) => {
describe('Timestamp override and fallback', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_fallback'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timestamp_fallback'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timestamp_fallback'
);
});
@@ -417,11 +417,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('with host risk index', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -444,11 +444,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
@@ -471,13 +475,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@skipInServerlessMKI manual rule run', () => {
beforeEach(async () => {
await stopAllManualRuns(supertest);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
await stopAllManualRuns(supertest);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold_alert_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold_alert_suppression.ts
index feb7b5ed18732..ed40d7d50b88b 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold_alert_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/threshold_alert_suppression.ts
@@ -59,12 +59,16 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await esArchiver.load(path);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(path);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
it('should update an alert using real rule executions', async () => {
@@ -958,11 +962,11 @@ export default ({ getService }: FtrProviderContext) => {
describe('with host risk index', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/entity/risks');
+ await esArchiver.unload('x-pack/solutions/security/test/fixtures/es_archives/entity/risks');
});
it('should be enriched with host risk score', async () => {
@@ -991,11 +995,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('with asset criticality', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/asset_criticality');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/asset_criticality'
+ );
});
it('should be enriched alert with criticality_level', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/trial_license_complete_tier/import_rules.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/trial_license_complete_tier/import_rules.ts
index 36f4acc0d52e3..df91dde637278 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/trial_license_complete_tier/import_rules.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/trial_license_complete_tier/import_rules.ts
@@ -955,12 +955,12 @@ export default ({ getService }: FtrProviderContext): void => {
beforeEach(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/import_rule_connector'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector'
);
});
afterEach(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/import_rule_connector'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector'
);
});
@@ -968,7 +968,7 @@ export default ({ getService }: FtrProviderContext): void => {
it('importing a non-default-space 7.16 rule with a connector made in the non-default space should result in a 200', async () => {
const spaceId = '714-space';
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
const buffer = getImportRuleBuffer(space714ActionConnectorId);
const { body } = await supertest
@@ -1010,7 +1010,7 @@ export default ({ getService }: FtrProviderContext): void => {
});
it('should import a non-default-space 7.16 rule with a connector made in the non-default space into the default space successfully', async () => {
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
const differentSpaceConnectorId = '963ec960-a21a-11ed-84a4-a33e4c2558c9';
const buffer = getImportRuleWithConnectorsBuffer(differentSpaceConnectorId);
@@ -1035,7 +1035,7 @@ export default ({ getService }: FtrProviderContext): void => {
it('importing a non-default-space 7.16 rule with a connector made in the non-default space into the default space should result in a 404 if the file does not contain connectors', async () => {
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
const buffer = getImportRuleBuffer(space714ActionConnectorId);
const { body } = await supertest
@@ -1061,7 +1061,7 @@ export default ({ getService }: FtrProviderContext): void => {
it('importing a non-default-space 7.16 rule with a connector made in the non-default space into a different non-default space should result in a 404', async () => {
const spaceId = '4567-space';
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
// it
const buffer = getImportRuleBuffer(space714ActionConnectorId);
@@ -1089,13 +1089,13 @@ export default ({ getService }: FtrProviderContext): void => {
describe('should be imported into the default space', () => {
it('should import a default-space 7.16 rule with a connector made in the default space into a non-default space successfully', async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/import_rule_connector'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector'
);
const defaultSpaceConnectorId = '8fbf6d10-a21a-11ed-84a4-a33e4c2558c9';
const spaceId = '4567-space';
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
// it
const buffer = getImportRuleWithConnectorsBuffer(defaultSpaceConnectorId);
@@ -1121,7 +1121,7 @@ export default ({ getService }: FtrProviderContext): void => {
it('importing a default-space 7.16 rule with a connector made in the default space into the default space should result in a 200', async () => {
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
// it
const buffer = getImportRuleBuffer(defaultSpaceActionConnectorId);
@@ -1141,11 +1141,11 @@ export default ({ getService }: FtrProviderContext): void => {
it('importing a default-space 7.16 rule with a connector made in the default space into a non-default space should result in a 404', async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/import_rule_connector'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector'
);
const spaceId = '4567-space';
// connectorId is from the 7.x connector here
- // x-pack/test/functional/es_archives/security_solution/import_rule_connector
+ // x-pack/solutions/security/test/fixtures/es_archives/security_solution/import_rule_connector
// it
const buffer = getImportRuleBuffer(defaultSpaceActionConnectorId);
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/trial_license_complete_tier/get_rule_execution_results.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/trial_license_complete_tier/get_rule_execution_results.ts
index e35ffcc4e126a..fbc27828a19e3 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/trial_license_complete_tier/get_rule_execution_results.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/trial_license_complete_tier/get_rule_execution_results.ts
@@ -55,13 +55,17 @@ export default ({ getService }: FtrProviderContext) => {
describe.skip('@ess @serverless Get Rule Execution Results', () => {
before(async () => {
await esArchiver.load(auditbeatPath);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alias');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias'
+ );
await createAlertsIndex(supertest, log);
});
after(async () => {
await esArchiver.unload(auditbeatPath);
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alias');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias'
+ );
await deleteAllAlerts(supertest, log, es);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/resolve_read_rules.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/resolve_read_rules.ts
index 437517c7545a2..d2deacaae27af 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/resolve_read_rules.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/resolve_read_rules.ts
@@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => {
beforeEach(async () => {
await createAlertsIndex(supertest, log);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14'
);
});
@@ -37,7 +37,7 @@ export default ({ getService }: FtrProviderContext) => {
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/resolve_read_rules/7_14'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/resolve_read_rules/7_14'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/all_types.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/all_types.ts
index 4b22a4b590621..b5b373a05cd17 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/all_types.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/all_types.ts
@@ -26,11 +26,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless All task telemetry types generically', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/detection_rules.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/detection_rules.ts
index cfaea8bdcde92..14f87469402c1 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/detection_rules.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/detection_rules.ts
@@ -37,11 +37,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless Detection rule task telemetry', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/security_lists.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/security_lists.ts
index d2458e986bc3f..513ab6446ea73 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/security_lists.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/task_based/security_lists.ts
@@ -35,11 +35,15 @@ export default ({ getService }: FtrProviderContext) => {
// Failing: See https://github.com/elastic/kibana/issues/164334
describe.skip('@ess @serverless Security lists task telemetry', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/all_types.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/all_types.ts
index 6622ec8d3a0d1..e12667e760e04 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/all_types.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/all_types.ts
@@ -26,11 +26,15 @@ export default ({ getService }: FtrProviderContext) => {
describe('@ess @serverless @skipInServerlessMKI Detection rule telemetry', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rule_status.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rule_status.ts
index 8c563556e1ef0..f59882c45ef3e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rule_status.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rule_status.ts
@@ -52,11 +52,15 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
// Just in case other tests do not clean up the event logs, let us clear them now and here only once.
await deleteAllEventLogExecutionEvents(es, log);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules.ts
index 73cc7f8101a4f..d58114fbf77c8 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules.ts
@@ -77,11 +77,15 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
// Just in case other tests do not clean up the event logs, let us clear them now and here only once.
await deleteAllEventLogExecutionEvents(es, log);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules_legacy_action.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules_legacy_action.ts
index 2f6e21626e83f..29f8c34abbe3e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules_legacy_action.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/detection_rules_legacy_action.ts
@@ -56,11 +56,15 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
// Just in case other tests do not clean up the event logs, let us clear them now and here only once.
await deleteAllEventLogExecutionEvents(es, log);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/exceptions_metrics.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/exceptions_metrics.ts
index 482695c815be5..e3d4f7b822177 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/exceptions_metrics.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/usage_collector/exceptions_metrics.ts
@@ -67,11 +67,15 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
// Just in case other tests do not clean up the event logs, let us clear them now and here only once.
await deleteAllEventLogExecutionEvents(es, log);
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/telemetry');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/telemetry'
+ );
});
beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/data_generator/README.md b/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/data_generator/README.md
index e737e7b133929..86095533b5d7c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/data_generator/README.md
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/data_generator/README.md
@@ -22,94 +22,95 @@ Helper to generate and index documents for using in Kibana functional tests
### Initialization
-
#### Prerequisites
-1. Create index mappings in `x-pack/test/functional/es_archives/security_solution`
- - create folder for index `foo_bar`
- - add mappings file `mappings.json` in it
-
- x-pack/test/functional/es_archives/security_solution/foo_bar/mappings.json
+1. Create index mappings in `x-pack/solutions/security/test/fixtures/es_archives/security_solution`
+
+ - create folder for index `foo_bar`
+ - add mappings file `mappings.json` in it
+
+
+ x-pack/solutions/security/test/fixtures/es_archives/security_solution/foo_bar/mappings.json
+
+ ```JSON
+ {
+ "type": "index",
+ "value": {
+ "index": "foo_bar",
+ "mappings": {
+ "properties": {
+ "id": {
+ "type": "keyword"
+ },
+ "@timestamp": {
+ "type": "date"
+ },
+ "foo": {
+ "type": "keyword"
+ },
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_replicas": "1",
+ "number_of_shards": "1"
+ }
+ }
+ }
+ }
+ ```
+
+
- ```JSON
- {
- "type": "index",
- "value": {
- "index": "foo_bar",
- "mappings": {
- "properties": {
- "id": {
- "type": "keyword"
- },
- "@timestamp": {
- "type": "date"
- },
- "foo": {
- "type": "keyword"
- },
- }
- },
- "settings": {
- "index": {
- "number_of_replicas": "1",
- "number_of_shards": "1"
- }
- }
- }
- }
- ```
-
2. Add in `before` of the test file index initialization
- ```ts
- const esArchiver = getService('esArchiver');
+ ```ts
+ const esArchiver = getService('esArchiver');
- before(async () => {
- await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/foo_bar'
- );
- });
-
- ```
+ before(async () => {
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/foo_bar'
+ );
+ });
+ ```
3. Add in `after` of the test file index removal
- ```ts
- const esArchiver = getService('esArchiver');
-
- before(async () => {
- await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/foo_bar'
- );
- });
+ ```ts
+ const esArchiver = getService('esArchiver');
- ```
+ before(async () => {
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/foo_bar'
+ );
+ });
+ ```
#### dataGeneratorFactory
`DataGeneratorParams`
-| Property | Description | Type |
-| --------------- | ------------------------------------------------------ | ------ |
-| es | ES client | `ESClient` |
-| index | index where document will be added | `string` |
-| log | log client | `LogClient`|
+| Property | Description | Type |
+| -------- | ---------------------------------- | ----------- |
+| es | ES client | `ESClient` |
+| index | index where document will be added | `string` |
+| log | log client | `LogClient` |
1. import and initialize factory
- ```ts
- import { dataGeneratorFactory } from '../../utils/data_generator';
+ ```ts
+ import { dataGeneratorFactory } from '../../utils/data_generator';
- const es = getService('es');
- const log = getService('log');
+ const es = getService('es');
+ const log = getService('log');
- const { indexListOfDocuments, indexGeneratedDocuments } = dataGeneratorFactory({
- es,
- index: 'foo_bar',
- log,
- });
+ const { indexListOfDocuments, indexGeneratedDocuments } = dataGeneratorFactory({
+ es,
+ index: 'foo_bar',
+ log,
+ });
+ ```
- ```
2. Factory will return 2 methods which can be used to index documents into `foo_bar`
where `getService` is method from `FtrProviderContext`
@@ -118,15 +119,14 @@ where `getService` is method from `FtrProviderContext`
#### **indexListOfDocuments**
-| Property | Description | Type |
-| --------------- | ------------------------------------------------------ | ------ |
-| documents | list of documents to index | `Record` |
+| Property | Description | Type |
+| --------- | -------------------------- | ------------------------- |
+| documents | list of documents to index | `Record` |
Will index list of documents to `foo_bar` index as defined in `dataGeneratorFactory` params
```ts
- await indexListOfDocuments([{ foo: "bar" }, { id: "test-1" }])
-
+await indexListOfDocuments([{ foo: 'bar' }, { id: 'test-1' }]);
```
#### **indexGeneratedDocuments**
@@ -135,12 +135,11 @@ Will generate 10 documents in defined interval and index them in `foo_bar` index
Method receives same parameters as [generateDocuments](#generateDocuments) util.
```ts
- await indexGeneratedDocuments({
- docsCount: 10,
- interval: ['2020-10-28T07:30:00.000Z', '2020-10-30T07:30:00.000Z'],
- seed: (i, id, timestamp) => ({ id, '@timestamp': timestamp, seq: i })
- })
-
+await indexGeneratedDocuments({
+ docsCount: 10,
+ interval: ['2020-10-28T07:30:00.000Z', '2020-10-30T07:30:00.000Z'],
+ seed: (i, id, timestamp) => ({ id, '@timestamp': timestamp, seq: i }),
+});
```
#### **indexEnhancedDocuments**
@@ -149,11 +148,10 @@ Will index list of enhanced documents to `foo_bar` index as defined in `dataGene
Method receives same parameters as [enhanceDocuments](#enhanceDocuments) util.
```ts
- await indexEnhancedDocuments({
- interval: ['1996-02-15T13:02:37.531Z', '2000-02-15T13:02:37.531Z'],
- documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }]
- })
-
+await indexEnhancedDocuments({
+ interval: ['1996-02-15T13:02:37.531Z', '2000-02-15T13:02:37.531Z'],
+ documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }],
+});
```
## Utils
@@ -162,27 +160,26 @@ Method receives same parameters as [enhanceDocuments](#enhanceDocuments) util.
Util `generateDocuments` can generate list of documents based on basic seed function
- Seed callback will receive sequential number of document of document, generated id, timestamp.
- Can be used to generate custom document with large set of options depends on needs. See examples below.
+Seed callback will receive sequential number of document of document, generated id, timestamp.
+Can be used to generate custom document with large set of options depends on needs. See examples below.
- | Property | Description | Type |
- | --------------- | ------------------------------------------------------ | ------ |
- | docsCount | number of documents to generate | `number` |
- | seed | function that receives sequential number of document, generated id, timestamp as arguments and can used it create a document | `(index: number, id: string, timestamp: string) => Document` |
- | interval | interval in which generate documents, defined by '@timestamp' field | `[string \| Date string \| Date]` _(optional)_ |
+| Property | Description | Type |
+| --------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ |
+| docsCount | number of documents to generate | `number` |
+| seed | function that receives sequential number of document, generated id, timestamp as arguments and can used it create a document | `(index: number, id: string, timestamp: string) => Document` |
+| interval | interval in which generate documents, defined by '@timestamp' field | `[string \| Date string \| Date]` _(optional)_ |
Examples:
- 1. Generate 10 documents with random id, timestamp in interval between '2020-10-28T07:30:00.000Z', '2020-10-30T07:30:00.000Z', and field `seq` that represents sequential number of document
+1. Generate 10 documents with random id, timestamp in interval between '2020-10-28T07:30:00.000Z', '2020-10-30T07:30:00.000Z', and field `seq` that represents sequential number of document
- ```ts
-
- const documents = generateDocuments({
- docsCount: 10,
- interval: ['2020-10-28T07:30:00.000Z', '2020-10-30T07:30:00.000Z'],
- seed: (i, id, timestamp) => ({ id, '@timestamp': timestamp, seq: i })
- })
- ```
+```ts
+const documents = generateDocuments({
+ docsCount: 10,
+ interval: ['2020-10-28T07:30:00.000Z', '2020-10-30T07:30:00.000Z'],
+ seed: (i, id, timestamp) => ({ id, '@timestamp': timestamp, seq: i }),
+});
+```
Generated docs
@@ -244,15 +241,14 @@ Examples:
- 2. Generate 3 identical documents `{foo: bar}`
+2. Generate 3 identical documents `{foo: bar}`
- ```ts
-
- const documents = generateDocuments({
- docsCount: 3,
- seed: () => ({ foo: 'bar' })
- })
- ```
+```ts
+const documents = generateDocuments({
+ docsCount: 3,
+ seed: () => ({ foo: 'bar' }),
+});
+```
Generated docs
@@ -275,13 +271,12 @@ Examples:
3. Generate 5 documents with custom ingested timestamp, with no interval. If interval not defined, timestamp will be current time
- ```ts
-
- const documents = generateDocuments({
- docsCount: 5,
- seed: (i, id, timestamp) => ({ foo: 'bar', event: { ingested: timestamp } })
- })
- ```
+```ts
+const documents = generateDocuments({
+ docsCount: 5,
+ seed: (i, id, timestamp) => ({ foo: 'bar', event: { ingested: timestamp } }),
+});
+```
Generated docs
@@ -323,15 +318,14 @@ Examples:
- 4. Generate 4 documents with custom if based on sequential number id
+4. Generate 4 documents with custom if based on sequential number id
- ```ts
-
- const documents = generateDocuments({
- docsCount: 4,
- seed: (i) => ({ foo: 'bar', id: `id-${i}`})
- })
- ```
+```ts
+const documents = generateDocuments({
+ docsCount: 4,
+ seed: (i) => ({ foo: 'bar', id: `id-${i}` }),
+});
+```
Generated docs
@@ -359,197 +353,199 @@ Examples:
-
### **enhanceDocument**
Adds generated `uuidv4` id and current time as `@timestamp` to document if `id`, `timestamp` params are not specified
-
`EnhanceDocumentOptions`
-| Property | Description | Type |
-| --------------- | ------------------------------------------------------ | ------ |
-| id | id for document | `string` _(optional)_ |
-| timestamp | timestamp for document | `string` _(optional)_ |
-| document | document to enhance | `Record` |
+| Property | Description | Type |
+| --------- | ---------------------- | ------------------------- |
+| id | id for document | `string` _(optional)_ |
+| timestamp | timestamp for document | `string` _(optional)_ |
+| document | document to enhance | `Record` |
Examples:
1. Enhance document with generated `uuidv4` id and current time as `@timestamp`
- ```ts
- const document = enhanceDocument({
- document: { foo: 'bar' },
- });
- ```
-
- document
+ ```ts
+ const document = enhanceDocument({
+ document: { foo: 'bar' },
+ });
+ ```
- ```JSON
- {
- "foo": "bar",
- "id": "b501a64f-0dd4-4275-a38c-889be6a15a4d",
- "@timestamp": "2023-02-15T17:21:21.429Z"
- }
- ```
+
+ document
+
+ ```JSON
+ {
+ "foo": "bar",
+ "id": "b501a64f-0dd4-4275-a38c-889be6a15a4d",
+ "@timestamp": "2023-02-15T17:21:21.429Z"
+ }
+ ```
-
+
2. Enhance document with generated `uuidv4` id and predefined timestamp
+ ```ts
+ const document = enhanceDocument({
+ timestamp: '1996-02-15T13:02:37.531Z',
+ document: { foo: 'bar' },
+ });
+ ```
- ```ts
- const document = enhanceDocument({
- timestamp: '1996-02-15T13:02:37.531Z',
- document: { foo: 'bar' },
- });
- ```
-
- document
+
+ document
- ```JSON
- {
- "foo": "bar",
- "id": "7b7460bf-e173-4744-af15-2c01ac52963b",
- "@timestamp": "1996-02-15T13:02:37.531Z"
- }
- ```
+ ```JSON
+ {
+ "foo": "bar",
+ "id": "7b7460bf-e173-4744-af15-2c01ac52963b",
+ "@timestamp": "1996-02-15T13:02:37.531Z"
+ }
+ ```
-
-
-3. Enhance document with predefined id and and current time as `@timestamp`
+
+3. Enhance document with predefined id and and current time as `@timestamp`
- ```ts
- const document = enhanceDocument({
- id: 'test-id',
- document: { foo: 'bar' },
- });
- ```
-
- document
+ ```ts
+ const document = enhanceDocument({
+ id: 'test-id',
+ document: { foo: 'bar' },
+ });
+ ```
- ```JSON
- {
- "foo": "bar",
- "id": "test-id",
- "@timestamp": "2023-02-15T17:21:21.429Z"
- }
- ```
-
+
+ document
-### **enhanceDocuments**
+ ```JSON
+ {
+ "foo": "bar",
+ "id": "test-id",
+ "@timestamp": "2023-02-15T17:21:21.429Z"
+ }
+ ```
+
+### **enhanceDocuments**
Adds generated `uuidv4` `id` property to list of documents if `id` parameter is not specified.
-Adds `@timestamp` in defined interval to list of documents. If it's not specified, `@timestamp` will be added as current time
+Adds `@timestamp` in defined interval to list of documents. If it's not specified, `@timestamp` will be added as current time
-| Property | Description | Type |
-| --------------- | ------------------------------------------------------ | ------ |
-| documents | documents to enhance | `Record[]` |
-| id | id for documents | `string` _(optional)_ |
-| interval | interval in which generate documents, defined by '@timestamp' field | `[string \| Date string \| Date]` _(optional)_ |
+| Property | Description | Type |
+| --------- | ------------------------------------------------------------------- | ---------------------------------------------- |
+| documents | documents to enhance | `Record[]` |
+| id | id for documents | `string` _(optional)_ |
+| interval | interval in which generate documents, defined by '@timestamp' field | `[string \| Date string \| Date]` _(optional)_ |
Examples:
1. Enhance documents with generated `uuidv4` id and current time as `@timestamp`
- ```ts
- const documents = enhanceDocuments({
- documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }]
- });
- ```
-
- documents
-
- ```JSON
- [
- {
- "foo": "bar",
- "id": "c55ddd6b-3cf2-4ebf-94d6-4eeeb4e5b655",
- "@timestamp": "2023-02-16T16:43:13.573Z"
- },
- {
- "foo": "bar-1",
- "id": "61b157b9-5f1f-4d99-a5bf-072069f5139d",
- "@timestamp": "2023-02-16T16:43:13.573Z"
- },
- {
- "foo": "bar-2",
- "id": "04929927-6d9e-4ccc-b083-250e3fe2d7a7",
- "@timestamp": "2023-02-16T16:43:13.573Z"
- }
- ]
- ```
-
-
+ ```ts
+ const documents = enhanceDocuments({
+ documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }],
+ });
+ ```
+
+
+ documents
+
+ ```JSON
+ [
+ {
+ "foo": "bar",
+ "id": "c55ddd6b-3cf2-4ebf-94d6-4eeeb4e5b655",
+ "@timestamp": "2023-02-16T16:43:13.573Z"
+ },
+ {
+ "foo": "bar-1",
+ "id": "61b157b9-5f1f-4d99-a5bf-072069f5139d",
+ "@timestamp": "2023-02-16T16:43:13.573Z"
+ },
+ {
+ "foo": "bar-2",
+ "id": "04929927-6d9e-4ccc-b083-250e3fe2d7a7",
+ "@timestamp": "2023-02-16T16:43:13.573Z"
+ }
+ ]
+ ```
+
+
2. Enhance document with generated `uuidv4` id and timestamp in predefined interval
- ```ts
- const documents = enhanceDocuments({
- interval: ['1996-02-15T13:02:37.531Z', '2000-02-15T13:02:37.531Z'],
- documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }]
- });
- ```
-
- documents
-
- ```JSON
- [
- {
- "foo": "bar",
- "id": "883a67cb-0a57-4711-bdf9-e8a394a52460",
- "@timestamp": "1998-07-04T15:16:46.587Z"
- },
- {
- "foo": "bar-1",
- "id": "70691d9e-1030-412f-8ae1-c6db50e90e91",
- "@timestamp": "1998-05-15T07:00:52.339Z"
- },
- {
- "foo": "bar-2",
- "id": "b2140328-5cc4-4532-947e-30b8fd830ed7",
- "@timestamp": "1999-09-01T21:50:38.957Z"
- }
- ]
- ```
-
-
-
-3. Enhance documents with predefined id and and current time as `@timestamp`
-
- ```ts
- const documents = enhanceDocuments({
- id: 'test-id',
- documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }]
- });
- ```
-
- documents
-
- ```JSON
- [
- {
- "foo": "bar",
- "id": "test-id",
- "@timestamp": "2023-02-16T16:43:13.574Z"
- },
- {
- "foo": "bar-1",
- "id": "test-id",
- "@timestamp": "2023-02-16T16:43:13.574Z"
- },
- {
- "foo": "bar-2",
- "id": "test-id",
- "@timestamp": "2023-02-16T16:43:13.574Z"
- }
- ]
-
- ```
-
+ ```ts
+ const documents = enhanceDocuments({
+ interval: ['1996-02-15T13:02:37.531Z', '2000-02-15T13:02:37.531Z'],
+ documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }],
+ });
+ ```
+
+
+ documents
+
+ ```JSON
+ [
+ {
+ "foo": "bar",
+ "id": "883a67cb-0a57-4711-bdf9-e8a394a52460",
+ "@timestamp": "1998-07-04T15:16:46.587Z"
+ },
+ {
+ "foo": "bar-1",
+ "id": "70691d9e-1030-412f-8ae1-c6db50e90e91",
+ "@timestamp": "1998-05-15T07:00:52.339Z"
+ },
+ {
+ "foo": "bar-2",
+ "id": "b2140328-5cc4-4532-947e-30b8fd830ed7",
+ "@timestamp": "1999-09-01T21:50:38.957Z"
+ }
+ ]
+ ```
+
+
+
+3. Enhance documents with predefined id and and current time as `@timestamp`
+
+ ```ts
+ const documents = enhanceDocuments({
+ id: 'test-id',
+ documents: [{ foo: 'bar' }, { foo: 'bar-1' }, { foo: 'bar-2' }],
+ });
+ ```
+
+
+ documents
+
+ ```JSON
+ [
+ {
+ "foo": "bar",
+ "id": "test-id",
+ "@timestamp": "2023-02-16T16:43:13.574Z"
+ },
+ {
+ "foo": "bar-1",
+ "id": "test-id",
+ "@timestamp": "2023-02-16T16:43:13.574Z"
+ },
+ {
+ "foo": "bar-2",
+ "id": "test-id",
+ "@timestamp": "2023-02-16T16:43:13.574Z"
+ }
+ ]
+
+ ```
+
+
## Usage
@@ -564,43 +560,40 @@ There are few possible ways to do this
2. Use the same id or specific field in documents.
For example:
- ```ts
-
- const id = uuidv4();
- const firstTimestamp = new Date().toISOString();
- const firstDocument = {
- id,
- '@timestamp': firstTimestamp,
- agent: {
- name: 'agent-1',
- },
- };
- await indexListOfDocuments([firstDocument, firstDocument]);
-
- const rule: QueryRuleCreateProps = {
- ...getRuleForSignalTesting(['ecs_compliant']),
- query: `id:${id}`,
- };
-
-
- ```
-
- All documents will have the same `id` and can be queried by following `id:${id}`
+ ```ts
+ const id = uuidv4();
+ const firstTimestamp = new Date().toISOString();
+ const firstDocument = {
+ id,
+ '@timestamp': firstTimestamp,
+ agent: {
+ name: 'agent-1',
+ },
+ };
+ await indexListOfDocuments([firstDocument, firstDocument]);
+
+ const rule: QueryRuleCreateProps = {
+ ...getRuleForSignalTesting(['ecs_compliant']),
+ query: `id:${id}`,
+ };
+ ```
+
+ All documents will have the same `id` and can be queried by following `id:${id}`
3. Use utility method `getKQLQueryFromDocumentList` that will create query from all ids in generated documents
- ```ts
- const { documents } = await indexGeneratedDocuments({
- docsCount: 4,
- document: { foo: 'bar' },
- enhance: true,
- });
-
- const query = getKQLQueryFromDocumentList(documents);
- const rule = {
- ...getRuleForSignalTesting(['ecs_non_compliant']),
- query,
- };
- ```
-
- util will generate the following query: `(id: "f6ca3ee1-407c-4685-a94b-11ef4ed5136b" or id: "2a7358b2-8cad-47ce-83b7-e4418c266f3e" or id: "9daec569-0ba1-4c46-a0c6-e340cee1c5fb" or id: "b03c2fdf-0ca1-447c-b8c6-2cc5a663ffe2")`, that will include all generated documents
\ No newline at end of file
+ ```ts
+ const { documents } = await indexGeneratedDocuments({
+ docsCount: 4,
+ document: { foo: 'bar' },
+ enhance: true,
+ });
+
+ const query = getKQLQueryFromDocumentList(documents);
+ const rule = {
+ ...getRuleForSignalTesting(['ecs_non_compliant']),
+ query,
+ };
+ ```
+
+ util will generate the following query: `(id: "f6ca3ee1-407c-4685-a94b-11ef4ed5136b" or id: "2a7358b2-8cad-47ce-83b7-e4418c266f3e" or id: "9daec569-0ba1-4c46-a0c6-e340cee1c5fb" or id: "b03c2fdf-0ca1-447c-b8c6-2cc5a663ffe2")`, that will include all generated documents
diff --git a/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/package/trial_license_complete_tier/package.ts b/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/package/trial_license_complete_tier/package.ts
index 60ce6d6f55a1b..1e61b5a2d8e0e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/package/trial_license_complete_tier/package.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/package/trial_license_complete_tier/package.ts
@@ -101,9 +101,12 @@ export default function ({ getService }: FtrProviderContext) {
describe('dns processor', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/pipeline/dns', {
- useCreate: true,
- });
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/pipeline/dns',
+ {
+ useCreate: true,
+ }
+ );
});
after(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/entity.ts b/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/entity.ts
index 141c9c0d864ef..f282bd25c074a 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/entity.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/edr_workflows/resolver/trial_license_complete_tier/entity.ts
@@ -24,11 +24,15 @@ export default function ({ getService }: FtrProviderContext) {
describe('winlogbeat tests', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/winlogbeat'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/winlogbeat'
+ );
});
it('returns a winlogbeat sysmon event when the event matches the schema correctly', async () => {
@@ -70,11 +74,15 @@ export default function ({ getService }: FtrProviderContext) {
// illegal_argument_exception: unknown setting [index.lifecycle.name] in before
describe('@skipInServerless @skipInServerlessMKI signals index mapping tests', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/resolver/signals'
+ );
});
it('returns an event even if it does not have a mapping for entity_id', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/entities_list.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/entities_list.ts
index 341d62a8fe7f1..0c6e1d2352980 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/entities_list.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/entities_list.ts
@@ -31,12 +31,14 @@ export default ({ getService }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/entity_store');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/entity_store'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/entity_store'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/entity_store'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_cleanup_api.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_cleanup_api.ts
index baafb7ac8cf26..636806c776483 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_cleanup_api.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_cleanup_api.ts
@@ -35,11 +35,15 @@ export default ({ getService }: FtrProviderContext) => {
log,
});
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
it('should return response with success status', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_schedule_now.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_schedule_now.ts
index 18b827cb5a78c..abbc62c59ebf9 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_schedule_now.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_schedule_now.ts
@@ -40,11 +40,15 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await cleanAllResources();
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
afterEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_so_config.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_so_config.ts
index deb71e7b585cd..2ada6ceeb675a 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_so_config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_engine_so_config.ts
@@ -45,7 +45,9 @@ export default ({ getService }: FtrProviderContext) => {
id: soId2.saved_objects[0].id,
});
}
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
@@ -69,7 +71,9 @@ export default ({ getService }: FtrProviderContext) => {
id: soId2.saved_objects[0].id,
});
}
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
it('should include the right keys as per the update', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_entity_calculation.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_entity_calculation.ts
index fb50a9beeed90..8a2fadb6f6b30 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_entity_calculation.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_entity_calculation.ts
@@ -85,12 +85,14 @@ export default ({ getService }: FtrProviderContext): void => {
before(async () => {
await riskEngineRoutes.cleanUp();
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_preview.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_preview.ts
index abc1d33221fc8..7671d28907185 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_preview.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_score_preview.ts
@@ -76,12 +76,14 @@ export default ({ getService }: FtrProviderContext): void => {
});
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution.ts
index f13ce4e4a681c..183768306b7f3 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution.ts
@@ -45,12 +45,14 @@ export default ({ getService }: FtrProviderContext): void => {
before(async () => {
await riskEngineRoutes.cleanUp();
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution_nondefault_spaces.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution_nondefault_spaces.ts
index 7424aa19671fd..91f67f1d93a87 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution_nondefault_spaces.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/risk_scoring_task/task_execution_nondefault_spaces.ts
@@ -45,12 +45,14 @@ export default ({ getService }: FtrProviderContextWithSpaces): void => {
before(async () => {
await riskEngineRoutesForNamespace.cleanUp();
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/ecs_compliant'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/telemetry_usage.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/telemetry_usage.ts
index 13cc5e3f6b045..bfab40164e2b4 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/telemetry_usage.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/telemetry_usage.ts
@@ -37,11 +37,15 @@ export default ({ getService }: FtrProviderContext) => {
before(async () => {
await riskEngineRoutes.cleanUp();
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ecs_compliant'
+ );
await deleteAllAlerts(supertest, log, es);
await deleteAllRules(supertest, log);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_details.ts b/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_details.ts
index 59c4912cc81e8..1ca2dad39c658 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_details.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_details.ts
@@ -55,10 +55,15 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
before(async () => {
supertest = await utils.createSuperTest();
search = await utils.createSearch();
- await esArchiver.load('x-pack/test/functional/es_archives/packetbeat/default');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/default'
+ );
});
after(
- async () => await esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/default')
+ async () =>
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/default'
+ )
);
it('Make sure that we get Network details data', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_dns.ts b/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_dns.ts
index cab4ee31744f6..c0d6e14319304 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_dns.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_dns.ts
@@ -28,10 +28,13 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
before(async () => {
supertest = await utils.createSuperTest();
search = await utils.createSearch();
- await esArchiver.load('x-pack/test/functional/es_archives/packetbeat/dns');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/packetbeat/dns');
});
after(
- async () => await esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/dns')
+ async () =>
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/dns'
+ )
);
const FROM = '2000-01-01T00:00:00.000Z';
diff --git a/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/tls.ts b/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/tls.ts
index 004a79b9788f4..516d7c5791adf 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/tls.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/tls.ts
@@ -95,10 +95,13 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
before(async () => {
supertest = await utils.createSuperTest();
search = await utils.createSearch();
- await esArchiver.load('x-pack/test/functional/es_archives/packetbeat/tls');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls');
});
after(
- async () => await esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/tls')
+ async () =>
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls'
+ )
);
it('Ensure data is returned for FlowTarget.Source', async () => {
@@ -164,10 +167,13 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
before(async () => {
supertest = await utils.createSuperTest();
search = await utils.createSearch();
- await esArchiver.load('x-pack/test/functional/es_archives/packetbeat/tls');
+ await esArchiver.load('x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls');
});
after(
- async () => await esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/tls')
+ async () =>
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/tls'
+ )
);
it('Ensure data is returned for FlowTarget.Source', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/tests/overview_network.ts b/x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/tests/overview_network.ts
index b6ea64ca404a9..bad6d0fc93f11 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/tests/overview_network.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/tests/overview_network.ts
@@ -70,11 +70,15 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
before(async () => {
supertest = await utils.createSuperTest();
search = await utils.createSearch();
- await esArchiver.load('x-pack/test/functional/es_archives/packetbeat/overview');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/overview'
+ );
});
after(
async () =>
- await esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/overview')
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/packetbeat/overview'
+ )
);
const FROM = '2000-01-01T00:00:00.000Z';
diff --git a/x-pack/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/evaluations.ts b/x-pack/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/evaluations.ts
index 5191bf88243fa..f613344f874c2 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/evaluations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/genai/evaluations/trial_license_complete_tier/evaluations.ts
@@ -61,7 +61,7 @@ export default ({ getService }: FtrProviderContext) => {
],
});
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/attack_discovery_alerts'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/attack_discovery_alerts'
);
// if run is to test prompt changes, uninstall prompt integration to default to local prompts
if (isEvalLocalPrompts) {
@@ -74,7 +74,7 @@ export default ({ getService }: FtrProviderContext) => {
after(async () => {
await deleteTinyElser({ ml, es, log });
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/attack_discovery_alerts'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/attack_discovery_alerts'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/semantic_text_indices.ts b/x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/semantic_text_indices.ts
index 10d7acb1c8171..0afa92df6d5d9 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/semantic_text_indices.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/semantic_text_indices.ts
@@ -17,16 +17,20 @@ export default ({ getService }: FtrProviderContext) => {
// FLAKY: https://github.com/elastic/kibana/issues/208603
describe.skip('@ess Security AI Assistant - Indices with `semantic_text` fields', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ignore_fields');
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/semantic_text_fields'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/semantic_text_fields'
);
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/ignore_fields');
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/semantic_text_fields'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/ignore_fields'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/semantic_text_fields'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline.ts b/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline.ts
index 1f525e2d1aa19..1de65bf1e0185 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline.ts
@@ -69,13 +69,13 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
describe('@skipInServerless resolve timeline', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timelines/7.15.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timelines/7.15.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0'
);
});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts b/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts
index a3a2bc27932c6..e631b988c6e30 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts
@@ -52,7 +52,7 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0_space'
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/security_solution/timelines/7.15.0_space',
@@ -119,13 +119,13 @@ export default function ({ getService }: FtrProviderContextWithSpaces) {
describe('7.16.0', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/security_solution/timelines/7.15.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0'
);
});
after(async () => {
await esArchiver.unload(
- 'x-pack/test/functional/es_archives/security_solution/timelines/7.15.0'
+ 'x-pack/solutions/security/test/fixtures/es_archives/security_solution/timelines/7.15.0'
);
});
describe('notes timelineId', () => {
diff --git a/x-pack/test/security_solution_cypress/cypress/README.md b/x-pack/test/security_solution_cypress/cypress/README.md
index 6acfe85ef3e85..be3251d676359 100644
--- a/x-pack/test/security_solution_cypress/cypress/README.md
+++ b/x-pack/test/security_solution_cypress/cypress/README.md
@@ -44,7 +44,7 @@ Please, before opening a PR with the new test, please make sure that the test fa
Note that we use tags in order to select which tests we want to execute:
-- `@serverless` includes a test in the Serverless test suite for PRs (the so-called first quality gate) and QA environment for the periodic pipeline. You need to explicitly add this tag to any test you want to run in CI for serverless.
+- `@serverless` includes a test in the Serverless test suite for PRs (the so-called first quality gate) and QA environment for the periodic pipeline. You need to explicitly add this tag to any test you want to run in CI for serverless.
- `@serverlessQA` includes a test in the Serverless test suite for the Kibana release process of serverless. You need to explicitly add this tag to any test you want you run in CI for the Kibana QA quality gate. These tests should be stable, otherwise they will be blocking the release pipeline. They should be also critical enough, so that when they fail, there's a high chance of an SDH or blocker issue to be reported.
- `@ess` includes a test in the normal, non-Serverless test suite. You need to explicitly add this tag to any test you want to run against a non-Serverless environment.
- `@skipInEss` excludes a test from the non-Serverless test suite. The test will not be executed as part for the PR process. All the skipped tests should have a link to a ticket describing the reason why the test got skipped.
@@ -56,47 +56,48 @@ Please, before opening a PR with a new test, make sure that the test fails. If y
## Running the tests
### Run them locally
+
When running the tests, FTR is used to spawn both a Kibana instance (http://localhost:5620) and an Elasticsearch instance (http://localhost:9220) with a preloaded minimum set of data (see preceding "Test data" section).
Run the tests with the following yarn scripts from `x-pack/test/security_solution_cypress`:
-| Script Name | Description |
-| ----------- | ----------- |
-| cypress | Runs the default Cypress command |
-| cypress:open:ess | Opens the Cypress UI with all tests in the `e2e` directory. This also runs a local kibana and ES instance. The kibana instance will reload when you make code changes. This is the recommended way to debug and develop tests. |
-| cypress:open:serverless | Opens the Cypress UI with all tests in the `e2e` directory. This also runs a mocked serverless environment. The kibana instance will reload when you make code changes. This is the recommended way to debug and develop tests. |
-| cypress:run:entity_analytics:ess | Runs all tests tagged as ESS placed in the `e2e/entity_analytics` directory in headless mode |
-| cypress:run:cases:ess | Runs all tests under `explore/cases` in the `e2e` directory related to the Cases area team in headless mode |
-| cypress:ess | Runs all ESS tests with the specified configuration in headless mode and produces a report using `cypress-multi-reporters` |
-| cypress:rule_management:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management` excluding `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
-| cypress:rule_management:prebuilt_rules:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
-| cypress:run:respops:ess | Runs all tests related to the Response Ops area team, specifically tests in `detection_alerts`, `detection_rules`, and `exceptions` directories in headless mode |
-| cypress:run:entity_analytics:serverless | Runs all tests tagged as SERVERLESS in the `e2e/entity_analytics` directory in headless mode |
-| cypress:rule_management:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` excluding `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
-| cypress:rule_management:prebuilt_rules:run:serverless | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
-| cypress:detection_engine:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/detection_engine` excluding `e2e/detection_response/detection_engine/exceptions` directory in headless mode |
-| cypress:detection_engine:exceptions:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode |
-| cypress:detection_engine:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine` excluding `e2e/detection_response/detection_engine` directory in headless mode |
-| cypress:ai_assistant:run:ess | Runs all tests tagged as ESS in the `e2e/ai_assistant` directory in headless mode |
-| cypress:ai_assistant:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode |
-| cypress:cloud_security_posture:run:ess | Runs all tests tagged as ESS in the `e2e/cloud_security_posture` directory in headless mode |
-| cypress:cloud_security_posture:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/cloud_security_posture` directory in headless mode |
-| cypress:detection_engine:exceptions:run:serverless | Runs all tests tagged as ESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode |
-| cypress:investigations:run:ess | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode |
-| cypress:explore:run:ess | Runs all tests tagged as ESS in the `e2e/explore` directory in headless mode |
-| cypress:investigations:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode |
-| cypress:explore:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode |
-| cypress:open:qa:serverless | Opens the Cypress UI with all tests in the `e2e` directory tagged as SERVERLESS. This also creates an MKI project in console.qa enviornment. The kibana instance will reload when you make code changes. This is the recommended way to debug tests in QA. Follow the readme in order to learn about the known limitations. |
-| cypress:run:qa:serverless:entity_analytics | Runs all tests tagged as SERVERLESS placed in the `e2e/entity_analytics` directory in headless mode using the QA environment and real MKI projects.|
-| cypress:run:qa:serverless:explore | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode using the QA environment and real MKI prorjects. |
-| cypress:run:qa:serverless:investigations | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:cloud_security_posture | Runs all tests tagged as SERVERLESS in the `e2e/cloud_security_posture` directory in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:rule_management | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` directory, excluding `e2e/detection_response/rule_management/prebuilt_rules` in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:rule_management:prebuilt_rules | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:detection_engine | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine` directory, excluding `e2e/detection_response/detection_engine/exceptions` in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:detection_engine:exceptions | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:ai_assistant | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode using the QA environment and reak MKI projects. |
-| junit:merge | Merges individual test reports into a single report and moves the report to the `junit` directory |
+| Script Name | Description |
+| -------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| cypress | Runs the default Cypress command |
+| cypress:open:ess | Opens the Cypress UI with all tests in the `e2e` directory. This also runs a local kibana and ES instance. The kibana instance will reload when you make code changes. This is the recommended way to debug and develop tests. |
+| cypress:open:serverless | Opens the Cypress UI with all tests in the `e2e` directory. This also runs a mocked serverless environment. The kibana instance will reload when you make code changes. This is the recommended way to debug and develop tests. |
+| cypress:run:entity_analytics:ess | Runs all tests tagged as ESS placed in the `e2e/entity_analytics` directory in headless mode |
+| cypress:run:cases:ess | Runs all tests under `explore/cases` in the `e2e` directory related to the Cases area team in headless mode |
+| cypress:ess | Runs all ESS tests with the specified configuration in headless mode and produces a report using `cypress-multi-reporters` |
+| cypress:rule_management:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management` excluding `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
+| cypress:rule_management:prebuilt_rules:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
+| cypress:run:respops:ess | Runs all tests related to the Response Ops area team, specifically tests in `detection_alerts`, `detection_rules`, and `exceptions` directories in headless mode |
+| cypress:run:entity_analytics:serverless | Runs all tests tagged as SERVERLESS in the `e2e/entity_analytics` directory in headless mode |
+| cypress:rule_management:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` excluding `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
+| cypress:rule_management:prebuilt_rules:run:serverless | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
+| cypress:detection_engine:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/detection_engine` excluding `e2e/detection_response/detection_engine/exceptions` directory in headless mode |
+| cypress:detection_engine:exceptions:run:ess | Runs all tests tagged as ESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode |
+| cypress:detection_engine:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine` excluding `e2e/detection_response/detection_engine` directory in headless mode |
+| cypress:ai_assistant:run:ess | Runs all tests tagged as ESS in the `e2e/ai_assistant` directory in headless mode |
+| cypress:ai_assistant:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode |
+| cypress:cloud_security_posture:run:ess | Runs all tests tagged as ESS in the `e2e/cloud_security_posture` directory in headless mode |
+| cypress:cloud_security_posture:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/cloud_security_posture` directory in headless mode |
+| cypress:detection_engine:exceptions:run:serverless | Runs all tests tagged as ESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode |
+| cypress:investigations:run:ess | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode |
+| cypress:explore:run:ess | Runs all tests tagged as ESS in the `e2e/explore` directory in headless mode |
+| cypress:investigations:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode |
+| cypress:explore:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode |
+| cypress:open:qa:serverless | Opens the Cypress UI with all tests in the `e2e` directory tagged as SERVERLESS. This also creates an MKI project in console.qa enviornment. The kibana instance will reload when you make code changes. This is the recommended way to debug tests in QA. Follow the readme in order to learn about the known limitations. |
+| cypress:run:qa:serverless:entity_analytics | Runs all tests tagged as SERVERLESS placed in the `e2e/entity_analytics` directory in headless mode using the QA environment and real MKI projects. |
+| cypress:run:qa:serverless:explore | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode using the QA environment and real MKI prorjects. |
+| cypress:run:qa:serverless:investigations | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:cloud_security_posture | Runs all tests tagged as SERVERLESS in the `e2e/cloud_security_posture` directory in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:rule_management | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` directory, excluding `e2e/detection_response/rule_management/prebuilt_rules` in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:rule_management:prebuilt_rules | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:detection_engine | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine` directory, excluding `e2e/detection_response/detection_engine/exceptions` in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:detection_engine:exceptions | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:ai_assistant | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode using the QA environment and reak MKI projects. |
+| junit:merge | Merges individual test reports into a single report and moves the report to the `junit` directory |
Please note that all the headless mode commands do not open the Cypress UI and are typically used in CI/CD environments. The scripts that open the Cypress UI are useful for development and debugging.
@@ -111,13 +112,11 @@ describe(
env: {
ftrConfig: {
kbnServerArgs: [
- `--xpack.securitySolution.enableExperimental=${JSON.stringify([
- 'MY_EXPERIMENTAL_FLAG',
- ])}`,
+ `--xpack.securitySolution.enableExperimental=${JSON.stringify(['MY_EXPERIMENTAL_FLAG'])}`,
],
},
},
- },
+ }
// ...
);
```
@@ -141,20 +140,19 @@ Cypress convention starting version 10 (previously known as integration). Contai
### Area teams folders
-These directories contain tests which are run in their own Buildkite pipeline.
+These directories contain tests which are run in their own Buildkite pipeline.
If you belong to one of the teams listed in the table, please add new e2e specs to the corresponding directory.
-| Directory | Area team |
-| -- | -- |
-| `e2e/explore` | Threat Hunting Explore |
-| `e2e/investigations` | Threat Hunting Investigations |
-| `e2e/detection_response/rule_management` | Detection Rule Management |
-| `e2e/detection_response/detection_engine` | Detection Engine |
-| `e2e/ai_assistant` | AI Assistant |
-| `e2e/entity_analytics` | Entity Analytics |
-| `e2e/asset_inventory` | Cloud Security Posture |
-
+| Directory | Area team |
+| ----------------------------------------- | ----------------------------- |
+| `e2e/explore` | Threat Hunting Explore |
+| `e2e/investigations` | Threat Hunting Investigations |
+| `e2e/detection_response/rule_management` | Detection Rule Management |
+| `e2e/detection_response/detection_engine` | Detection Engine |
+| `e2e/ai_assistant` | AI Assistant |
+| `e2e/entity_analytics` | Entity Analytics |
+| `e2e/asset_inventory` | Cloud Security Posture |
### fixtures/
@@ -243,40 +241,39 @@ Archives used only for Cypress tests purposes are stored in `x-pack/test/securit
```typescript
cy.task('esArchiverLoad', { archiveName: 'overview' });
-cy.task('esArchiverUnload', { archiveName: 'overview'});
-
+cy.task('esArchiverUnload', { archiveName: 'overview' });
```
-You can also use archives located in `x-pack/test/functional/es_archives/security_solution` by specifying `type: 'ftr'` in the archiver tasks:
+You can also use archives located in `x-pack/solutions/security/test/fixtures/es_archives/security_solution` by specifying `type: 'ftr'` in the archiver tasks:
```typescript
-// loads then unloads from x-pack/test/functional/es_archives/security_solution/alias
-cy.task('esArchiverLoad', { archiveName: 'alias', type: 'ftr'});
-cy.task('esArchiverUnload', { archiveName: 'alias', type:'ftr'});
+// loads then unloads from x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias
+cy.task('esArchiverLoad', { archiveName: 'alias', type: 'ftr' });
+cy.task('esArchiverUnload', { archiveName: 'alias', type: 'ftr' });
```
## Serverless
Note that we use tags in order to select which tests we want to execute, if you want a test to be executed on serverless you need to add @serverless tag to it.
-
-### Running serverless tests locally pointing to FTR serverless (First Quality Gate)
+### Running serverless tests locally pointing to FTR serverless (First Quality Gate)
Run the tests with the following yarn scripts from `x-pack/test/security_solution_cypress`:
-| Script Name | Description |
-| ----------- | ----------- |
-| cypress:open:serverless | Opens the Cypress UI with all tests in the `e2e` directory. This also runs a mocked serverless environment. The kibana instance will reload when you make code changes. This is the recommended way to debug and develop tests. |
-| cypress:entity_analytics:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/entity_analytics` directory in headless mode |
-| cypress:investigations:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode |
-| cypress:explore:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode |
-| cypress:rule_management:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` excluding `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
-| cypress:rule_management:prebuilt_rules:run:serverless | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
-| cypress:ai_assistant:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode |
+| Script Name | Description |
+| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| cypress:open:serverless | Opens the Cypress UI with all tests in the `e2e` directory. This also runs a mocked serverless environment. The kibana instance will reload when you make code changes. This is the recommended way to debug and develop tests. |
+| cypress:entity_analytics:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/entity_analytics` directory in headless mode |
+| cypress:investigations:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode |
+| cypress:explore:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode |
+| cypress:rule_management:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` excluding `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
+| cypress:rule_management:prebuilt_rules:run:serverless | Runs all tests tagged as ESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode |
+| cypress:ai_assistant:run:serverless | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode |
Please note that all the headless mode commands do not open the Cypress UI and are typically used in CI/CD environments. The scripts that open the Cypress UI are useful for development and debugging.
#### PLIs
+
When running serverless Cypress tests, the following PLIs are set by default:
```
@@ -288,19 +285,17 @@ When running serverless Cypress tests, the following PLIs are set by default:
With the above configuration we'll be able to cover most of the scenarios, but there are some cases were we might want to use a different configuration. In that case, we just need to pass to the header of the test, which is the configuration we want for it.
```typescript
-describe(
- 'Entity Analytics Dashboard in Serverless',
- {
- tags: '@serverless',
- env: {
- ftrConfig: {
- productTypes: [
- { product_line: 'security', product_tier: 'essentials' },
- { product_line: 'endpoint', product_tier: 'essentials' },
- ],
- },
+describe('Entity Analytics Dashboard in Serverless', {
+ tags: '@serverless',
+ env: {
+ ftrConfig: {
+ productTypes: [
+ { product_line: 'security', product_tier: 'essentials' },
+ { product_line: 'endpoint', product_tier: 'essentials' },
+ ],
},
- });
+ },
+});
```
Per the way we set the environment during the execution process on CI, the above configuration is going to be valid when the test is executed on headless mode.
@@ -314,6 +309,7 @@ Custom roles for serverless is currently supported only for stateless environmen
##### Creating a Custom Role
To create a custom role, use the Cypress task `createServerlessCustomRole`. This task requires two parameters:
+
- **`roleDescriptor`**: Defines the permissions and access for the role.
- **`roleName`**: A unique name for the custom role.
@@ -345,7 +341,6 @@ Once the custom role is created, you can log in to the application using your re
login('customRole');
```
-
##### Deleting a Custom Role
After your tests, always delete the custom role to ensure a clean environment. Use the `deleteServerlessCustomRole` task and provide the name of the role as the parameter.
@@ -391,24 +386,22 @@ after(() => {
Note that when using any of the below scripts, the tests are going to be executed through an MKI project with the version that is currently available in QA. If you need to use
a specific commit (i.e. debugging a failing tests on the periodic pipeline), check the section: `Running serverless tests locally pointing to a MKI project created in QA environment with an overridden image`.
-Run the tests with the following yarn scripts from `x-pack/test/security_solution_cypress`:
-
-| Script Name | Description |
-| ----------- | ----------- |
-| cypress:open:qa:serverless | Opens the Cypress UI with all tests in the `e2e` directory tagged as SERVERLESS. This also creates an MKI project in console.qa enviornment. The kibana instance will reload when you make code changes. This is the recommended way to debug tests in QA. Follow the readme in order to learn about the known limitations. |
-| cypress:run:qa:serverless | Runs all tests tagged as SERVERLESS placed in the `e2e` directory excluding `investigations` and `explore` directories in headless mode using the QA environment and real MKI projects.|
-| cypress:run:qa:serverless:explore | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode using the QA environment and real MKI prorjects. |
-| cypress:run:qa:serverless:investigations | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:rule_management | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` directory, excluding `e2e/detection_response/rule_management/prebuilt_rules` in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:rule_management:prebuilt_rules | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode using the QA environment and real MKI projects. |
-| cypress:run:qa:serverless:detection_engine | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine` directory, excluding `e2e/detection_response/detection_engine/exceptions` in headless mode using the QA environment and reak MKI projects. |
-| cypress:run:qa:serverless:detection_engine:prebuilt_rules | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode using the QA environment and real MKI projects. |
-| cypress:run:qa:serverless:ai_assistant | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode using the QA environment and reak MKI projects. |
+Run the tests with the following yarn scripts from `x-pack/test/security_solution_cypress`:
+| Script Name | Description |
+| --------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| cypress:open:qa:serverless | Opens the Cypress UI with all tests in the `e2e` directory tagged as SERVERLESS. This also creates an MKI project in console.qa enviornment. The kibana instance will reload when you make code changes. This is the recommended way to debug tests in QA. Follow the readme in order to learn about the known limitations. |
+| cypress:run:qa:serverless | Runs all tests tagged as SERVERLESS placed in the `e2e` directory excluding `investigations` and `explore` directories in headless mode using the QA environment and real MKI projects. |
+| cypress:run:qa:serverless:explore | Runs all tests tagged as SERVERLESS in the `e2e/explore` directory in headless mode using the QA environment and real MKI prorjects. |
+| cypress:run:qa:serverless:investigations | Runs all tests tagged as SERVERLESS in the `e2e/investigations` directory in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:rule_management | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management` directory, excluding `e2e/detection_response/rule_management/prebuilt_rules` in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:rule_management:prebuilt_rules | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/rule_management/prebuilt_rules` directory in headless mode using the QA environment and real MKI projects. |
+| cypress:run:qa:serverless:detection_engine | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine` directory, excluding `e2e/detection_response/detection_engine/exceptions` in headless mode using the QA environment and reak MKI projects. |
+| cypress:run:qa:serverless:detection_engine:prebuilt_rules | Runs all tests tagged as SERVERLESS in the `e2e/detection_response/detection_engine/exceptions` directory in headless mode using the QA environment and real MKI projects. |
+| cypress:run:qa:serverless:ai_assistant | Runs all tests tagged as SERVERLESS in the `e2e/ai_assistant` directory in headless mode using the QA environment and reak MKI projects. |
Please note that all the headless mode commands do not open the Cypress UI and are typically used in CI/CD environments. The scripts that open the Cypress UI are useful for development and debugging.
-
#### Setup required
Setup a valid Elastic Cloud API key for QA environment:
@@ -432,7 +425,7 @@ Store the saved key on `~/.elastic/cloud.json` using the following format:
}
```
-By default all our Serverless tests are executed with the `platform_engineer` role.
+By default all our Serverless tests are executed with the `platform_engineer` role.
So you need to add to your organization a new user that has the required role. You can achieve that by using email aliases.
@@ -459,8 +452,7 @@ You need to have everything setup as mentioned above in `Setup required`. Once t
yarn cypress:open:qa:serverless --commit
```
-
-#### Testing with different roles
+#### Testing with different roles
If you want to execute a test using Cypress on visual mode with MKI, you need to make sure you have the user created in your organization, and add it tot he `.ftr/role_users.json`:
@@ -478,6 +470,7 @@ If you want to execute a test using Cypress on visual mode with MKI, you need to
```
As role names please use:
+
- admin
- detections_admin
- editor
@@ -498,6 +491,7 @@ The above should be the same used on the automation.
#### PLIs
When running serverless Cypress tests on QA environment, the following PLIs are set by default:
+
```
{ product_line: 'security', product_tier: 'complete' },
{ product_line: 'endpoint', product_tier: 'complete' },
@@ -507,19 +501,17 @@ When running serverless Cypress tests on QA environment, the following PLIs are
With the above configuration we'll be able to cover most of the scenarios, but there are some cases were we might want to use a different configuration. In that case, we just need to pass to the header of the test, which is the configuration we want for it.
```typescript
-describe(
- 'Entity Analytics Dashboard in Serverless',
- {
- tags: '@serverless',
- env: {
- ftrConfig: {
- productTypes: [
- { product_line: 'security', product_tier: 'essentials' },
- { product_line: 'endpoint', product_tier: 'essentials' },
- ],
- },
+describe('Entity Analytics Dashboard in Serverless', {
+ tags: '@serverless',
+ env: {
+ ftrConfig: {
+ productTypes: [
+ { product_line: 'security', product_tier: 'essentials' },
+ { product_line: 'endpoint', product_tier: 'essentials' },
+ ],
},
- });
+ },
+});
```
For test developing or test debugging purposes on QA, you have avaialable the following options:
@@ -544,13 +536,13 @@ The above command will open the Cypress UI with all tests in the `e2e` directory
Note that all the above flags can be combined.
-
## Development Best Practices
Below you will a set of best practices that should be followed when writing Cypress tests.
### For serverless
-Reuse just those tests that have the SAME exact behaviour and steps. Take the necessity of adding a conditional to the test to make it pass in order to, perform a different set of steps, setup, or assertions, as a signal for the need of a serverless
+
+Reuse just those tests that have the SAME exact behaviour and steps. Take the necessity of adding a conditional to the test to make it pass in order to, perform a different set of steps, setup, or assertions, as a signal for the need of a serverless
specific test.
### Avoid forced actions
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/README.md b/x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/README.md
index 2e0ef7499bdb0..c35469cf11f9b 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/README.md
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/README.md
@@ -39,19 +39,20 @@ Please, before opening a PR with the new test, please make sure that the test fa
Note that we use tags in order to select which tests we want to execute:
-- `@serverless` includes a test in the Serverless test suite for PRs (the so-called first quality gate) and QA environment for the periodic pipeline. You need to explicitly add this tag to any test you want to run in CI for serverless.
+- `@serverless` includes a test in the Serverless test suite for PRs (the so-called first quality gate) and QA environment for the periodic pipeline. You need to explicitly add this tag to any test you want to run in CI for serverless.
## Running the tests
### Run them locally
+
When running the tests, FTR is used to spawn both a Kibana instance (http://localhost:5620) and an Elasticsearch instance (http://localhost:9220) with a preloaded minimum set of data (see preceding "Test data" section).
Run the tests with the following yarn scripts from `x-pack/test/security_solution_cypress`:
-| Script Name | Description |
-| ----------- | ----------- |
+| Script Name | Description |
+| ------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| cypress:open:ai4dsoc:serverless | Opens the Cypress UI with all tests in the `e2e/aid4soc` directory. This also runs a mocked serverless environment using the `ai_soc` pruduct line and `search_ai_lake` tier by default. |
-| cypress:run:ai4dsoc:serverless | Runs all tests tagged as SERVERLESS in the `e2e/ai4dsoc` directory in headless mode using the `ai_soc` pruduct line and `search_ai_lake` tier by default.|
+| cypress:run:ai4dsoc:serverless | Runs all tests tagged as SERVERLESS in the `e2e/ai4dsoc` directory in headless mode using the `ai_soc` pruduct line and `search_ai_lake` tier by default. |
Please note that the headless mode command do not open the Cypress UI and are typically used in CI/CD environments. The scripts that open the Cypress UI are useful for development and debugging.
@@ -66,13 +67,11 @@ describe(
env: {
ftrConfig: {
kbnServerArgs: [
- `--xpack.securitySolution.enableExperimental=${JSON.stringify([
- 'MY_EXPERIMENTAL_FLAG',
- ])}`,
+ `--xpack.securitySolution.enableExperimental=${JSON.stringify(['MY_EXPERIMENTAL_FLAG'])}`,
],
},
},
- },
+ }
// ...
);
```
@@ -185,16 +184,15 @@ Archives used only for Cypress tests purposes are stored in `x-pack/test/securit
```typescript
cy.task('esArchiverLoad', { archiveName: 'overview' });
-cy.task('esArchiverUnload', { archiveName: 'overview'});
-
+cy.task('esArchiverUnload', { archiveName: 'overview' });
```
-You can also use archives located in `x-pack/test/functional/es_archives/security_solution` by specifying `type: 'ftr'` in the archiver tasks:
+You can also use archives located in `x-pack/solutions/security/test/fixtures/es_archives/security_solution` by specifying `type: 'ftr'` in the archiver tasks:
```typescript
-// loads then unloads from x-pack/test/functional/es_archives/security_solution/alias
-cy.task('esArchiverLoad', { archiveName: 'alias', type: 'ftr'});
-cy.task('esArchiverUnload', { archiveName: 'alias', type:'ftr'});
+// loads then unloads from x-pack/solutions/security/test/fixtures/es_archives/security_solution/alias
+cy.task('esArchiverLoad', { archiveName: 'alias', type: 'ftr' });
+cy.task('esArchiverUnload', { archiveName: 'alias', type: 'ftr' });
```
## Serverless
@@ -205,6 +203,7 @@ Note that we use tags in order to select which tests we want to execute in the d
`@serverlessQA` for the tests that we want to execute as part of the Kibana QA quality gate.
#### PLIs
+
When running AI4DSOC Cypress tests, the following PLI is set by default:
```
@@ -218,6 +217,7 @@ Custom roles for serverless is currently supported only for stateless environmen
##### Creating a Custom Role
To create a custom role, use the Cypress task `createServerlessCustomRole`. This task requires two parameters:
+
- **`roleDescriptor`**: Defines the permissions and access for the role.
- **`roleName`**: A unique name for the custom role.
@@ -249,7 +249,6 @@ Once the custom role is created, you can log in to the application using your re
login('customRole');
```
-
##### Deleting a Custom Role
After your tests, always delete the custom role to ensure a clean environment. Use the `deleteServerlessCustomRole` task and provide the name of the role as the parameter.
diff --git a/x-pack/test/security_solution_cypress/cypress/support/es_archiver.ts b/x-pack/test/security_solution_cypress/cypress/support/es_archiver.ts
index 84bbfd520bca0..cf5db5e63ef47 100644
--- a/x-pack/test/security_solution_cypress/cypress/support/es_archiver.ts
+++ b/x-pack/test/security_solution_cypress/cypress/support/es_archiver.ts
@@ -77,7 +77,7 @@ export const esArchiver = (
log,
client,
kbnClient,
- baseDir: '../../functional/es_archives/security_solution',
+ baseDir: '../../../solutions/security/test/fixtures/es_archives/security_solution',
});
on('task', {
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
index f4ce2de236bd1..bc4f1510f1111 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
@@ -46,7 +46,9 @@ export default function ({ getService }: FtrProviderContext) {
});
describe('when agents are connected with endpoint integration disabled', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/telemetry/agent_only');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/agent_only'
+ );
});
it('reports no endpoints or policies', async () => {
@@ -72,7 +74,9 @@ export default function ({ getService }: FtrProviderContext) {
'checkin_now',
0
);
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/telemetry/checkin_now');
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/checkin_now'
+ );
await telemetryTestResources.deleteArchive('checkin_now');
});
@@ -102,7 +106,7 @@ export default function ({ getService }: FtrProviderContext) {
2
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/checkin_2_days_ago'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/checkin_2_days_ago'
);
await telemetryTestResources.deleteArchive('checkin_2_days_ago');
});
@@ -128,7 +132,7 @@ export default function ({ getService }: FtrProviderContext) {
describe('when agents are connected with endpoints integration malware enabled', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_enabled'
);
});
@@ -141,7 +145,7 @@ export default function ({ getService }: FtrProviderContext) {
describe('when agents are connected with endpoints integration malware disabled', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_malware_disabled'
);
});
it('reports the correct number of windows and macos endpoints under policies malware', async () => {
@@ -153,7 +157,7 @@ export default function ({ getService }: FtrProviderContext) {
describe('when agents are connected with endpoints integration uninstalled', () => {
before(async () => {
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/endpoint_uninstalled'
);
});
it('reports no endpoints or policies', async () => {
@@ -181,7 +185,7 @@ export default function ({ getService }: FtrProviderContext) {
0
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_test'
);
await telemetryTestResources.deleteArchive('cloned_endpoint_test');
});
@@ -228,7 +232,7 @@ export default function ({ getService }: FtrProviderContext) {
0
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_test'
);
await telemetryTestResources.deleteArchive('cloned_endpoint_test');
});
@@ -275,7 +279,7 @@ export default function ({ getService }: FtrProviderContext) {
0
);
await esArchiver.load(
- 'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/cloned_endpoint_test'
);
await telemetryTestResources.deleteArchive('cloned_endpoint_test');
});
diff --git a/x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts b/x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts
index 5da579041252d..14cc6fc7cc51b 100644
--- a/x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts
@@ -19,9 +19,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
targetTags(this, ['@ess', '@serverless']);
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/endpoint/metadata/api_feature', {
- useCreate: true,
- });
+ await esArchiver.load(
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/metadata/api_feature',
+ {
+ useCreate: true,
+ }
+ );
await browser.refresh();
});
after(async () => {
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts
index d786a0df14b9a..a391d32988222 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts
@@ -14,7 +14,7 @@ import { FtrProviderContext } from '../configs/ftr_provider_context';
const TELEMETRY_API_ROOT = '/api/stats?extended=true';
const TELEMETRY_DATA_ROOT = Path.join(
KIBANA_ROOT,
- 'x-pack/test/functional/es_archives/endpoint/telemetry/'
+ 'x-pack/solutions/security/test/fixtures/es_archives/endpoint/telemetry/'
);
interface EndpointTelemetry {
diff --git a/x-pack/test_serverless/functional/test_suites/observability/infra/hosts_page.ts b/x-pack/test_serverless/functional/test_suites/observability/infra/hosts_page.ts
index 123de23bbe6c1..0ff36a849da58 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/infra/hosts_page.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/infra/hosts_page.ts
@@ -42,7 +42,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Hosts Page', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await pageObjects.svlCommonPage.loginAsViewer();
await pageObjects.common.navigateToApp(HOSTS_VIEW_PATH);
@@ -52,7 +54,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
describe('#Single Host Flyout', () => {
diff --git a/x-pack/test_serverless/functional/test_suites/observability/infra/infra.ts b/x-pack/test_serverless/functional/test_suites/observability/infra/infra.ts
index b91ae6b09bde2..d49118cc1fc43 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/infra/infra.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/infra/infra.ts
@@ -42,14 +42,22 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('with metrics present', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
- await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/pods_only');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only'
+ );
await pageObjects.common.navigateToApp(INVENTORY_PATH);
await pageObjects.infraHome.waitForLoading();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/pods_only');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/8.0.0/pods_only'
+ );
});
it('renders the correct page title', async () => {
@@ -114,13 +122,17 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
});
describe('Metrics explorer page', function () {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await pageObjects.common.navigateToApp(METRICS_EXPLORER_PATH);
await pageObjects.infraHome.waitForLoading();
await pageObjects.header.waitUntilLoadingHasFinished();
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
it('should be disabled', async () => {
diff --git a/x-pack/test_serverless/functional/test_suites/observability/infra/node_details.ts b/x-pack/test_serverless/functional/test_suites/observability/infra/node_details.ts
index 254bf9e555a13..559d525021b3d 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/infra/node_details.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/infra/node_details.ts
@@ -33,7 +33,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
describe('Node Details', () => {
describe('#With Asset Details', () => {
before(async () => {
- await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.load(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
await pageObjects.svlCommonPage.loginAsViewer();
await pageObjects.common.navigateToApp(
@@ -43,7 +45,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
});
after(async () => {
- await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+ await esArchiver.unload(
+ 'x-pack/solutions/observability/test/fixtures/es_archives/infra/metrics_and_logs'
+ );
});
describe('Osquery Tab', () => {