Skip to content

Commit bf1d689

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into telemetry/use-versioned-routing
2 parents 5450e48 + b336a19 commit bf1d689

2,881 files changed

Lines changed: 89018 additions & 22960 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/disabled_jest_configs.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
[
2-
"x-pack/plugins/watcher/jest.config.js"
3-
]
1+
[]

‎.buildkite/ftr_configs.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ disabled:
3434
- x-pack/test/osquery_cypress/cli_config.ts
3535
- x-pack/test/osquery_cypress/config.ts
3636
- x-pack/test/osquery_cypress/visual_config.ts
37-
- x-pack/test/security_solution_cypress/ccs_config.ts
3837
- x-pack/test/security_solution_cypress/cli_config.ts
39-
- x-pack/test/security_solution_cypress/config.firefox.ts
4038
- x-pack/test/security_solution_cypress/config.ts
41-
- x-pack/test/security_solution_cypress/upgrade_config.ts
4239
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
4340
- x-pack/test/threat_intelligence_cypress/config.ts
4441
- x-pack/test/functional_enterprise_search/visual_config.ts
@@ -328,6 +325,7 @@ enabled:
328325
- x-pack/test/functional/config_security_basic.ts
329326
- x-pack/test/functional/config.ccs.ts
330327
- x-pack/test/functional/config.firefox.js
328+
- x-pack/test/functional/config.upgrade_assistant.ts
331329
- x-pack/test/functional_cloud/config.ts
332330
- x-pack/test/kubernetes_security/basic/config.ts
333331
- x-pack/test/licensing_plugin/config.public.ts

‎.buildkite/pipelines/artifacts_container_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- command: .buildkite/scripts/steps/artifacts/docker_image.sh
3-
label: Build default container images
3+
label: Build serverless container images
44
agents:
55
queue: n2-16-spot
66
timeout_in_minutes: 60

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,14 @@ steps:
1212
limit: 1
1313
artifact_paths:
1414
- "target/kibana-security-solution/**/*"
15+
16+
- command: .buildkite/scripts/steps/functional/security_solution_burn.sh
17+
label: 'Security Solution Cypress tests, burning changed specs'
18+
agents:
19+
queue: n2-4-spot
20+
depends_on: build
21+
timeout_in_minutes: 120
22+
parallelism: 1
23+
soft_fail: true
24+
artifact_paths:
25+
- "target/kibana-security-solution/**/*"

‎.buildkite/scripts/build_kibana.sh‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,6 @@ if is_pr_with_label "ci:build-cloud-image"; then
4141
EOF
4242
fi
4343

