Skip to content

Commit 2c5c953

Browse files
davismcpheedavismcphee
authored
Merge branch 'main' into o11y-profiles-telemetry
2 parents 0585a25 + 2775089 commit 2c5c953

1,452 files changed

Lines changed: 23218 additions & 11998 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_oblt_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ enabled:
3232
- x-pack/test/api_integration/apis/synthetics/config.ts
3333
- x-pack/test/api_integration/apis/uptime/config.ts
3434
- x-pack/test/api_integration/apis/entity_manager/config.ts
35+
- x-pack/test/api_integration/apis/streams/config.ts
3536
- x-pack/test/apm_api_integration/basic/config.ts
3637
- x-pack/test/apm_api_integration/cloud/config.ts
3738
- x-pack/test/apm_api_integration/rules/config.ts

‎.buildkite/pipeline-resource-definitions/kibana-pr.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ spec:
2121
env:
2222
ELASTIC_PR_COMMENTS_ENABLED: 'true'
2323
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
24-
GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
2524
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
2625
allow_rebuilds: true
2726
branch_configuration: ''

‎.buildkite/pipeline-resource-definitions/locations.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
1616
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-chrome-forward-testing.yml
1717
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-codeql.yml
18+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml
1819
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
1920
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-deploy-project.yml
2021
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml

‎.buildkite/pipelines/artifacts.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ steps:
66
imageProject: elastic-images-prod
77
provider: gcp
88
machineType: c2-standard-16
9+
diskSizeGb: 125
910
timeout_in_minutes: 120
1011
retry:
1112
automatic:

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ steps:
1212
agents:
1313
machineType: n2-standard-8
1414
preemptible: true
15+
diskSizeGb: 125
1516
key: build
1617
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
1718
timeout_in_minutes: 90

