Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ disabled:
- x-pack/test_serverless/api_integration/config.base.ts
- x-pack/test_serverless/functional/config.base.ts
- x-pack/test_serverless/shared/config.base.ts

# Detection Rules Management base configs
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/configs/serverless/rules_management.essentials.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/configs/serverless/rules_management.complete.config.ts

- x-pack/test_serverless/api_integration/test_suites/security/config.ts
- x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
- x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
Expand Down
4 changes: 4 additions & 0 deletions .buildkite/ftr_security_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ disabled:
# Playwright
- x-pack/test/security_solution_playwright/playwright.config.ts

# Detection Rules Management base configs
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/configs/ess/rules_management.basic.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/configs/ess/rules_management.trial.config.ts

defaultQueue: 'n2-4-spot'
enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const importRuleExceptions = async ({
const {
errors,
success,
// return only count of exception list items, without count excpetions list
// return only count of exception list items, without count exceptions list
// to be consistent with UI, and users shouldn't know about backend structure
success_count_exception_list_items: successCount,
} = await exceptionsClient.importExceptionListAndItemsAsArray({
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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.
*/

export const LOGGING_CONFIG = [
{
name: 'plugins.securitySolution',
level: 'debug',
},
{
name: 'plugins.fleet',
level: 'debug',
},
];
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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';
import { LOGGING_CONFIG } from '../constants';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../config/ess/config.base.basic')
);

return {
...functionalConfig.getAll(),
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
serverArgs: [
...functionalConfig.get('kbnTestServer.serverArgs'),
`--logging.loggers=${JSON.stringify(LOGGING_CONFIG)}`,
],
},
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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';
import { LOGGING_CONFIG } from '../constants';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../config/ess/config.base.trial')
);

return {
...functionalConfig.getAll(),
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
serverArgs: [
...functionalConfig.get('kbnTestServer.serverArgs'),
`--logging.loggers=${JSON.stringify(LOGGING_CONFIG)}`,
],
},
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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 type { CreateTestConfigOptions } from '../../../../../config/serverless/config.base';
import { createTestConfig } from '../../../../../config/serverless/config.base';
import { LOGGING_CONFIG } from '../constants';

export function createCompleteTierTestConfig(options: CreateTestConfigOptions) {
return createTestConfig({
kbnTestServerArgs: [`--logging.loggers=${JSON.stringify(LOGGING_CONFIG)}`],
...options,
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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 type { CreateTestConfigOptions } from '../../../../../config/serverless/config.base.essentials';
import { createTestConfig } from '../../../../../config/serverless/config.base.essentials';
import { LOGGING_CONFIG } from '../constants';

export function createEssentialsTierTestConfig(options: CreateTestConfigOptions) {
return createTestConfig({
kbnTestServerArgs: [`--logging.loggers=${JSON.stringify(LOGGING_CONFIG)}`],
...options,
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const PACKAGES_PATH = path.join(path.dirname(__filename), '../../fixtures/packag

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../../config/ess/config.base.basic')
require.resolve('../../../../configs/ess/rules_management.basic.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const BUNDLED_PACKAGE_DIR = path.join(

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../../config/ess/config.base.basic')
require.resolve('../../../../configs/ess/rules_management.basic.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../../config/ess/config.base.trial')
require.resolve('../../../../configs/ess/rules_management.trial.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../configs/ess/rules_management.basic.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base.essentials';
import { createEssentialsTierTestConfig } from '../../../configs/serverless/rules_management.essentials.config';

export default createTestConfig({
export default createEssentialsTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../configs/ess/rules_management.basic.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base.essentials';
import { createEssentialsTierTestConfig } from '../../../configs/serverless/rules_management.essentials.config';

export default createTestConfig({
export default createEssentialsTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.trial')
require.resolve('../../../configs/ess/rules_management.trial.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base';
import { createCompleteTierTestConfig } from '../../../configs/serverless/rules_management.complete.config';

export default createTestConfig({
export default createCompleteTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../../../../config/ess/config.base.trial.ts')
require.resolve('../../../../../../configs/ess/rules_management.trial.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../../../../config/serverless/config.base';
import { createCompleteTierTestConfig } from '../../../../../../configs/serverless/rules_management.complete.config';

export default createTestConfig({
export default createCompleteTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../../../../config/ess/config.base.trial.ts')
require.resolve('../../../../../../configs/ess/rules_management.trial.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../../../../config/serverless/config.base';
import { createCompleteTierTestConfig } from '../../../../../../configs/serverless/rules_management.complete.config';

export default createTestConfig({
export default createCompleteTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../configs/ess/rules_management.basic.config')
);

const testConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base.essentials';
import { createEssentialsTierTestConfig } from '../../../configs/serverless/rules_management.essentials.config';

export default createTestConfig({
export default createEssentialsTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.trial')
require.resolve('../../../configs/ess/rules_management.trial.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { createTestConfig } from '../../../../../../config/serverless/config.base';
import { createCompleteTierTestConfig } from '../../../configs/serverless/rules_management.complete.config';

export default createTestConfig({
export default createCompleteTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../configs/ess/rules_management.basic.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base.essentials';
import { createEssentialsTierTestConfig } from '../../../configs/serverless/rules_management.essentials.config';

export default createTestConfig({
export default createEssentialsTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.trial')
require.resolve('../../../configs/ess/rules_management.trial.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base';
import { createCompleteTierTestConfig } from '../../../configs/serverless/rules_management.complete.config';

export default createTestConfig({
export default createCompleteTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../configs/ess/rules_management.basic.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { createTestConfig } from '../../../../../../config/serverless/config.base.essentials';
import { createEssentialsTierTestConfig } from '../../../configs/serverless/rules_management.essentials.config';

export default createTestConfig({
export default createEssentialsTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.trial')
require.resolve('../../../configs/ess/rules_management.trial.config')
);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { createTestConfig } from '../../../../../../config/serverless/config.base';
import { createCompleteTierTestConfig } from '../../../configs/serverless/rules_management.complete.config';

export default createTestConfig({
export default createCompleteTierTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
Expand Down
Loading