Skip to content

Commit 8f96823

Browse files
authored
Merge branch 'main' into alerts-table/update-dts-based-on-loading-prop
2 parents 8cb2e33 + 10741d9 commit 8f96823

2,134 files changed

Lines changed: 33943 additions & 64665 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.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
disabled:
2+
# Base config files, only necessary to inform config finding script
3+
4+
defaultQueue: 'n2-4-spot'
5+
enabled:
6+
- x-pack/test_serverless/api_integration/test_suites/chat/config.ts
7+
- x-pack/test_serverless/api_integration/test_suites/chat/config.feature_flags.ts
8+
- x-pack/test_serverless/api_integration/test_suites/chat/common_configs/config.group1.ts
9+
- x-pack/test_serverless/functional/test_suites/chat/config.ts
10+
- x-pack/test_serverless/functional/test_suites/chat/config.feature_flags.ts
11+
- x-pack/test_serverless/functional/test_suites/chat/common_configs/config.group1.ts

.buildkite/ftr_configs_manifests.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
".buildkite/ftr_base_serverless_configs.yml",
1010
".buildkite/ftr_oblt_serverless_configs.yml",
1111
".buildkite/ftr_security_serverless_configs.yml",
12-
".buildkite/ftr_search_serverless_configs.yml"
12+
".buildkite/ftr_search_serverless_configs.yml",
13+
".buildkite/ftr_chat_serverless_configs.yml"
1314
]
14-
}
15+
}

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ enabled:
3030
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
3131
# serverless config files that run deployment-agnostic tests
3232
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
33+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
3334
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
35+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
36+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ enabled:
8080
- src/platform/test/functional/apps/discover/group6/config.ts
8181
- src/platform/test/functional/apps/discover/group7/config.ts
8282
- src/platform/test/functional/apps/discover/group8/config.ts
83+
- src/platform/test/functional/apps/discover/group9/config.ts
84+
- src/platform/test/functional/apps/discover/group10/config.ts
8385
- src/platform/test/functional/apps/discover/context_awareness/config.ts
8486
- src/platform/test/functional/apps/discover/observability/config.ts
8587
- src/platform/test/functional/apps/getting_started/config.ts
@@ -266,6 +268,7 @@ enabled:
266268
- x-pack/test/functional/apps/rollup_job/config.ts
267269
- x-pack/test/functional/apps/saved_objects_management/config.ts
268270
- x-pack/test/functional/apps/saved_query_management/config.ts
271+
- x-pack/test/functional/apps/saved_query_management/config.v2.ts
269272
- x-pack/test/functional/apps/security/config.ts
270273
- x-pack/test/functional/apps/snapshot_restore/config.ts
271274
- x-pack/test/functional/apps/spaces/config.ts

.buildkite/pipelines/pull_request/scout_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
99
retry:
1010
automatic:
11-
# No retry when Scout CI config validation fails
11+
# No retry when Scout configs fail
1212
- exit_status: 10
1313
limit: 0
1414
- exit_status: '*'

.buildkite/scripts/steps/checks/prettier_topology.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo --- Check Prettier Configuration Topology
8-
node scripts/prettier_topology_check
8+
retry 3 3 node scripts/prettier_topology_check

.buildkite/scripts/steps/fips/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ node scripts/build \
3232
cd "$KIBANA_DIR/target"
3333
buildkite-agent artifact upload "./*docker-image*.tar.gz"
3434

35-
KIBANA_FIPS_IMAGE="docker.elastic.co/kibana-ci/kibana-fips:$FULL_VERSION-$BUILDKITE_COMMIT"
35+
KIBANA_FIPS_IMAGE="docker.elastic.co/kibana-ci/kibana-wolfi-fips:$FULL_VERSION-$BUILDKITE_COMMIT"
3636

