Merge branch 'main' into #204483

x-pack/platform/plugins/private/translations/translations/fr-FR.json

@@ -170,14 +170,6 @@
     "avcBanner.body": "Elastic Security passe avec brio le test de protection contre les malwares réalisé par AV-Comparatives",
     "avcBanner.readTheBlog.link": "Lire le blog",
     "avcBanner.title": "Protection à 100 % sans aucun faux positif.",
-    "bfetch.advancedSettings.disableBfetchCompressionDeprecation": "Ce paramètre est déclassé et sera supprimé dans la version 9.0 de Kibana.",
-    "bfetch.advancedSettings.disableBfetchDeprecation": "Ce paramètre est déclassé et sera supprimé dans la version 9.0 de Kibana.",
-    "bfetch.disableBfetch": "Désactiver la mise en lots de requêtes",
-    "bfetch.disableBfetchCompression": "Désactiver la compression par lots",
-    "bfetch.disableBfetchCompressionDesc": "Vous pouvez désactiver la compression par lots. Cela permet de déboguer des requêtes individuelles, mais augmente la taille des réponses.",
-    "bfetch.disableBfetchDesc": "Désactive la mise en lot des requêtes. Cette option augmente le nombre de requêtes HTTP depuis Kibana, mais permet de les déboguer individuellement.",
-    "bfetchError.networkError": "Vérifiez votre connexion réseau et réessayez.",
-    "bfetchError.networkErrorWithStatus": "Vérifiez votre connexion réseau et réessayez. Code {code}",
     "cases.components.status.closed": "Fermé",
     "cases.components.status.inProgress": "En cours",
     "cases.components.status.open": "Ouvrir",

x-pack/platform/plugins/private/translations/translations/ja-JP.json

@@ -170,14 +170,6 @@
     "avcBanner.body": "AV-Comparativesのマルウェア保護テストで高い評価を受けたElastic Security",
     "avcBanner.readTheBlog.link": "ブログを読む",
     "avcBanner.title": "誤検知がゼロの100%保護。",
-    "bfetch.advancedSettings.disableBfetchCompressionDeprecation": "この設定はサポートが終了し、Kibana 9.0では削除されます。",
-    "bfetch.advancedSettings.disableBfetchDeprecation": "この設定はサポートが終了し、Kibana 9.0では削除されます。",
-    "bfetch.disableBfetch": "リクエストバッチを無効にする",
-    "bfetch.disableBfetchCompression": "バッチ圧縮を無効にする",
-    "bfetch.disableBfetchCompressionDesc": "バッチ圧縮を無効にします。個別の要求をデバッグできますが、応答サイズが大きくなります。",
-    "bfetch.disableBfetchDesc": "リクエストバッチを無効にします。これにより、KibanaからのHTTPリクエスト数は減りますが、個別にリクエストをデバッグできます。",
-    "bfetchError.networkError": "ネットワーク接続を確認して再試行してください。",
-    "bfetchError.networkErrorWithStatus": "ネットワーク接続を確認して再試行してください。コード{code}",
     "cases.components.status.closed": "終了",
     "cases.components.status.inProgress": "進行中",
     "cases.components.status.open": "オープン",

x-pack/platform/plugins/private/translations/translations/zh-CN.json

@@ -196,14 +196,6 @@
     "avcBanner.body": "在 AV-Comparatives 进行的恶意软件防护测试中，Elastic Security 表现突出",
     "avcBanner.readTheBlog.link": "阅读博客",
     "avcBanner.title": "提供全面保护，误报率为零。",
-    "bfetch.advancedSettings.disableBfetchCompressionDeprecation": "此设置已过时，将在 Kibana 9.0 中移除。",
-    "bfetch.advancedSettings.disableBfetchDeprecation": "此设置已过时，将在 Kibana 9.0 中移除。",
-    "bfetch.disableBfetch": "禁用请求批处理",
-    "bfetch.disableBfetchCompression": "禁用批量压缩",
-    "bfetch.disableBfetchCompressionDesc": "禁用批量压缩。这允许您对单个请求进行故障排查，但会增加响应大小。",
-    "bfetch.disableBfetchDesc": "禁用请求批处理。这会增加来自 Kibana 的 HTTP 请求数，但允许对单个请求进行故障排查。",
-    "bfetchError.networkError": "检查您的网络连接，然后重试。",
-    "bfetchError.networkErrorWithStatus": "检查您的网络连接，然后重试。代码 {code}",
     "cases.components.status.closed": "已关闭",
     "cases.components.status.inProgress": "进行中",
     "cases.components.status.open": "打开",

