Merge branch 'main' into 106561-superuser-role

elastic · Apr 30, 2024 · 46278dc · 46278dc
2 parents abd7477 + e9c63bb
commit 46278dc
Show file tree

Hide file tree

Showing 553 changed files with 2,297 additions and 1,614 deletions.
diff --git a/.buildkite/pipeline-resource-definitions/kibana-apis-capacity-testing-daily.yml b/.buildkite/pipeline-resource-definitions/kibana-apis-capacity-testing-daily.yml
@@ -29,9 +29,10 @@ spec:
       pipeline_file: .buildkite/pipelines/scalability/api_capacity_testing_daily.yml
       skip_intermediate_builds: false
       provider_settings:
+        trigger_mode: none
         build_branches: true
-        prefix_pull_request_fork_branch_names: false
-        skip_pull_request_builds_for_existing_commits: false
+        prefix_pull_request_fork_branch_names: true
+        skip_pull_request_builds_for_existing_commits: true
       teams:
         everyone:
           access_level: BUILD_AND_READ

diff --git a/.buildkite/pipeline-resource-definitions/kibana-performance-daily.yml b/.buildkite/pipeline-resource-definitions/kibana-performance-daily.yml
@@ -29,9 +29,11 @@ spec:
       pipeline_file: .buildkite/pipelines/performance/daily.yml
       skip_intermediate_builds: false
       provider_settings:
+        trigger_mode: none
         build_branches: true
-        prefix_pull_request_fork_branch_names: false
-        skip_pull_request_builds_for_existing_commits: false
+        prefix_pull_request_fork_branch_names: true
+        publish_commit_status: false
+        skip_pull_request_builds_for_existing_commits: true
       teams:
         everyone:
           access_level: BUILD_AND_READ

diff --git a/.buildkite/pipeline-resource-definitions/kibana-performance-data-set-extraction-daily.yml b/.buildkite/pipeline-resource-definitions/kibana-performance-data-set-extraction-daily.yml
@@ -29,9 +29,10 @@ spec:
       pipeline_file: .buildkite/pipelines/performance/data_set_extraction_daily.yml
       skip_intermediate_builds: false
       provider_settings:
+        trigger_mode: none
         build_branches: true
-        prefix_pull_request_fork_branch_names: false
-        skip_pull_request_builds_for_existing_commits: false
+        prefix_pull_request_fork_branch_names: true
+        skip_pull_request_builds_for_existing_commits: true
       teams:
         everyone:
           access_level: BUILD_AND_READ

diff --git a/.buildkite/pipeline-resource-definitions/scalability_testing-daily.yml b/.buildkite/pipeline-resource-definitions/scalability_testing-daily.yml
@@ -29,9 +29,10 @@ spec:
       pipeline_file: .buildkite/pipelines/scalability/daily.yml
       skip_intermediate_builds: false
       provider_settings:
+        trigger_mode: none
         build_branches: true
-        prefix_pull_request_fork_branch_names: false
-        skip_pull_request_builds_for_existing_commits: false
+        prefix_pull_request_fork_branch_names: true
+        skip_pull_request_builds_for_existing_commits: true
       teams:
         everyone:
           access_level: BUILD_AND_READ

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -51,7 +51,7 @@ packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/
 packages/kbn-apm-utils @elastic/obs-ux-infra_services-team
 test/plugin_functional/plugins/app_link_test @elastic/kibana-core
 x-pack/test/usage_collection/plugins/application_usage_test @elastic/kibana-core
-x-pack/plugins/asset_manager @elastic/obs-knowledge-team
+x-pack/plugins/observability_solution/asset_manager @elastic/obs-knowledge-team
 x-pack/test/security_api_integration/plugins/audit_log @elastic/kibana-security
 packages/kbn-axe-config @elastic/kibana-qa
 packages/kbn-babel-preset @elastic/kibana-operations
@@ -555,7 +555,7 @@ x-pack/examples/third_party_maps_source_example @elastic/kibana-gis
 src/plugins/maps_ems @elastic/kibana-gis
 x-pack/plugins/maps @elastic/kibana-gis
 x-pack/packages/maps/vector_tile_utils @elastic/kibana-gis
-x-pack/plugins/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
 x-pack/packages/ml/agg_utils @elastic/ml-ui
 x-pack/packages/ml/anomaly_utils @elastic/ml-ui
 x-pack/packages/ml/cancellable_search @elastic/ml-ui

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -462,7 +462,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/asset_manager/README.md[assetManager]
+|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/asset_manager/README.md[assetManager]
 |This plugin provides access to observed asset data, such as information about hosts, pods, containers, services, and more.
 
 
@@ -659,7 +659,7 @@ using the CURL scripts in the scripts folder.
 |Visualize geo data from Elasticsearch or 3rd party geo-services.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/metrics_data_access/README.md[metricsDataAccess]
