Skip to content

Commit 9cbf805

Browse files
delannidelanni
committed
Merge branch '9.1' into backport/9.1/pr-244556
2 parents 9e03a23 + a66b209 commit 9cbf805

98 files changed

Lines changed: 62227 additions & 720 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_security_serverless_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ disabled:
114114
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
115115
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
116116
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
117+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/basic_license_essentials_tier/configs/serverless.config.ts
117118
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/configs/serverless.config.ts
118119
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
119120
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ enabled:
9797
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
9898
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts
9999
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts
100+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/basic_license_essentials_tier/configs/ess.config.ts
100101
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/configs/ess.config.ts
101102
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/ess.config.ts
102103
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/ess.config.ts

‎.buildkite/package-lock.json‎

Lines changed: 97 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.buildkite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"typecheck": "tsc --noEmit"
99
},
1010
"dependencies": {
11-
"@octokit/rest": "^22.0.0",
11+
"@octokit/rest": "^22.0.1",
1212
"adm-zip": "^0.5.16",
1313
"axios": "^1.8.3",
1414
"globby": "^11.1.0",

‎.buildkite/pipelines/fips.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
env:
22
DISABLE_CI_STATS_SHIPPING: 'true'
33
TEST_BROWSER_HEADLESS: 1
4-
agents:
5-
provider: 'gcp'
6-
image: 'family/kibana-fips-ubuntu-2404'
7-
imageProject: 'elastic-images-prod'
84
steps:
95
- command: .buildkite/scripts/lifecycle/pre_build.sh
106
label: Pre-Build

‎.buildkite/scout_ci_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ plugins:
88
- maps
99
- observability_onboarding
1010
- painless_lab
11+
- profiling
1112
- security_solution
1213
- spaces
1314
- streams_app

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "--- Fleet Cypress tests (Chrome)"
1212
cd x-pack/platform/plugins/shared/fleet
1313

1414
set +e
15-
yarn cypress:run:reporter; status=$?; yarn cypress_space_awareness:run:reporter; space_status=$?; yarn junit:merge || :
15+
yarn cypress:ci:run; status=$?; yarn cypress_space_awareness:ci:run; space_status=$?; yarn junit:merge || :
1616

1717
# Scout reporter
1818
upload_scout_cypress_events "Fleet Cypress tests"

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ x-pack/platform/plugins/shared/fleet/cypress.config.d.ts
108108
x-pack/platform/plugins/shared/fleet/cypress.config.js
109109
x-pack/platform/plugins/shared/fleet/cypress.config.space_awareness.d.ts
110110
x-pack/platform/plugins/shared/fleet/cypress.config.space_awareness.js
111+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.d.ts
112+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.js
113+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.space_awareness.d.ts
114+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.space_awareness.js
111115
x-pack/platform/plugins/shared/osquery/cypress.config.d.ts
112116
x-pack/platform/plugins/shared/osquery/cypress.config.js
113117
x-pack/solutions/search/plugins/enterprise_search/cypress.config.d.ts

‎fleet_packages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
},
5757
{
5858
"name": "security_detection_engine",
59-
"version": "9.1.12"
59+
"version": "9.1.13"
6060
}
6161
]

‎oas_docs/package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)