Skip to content

Commit 8e2d445

Browse files
CoenWarmerCoenWarmer
committed
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-plugins-observability-onboarding
2 parents e626d09 + 9d889b1 commit 8e2d445

1,340 files changed

Lines changed: 4267 additions & 2307 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_configs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ disabled:
6161
- x-pack/plugins/synthetics/e2e/config.ts
6262
- x-pack/plugins/uptime/e2e/uptime/synthetics_run.ts
6363
- x-pack/plugins/synthetics/e2e/synthetics/synthetics_run.ts
64-
- x-pack/plugins/ux/e2e/synthetics_run.ts
64+
- x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts
6565
- x-pack/plugins/exploratory_view/e2e/synthetics_run.ts
6666

6767
# Configs that exist but weren't running in CI when this file was introduced

‎.buildkite/pipelines/pull_request/ux_plugin_e2e.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- quick_checks
99
timeout_in_minutes: 60
1010
artifact_paths:
11-
- 'x-pack/plugins/ux/e2e/.journeys/**/*'
11+
- 'x-pack/plugins/observability_solution/ux/e2e/.journeys/**/*'
1212
retry:
1313
automatic:
1414
- exit_status: '-1'

‎.buildkite/scripts/lifecycle/pre_command.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ export GCS_SA_CDN_EMAIL
151151
GCS_SA_CDN_BUCKET="$(vault_get gcs-sa-cdn-prod bucket)"
152152
export GCS_SA_CDN_BUCKET
153153