37-
cat <<EOF | buildkite-agent annotate --style "info" --context kibana-fips-image
37+
cat <<EOF | buildkite-agent annotate --style "info" --context kibana-wolfi-fips-image
3838
3939
Kibana FIPS image: \`$KIBANA_FIPS_IMAGE\`
4040
EOF

.github/CODEOWNERS

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,6 @@ x-pack/solutions/observability/packages/get-padded-alert-time-range-util @elasti
957957
x-pack/solutions/observability/packages/kbn-alerts-grouping @elastic/response-ops
958958
x-pack/solutions/observability/packages/kbn-custom-integrations @elastic/obs-ux-logs-team
959959
x-pack/solutions/observability/packages/kbn-genai-cli @elastic/obs-knowledge-team
960-
x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux-management-team
961960
x-pack/solutions/observability/packages/kbn-observability-schema @elastic/obs-ux-management-team
962961
x-pack/solutions/observability/packages/kbn-scout-oblt @elastic/appex-qa
963962
x-pack/solutions/observability/packages/observability-ai/observability-ai-common @elastic/obs-ai-assistant
@@ -975,8 +974,6 @@ x-pack/solutions/observability/plugins/exploratory_view @elastic/obs-ux-manageme
975974
x-pack/solutions/observability/plugins/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
976975
x-pack/solutions/observability/plugins/inventory @elastic/obs-ux-infra_services-team
977976
x-pack/solutions/observability/plugins/inventory/e2e @elastic/obs-ux-infra_services-team
978-
x-pack/solutions/observability/plugins/investigate @elastic/obs-ux-management-team
979-
x-pack/solutions/observability/plugins/investigate_app @elastic/obs-ux-management-team
980977
x-pack/solutions/observability/plugins/metrics_data_access @elastic/obs-ux-infra_services-team
981978
x-pack/solutions/observability/plugins/observability @elastic/obs-ux-management-team
982979
x-pack/solutions/observability/plugins/observability_ai_assistant_app @elastic/obs-ai-assistant
@@ -1253,11 +1250,11 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/
12531250
/src/platform/test/api_integration/apis/event_annotations @elastic/kibana-visualizations
12541251
/x-pack/test_serverless/functional/test_suites/common/visualizations/ @elastic/kibana-visualizations
12551252
/x-pack/test_serverless/functional/fixtures/kbn_archiver/lens/ @elastic/kibana-visualizations
1256-
packages/kbn-monaco/src/esql @elastic/kibana-esql
12571253

1258-
# ESQL
1254+
# ES|QL
12591255
/src/platform/test/api_integration/apis/esql/*.ts @elastic/kibana-esql
12601256
/src/platform/test/functional/services/esql.ts @elastic/kibana-esql
1257+
/src/platform/packages/shared/kbn-monaco/src/languages/esql @elastic/kibana-esql
12611258

12621259
# Global Experience
12631260

@@ -2107,6 +2104,12 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
21072104
/x-pack/test_serverless/functional/page_objects/svl_search_* @elastic/search-kibana
21082105
/x-pack/test/functional_search/ @elastic/search-kibana
21092106

2107+
# workchat
2108+
/x-pack/test_serverless/api_integration/test_suites/chat @elastic/search-kibana
2109+
/x-pack/test_serverless/api_integration/test_suites/chat/config.ts @elastic/search-kibana @elastic/appex-qa
2110+
/x-pack/test_serverless/functional/test_suites/chat/ @elastic/search-kibana
2111+
/x-pack/test_serverless/functional/test_suites/chat/config.ts @elastic/search-kibana @elastic/appex-qa
2112+
21102113
# Management Experience - Deployment Management
21112114
/src/platform/test/functional/fixtures/kbn_archiver/management.json @elastic/kibana-management @elastic/kibana-data-discovery # Assigned per 2 uses: test/functional/apps/management/_import_objects.ts && test/functional/apps/management/data_views/_scripted_fields_filter.ts
21122115
/x-pack/test/functional/fixtures/kbn_archiver/home/feature_controls/security/security.json @elastic/kibana-management

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
ref: ${{ matrix.branch }}
2828

2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
30+
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
3131
with:
3232
languages: ${{ matrix.language }}
3333
config-file: ./.github/codeql/codeql-config.yml
@@ -51,7 +51,7 @@ jobs:
5151
run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV"
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
54+
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
5555
env:
5656
NODE_OPTIONS: "--max-old-space-size=8192"
5757
CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES: ${{ env.CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES }}

.swn

12 KB
Binary file not shown.

0 commit comments

Comments
 (0)