Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fleet]: Beta label is shown inconsistently while selecting proxy under Fleet settings. #170634

Merged
merged 3 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,21 @@ export const EditOutputFlyout: React.FunctionComponent<EditOutputFlyoutProps> =
label={
<FormattedMessage
id="xpack.fleet.settings.editOutputFlyout.proxyIdLabel"
defaultMessage="Proxy"
defaultMessage="Proxy {badge}"
values={{
badge: (
<EuiBetaBadge
size="s"
className="eui-alignTop"
label={i18n.translate(
'xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdBetaBadge',
{
defaultMessage: 'Beta',
}
)}
/>
),
}}
/>
}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
EuiSwitch,
EuiComboBox,
EuiCallOut,
EuiBetaBadge,
} from '@elastic/eui';

import { MultiRowInput } from '../multi_row_input';
Expand Down Expand Up @@ -158,7 +159,21 @@ export const FleetServerHostsFlyout: React.FunctionComponent<FleetServerHostsFly
label={
<FormattedMessage
id="xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel"
defaultMessage="Proxy"
defaultMessage="Proxy {badge}"
values={{
badge: (
<EuiBetaBadge
size="s"
className="eui-alignTop"
label={i18n.translate(
'xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdBetaBadge',
{
defaultMessage: 'Beta',
}
)}
/>
),
}}
/>
}
>
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -17731,7 +17731,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",
Expand Down Expand Up @@ -17796,7 +17795,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é",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -17744,7 +17744,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": "フラッシュタイムアウト",
Expand Down Expand Up @@ -17809,7 +17808,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サーバーホストが保存されました",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -17838,7 +17838,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": "清空超时",
Expand Down Expand Up @@ -17903,7 +17902,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 服务器主机",
Expand Down
Loading