Merge branch 'main' into prevent-creating-default-synthetics-rules-without-connectors-being-defined

Author: justinkambic

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -507,7 +507,7 @@ export async function pickTestGroupRunOrder() {
             key: 'jest',
             agents: {
               ...expandAgentQueue('n2-4-spot'),
-              diskSizeGb: 85,
+              diskSizeGb: 100,
             },
             env: {
               SCOUT_TARGET_TYPE: 'local',

.buildkite/pipelines/on_merge.yml

@@ -10,7 +10,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
-      diskSizeGb: 85
+      diskSizeGb: 100
     retry:
       automatic:
         - exit_status: '*'
@@ -40,7 +40,7 @@ steps:
       provider: gcp
       machineType: n2-highcpu-8
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -55,7 +55,7 @@ steps:
       provider: gcp
       machineType: n2-standard-2
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -70,7 +70,7 @@ steps:
       provider: gcp
       machineType: n2-standard-16
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -85,7 +85,7 @@ steps:
       provider: gcp
       machineType: n2-standard-32
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -102,7 +102,7 @@ steps:
       diskType: 'hyperdisk-balanced'
       preemptible: true
       spotZones: us-central1-a,us-central1-b,us-central1-c
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -134,7 +134,7 @@ steps:
       provider: gcp
       machineType: n2-highmem-4
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 80
     retry:
       automatic:
@@ -150,7 +150,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -167,7 +167,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 10
     env:
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
@@ -185,7 +185,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-4
-      diskSizeGb: 85
+      diskSizeGb: 100
     key: build_scout_tests
     timeout_in_minutes: 10
     depends_on:

.buildkite/pipelines/pull_request/base.yml

@@ -4,7 +4,7 @@ steps:
     timeout_in_minutes: 10
     agents:
       machineType: n2-standard-2
-      diskSizeGb: 85
+      diskSizeGb: 100
 
   - wait
 
@@ -27,7 +27,7 @@ steps:
     agents:
       machineType: n2-highcpu-8
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     key: quick_checks
     timeout_in_minutes: 60
     retry:
@@ -41,7 +41,7 @@ steps:
     agents:
       machineType: n2-standard-2
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -53,7 +53,7 @@ steps:
     agents:
       machineType: n2-standard-16
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     key: linting
     timeout_in_minutes: 60
     retry:
@@ -66,7 +66,7 @@ steps:
     agents:
       machineType: n2-standard-32
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     key: linting_with_types
     timeout_in_minutes: 60
     retry:
@@ -93,7 +93,7 @@ steps:
       diskType: 'hyperdisk-balanced'
       preemptible: true
       spotZones: us-central1-a,us-central1-b,us-central1-c
-      diskSizeGb: 85
+      diskSizeGb: 100
     key: check_types
     timeout_in_minutes: 60
     retry:
@@ -107,7 +107,7 @@ steps:
     label: Mark CI Stats as ready
     agents:
       machineType: n2-standard-2
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -122,7 +122,7 @@ steps:
     agents:
       machineType: n2-highmem-4
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     key: build_api_docs
     timeout_in_minutes: 90
     retry:

.buildkite/pipelines/pull_request/pick_test_groups.yml

@@ -3,7 +3,7 @@ steps:
     label: 'Pick Test Group Run Order'
     agents:
       machineType: n2-standard-2
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 10
     env:
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'

.buildkite/pipelines/pull_request/prompt_changes.yml

@@ -4,7 +4,7 @@ steps:
     agents:
       machineType: n2-standard-2
       preemptible: true
-      diskSizeGb: 85
+      diskSizeGb: 100
     timeout_in_minutes: 10
     retry:
       automatic:

src/platform/plugins/shared/console/server/lib/spec_definitions/js/mappings.ts

@@ -9,7 +9,7 @@
 
 import type { SpecDefinitionsService } from '../../../services';
 
-import { BOOLEAN } from './shared';
+import { BOOLEAN, ChunkingSettings } from './shared';
 
 export const mappings = (specService: SpecDefinitionsService) => {
   specService.addEndpointDescription('put_mapping', {
@@ -117,14 +117,7 @@ export const mappings = (specService: SpecDefinitionsService) => {
               DenseVectorIndexOptions,
             ],
           },
-          chunking_settings: {
-            strategy: {
-              __one_of: ['sentence', 'word', 'none'],
-            },
-            max_chunk_size: 250,
-            sentence_overlap: 1,
-            overlap: 1,
-          },
+          chunking_settings: ChunkingSettings,
           analyzer: 'standard',
           search_analyzer: 'standard',
           include_in_all: {

src/platform/plugins/shared/console/server/lib/spec_definitions/js/retriever.ts

@@ -8,6 +8,7 @@
  */
 
 import type { SpecDefinitionsService } from '../../../services';
+import { ChunkingSettings } from './shared';
 
 export const retriever = (specService: SpecDefinitionsService) => {
   specService.addGlobalAutocompleteRules('retriever', {
@@ -149,6 +150,7 @@ export const retriever = (specService: SpecDefinitionsService) => {
         inference_id: '',
         inference_text: '',
         field: '',
+        chunk_rescorer: {},
       },
       retriever: {
         __scope_link: '.',
@@ -161,6 +163,10 @@ export const retriever = (specService: SpecDefinitionsService) => {
       filter: {
         __scope_link: 'GLOBAL.query',
       },
+      chunk_rescorer: {
+        size: 1,
+        chunking_settings: ChunkingSettings,
+      },
     },
   });
 };

src/platform/plugins/shared/console/server/lib/spec_definitions/js/shared.ts

@@ -10,3 +10,12 @@
 export const BOOLEAN = Object.freeze({
   __one_of: [true, false],
 });
+
+export const ChunkingSettings = {
+  strategy: {
+    __one_of: ['sentence', 'word', 'none', 'recursive'],
+  },
+  max_chunk_size: 250,
+  sentence_overlap: 1,
+  overlap: 1,
+};

src/platform/plugins/shared/dashboard/public/dashboard_app/url/bwc/extract_panels_state.test.ts

@@ -103,6 +103,49 @@ describe('extractPanelsState', () => {
     });
   });
 
+  describe('8.19', () => {
+    test('should migrate panels in sections', () => {
+      const { panels } = extractPanelsState({
+        panels: [
+          {
+            title: 'Section 1',
+            gridData: {},
+            panels: [
+              {
+                embeddableConfig: {
+                  timeRange: {
+                    from: 'now-7d/d',
+                    to: 'now',
+                  },
+                },
+                gridData: {},
+                type: 'map',
+              },
+            ],
+          },
+        ],
+      });
+      expect(panels).toEqual([
+        {
+          title: 'Section 1',
+          grid: {},
+          panels: [
+            {
+              config: {
+                timeRange: {
+                  from: 'now-7d/d',
+                  to: 'now',
+                },
+              },
+              grid: {},
+              type: 'map',
+            },
+          ],
+        },
+      ]);
+    });
+  });
+
   describe('< 8.19 panels state', () => {
     test('should move id and title to config', () => {
       const { panels } = extractPanelsState({

src/platform/plugins/shared/dashboard/public/dashboard_app/url/bwc/extract_panels_state.ts

@@ -56,6 +56,13 @@ export function extractPanelsState(state: { [key: string]: unknown }): {
   const standardizedPanels: DashboardState['panels'] = panels.map((legacyPanel) => {
     const panel = typeof legacyPanel === 'object' ? { ...legacyPanel } : {};
 
+    if (panel.panels) {
+      const { panels: sectionPanels, savedObjectReferences: sectionPanelReferences } =
+        extractPanelsState({ panels: panel.panels });
+      savedObjectReferences.push(...(sectionPanelReferences ?? []));
+      panel.panels = sectionPanels;
+    }
+
     // < 8.17 panels state stored panelConfig as embeddableConfig
     if (panel?.embeddableConfig) {
       panel.config = panel.embeddableConfig;