Merge branch 'main' into ci/add-kibana-8gb-smoke-test

Ikuni17 · web-flow · commit 2a2610ca52d5 · 2025-10-14T07:42:27.000+10:00
diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml b/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -56,10 +56,6 @@ spec:
           cronline: 0 22 * * * America/New_York
           message: Daily build
           branch: '9.1'
-        Daily build (9.0):
-          cronline: 0 22 * * * America/New_York
-          message: Daily build
-          branch: '9.0'
         Daily build (8.19):
           cronline: 0 22 * * * America/New_York
           message: Daily build
@@ -99,7 +95,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -148,7 +144,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
@@ -23,7 +23,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml
diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
@@ -26,7 +26,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 9.2 9.1 9.0 8.19 8.18 7.17
+      branch_configuration: main 9.2 9.1 8.19 8.18 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge.yml
diff --git a/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts b/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
@@ -565,7 +565,7 @@ export async function pickTestGroupRunOrder() {
                 ({ title, key, queue = defaultQueue }): BuildkiteStep => ({
                   label: title,
                   command: getRequiredEnv('FTR_CONFIGS_SCRIPT'),
-                  timeout_in_minutes: 90,
+                  timeout_in_minutes: 120,
                   agents: expandAgentQueue(queue),
                   env: {
                     SCOUT_TARGET_TYPE: 'local',
diff --git a/renovate.json b/renovate.json
@@ -19,7 +19,6 @@
     "main",
     "9.2",
     "9.1",
-    "9.0",
     "8.19",
     "8.18",
     "7.17"
@@ -4782,4 +4781,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
diff --git a/versions.json b/versions.json
@@ -16,11 +16,6 @@
       "branch": "9.1",
       "branchType": "release"
     },
-    {
-      "version": "9.0.9",
-      "branch": "9.0",
-      "branchType": "release"
-    },
     {
       "version": "8.19.6",
       "branch": "8.19",
@@ -37,4 +32,4 @@
       "branchType": "unmaintained"
     }
   ]
-}
+}
diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/dashboards/components/data_input_flyout/data_input_flyout.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/dashboards/components/data_input_flyout/data_input_flyout.test.tsx
@@ -306,7 +306,7 @@ describe('DashboardMigrationDataInputFlyout', () => {
     // Start migration
     fireEvent.click(getByTestId('testModalStartMigrationButton'));
 
-    expect(mockStartMigration).toHaveBeenCalledWith('test-id-retry', 'failed', {
+    expect(mockStartMigration).toHaveBeenCalledWith('test-id-retry', 'not_fully_translated', {
       connectorId: 'Test Connector 1',
     });
   });
diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/dashboards/components/data_input_flyout/data_input_flyout.tsx b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/dashboards/components/data_input_flyout/data_input_flyout.tsx
@@ -112,7 +112,7 @@ export const DashboardMigrationDataInputFlyout = React.memo(
         if (migrationStats?.id) {
           startMigration(
             migrationStats.id,
-            isRetry ? SiemMigrationRetryFilter.FAILED : undefined,
+            isRetry ? SiemMigrationRetryFilter.NOT_FULLY_TRANSLATED : undefined,
             settings
           );
         }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`"main",`
`20`	`20`	`"9.2",`
`21`	`21`	`"9.1",`
`22`		`- "9.0",`
`23`	`22`	`"8.19",`
`24`	`23`	`"8.18",`
`25`	`24`	`"7.17"`
`@@ -4782,4 +4781,4 @@`
`4782`	`4781`	`"datasourceTemplate": "docker"`
`4783`	`4782`	`}`
`4784`	`4783`	`]`
`4785`		`-}`
	`4784`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@`
`16`	`16`	`"branch": "9.1",`
`17`	`17`	`"branchType": "release"`
`18`	`18`	`},`
`19`		`- {`
`20`		`- "version": "9.0.9",`
`21`		`- "branch": "9.0",`
`22`		`- "branchType": "release"`
`23`		`- },`
`24`	`19`	`{`
`25`	`20`	`"version": "8.19.6",`
`26`	`21`	`"branch": "8.19",`
`@@ -37,4 +32,4 @@`
`37`	`32`	`"branchType": "unmaintained"`
`38`	`33`	`}`
`39`	`34`	`]`
`40`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ export const DashboardMigrationDataInputFlyout = React.memo(`
`112`	`112`	`if (migrationStats?.id) {`
`113`	`113`	`startMigration(`
`114`	`114`	`migrationStats.id,`
`115`		`- isRetry ? SiemMigrationRetryFilter.FAILED : undefined,`
	`115`	`+ isRetry ? SiemMigrationRetryFilter.NOT_FULLY_TRANSLATED : undefined,`
`116`	`116`	`settings`
`117`	`117`	`);`
`118`	`118`	`}`