+|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/metrics_data_access/README.md[metricsDataAccess]
 |Exposes utilities to access metrics data.
 
 

diff --git a/package.json b/package.json
@@ -102,7 +102,7 @@
     "@dnd-kit/utilities": "^2.0.0",
     "@elastic/apm-rum": "^5.16.0",
     "@elastic/apm-rum-react": "^2.0.2",
-    "@elastic/charts": "64.0.2",
+    "@elastic/charts": "64.1.0",
     "@elastic/datemath": "5.0.3",
     "@elastic/ecs": "^8.11.1",
     "@elastic/elasticsearch": "^8.13.0",
@@ -173,7 +173,7 @@
     "@kbn/apm-utils": "link:packages/kbn-apm-utils",
     "@kbn/app-link-test-plugin": "link:test/plugin_functional/plugins/app_link_test",
     "@kbn/application-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/application_usage_test",
-    "@kbn/assetManager-plugin": "link:x-pack/plugins/asset_manager",
+    "@kbn/assetManager-plugin": "link:x-pack/plugins/observability_solution/asset_manager",
     "@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log",
     "@kbn/banners-plugin": "link:x-pack/plugins/banners",
     "@kbn/bfetch-error": "link:packages/kbn-bfetch-error",
@@ -577,7 +577,7 @@
     "@kbn/maps-ems-plugin": "link:src/plugins/maps_ems",
     "@kbn/maps-plugin": "link:x-pack/plugins/maps",
     "@kbn/maps-vector-tile-utils": "link:x-pack/packages/maps/vector_tile_utils",
-    "@kbn/metrics-data-access-plugin": "link:x-pack/plugins/metrics_data_access",
+    "@kbn/metrics-data-access-plugin": "link:x-pack/plugins/observability_solution/metrics_data_access",
     "@kbn/ml-agg-utils": "link:x-pack/packages/ml/agg_utils",
     "@kbn/ml-anomaly-utils": "link:x-pack/packages/ml/anomaly_utils",
     "@kbn/ml-cancellable-search": "link:x-pack/packages/ml/cancellable_search",

diff --git a/packages/kbn-test/src/jest/setup/polyfills.jsdom.js b/packages/kbn-test/src/jest/setup/polyfills.jsdom.js
@@ -46,4 +46,28 @@ if (!global.hasOwnProperty('Worker')) {
   }
 
   global.Worker = Worker;
+
+  // Mocking matchMedia to resolve TypeError: window.matchMedia is not a function
+  // For more info, see https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
+  if (!global.hasOwnProperty('matchMedia')) {
+    Object.defineProperty(global, 'matchMedia', {
+      writable: true,
+      // eslint-disable-next-line no-undef
+      value: jest.fn().mockImplementation((query) => ({
+        matches: false,
+        media: query,
+        onchange: null,
+        // eslint-disable-next-line no-undef
+        addListener: jest.fn(), // deprecated
+        // eslint-disable-next-line no-undef
+        removeListener: jest.fn(), // deprecated
+        // eslint-disable-next-line no-undef
+        addEventListener: jest.fn(),
+        // eslint-disable-next-line no-undef
+        removeEventListener: jest.fn(),
+        // eslint-disable-next-line no-undef
+        dispatchEvent: jest.fn(),
+      })),
+    });
+  }
 }
diff --git a/packages/kbn-text-based-editor/src/text_based_languages_editor.test.tsx b/packages/kbn-text-based-editor/src/text_based_languages_editor.test.tsx
@@ -59,23 +59,7 @@ describe('TextBasedLanguagesEditor', () => {
     );
   }
   let props: TextBasedLanguagesEditorProps;
-  beforeAll(() => {
-    // Mocking matchMedia to resolve TypeError: window.matchMedia is not a function
-    // For more info, see https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
-    Object.defineProperty(window, 'matchMedia', {
-      writable: true,
-      value: jest.fn().mockImplementation((query) => ({
-        matches: false,
-        media: query,
-        onchange: null,
-        addListener: jest.fn(), // deprecated
-        removeListener: jest.fn(), // deprecated
-        addEventListener: jest.fn(),
-        removeEventListener: jest.fn(),
-        dispatchEvent: jest.fn(),
-      })),
-    });
-  });
+
   beforeEach(() => {
     props = {
       query: { esql: 'from test' },

diff --git a/packages/kbn-unified-data-table/src/utils/get_render_cell_value.test.tsx b/packages/kbn-unified-data-table/src/utils/get_render_cell_value.test.tsx
@@ -38,16 +38,6 @@ jest.mock('@kbn/code-editor', () => {
   };
 });
 
-window.matchMedia = jest.fn().mockImplementation((query) => {
-  return {
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: jest.fn(),
-    removeListener: jest.fn(),
-  };
-});
-
 const mockServices = {
   settings: {
     client: {

diff --git a/...xpressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap b/...xpressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap
diff --git a/...ssion_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap b/...ssion_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap