mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
[8.18] [Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier (#211477) (#212278)
# Backport This will backport the following commits from `main` to `8.18`: - [[Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier (#211477)](https://github.com/elastic/kibana/pull/211477) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Vitalii Dmyterko","email":"92328789+vitaliidm@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-02-24T13:59:06Z","message":"[Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier (#211477)\n\n## Summary\n\n - addresses https://github.com/elastic/kibana/issues/179767\n- ignore_fields tests run as expected on basic/essentials license, so\nmoved to that tier\n- moves the rest of files in `general_logic` set of tests to basic\nlevel, apart from synthetic source tests that requires platinum(trial)\nlicense","sha":"04a9acd365762fc82a04d7431b5438e29fce971f","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Engine","backport:version","v8.18.0","v9.1.0","v8.19.0"],"title":"[Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier","number":211477,"url":"https://github.com/elastic/kibana/pull/211477","mergeCommit":{"message":"[Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier (#211477)\n\n## Summary\n\n - addresses https://github.com/elastic/kibana/issues/179767\n- ignore_fields tests run as expected on basic/essentials license, so\nmoved to that tier\n- moves the rest of files in `general_logic` set of tests to basic\nlevel, apart from synthetic source tests that requires platinum(trial)\nlicense","sha":"04a9acd365762fc82a04d7431b5438e29fce971f"}},"sourceBranch":"main","suggestedTargetBranches":["8.18","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/212247","number":212247,"state":"MERGED","mergeCommit":{"sha":"87db538b04ea9b5096c9aba19ca21c37d6070675","message":"[9.0] [Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier (#211477) (#212247)\n\n# Backport\n\nThis will backport the following commits from `main` to `9.0`:\n- [[Security Solution][Detection Engine] moves general logic rule\nexecutions FTR tests to Essentials/Basic tier\n(#211477)](https://github.com/elastic/kibana/pull/211477)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Vitalii Dmyterko <92328789+vitaliidm@users.noreply.github.com>"}},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/211477","number":211477,"mergeCommit":{"message":"[Security Solution][Detection Engine] moves general logic rule executions FTR tests to Essentials/Basic tier (#211477)\n\n## Summary\n\n - addresses https://github.com/elastic/kibana/issues/179767\n- ignore_fields tests run as expected on basic/essentials license, so\nmoved to that tier\n- moves the rest of files in `general_logic` set of tests to basic\nlevel, apart from synthetic source tests that requires platinum(trial)\nlicense","sha":"04a9acd365762fc82a04d7431b5438e29fce971f"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
This commit is contained in:
parent
ace412e802
commit
cf8ca97e00
18 changed files with 100 additions and 6 deletions
|
@ -54,6 +54,7 @@ disabled:
|
|||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/serverless.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/serverless.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/serverless.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/configs/serverless.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/serverless.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/serverless.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/serverless.config.ts
|
||||
|
|
|
@ -42,6 +42,7 @@ enabled:
|
|||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/ess.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/ess.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/ess.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/configs/ess.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/ess.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/ess.config.ts
|
||||
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/ess.config.ts
|
||||
|
|
|
@ -364,6 +364,20 @@ steps:
|
|||
automatic:
|
||||
- exit_status: '1'
|
||||
limit: 2
|
||||
|
||||
- label: Running rule_execution_logic:general_logic:essentials:qa:serverless
|
||||
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:general_logic:essentials:qa:serverless
|
||||
key: rule_execution_logic:general_logic:essentials:qa:serverless
|
||||
agents:
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-prod
|
||||
provider: gcp
|
||||
machineType: n2-standard-4
|
||||
timeout_in_minutes: 120
|
||||
retry:
|
||||
automatic:
|
||||
- exit_status: '1'
|
||||
limit: 2
|
||||
|
||||
- label: Running rule_execution_logic:indicator_match:qa:serverless
|
||||
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:indicator_match:qa:serverless
|
||||
|
|
|
@ -341,6 +341,20 @@ steps:
|
|||
- exit_status: "1"
|
||||
limit: 2
|
||||
|
||||
- label: Running rule_execution_logic:general_logic:essentials:qa:serverless:release
|
||||
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:general_logic:essentials:qa:serverless:release
|
||||
key: rule_execution_logic:general_logic:essentials:qa:serverless:release
|
||||
agents:
|
||||
image: family/kibana-ubuntu-2004
|
||||
imageProject: elastic-images-prod
|
||||
provider: gcp
|
||||
machineType: n2-standard-4
|
||||
timeout_in_minutes: 120
|
||||
retry:
|
||||
automatic:
|
||||
- exit_status: '1'
|
||||
limit: 2
|
||||
|
||||
- label: Running rule_execution_logic:indicator_match:qa:serverless:release
|
||||
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:indicator_match:qa:serverless:release
|
||||
key: rule_execution_logic:indicator_match:qa:serverless:release
|
||||
|
|
|
@ -290,6 +290,13 @@
|
|||
"rule_execution_logic:general_logic:server:ess": "npm run initialize-server:de rule_execution_logic/general_logic ess",
|
||||
"rule_execution_logic:general_logic:runner:ess": "npm run run-tests:de rule_execution_logic/general_logic ess essEnv",
|
||||
|
||||
"rule_execution_logic:general_logic:essentials:server:serverless": "npm run initialize-server:de:basic_essentials rule_execution_logic/general_logic serverless",
|
||||
"rule_execution_logic:general_logic:essentials:runner:serverless": "npm run run-tests:de:basic_essentials rule_execution_logic/general_logic serverless serverlessEnv",
|
||||
"rule_execution_logic:general_logic:essentials:qa:serverless": "npm run run-tests:de:basic_essentials rule_execution_logic/general_logic serverless qaPeriodicEnv",
|
||||
"rule_execution_logic:general_logic:essentials:qa:serverless:release": "npm run run-tests:de:basic_essentials rule_execution_logic/general_logic serverless qaEnv",
|
||||
"rule_execution_logic:general_logic:basic:server:ess": "npm run initialize-server:de:basic_essentials rule_execution_logic/general_logic ess",
|
||||
"rule_execution_logic:general_logic:basic:runner:ess": "npm run run-tests:de:basic_essentials rule_execution_logic/general_logic ess essEnv",
|
||||
|
||||
"rule_execution_logic:indicator_match:server:serverless": "npm run initialize-server:de rule_execution_logic/indicator_match serverless",
|
||||
"rule_execution_logic:indicator_match:runner:serverless": "npm run run-tests:de rule_execution_logic/indicator_match serverless serverlessEnv",
|
||||
"rule_execution_logic:indicator_match:qa:serverless": "npm run run-tests:de rule_execution_logic/indicator_match serverless qaPeriodicEnv",
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
|
||||
import { FtrConfigProviderContext } from '@kbn/test';
|
||||
|
||||
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
|
||||
const functionalConfig = await readConfigFile(
|
||||
require.resolve('../../../../../../../config/ess/config.base.basic')
|
||||
);
|
||||
|
||||
return {
|
||||
...functionalConfig.getAll(),
|
||||
testFiles: [require.resolve('..')],
|
||||
junit: {
|
||||
reportName:
|
||||
'Detection Engine - General Execution Logic Integration Tests - ESS Env - Basic License',
|
||||
},
|
||||
};
|
||||
}
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
import { createTestConfig } from '../../../../../../../config/serverless/config.base.essentials';
|
||||
|
||||
export default createTestConfig({
|
||||
testFiles: [require.resolve('..')],
|
||||
junit: {
|
||||
reportName:
|
||||
'Detection Engine - General Execution Logic Integration Tests - Serverless Env - Essentials Tier',
|
||||
},
|
||||
kbnTestServerArgs: [
|
||||
`--xpack.securitySolution.alertIgnoreFields=${JSON.stringify([
|
||||
'testing_ignored.constant',
|
||||
'/testing_regex*/',
|
||||
])}`, // See tests within the file "ignore_fields.ts" which use these values in "alertIgnoreFields"
|
||||
],
|
||||
});
|
|
@ -0,0 +1,18 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
|
||||
import { FtrProviderContext } from '../../../../../../ftr_provider_context';
|
||||
|
||||
export default function ({ loadTestFile }: FtrProviderContext) {
|
||||
describe('Rule execution logic API - Basic License/Essentials Tier', function () {
|
||||
loadTestFile(require.resolve('./keyword_family'));
|
||||
loadTestFile(require.resolve('./ignore_fields'));
|
||||
loadTestFile(require.resolve('./runtime'));
|
||||
loadTestFile(require.resolve('./non_ecs_fields'));
|
||||
loadTestFile(require.resolve('./timestamps'));
|
||||
});
|
||||
}
|
|
@ -8,12 +8,7 @@
|
|||
import { FtrProviderContext } from '../../../../../../ftr_provider_context';
|
||||
|
||||
export default function ({ loadTestFile }: FtrProviderContext) {
|
||||
describe('Rule execution logic API', function () {
|
||||
loadTestFile(require.resolve('./keyword_family'));
|
||||
loadTestFile(require.resolve('./ignore_fields'));
|
||||
loadTestFile(require.resolve('./runtime'));
|
||||
loadTestFile(require.resolve('./non_ecs_fields'));
|
||||
describe('Rule execution logic API - Trial License/Complete Tier', function () {
|
||||
loadTestFile(require.resolve('./synthetic_source'));
|
||||
loadTestFile(require.resolve('./timestamps'));
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue