Skip to content

Commit 0716a4d

Browse files
CoenWarmerCoenWarmer
committed
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-plugins-observability-onboarding
2 parents f068120 + 03e8e9c commit 0716a4d

570 files changed

Lines changed: 3054 additions & 2369 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ disabled:
5353
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
5454
- x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
5555
- x-pack/test/security_solution_cypress/serverless_config.ts
56-
- x-pack/plugins/profiling/e2e/ftr_config_open.ts
57-
- x-pack/plugins/profiling/e2e/ftr_config_runner.ts
58-
- x-pack/plugins/profiling/e2e/ftr_config.ts
56+
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config_open.ts
57+
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config_runner.ts
58+
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
5959

6060
# Elastic Synthetics configs
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/observability_solution/exploratory_view/e2e/synthetics_run.ts
6465
- x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts
65-
- 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
6868
- x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts

‎.buildkite/pipelines/pull_request/exploratory_view_plugin.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/exploratory_view/e2e/.journeys/**/*'
11+
- 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'
1212
retry:
1313
automatic:
1414
- exit_status: '-1'

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

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

1414
cd "$XPACK_DIR"
1515

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ echo "--- Profiling Cypress Tests"
1313

1414
cd "$XPACK_DIR"
1515

16-
NODE_OPTIONS=--openssl-legacy-provider node plugins/profiling/scripts/test/e2e.js \
16+
NODE_OPTIONS=--openssl-legacy-provider node plugins/observability_solution/profiling/scripts/test/e2e.js \
1717
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \

