Skip to content

Commit

Permalink
[Fleet] Update text in Fleet Settings flyout / confirm modals (#97648)
Browse files Browse the repository at this point in the history
* Remove "Global Output" heading from the flyout

* Tweak flyout description

* Tweak fleet server hosts input description

* Tweak ES hosts input description

* Tweak modal button

* Tweak confirmation modal callout title

* Tweak callout when fleet server hosts are modified

* Tweak callout when ES hosts are modified

* Fix i18n

* Remove period from title
  • Loading branch information
Alejandro Fernández Gómez authored Apr 20, 2021
1 parent 0167009 commit f374920
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const SettingsConfirmModal = React.memo<SettingsConfirmModalProps>(
title={
<FormattedMessage
id="xpack.fleet.settingsConfirmModal.calloutTitle"
defaultMessage="This action will update all agent policies and enrolled agents."
defaultMessage="This action updates all agent policies and enrolled agents"
/>
}
color="warning"
Expand All @@ -124,13 +124,13 @@ export const SettingsConfirmModal = React.memo<SettingsConfirmModalProps>(
<p>
<FormattedMessage
id="xpack.fleet.settingsConfirmModal.fleetServerChangedText"
defaultMessage="If agents are unable to connect at the new {fleetServerUrl}, they will log an error and report an unhealthy status. They will remain on the current agent policy version and check for updates at the old URL until they successfully connect at the new URL"
defaultMessage="Agents that cannot connect to the new {fleetServerHosts} log an error. The agents remain on the current policy and check for updates at the old URL until they connect at the new URL."
values={{
fleetServerUrl: (
fleetServerHosts: (
<strong>
<FormattedMessage
id="xpack.fleet.settingsConfirmModal.fleetServerUrl"
defaultMessage="Fleet Server URL"
id="xpack.fleet.settingsConfirmModal.fleetServerHosts"
defaultMessage="Fleet Server hosts"
/>
</strong>
),
Expand All @@ -143,13 +143,13 @@ export const SettingsConfirmModal = React.memo<SettingsConfirmModalProps>(
<p>
<FormattedMessage
id="xpack.fleet.settingsConfirmModal.eserverChangedText"
defaultMessage="If agents are unable to connect at the new {elasticsearchUrl}, Fleet Server will report them as healthy but they will be unable to send data to Elasticsearch. This will not update URL that Fleet server itself uses to connect to Elasticsearch; you must manually reenroll it to update the URL"
defaultMessage="Agents that cannot connect at the new {elasticsearchHosts} have a healthy status even though they are unable to send data. To update the URL that Fleet Server uses to connect to Elasticsearch, you must reenroll Fleet Server."
values={{
elasticsearchUrl: (
elasticsearchHosts: (
<strong>
<FormattedMessage
id="xpack.fleet.settingsConfirmModal.elasticsearchUrl"
defaultMessage="Elasticsearch URL"
id="xpack.fleet.settingsConfirmModal.elasticsearchHosts"
defaultMessage="Elasticsearch hosts"
/>
</strong>
),
Expand Down Expand Up @@ -178,7 +178,7 @@ export const SettingsConfirmModal = React.memo<SettingsConfirmModalProps>(
<EuiButton onClick={onConfirm} fill>
<FormattedMessage
id="xpack.fleet.settingsConfirmModal.confirmButton"
defaultMessage="Confirm changes"
defaultMessage="Apply settings"
/>
</EuiButton>
</EuiModalFooter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,19 +251,10 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {

const body = settings && (
<EuiForm>
<EuiTitle size="s">
<h3>
<FormattedMessage
id="xpack.fleet.settings.globalOutputTitle"
defaultMessage="Global output"
/>
</h3>
</EuiTitle>
<EuiSpacer size="s" />
<EuiText color="subdued" size="s">
<FormattedMessage
id="xpack.fleet.settings.globalOutputDescription"
defaultMessage="These settings are applied globally to the {outputs} section of all agent policies and will affect all enrolled agents if changed."
defaultMessage="These settings are applied globally to the {outputs} section of all agent policies and affect all enrolled agents."
values={{
outputs: <EuiCode>outputs</EuiCode>,
}}
Expand All @@ -279,7 +270,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
helpText={
<FormattedMessage
id="xpack.fleet.settings.fleetServerHostsHelpTect"
defaultMessage="Specify the URLs that your agents will use to connect to a Fleet Server. If multiple URLs exist, Fleet will show the first provided URL for enrollment purposes. For more information, see the {link}."
defaultMessage="Specify the URLs that your agents will use to connect to a Fleet Server. If multiple URLs exist, Fleet shows the first provided URL for enrollment purposes. Refer to the {link}."
values={{
link: (
<EuiLink
Expand Down Expand Up @@ -308,7 +299,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
defaultMessage: 'Elasticsearch hosts',
})}
helpText={i18n.translate('xpack.fleet.settings.elasticsearchUrlsHelpTect', {
defaultMessage: 'Specify the Elasticsearch URLs where agents will send data.',
defaultMessage: 'Specify the Elasticsearch URLs where agents send data.',
})}
{...inputs.elasticsearchUrl.formRowProps}
>
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -8651,7 +8651,6 @@
"xpack.fleet.settings.elasticHostError": "無効なURL",
"xpack.fleet.settings.elasticsearchUrlLabel": "Elasticsearch URL",
"xpack.fleet.settings.flyoutTitle": "Fleet 設定",
"xpack.fleet.settings.globalOutputTitle": "グローバル出力",
"xpack.fleet.settings.invalidYamlFormatErrorMessage": "無効なYAML形式:{reason}",
"xpack.fleet.settings.saveButtonLabel": "設定を保存",
"xpack.fleet.settings.success.message": "設定が保存されました",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -8737,7 +8737,6 @@
"xpack.fleet.settings.elasticHostError": "URL 无效",
"xpack.fleet.settings.elasticsearchUrlLabel": "Elasticsearch URL",
"xpack.fleet.settings.flyoutTitle": "Fleet 设置",
"xpack.fleet.settings.globalOutputTitle": "全局输出",
"xpack.fleet.settings.invalidYamlFormatErrorMessage": "YAML 无效:{reason}",
"xpack.fleet.settings.saveButtonLabel": "保存设置",
"xpack.fleet.settings.success.message": "设置已保存",
Expand Down

0 comments on commit f374920

Please sign in to comment.