x-pack/platform/plugins/private/upgrade_assistant/server/routes/app.ts

@@ -43,6 +43,12 @@ export function registerAppRoutes({
   router.get(
     {
       path: `${API_BASE_PATH}/privileges`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: false,
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/cloud_backup_status.ts

@@ -15,7 +15,16 @@ export function registerCloudBackupStatusRoutes({
 }: RouteDependencies) {
   // GET most recent Cloud snapshot
   router.get(
-    { path: `${API_BASE_PATH}/cloud_backup_status`, validate: false },
+    {
+      path: `${API_BASE_PATH}/cloud_backup_status`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
+      validate: false,
+    },
     versionCheckHandlerWrapper(async (context, request, response) => {
       const { client: clusterClient } = (await context.core).elasticsearch;
 

x-pack/platform/plugins/private/upgrade_assistant/server/routes/cluster_settings.ts

@@ -17,6 +17,12 @@ export function registerClusterSettingsRoute({
   router.post(
     {
       path: `${API_BASE_PATH}/cluster_settings`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: {
         body: schema.object({
           settings: schema.arrayOf(schema.string()),

x-pack/platform/plugins/private/upgrade_assistant/server/routes/cluster_upgrade_status.ts

@@ -11,7 +11,16 @@ import { RouteDependencies } from '../types';
 
 export function registerClusterUpgradeStatusRoutes({ router }: RouteDependencies) {
   router.get(
-    { path: `${API_BASE_PATH}/cluster_upgrade_status`, validate: false },
+    {
+      path: `${API_BASE_PATH}/cluster_upgrade_status`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Lightweight endpoint',
+        },
+      },
+      validate: false,
+    },
     // We're just depending on the version check to return a 426.
     // Otherwise we just return a 200.
     versionCheckHandlerWrapper(async (context, request, response) => {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/deprecation_logging.ts

@@ -28,6 +28,12 @@ export function registerDeprecationLoggingRoutes({
   router.get(
     {
       path: `${API_BASE_PATH}/deprecation_logging`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: false,
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {
@@ -46,6 +52,12 @@ export function registerDeprecationLoggingRoutes({
   router.put(
     {
       path: `${API_BASE_PATH}/deprecation_logging`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: {
         body: schema.object({
           isEnabled: schema.boolean(),
@@ -70,6 +82,12 @@ export function registerDeprecationLoggingRoutes({
   router.get(
     {
       path: `${API_BASE_PATH}/deprecation_logging/count`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: {
         query: schema.object({
           from: schema.string(),
@@ -124,6 +142,12 @@ export function registerDeprecationLoggingRoutes({
   router.delete(
     {
       path: `${API_BASE_PATH}/deprecation_logging/cache`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: false,
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/es_deprecations.ts

@@ -22,6 +22,12 @@ export function registerESDeprecationRoutes({
   router.get(
     {
       path: `${API_BASE_PATH}/es_deprecations`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es and saved object clients for authorization',
+        },
+      },
       validate: false,
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/ml_snapshots.ts

@@ -145,6 +145,12 @@ export function registerMlSnapshotRoutes({
   router.post(
     {
       path: `${API_BASE_PATH}/ml_snapshots`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: {
         body: schema.object({
           snapshotId: schema.string(),
@@ -195,6 +201,12 @@ export function registerMlSnapshotRoutes({
   router.get(
     {
       path: `${API_BASE_PATH}/ml_snapshots/{jobId}/{snapshotId}`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es and saved object clients for authorization',
+        },
+      },
       validate: {
         params: schema.object({
           snapshotId: schema.string(),

x-pack/platform/plugins/private/upgrade_assistant/server/routes/node_disk_space.ts

@@ -47,6 +47,12 @@ export function registerNodeDiskSpaceRoute({ router, lib: { handleEsError } }: R
   router.get(
     {
       path: `${API_BASE_PATH}/node_disk_space`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: false,
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts

@@ -36,6 +36,12 @@ export function registerBatchReindexIndicesRoutes(
   router.get(
     {
       path: `${BASE_PATH}/batch/queue`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       options: {
         access: 'public',
         summary: `Get the batch reindex queue`,
@@ -75,6 +81,12 @@ export function registerBatchReindexIndicesRoutes(
   router.post(
     {
       path: `${BASE_PATH}/batch`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       options: {
         access: 'public',
         summary: `Batch start or resume reindex`,

x-pack/platform/plugins/private/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts

@@ -34,6 +34,12 @@ export function registerReindexIndicesRoutes(
   router.post(
     {
       path: `${BASE_PATH}/{indexName}`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es and saved object clients for authorization',
+        },
+      },
       options: {
         access: 'public',
         summary: `Start or resume reindex`,

x-pack/platform/plugins/private/upgrade_assistant/server/routes/remote_clusters.ts

@@ -13,6 +13,12 @@ export function registerRemoteClustersRoute({ router, lib: { handleEsError } }:
   router.get(
     {
       path: `${API_BASE_PATH}/remote_clusters`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: false,
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/status.ts

@@ -24,6 +24,12 @@ export function registerUpgradeStatusRoute({
   router.get(
     {
       path: `${API_BASE_PATH}/status`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       options: {
         access: 'public',
         summary: `Get upgrade readiness status`,

x-pack/platform/plugins/private/upgrade_assistant/server/routes/system_indices_migration.ts

@@ -19,7 +19,16 @@ export function registerSystemIndicesMigrationRoutes({
 }: RouteDependencies) {
   // GET status of the system indices migration
   router.get(
-    { path: `${API_BASE_PATH}/system_indices_migration`, validate: false },
+    {
+      path: `${API_BASE_PATH}/system_indices_migration`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
+      validate: false,
+    },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {
       try {
         const {

x-pack/platform/plugins/private/upgrade_assistant/server/routes/update_index_settings.ts

@@ -14,6 +14,12 @@ export function registerUpdateSettingsRoute({ router }: RouteDependencies) {
   router.post(
     {
       path: `${API_BASE_PATH}/{indexName}/index_settings`,
+      security: {
+        authz: {
+          enabled: false,
+          reason: 'Relies on es client for authorization',
+        },
+      },
       validate: {
         params: schema.object({
           indexName: schema.string(),

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_creation/components/ml_job_select/ml_job_select.test.tsx

@@ -21,7 +21,7 @@ describe('MlJobSelect', () => {
 
   it('renders correctly', () => {
     const Component = () => {
-      const field = useFormFieldMock<string[]>();
+      const field = useFormFieldMock<string[]>({ value: [] });
 
       return <MlJobSelect field={field} loading={false} jobs={[]} />;
     };

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_creation/components/ml_job_select/ml_job_select.tsx

@@ -57,6 +57,21 @@ export const MlJobSelect: React.FC<MlJobSelectProps> = ({
     label: `${job.customSettings?.security_app_display_name} ${job.id}`,
   }));
 
+  // If rule's ML job is no longer available or has not yet become available, we still want it to appear in the dropdown.
+  selectedJobIds.forEach((selectedJobId) => {
+    const isSelectedJobAvailable = jobOptions.some((job) => job.value.id === selectedJobId);
+    if (!isSelectedJobAvailable) {
+      jobOptions.push({
+        value: {
+          id: selectedJobId,
+          description: '',
+          name: selectedJobId,
+        },
+        label: selectedJobId,
+      });
+    }
+  });
+
   const selectedJobOptions = jobOptions
     .filter((option) => selectedJobIds.includes(option.value.id))
     // 'label' defines what is rendered inside the selected ComboBoxPill

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_creation/components/ml_jobs_description/ml_job_item.tsx

@@ -9,6 +9,7 @@ import type { FC, ReactNode } from 'react';
 import React, { memo } from 'react';
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiThemeVars } from '@kbn/ui-theme';
 
 import type { MlSummaryJob } from '@kbn/ml-plugin/public';
 import * as i18n from './translations';
@@ -21,6 +22,7 @@ import { MlJobStatusBadge } from '../ml_job_status_badge';
 
 const Wrapper = styled.div`
   overflow: hidden;
+  margin-bottom: ${euiThemeVars.euiSizeS};
 `;
 
 const MlJobItemComponent: FC<{