Merge branch 'main' into add-access-alerting-routes

elastic · Sep 25, 2024 · a035d3c · a035d3c
2 parents 3659048 + 0be74e9
commit a035d3c
Show file tree

Hide file tree

Showing 101 changed files with 2,201 additions and 493 deletions.
diff --git a/packages/kbn-test/src/es/test_es_cluster.ts b/packages/kbn-test/src/es/test_es_cluster.ts
@@ -191,7 +191,10 @@ export function createTestEsCluster<
     `transport.port=${transportPort ?? esTestConfig.getTransportPort()}`,
     // For multi-node clusters, we make all nodes master-eligible by default.
     ...(nodes.length > 1
-      ? ['discovery.type=zen', `cluster.initial_master_nodes=${nodes.map((n) => n.name).join(',')}`]
+      ? [
+          'discovery.type=multi-node',
+          `cluster.initial_master_nodes=${nodes.map((n) => n.name).join(',')}`,
+        ]
       : ['discovery.type=single-node']),
   ];
 

diff --git a/packages/kbn-unified-data-table/src/components/default_cell_actions.tsx b/packages/kbn-unified-data-table/src/components/default_cell_actions.tsx
@@ -50,7 +50,7 @@ export const FilterInBtn = ({
 }) => {
   const context = useContext(UnifiedDataTableContext);
   const filteringDisabled =
-    isPlainRecord && Array.isArray(context.rows[rowIndex]?.flattened[columnId]);
+    isPlainRecord && Array.isArray(context.getRowByIndex(rowIndex)?.flattened[columnId]);
   const buttonTitle = i18n.translate('unifiedDataTable.grid.filterForAria', {
     defaultMessage: 'Filter for this {value}',
     values: { value: columnId },
@@ -85,7 +85,7 @@ export const FilterOutBtn = ({
 }) => {
   const context = useContext(UnifiedDataTableContext);
   const filteringDisabled =
-    isPlainRecord && Array.isArray(context.rows[rowIndex]?.flattened[columnId]);
+    isPlainRecord && Array.isArray(context.getRowByIndex(rowIndex)?.flattened[columnId]);
   const buttonTitle = i18n.translate('unifiedDataTable.grid.filterOutAria', {
     defaultMessage: 'Filter out this {value}',
     values: { value: columnId },

diff --git a/src/core/server/integration_tests/saved_objects/migrations/archives/7.13.0_5k_so_node_01.zip b/src/core/server/integration_tests/saved_objects/migrations/archives/7.13.0_5k_so_node_01.zip
diff --git a/src/core/server/integration_tests/saved_objects/migrations/archives/7.13.0_5k_so_node_02.zip b/src/core/server/integration_tests/saved_objects/migrations/archives/7.13.0_5k_so_node_02.zip
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
@@ -95,8 +95,7 @@ function createRoot({ logFileName, hosts }: RootConfig) {
   });
 }
 
-// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
-describe.skip('migration v2', () => {
+describe('migration v2', () => {
   let esServer: TestElasticsearchUtils;
   let root: Root;
   const migratedIndexAlias = `.kibana_${pkg.version}`;