From ad465a6de4c7d90823eed7c3712826167c73a52b Mon Sep 17 00:00:00 2001 From: gitstart Date: Mon, 6 Nov 2023 12:28:34 +0000 Subject: [PATCH 1/2] feat: [Fleet]: Beta label is shown inconsistently while selecting proxy under Fleet settings. Co-authored-by: KlingerMatheus --- .../components/edit_output_flyout/index.tsx | 16 +++++++++++++++- .../fleet_server_hosts_flyout/index.tsx | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx index b35162bc51667..97dc68a386da0 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx @@ -471,7 +471,21 @@ export const EditOutputFlyout: React.FunctionComponent = label={ + ), + }} /> } > diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/index.tsx index 4ac3a093d351c..f8dfc630f5a51 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/index.tsx @@ -26,6 +26,7 @@ import { EuiSwitch, EuiComboBox, EuiCallOut, + EuiBetaBadge, } from '@elastic/eui'; import { MultiRowInput } from '../multi_row_input'; @@ -158,7 +159,21 @@ export const FleetServerHostsFlyout: React.FunctionComponent + ), + }} /> } > From 7c9dda3cbdd17bdb0cd1cfcb63b24241ce86acde Mon Sep 17 00:00:00 2001 From: Kyle Pollich Date: Mon, 6 Nov 2023 09:00:41 -0500 Subject: [PATCH 2/2] Fix i18n --- x-pack/plugins/translations/translations/fr-FR.json | 2 -- x-pack/plugins/translations/translations/ja-JP.json | 2 -- x-pack/plugins/translations/translations/zh-CN.json | 2 -- 3 files changed, 6 deletions(-) diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index 6f21534c395bd..053e0e3ae49ce 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -16508,7 +16508,6 @@ "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "Indiquer le nom", "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "La plupart des actions liées à cette sortie sont indisponibles. Reportez-vous à votre configuration Kibana pour en savoir plus.", "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "Cette sortie est gérée en dehors de Fleet.", - "xpack.fleet.settings.editOutputFlyout.proxyIdLabel": "Proxy", "xpack.fleet.settings.editOutputFlyout.proxyIdPlaceholder": "Sélectionner un proxy", "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutDescription": "À l'expiration, la file d'attente de sortie est vidée, et les données sont écrites dans la sortie.", "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutLabel": "Délai de vidage", @@ -16573,7 +16572,6 @@ "xpack.fleet.settings.fleetServerHostsFlyout.hostUrlLabel": "URL", "xpack.fleet.settings.fleetServerHostsFlyout.nameInputLabel": "Nom", "xpack.fleet.settings.fleetServerHostsFlyout.nameInputPlaceholder": "Indiquer le nom", - "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel": "Proxy", "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdPlaceholder": "Sélectionner un proxy", "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "Enregistrer et appliquer les paramètres", "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "Hôte du serveur Fleet enregistré", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 9413b9f42b70f..400e9e3fef33a 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -16522,7 +16522,6 @@ "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "名前を指定", "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "この出力に関連するほとんどのアクションは使用できません。詳細については、Kibana構成を参照してください。", "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "この出力はFleet外で管理されます", - "xpack.fleet.settings.editOutputFlyout.proxyIdLabel": "プロキシ", "xpack.fleet.settings.editOutputFlyout.proxyIdPlaceholder": "プロキシを選択", "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutDescription": "有効期限切れになると、出力キューがフラッシュされ、データが出力に書き込まれます。", "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutLabel": "フラッシュタイムアウト", @@ -16587,7 +16586,6 @@ "xpack.fleet.settings.fleetServerHostsFlyout.hostUrlLabel": "URL", "xpack.fleet.settings.fleetServerHostsFlyout.nameInputLabel": "名前", "xpack.fleet.settings.fleetServerHostsFlyout.nameInputPlaceholder": "名前を指定", - "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel": "プロキシ", "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdPlaceholder": "プロキシを選択", "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "設定を保存して適用", "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "Fleetサーバーホストが保存されました", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 70d885c3f3961..7de54b72e2638 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -16522,7 +16522,6 @@ "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "指定名称", "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "与此输出相关的操作多数不可用。请参阅 Kibana 配置了解详情。", "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "此输出在 Fleet 外部进行管理", - "xpack.fleet.settings.editOutputFlyout.proxyIdLabel": "代理", "xpack.fleet.settings.editOutputFlyout.proxyIdPlaceholder": "选择代理", "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutDescription": "过期后，将清空此输出队列，并将数据写入到输出。", "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutLabel": "清空超时", @@ -16587,7 +16586,6 @@ "xpack.fleet.settings.fleetServerHostsFlyout.hostUrlLabel": "URL", "xpack.fleet.settings.fleetServerHostsFlyout.nameInputLabel": "名称", "xpack.fleet.settings.fleetServerHostsFlyout.nameInputPlaceholder": "指定名称", - "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel": "代理", "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdPlaceholder": "选择代理", "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "保存并应用设置", "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "已保存 Fleet 服务器主机",