44-
if is_pr_with_label "ci:build-serverless-image"; then
45-
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
46-
GIT_ABBREV_COMMIT=${BUILDKITE_COMMIT:0:12}
47-
node scripts/build \
48-
--skip-initialize \
49-
--skip-generic-folders \
50-
--skip-platform-folders \
51-
--skip-archives \
52-
--docker-images \
53-
--docker-namespace="kibana-ci" \
54-
--docker-tag="pr-$BUILDKITE_PULL_REQUEST-$GIT_ABBREV_COMMIT" \
55-
--docker-push \
56-
--skip-docker-ubi \
57-
--skip-docker-ubuntu \
58-
--skip-docker-cloud \
59-
--skip-docker-contexts
60-
docker logout docker.elastic.co
61-
62-
SERVERLESS_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-serverless)
63-
buildkite-agent meta-data set pr_comment:deploy_cloud:head "* Kibana Serverless Image: \`$SERVERLESS_IMAGE\`"
64-
cat << EOF | buildkite-agent annotate --style "info" --context kibana-serverless-image
65-
66-
Kibana Serverless Image: \`$SERVERLESS_IMAGE\`
67-
EOF
68-
fi
69-
7044
echo "--- Archive Kibana Distribution"
7145
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
7246
installDir="$KIBANA_DIR/install/kibana"

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ const uploadPipeline = (pipelineContent: string | object) => {
170170
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/deploy_cloud.yml'));
171171
}
172172

173+
if (GITHUB_PR_LABELS.includes('ci:build-serverless-image')) {
174+
pipeline.push(getPipeline('.buildkite/pipelines/artifacts_container_image.yml'));
175+
}
176+
173177
if (
174178
(await doAnyChangesMatch([/.*stor(ies|y).*/])) ||
175179
GITHUB_PR_LABELS.includes('ci:build-storybooks')

‎.buildkite/scripts/pipelines/security_solution_quality_gate/pipeline.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
echo "In the entrypoint for the quality gate"

‎.buildkite/scripts/steps/artifacts/docker_image.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,19 @@ set -euo pipefail
77
source .buildkite/scripts/steps/artifacts/env.sh
88

99
GIT_ABBREV_COMMIT=${BUILDKITE_COMMIT:0:12}
10-
KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:git-$GIT_ABBREV_COMMIT"
10+
if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
11+
KIBANA_IMAGE_TAG="git-$GIT_ABBREV_COMMIT"
12+
else
13+
KIBANA_IMAGE_TAG="pr-$BUILDKITE_PULL_REQUEST-$GIT_ABBREV_COMMIT"
14+
fi
15+
16+
KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:$KIBANA_IMAGE_TAG"
1117

1218
echo "--- Verify manifest does not already exist"
1319
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
1420
trap 'docker logout docker.elastic.co' EXIT
1521

22+
echo "Checking manifest for $KIBANA_IMAGE"
1623
if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
1724
echo "Manifest already exists, exiting"
1825
exit 1
@@ -25,7 +32,7 @@ node scripts/build \
2532
--docker-cross-compile \
2633
--docker-images \
2734
--docker-namespace="kibana-ci" \
28-
--docker-tag="git-$GIT_ABBREV_COMMIT" \
35+
--docker-tag="$KIBANA_IMAGE_TAG" \
2936
--skip-docker-ubuntu \
3037
--skip-docker-ubi \
3138
--skip-docker-cloud \
@@ -55,7 +62,7 @@ docker manifest push "$KIBANA_IMAGE"
5562
docker logout docker.elastic.co
5663

5764
cat << EOF | buildkite-agent annotate --style "info" --context image
58-
### Container Images
65+
### Serverless Images
5966
6067
Manifest: \`$KIBANA_IMAGE\`
6168
@@ -64,6 +71,11 @@ cat << EOF | buildkite-agent annotate --style "info" --context image
6471
ARM64: \`$KIBANA_IMAGE-arm64\`
6572
EOF
6673

74+
if [[ "${BUILDKITE_PULL_REQUEST:-false}" != "false" ]]; then
75+
buildkite-agent meta-data set pr_comment:build_serverless:head "* Kibana Serverless Image: \`$KIBANA_IMAGE\`"
76+
buildkite-agent meta-data set pr_comment:early_comment_job_id "$BUILDKITE_JOB_ID"
77+
fi
78+
6779
echo "--- Build dependencies report"
6880
node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
6981

@@ -80,7 +92,7 @@ cd -
8092
# so that new stack instances contain the latest and greatest image of kibana,
8193
# and the respective stack components of course.
8294
echo "--- Trigger image tag update"
83-
if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
95+
if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
8496
cat << EOF | buildkite-agent pipeline upload
8597
steps:
8698
- label: ":argo: Update kibana image tag for kibana-controller using gpctl"

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source .buildkite/scripts/steps/functional/common.sh
6+
source .buildkite/scripts/steps/functional/common_cypress.sh
7+
8+
export JOB=kibana-security-solution-chrome
9+
export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
10+
11+
buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'false'
12+
13+
echo "--- Security Solution Cypress tests, burning changed specs (Chrome)"
14+
15+
yarn --cwd x-pack/plugins/security_solution cypress:changed-specs-only

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,9 @@ examples/screenshot_mode_example @elastic/kibana-app-services
588588
src/plugins/screenshot_mode @elastic/appex-sharedux
589589
x-pack/examples/screenshotting_example @elastic/appex-sharedux
590590
x-pack/plugins/screenshotting @elastic/kibana-reporting-services
591+
packages/kbn-search-api-panels @elastic/enterprise-search-frontend
591592
examples/search_examples @elastic/kibana-data-discovery
593+
packages/kbn-search-response-warnings @elastic/kibana-data-discovery
592594
x-pack/plugins/searchprofiler @elastic/platform-deployment-management
593595
x-pack/test/security_api_integration/packages/helpers @elastic/kibana-core
594596
x-pack/plugins/security @elastic/kibana-security
@@ -751,6 +753,7 @@ src/plugins/url_forwarding @elastic/kibana-visualizations
751753
packages/kbn-url-state @elastic/security-threat-hunting-investigations
752754
src/plugins/usage_collection @elastic/kibana-core
753755
test/plugin_functional/plugins/usage_collection @elastic/kibana-core
756+
packages/kbn-use-tracked-promise @elastic/infra-monitoring-ui
754757
packages/kbn-user-profile-components @elastic/kibana-security
755758
examples/user_profile_examples @elastic/kibana-security
756759
x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security
@@ -1098,6 +1101,8 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
10981101
/x-pack/plugins/security_solution/server/lib/timeline @elastic/security-threat-hunting-investigations
10991102

11001103
## Security Solution sub teams - Threat Hunting Explore
1104+
/x-pack/plugins/security_solution/common/api/tags @elastic/security-threat-hunting-explore
1105+
/x-pack/plugins/security_solution/common/api/risk_score @elastic/security-threat-hunting-explore
11011106
/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts @elastic/security-threat-hunting-explore
11021107
/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram @elastic/security-threat-hunting-explore
11031108
/x-pack/plugins/security_solution/common/search_strategy/security_solution/network @elastic/security-threat-hunting-explore
@@ -1144,6 +1149,11 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
11441149
/x-pack/plugins/stack_connectors/server/connector_types/gen_ai @elastic/security-threat-hunting-explore
11451150
/x-pack/plugins/stack_connectors/common/gen_ai @elastic/security-threat-hunting-explore
11461151

1152+
## Defend Workflows owner connectors
1153+
/x-pack/plugins/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows
1154+
/x-pack/plugins/stack_connectors/server/connector_types/sentinelone @elastic/security-defend-workflows
1155+
/x-pack/plugins/stack_connectors/common/sentinelone @elastic/security-defend-workflows
1156+
11471157
## Security Solution sub teams - Detection Rule Management
11481158
/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema @elastic/security-detection-rule-management @elastic/security-detection-engine
11491159
/x-pack/plugins/security_solution/common/api/detection_engine/fleet_integrations @elastic/security-detection-rule-management

0 commit comments

Comments
 (0)