‎.buildkite/scripts/steps/console_definitions_sync.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4+
GIT_SCOPE="src/plugins/console/server/lib/spec_definitions"
5+
46
report_main_step () {
57
echo "--- $1"
68
}
@@ -16,14 +18,16 @@ main () {
1618
exit 1
1719
fi
1820

21+
report_main_step "Bootstrapping Kibana"
1922
cd "$KIBANA_DIR"
23+
.buildkite/scripts/bootstrap.sh
2024

2125
report_main_step "Generating console definitions"
2226
node scripts/generate_console_definitions.js --source "$PARENT_DIR/elasticsearch-specification" --emptyDest
2327

2428
# Check if there are any differences
2529
set +e
26-
git diff --exit-code --quiet "$destination_file"
30+
git diff --exit-code --quiet "$GIT_SCOPE"
2731
if [ $? -eq 0 ]; then
2832
echo "No differences found. Exiting.."
2933
exit
@@ -54,7 +58,7 @@ main () {
5458

5559
git checkout -b "$BRANCH_NAME"
5660

57-
git add src/plugins/console/server/lib/spec_definitions/json/generated/*
61+
git add $GIT_SCOPE
5862
git commit -m "Update console definitions"
5963

6064
report_main_step "Changes committed. Creating pull request."

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ packages/kbn-rrule @elastic/response-ops
466466
packages/kbn-rule-data-utils @elastic/security-detections-response @elastic/response-ops @elastic/obs-ux-management-team
467467
packages/kbn-safer-lodash-set @elastic/kibana-security
468468
packages/kbn-saved-objects-settings @elastic/appex-sharedux
469+
packages/kbn-scout @elastic/appex-qa
469470
packages/kbn-screenshotting-server @elastic/appex-sharedux
470471
packages/kbn-search-api-keys-components @elastic/search-kibana
471472
packages/kbn-search-api-keys-server @elastic/search-kibana
@@ -1238,8 +1239,8 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
12381239
### Observability Plugins
12391240

12401241
# Observability AI Assistant
1241-
/x-pack/test_serverless/api_integration/test_suites/common/data_usage @elastic/obs-ai-assistant
1242-
/x-pack/test_serverless/functional/test_suites/common/data_usage @elastic/obs-ai-assistant @elastic/kibana-security
1242+
/x-pack/test_serverless/api_integration/test_suites/common/data_usage @elastic/obs-ai-assistant @elastic/security-solution
1243+
/x-pack/test_serverless/functional/test_suites/common/data_usage @elastic/obs-ai-assistant @elastic/security-solution
12431244
/x-pack/test/observability_ai_assistant_api_integration @elastic/obs-ai-assistant
12441245
/x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
12451246
/x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai-assistant
@@ -1431,6 +1432,8 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
14311432
### END Observability Plugins
14321433

14331434
# Presentation
1435+
/x-pack/test/upgrade/screenshots @elastic/kibana-presentation
1436+
/x-pack/test/functional/screenshots @elastic/kibana-presentation
14341437
/test/functional/fixtures/kbn_archiver/legacy.json @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/200934#discussion_r1856407606
14351438
/x-pack/test/functional/fixtures/kbn_archiver/maps.json @elastic/kibana-presentation
14361439
/x-pack/test/functional/fixtures/kbn_archiver/canvas @elastic/kibana-presentation
@@ -1514,6 +1517,7 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
15141517
/x-pack/test/api_integration/services/transform.ts @elastic/ml-ui
15151518
/x-pack/test/functional/apps/aiops @elastic/ml-ui
15161519
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
1520+
/x-pack/test/functional/es_archives/large_arrays @elastic/ml-ui # Assigned per usages
15171521
/x-pack/test/functional/services/transform/ @elastic/ml-ui
15181522
/x-pack/test/functional/services/aiops @elastic/ml-ui
15191523
/x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
@@ -1550,6 +1554,7 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
15501554
/.eslintignore @elastic/kibana-operations
15511555

15521556
# QA - Appex QA
1557+
/x-pack/plugins/discover_enhanced/ui_tests/ @elastic/appex-qa # temporarily
15531558
/x-pack/test/functional/fixtures/package_registry_config.yml @elastic/appex-qa # No usages found
15541559
/x-pack/test/functional/fixtures/kbn_archiver/packaging.json @elastic/appex-qa # No usages found
15551560
/x-pack/test/functional/es_archives/filebeat @elastic/appex-qa
@@ -2144,6 +2149,8 @@ x-pack/test/security_solution_api_integration/test_suites/explore @elastic/secur
21442149
x-pack/test/security_solution_api_integration/test_suites/investigations @elastic/security-threat-hunting-investigations
21452150
x-pack/test/security_solution_api_integration/test_suites/sources @elastic/security-detections-response
21462151
/x-pack/test/common/utils/security_solution/detections_response @elastic/security-detections-response
2152+
/x-pack/test/functional/es_archives/signals @elastic/security-detections-response
2153+
/x-pack/test/functional/es_archives/rule_keyword_family @elastic/security-detections-response
21472154

21482155
# Security Solution sub teams
21492156

@@ -2464,6 +2471,7 @@ x-pack/plugins/security_solution/server/lib/security_integrations @elastic/secur
24642471
/x-pack/plugins/security_solution_serverless/**/*.scss @elastic/security-design
24652472

24662473
# Logstash
2474+
/x-pack/test/functional/es_archives/logstash/example_pipelines @elastic/logstash
24672475
/x-pack/test/functional/services/pipeline_* @elastic/logstash
24682476
/x-pack/test/functional/page_objects/logstash_page.ts @elastic/logstash
24692477
/x-pack/test/functional/apps/logstash @elastic/logstash

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ x-pack/test/security_api_integration/plugins/audit_log/audit.log
143143
.ftr
144144
role_users.json
145145

146+
# ignore Scout temp directory
147+
.scout
146148

147149
.devcontainer/.env
148150

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2024-11-25
11+
date: 2024-11-26
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

‎api_docs/advanced_settings.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2024-11-25
11+
date: 2024-11-26
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

0 commit comments

Comments
 (0)