Skip to content

Commit 95edaac

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into eui/v-81.0.0
2 parents 1500071 + 0ff50e1 commit 95edaac

564 files changed

Lines changed: 8733 additions & 3943 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_configs.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ disabled:
3838
- x-pack/test/security_solution_cypress/cases_cli_config.ts
3939
- x-pack/test/security_solution_cypress/ccs_config.ts
4040
- x-pack/test/security_solution_cypress/cli_config.ts
41-
- x-pack/test/security_solution_cypress/cli_config_parallel.ts
4241
- x-pack/test/security_solution_cypress/cli_config_investigations_parallel.ts
4342
- x-pack/test/security_solution_cypress/config.firefox.ts
4443
- x-pack/test/security_solution_cypress/config.ts
4544
- x-pack/test/security_solution_cypress/response_ops_cli_config.ts
4645
- x-pack/test/security_solution_cypress/upgrade_config.ts
47-
- x-pack/test/security_solution_cypress/visual_config.ts
4846
- x-pack/test/threat_intelligence_cypress/visual_config.ts
4947
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
5048
- x-pack/test/threat_intelligence_cypress/config.ts

‎.buildkite/pipelines/pull_request/defend_workflows.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ steps:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 120
8+
parallelism: 2
89
retry:
910
automatic:
1011
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/response_ops.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ steps:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 120
8+
parallelism: 4
89
retry:
910
automatic:
1011
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/security_solution.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 120
8-
parallelism: 4
8+
parallelism: 15
99
retry:
1010
automatic:
1111
- exit_status: '-1'

‎.buildkite/scripts/steps/functional/defend_workflows.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
set -euo pipefail
44

5-
source .buildkite/scripts/common/util.sh
6-
7-
.buildkite/scripts/bootstrap.sh
8-
node scripts/build_kibana_platform_plugins.js
5+
source .buildkite/scripts/steps/functional/common.sh
96

107
export JOB=kibana-defend-workflows-cypress
8+
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
119

12-
echo "--- Defend Workflows Cypress tests"
10+
Xvfb -screen 0 1680x946x24 :99 &
1311

14-
node scripts/functional_tests \
15-
--debug --bail \
16-
--config x-pack/test/defend_workflows_cypress/cli_config.ts
12+
export DISPLAY=:99
13+
14+
echo "--- Defend Workflows Cypress tests"
1715

16+
yarn --cwd x-pack/plugins/security_solution cypress:dw:run

‎.buildkite/scripts/steps/functional/response_ops.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ set -euo pipefail
55
source .buildkite/scripts/steps/functional/common.sh
66

77
export JOB=kibana-security-solution-chrome
8+
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
9+
10+
Xvfb -screen 0 1680x946x24 :99 &
11+
12+
export DISPLAY=:99
813

914
echo "--- Response Ops Cypress Tests on Security Solution"
1015

11-
node scripts/functional_tests \
12-
--debug --bail \
13-
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
14-
--config x-pack/test/security_solution_cypress/response_ops_cli_config.ts
16+
yarn --cwd x-pack/plugins/security_solution cypress:run:respops

‎.buildkite/scripts/steps/functional/response_ops_cases.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ set -euo pipefail
55
source .buildkite/scripts/steps/functional/common.sh
66

77
export JOB=kibana-security-solution-chrome
8+
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
9+
10+
Xvfb -screen 0 1680x946x24 :99 &
11+
12+
export DISPLAY=:99
813

914
echo "--- Response Ops Cases Cypress Tests on Security Solution"
1015

11-
node scripts/functional_tests \
12-
--debug --bail \
13-
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
14-
--config x-pack/test/security_solution_cypress/cases_cli_config.ts
16+
yarn --cwd x-pack/plugins/security_solution cypress:run:cases

‎.buildkite/scripts/steps/functional/security_solution.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ set -euo pipefail
55
source .buildkite/scripts/steps/functional/common.sh
66

77
export JOB=kibana-security-solution-chrome
8-
export CLI_NUMBER=${CLI_NUMBER:-$((BUILDKITE_PARALLEL_JOB+1))}
9-
export CLI_COUNT=${CLI_COUNT:-$BUILDKITE_PARALLEL_JOB_COUNT}
8+
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
9+
10+
Xvfb :99 -screen 0 1600x1200x24 &
11+
12+
export DISPLAY=:99
1013

1114
echo "--- Security Solution tests (Chrome)"
1215

13-
node scripts/functional_tests \
14-
--debug --bail \
15-
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
16-
--config x-pack/test/security_solution_cypress/cli_config_parallel.ts
16+
yarn --cwd x-pack/plugins/security_solution cypress:run

‎.buildkite/scripts/steps/functional/security_solution_investigations.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ set -euo pipefail
55
source .buildkite/scripts/steps/functional/common.sh
66

77
export JOB=kibana-security-solution-chrome
8-
export CLI_NUMBER=${CLI_NUMBER:-$((BUILDKITE_PARALLEL_JOB+1))}
9-
export CLI_COUNT=${CLI_COUNT:-$BUILDKITE_PARALLEL_JOB_COUNT}
8+
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
109

11-
echo "--- Security Solution tests (Chrome)"
1210

13-
node scripts/functional_tests \
14-
--debug --bail \
15-
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
16-
--config x-pack/test/security_solution_cypress/cli_config_investigations_parallel.ts
11+
Xvfb :99 -screen 0 1600x1200x24 &
12+
13+
export DISPLAY=:99
14+
15+
echo "--- Investigations Cypress Tests on Security Solution"
16+
17+
yarn --cwd x-pack/plugins/security_solution cypress:investigations:run

‎config/serverless.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
newsfeed.enabled: false
22
xpack.security.showNavLinks: false
33
xpack.serverless.plugin.enabled: true
4-
xpack.fleet.enableExperimental: ['fleetServerStandalone']
4+
xpack.fleet.internal.fleetServerStandalone: true
55
xpack.fleet.internal.disableILMPolicies: true
66

77
# Management team plugins
@@ -18,6 +18,7 @@ xpack.license_management.enabled: false
1818
#xpack.canvas.enabled: false #only disabable in dev-mode
1919
xpack.reporting.enabled: false
2020
xpack.cloud_integrations.data_migration.enabled: false
21+
data.search.sessions.enabled: false
2122

2223
# Enforce restring access to internal APIs see https://github.com/elastic/kibana/issues/151940
2324
# server.restrictInternalApis: true

0 commit comments

Comments
 (0)