Skip to content

Commit

Permalink
Merge branch 'main' into svl_ftr_es_supertest
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Sep 20, 2023
2 parents 25c86c6 + a31cc1f commit 59a322f
Show file tree
Hide file tree
Showing 305 changed files with 9,794 additions and 2,457 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ disabled:
- x-pack/test/defend_workflows_cypress/cli_config.ts
- x-pack/test/defend_workflows_cypress/config.ts
- x-pack/test/defend_workflows_cypress/endpoint_config.ts
- x-pack/test/defend_workflows_cypress/endpoint_serverless_config.ts
- x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts
- x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
- x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
Expand Down
20 changes: 18 additions & 2 deletions .buildkite/pipelines/flaky_tests/groups.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,37 @@
{
"groups": [
{
"key": "cypress/security_solution",
"name": "Security Solution - Cypress"
},
{
"key": "cypress/security_serverless",
"name": "[Serverless] Security Solution - Cypress"
},
{
"key": "cypress/security_solution_investigations",
"name": "Security Solution Investigations - Cypress"
},
{
"key": "cypress/security_solution",
"name": "Security Solution - Cypress"
"key": "cypress/security_serverless_investigations",
"name": "[Serverless] Security Solution Investigations - Cypress"
},
{
"key": "cypress/security_solution_explore",
"name": "Security Solution Explore - Cypress"
},
{
"key": "cypress/security_serverless_explore",
"name": "[Serverless] Security Solution Explore - Cypress"
},
{
"key": "cypress/osquery_cypress",
"name": "Osquery - Cypress"
},
{
"key": "cypress/security_serverless_osquery",
"name": "[Serverless] Osquery - Cypress"
},
{
"key": "cypress/fleet_cypress",
"name": "Fleet - Cypress"
Expand Down
25 changes: 25 additions & 0 deletions .buildkite/pipelines/pull_request/defend_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,28 @@ steps:
automatic:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
label: 'Defend Workflows Cypress Tests on Serverless'
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
parallelism: 2
retry:
automatic:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/defend_workflows_vagrant_serverless.sh
label: 'Defend Workflows Endpoint Cypress Tests on Serverless'
agents:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 120
parallelism: 5
retry:
automatic:
- exit_status: '*'
limit: 1

15 changes: 15 additions & 0 deletions .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/steps/functional/common.sh
source .buildkite/scripts/steps/functional/common_cypress.sh

export JOB=kibana-defend-workflows-serverless-cypress
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}

echo "--- Defend Workflows Cypress tests on Serverless"

cd x-pack/plugins/security_solution

yarn cypress:dw:serverless:run; status=$?; yarn junit:merge || :; exit $status
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/steps/functional/common.sh
source .buildkite/scripts/steps/functional/common_cypress.sh

export JOB=kibana-defend-workflows-endpoint-serverless-cypress
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}

echo "--- Defend Workflows Endpoint Cypress tests on Serverless"

cd x-pack/plugins/security_solution

yarn cypress:dw:endpoint:serverless:run; status=$?; yarn junit:merge || :; exit $status
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -1041,6 +1041,7 @@ x-pack/plugins/infra/server/lib/alerting @elastic/actionable-observability
/packages/kbn-test/src/functional_test_runner @elastic/appex-qa
/packages/kbn-performance-testing-dataset-extractor @elastic/appex-qa
/x-pack/test_serverless/**/*config.base.ts @elastic/appex-qa
/x-pack/test_serverless/**/deployment_agnostic_services.ts @elastic/appex-qa

# Core
/config/ @elastic/kibana-core
Expand Down Expand Up @@ -1398,6 +1399,9 @@ x-pack/plugins/translations/translations
# Profiling api integration testing
x-pack/test/profiling_api_integration @elastic/profiling-ui

# Observability shared profiling
x-pack/plugins/observability_shared/public/components/profiling @elastic/profiling-ui

# Shared UX
packages/react @elastic/appex-sharedux

Expand Down
6 changes: 5 additions & 1 deletion config/serverless.oblt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ xpack.fleet.agentIdVerificationEnabled: false
xpack.apm.serverlessOnboarding: true

# Fleet specific configuration
xpack.fleet.internal.capabilities: ['apm', 'observability']
xpack.fleet.internal.registry.capabilities: ['apm', 'observability']
xpack.fleet.internal.registry.spec.max: '3.0'
# Disabled until packages implement the new spec https://github.com/elastic/kibana/issues/166742
# xpack.fleet.internal.registry.kibanaVersionCheckEnabled: false
# xpack.fleet.internal.registry.spec.min: '3.0'

## Required for force installation of APM Package
xpack.fleet.packages:
Expand Down
6 changes: 5 additions & 1 deletion config/serverless.security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ xpack.serverless.plugin.developer.projectSwitcher.currentType: 'security'
telemetry.labels.serverless: security

# Fleet specific configuration
xpack.fleet.internal.capabilities: ['security']
xpack.fleet.internal.registry.capabilities: ['security']
xpack.fleet.internal.registry.spec.max: '3.0'
# Disabled until packages implement the new spec https://github.com/elastic/kibana/issues/166742
# xpack.fleet.internal.registry.kibanaVersionCheckEnabled: false
# xpack.fleet.internal.registry.spec.min: '3.0'

# Serverless security specific options
xpack.securitySolution.enableExperimental:
Expand Down
4 changes: 2 additions & 2 deletions config/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ xpack.fleet.internal.activeAgentsSoftLimit: 25000
xpack.fleet.internal.onlyAllowAgentUpgradeToKnownVersions: true

# Cloud links
xpack.cloud.base_url: "https://cloud.elastic.co"
xpack.cloud.base_url: 'https://cloud.elastic.co'

# Enable ZDT migration algorithm
migrations.algorithm: zdt
Expand Down Expand Up @@ -86,7 +86,7 @@ xpack.spaces.allowFeatureVisibility: false
console.autocompleteDefinitions.endpointsAvailability: serverless

# Allow authentication via the Elasticsearch JWT realm with the `shared_secret` client authentication type.
elasticsearch.requestHeadersWhitelist: ["authorization", "es-client-authentication"]
elasticsearch.requestHeadersWhitelist: ['authorization', 'es-client-authentication']

# Limit maxSockets to 800 as we do in ESS, which improves reliability under high loads.
elasticsearch.maxSockets: 800
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"yarn": "^1.22.19"
},
"resolutions": {
"**/@hello-pangea/dnd": "16.2.0",
"**/@types/node": "18.17.1",
"**/@typescript-eslint/utils": "5.62.0",
"**/chokidar": "^3.5.3",
Expand All @@ -100,7 +101,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.9.1-canary.1",
"@elastic/ems-client": "8.4.0",
"@elastic/eui": "88.2.0",
"@elastic/eui": "88.3.0",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand All @@ -125,7 +126,7 @@
"@hapi/hoek": "^9.2.1",
"@hapi/inert": "^6.0.4",
"@hapi/wreck": "^17.1.0",
"@hello-pangea/dnd": "^16.3.0",
"@hello-pangea/dnd": "16.2.0",
"@juggle/resize-observer": "^3.4.0",
"@kbn/aad-fixtures-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/aad",
"@kbn/ace": "link:packages/kbn-ace",
Expand Down
Loading

0 comments on commit 59a322f

Please sign in to comment.