154+
GCS_SA_CDN_URL="$(vault_get gcs-sa-cdn-prod cdn)"
155+
export GCS_SA_CDN_URL
156+
154157
# Setup Failed Test Reporter Elasticsearch credentials
155158
{
156159
TEST_FAILURES_ES_CLOUD_ID=$(vault_get failed_tests_reporter_es cloud_id)

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,28 @@ tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip
9898
gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_BUCKET/$GIT_ABBREV_COMMIT"
9999
gcloud auth revoke "$GCS_SA_CDN_EMAIL"
100100

101+
echo "--- Validate CDN assets"
102+
(
103+
shopt -s globstar
104+
THREADS=$(grep -c ^processor /proc/cpuinfo)
105+
i=0
106+
cd $CDN_ASSETS_FOLDER
107+
for CDN_ASSET in **/*; do
108+
((i=(i+1)%THREADS)) || wait
109+
if [[ -f "$CDN_ASSET" ]]; then
110+
echo -n "Testing $CDN_ASSET..."
111+
curl -I --write-out '%{http_code}\n' --fail --silent --output /dev/null "$GCS_SA_CDN_URL/$CDN_ASSET"
112+
fi
113+
done
114+
)
115+
101116
echo "--- Upload archives"
102117
buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"
103118
buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-aarch64.tar.gz"
104119
buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
105120
buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
106121
buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
107122
buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
108-
cd -
109123

110124
# This part is related with updating the configuration of kibana-controller,
111125
# so that new stack instances contain the latest and greatest image of kibana,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- User Experience @elastic/synthetics Tests"
1313

1414
cd "$XPACK_DIR"
1515

16-
node plugins/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
16+
node plugins/observability_solution/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

‎.eslintrc.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ module.exports = {
874874
'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
875875
'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
876876
'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
877-
'x-pack/plugins/ux/**/*.{js,mjs,ts,tsx}',
877+
'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
878878
],
879879
rules: {
880880
'no-console': ['warn', { allow: ['error'] }],
@@ -915,12 +915,12 @@ module.exports = {
915915
'x-pack/plugins/exploratory_view/**/*.tsx',
916916
'x-pack/plugins/infra/**/*.tsx',
917917
'x-pack/plugins/observability/**/*.tsx',
918-
'x-pack/plugins/observability_ai_assistant/**/*.tsx',
919918
'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
919+
'x-pack/plugins/observability_shared/observability_ai_assistant/**/*.tsx',
920920
'x-pack/plugins/observability_shared/**/*.tsx',
921921
'x-pack/plugins/profiling/**/*.tsx',
922922
'x-pack/plugins/synthetics/**/*.tsx',
923-
'x-pack/plugins/ux/**/*.tsx',
923+
'x-pack/plugins/observability_solution/ux/**/*.tsx',
924924
'src/plugins/ai_assistant_management/**/*.tsx',
925925
],
926926
rules: {
@@ -933,12 +933,12 @@ module.exports = {
933933
'x-pack/plugins/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
934934
'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
935935
'x-pack/plugins/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
936-
'x-pack/plugins/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
937936
'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
937+
'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
938938
'x-pack/plugins/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
939939
'x-pack/plugins/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
940940
'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
941-
'x-pack/plugins/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
941+
'x-pack/plugins/observability_solution/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
942942
'src/plugins/ai_assistant_management/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
943943
],
944944
rules: {

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ test/common/plugins/newsfeed @elastic/kibana-core
569569
src/plugins/no_data_page @elastic/appex-sharedux
570570
x-pack/plugins/notifications @elastic/appex-sharedux
571571
packages/kbn-object-versioning @elastic/appex-sharedux
572-
x-pack/plugins/observability_ai_assistant @elastic/obs-knowledge-team
572+
x-pack/plugins/observability_solution/observability_ai_assistant @elastic/obs-knowledge-team
573573
x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
574574
x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
575575
x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
@@ -856,7 +856,7 @@ x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kib
856856
packages/kbn-utility-types @elastic/kibana-core
857857
packages/kbn-utility-types-jest @elastic/kibana-operations
858858
packages/kbn-utils @elastic/kibana-operations
859-
x-pack/plugins/ux @elastic/obs-ux-infra_services-team
859+
x-pack/plugins/observability_solution/ux @elastic/obs-ux-infra_services-team
860860
examples/v8_profiler_examples @elastic/response-ops
861861
packages/kbn-validate-next-docs-cli @elastic/kibana-operations
862862
src/plugins/vis_default_editor @elastic/kibana-visualizations

‎.github/paths-labeller.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
2-
- "Feature:Embedding":
3-
- "src/plugins/embeddable/**/*.*"
4-
- "src/plugins/dashboard_embeddable_container/**/*.*"
5-
- "Feature:Drilldowns":
6-
- "x-pack/plugins/drilldowns/**/*.*"
7-
- "x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*"
8-
- "Feature:ExpressionLanguage":
9-
- "src/plugins/expressions/**/*.*"
10-
- "src/plugins/bfetch/**/*.*"
11-
- "Team:obs-ux-infra_services":
12-
- "x-pack/plugins/apm/**/*.*"
13-
- "x-pack/test/apm_api_integration/**/*.*"
14-
- "packages/kbn-apm-synthtrace/**/*.*"
15-
- "packages/kbn-apm-synthtrace-client/**/*.*"
16-
- "packages/kbn-apm-utils/**/*.*"
17-
- "x-pack/plugins/synthetics/**/*.*"
18-
- "x-pack/plugins/ux/**/*.*"
19-
- "x-pack/plugins/observability/public/components/shared/exploratory_view/**/*.*"
20-
- "Team:Fleet":
21-
- "x-pack/plugins/fleet/**/*.*"
22-
- "x-pack/test/fleet_api_integration/**/*.*"
23-
- "Team:obs-ux-management":
24-
- "x-pack/plugins/observability/**/*.*"
2+
- 'Feature:Embedding':
3+
- 'src/plugins/embeddable/**/*.*'
4+
- 'src/plugins/dashboard_embeddable_container/**/*.*'
5+
- 'Feature:Drilldowns':
6+
- 'x-pack/plugins/drilldowns/**/*.*'
7+
- 'x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*'
8+
- 'Feature:ExpressionLanguage':
9+
- 'src/plugins/expressions/**/*.*'
10+
- 'src/plugins/bfetch/**/*.*'
11+
- 'Team:obs-ux-infra_services':
12+
- 'x-pack/plugins/apm/**/*.*'
13+
- 'x-pack/test/apm_api_integration/**/*.*'
14+
- 'packages/kbn-apm-synthtrace/**/*.*'
15+
- 'packages/kbn-apm-synthtrace-client/**/*.*'
16+
- 'packages/kbn-apm-utils/**/*.*'
17+
- 'x-pack/plugins/synthetics/**/*.*'
18+
- 'x-pack/plugins/observability_solution/ux/**/*.*'
19+
- 'x-pack/plugins/observability/public/components/shared/exploratory_view/**/*.*'
20+
- 'Team:Fleet':
21+
- 'x-pack/plugins/fleet/**/*.*'
22+
- 'x-pack/test/fleet_api_integration/**/*.*'
23+
- 'Team:obs-ux-management':
24+
- 'x-pack/plugins/observability/**/*.*'

‎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-02-21
11+
date: 2024-02-22
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-02-21
11+
date: 2024-02-22
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

0 commit comments

Comments
 (0)