‎.eslintrc.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ module.exports = {
873873
files: [
874874
'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
875875
'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
876-
'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
876+
'x-pack/plugins/observability_solution/exploratory_view/**/*.{js,mjs,ts,tsx}',
877877
'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
878878
],
879879
rules: {
@@ -896,7 +896,7 @@ module.exports = {
896896
files: [
897897
'x-pack/plugins/apm/**/*.stories.*',
898898
'x-pack/plugins/observability/**/*.stories.*',
899-
'x-pack/plugins/exploratory_view/**/*.stories.*',
899+
'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*',
900900
],
901901
rules: {
902902
'react/function-component-definition': [
@@ -912,13 +912,13 @@ module.exports = {
912912
files: [
913913
'x-pack/plugins/aiops/**/*.tsx',
914914
'x-pack/plugins/apm/**/*.tsx',
915-
'x-pack/plugins/exploratory_view/**/*.tsx',
915+
'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
916916
'x-pack/plugins/infra/**/*.tsx',
917917
'x-pack/plugins/observability/**/*.tsx',
918918
'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
919919
'x-pack/plugins/observability_shared/observability_ai_assistant/**/*.tsx',
920920
'x-pack/plugins/observability_shared/**/*.tsx',
921-
'x-pack/plugins/profiling/**/*.tsx',
921+
'x-pack/plugins/observability_solution/profiling/**/*.tsx',
922922
'x-pack/plugins/synthetics/**/*.tsx',
923923
'x-pack/plugins/observability_solution/ux/**/*.tsx',
924924
'src/plugins/ai_assistant_management/**/*.tsx',
@@ -930,13 +930,13 @@ module.exports = {
930930
{
931931
files: [
932932
'x-pack/plugins/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
933-
'x-pack/plugins/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
933+
'x-pack/plugins/observability_solution/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)',
936936
'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
937937
'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)',
939-
'x-pack/plugins/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
939+
'x-pack/plugins/observability_solution/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
940940
'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
941941
'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)',
@@ -960,7 +960,7 @@ module.exports = {
960960
},
961961
// Profiling
962962
{
963-
files: ['x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}'],
963+
files: ['x-pack/plugins/observability_solution/profiling/**/*.{js,mjs,ts,tsx}'],
964964
rules: {
965965
'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
966966
'react-hooks/exhaustive-deps': [

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ x-pack/plugins/event_log @elastic/response-ops
393393
packages/kbn-expandable-flyout @elastic/security-threat-hunting-investigations
394394
packages/kbn-expect @elastic/kibana-operations @elastic/appex-qa
395395
x-pack/examples/exploratory_view_example @elastic/obs-ux-infra_services-team
396-
x-pack/plugins/exploratory_view @elastic/obs-ux-infra_services-team
396+
x-pack/plugins/observability_solution/exploratory_view @elastic/obs-ux-infra_services-team
397397
src/plugins/expression_error @elastic/kibana-presentation
398398
src/plugins/chart_expressions/expression_gauge @elastic/kibana-visualizations
399399
src/plugins/chart_expressions/expression_heatmap @elastic/kibana-visualizations
@@ -603,8 +603,8 @@ packages/presentation/presentation_library @elastic/kibana-presentation
603603
src/plugins/presentation_panel @elastic/kibana-presentation
604604
packages/presentation/presentation_publishing @elastic/kibana-presentation
605605
src/plugins/presentation_util @elastic/kibana-presentation
606-
x-pack/plugins/profiling_data_access @elastic/obs-ux-infra_services-team
607-
x-pack/plugins/profiling @elastic/obs-ux-infra_services-team
606+
x-pack/plugins/observability_solution/profiling_data_access @elastic/obs-ux-infra_services-team
607+
x-pack/plugins/observability_solution/profiling @elastic/obs-ux-infra_services-team
608608
packages/kbn-profiling-utils @elastic/obs-ux-infra_services-team
609609
x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations
610610
packages/kbn-react-field @elastic/kibana-data-discovery

‎api_docs/deprecations_by_plugin.mdx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -742,10 +742,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
742742

743743
| Deprecated API | Reference location(s) | Remove By |
744744
| ---------------|-----------|-----------|
745-
| <DocLink id="kibDiscoverPluginApi" section="def-common.DiscoverAppLocatorParams.indexPatternId" text="indexPatternId"/> | [use_discover_link.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_discover_link.tsx#:~:text=indexPatternId) | - |
746-
| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | [add_to_case_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx#:~:text=toMountPoint), [add_to_case_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx#:~:text=toMountPoint) | - |
747-
| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/application/index.tsx#:~:text=KibanaThemeProvider) | - |
748-
| <DocLink id="kibKbnCoreSavedObjectsBrowserPluginApi" section="def-common.SavedObjectsStart" text="SavedObjectsStart"/> | [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/application/types.ts#:~:text=SavedObjectsStart), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/exploratory_view/public/application/types.ts#:~:text=SavedObjectsStart) | - |
745+
| <DocLink id="kibDiscoverPluginApi" section="def-common.DiscoverAppLocatorParams.indexPatternId" text="indexPatternId"/> | [use_discover_link.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/hooks/use_discover_link.tsx#:~:text=indexPatternId) | - |
746+
| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | [add_to_case_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx#:~:text=toMountPoint), [add_to_case_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx#:~:text=toMountPoint) | - |
747+
| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/application/index.tsx#:~:text=KibanaThemeProvider) | - |
748+
| <DocLink id="kibKbnCoreSavedObjectsBrowserPluginApi" section="def-common.SavedObjectsStart" text="SavedObjectsStart"/> | [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/application/types.ts#:~:text=SavedObjectsStart), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/exploratory_view/public/application/types.ts#:~:text=SavedObjectsStart) | - |
749749

750750

751751

@@ -1259,8 +1259,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
12591259

12601260
| Deprecated API | Reference location(s) | Remove By |
12611261
| ---------------|-----------|-----------|
1262-
| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/profiling/public/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/profiling/public/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/profiling/public/app.tsx#:~:text=KibanaThemeProvider) | - |
1263-
| <DocLink id="kibLicensingPluginApi" section="def-public.LicensingPluginSetup.license$" text="license$"/> | [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/profiling/public/components/contexts/license/license_context.tsx#:~:text=license%24) | 8.8.0 |
1262+
| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/profiling/public/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/profiling/public/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/profiling/public/app.tsx#:~:text=KibanaThemeProvider) | - |
1263+
| <DocLink id="kibLicensingPluginApi" section="def-public.LicensingPluginSetup.license$" text="license$"/> | [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/profiling/public/components/contexts/license/license_context.tsx#:~:text=license%24) | 8.8.0 |
12641264

12651265

12661266

0 commit comments

Comments
 (0)