Skip to content

Commit

Permalink
[8.x] [Fleet] Improve text strings in new agent binary download secti…
Browse files Browse the repository at this point in the history
…on (elastic#204988) (elastic#205539)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Fleet] Improve text strings in new agent binary download section
(elastic#204988)](elastic#204988)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Mason
Herron","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-03T19:45:49Z","message":"[Fleet]
Improve text strings in new agent binary download section
(elastic#204988)\n\n## Summary\r\nCloses elastic#139151 \r\n\r\nChanged placeholder
and help text to be more descriptive (using approved\r\ntext from
issue).\r\n\r\n\r\n### Checklist\r\n\r\nCheck the PR satisfies following
conditions. \r\n\r\nReviewers should verify this PR satisfies this list
as well.\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [ ] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] If a plugin
configuration key changed, check if it needs to be\r\nallowlisted in the
cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.\r\n- [ ] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [ ] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_note:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n###
Identify risks\r\n\r\nn/a\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>","sha":"8534f0a35d671240b1cff02d1d31a7f3b8bfe9a5","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"title":"[Fleet]
Improve text strings in new agent binary download
section","number":204988,"url":"https://github.com/elastic/kibana/pull/204988","mergeCommit":{"message":"[Fleet]
Improve text strings in new agent binary download section
(elastic#204988)\n\n## Summary\r\nCloses elastic#139151 \r\n\r\nChanged placeholder
and help text to be more descriptive (using approved\r\ntext from
issue).\r\n\r\n\r\n### Checklist\r\n\r\nCheck the PR satisfies following
conditions. \r\n\r\nReviewers should verify this PR satisfies this list
as well.\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [ ] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] If a plugin
configuration key changed, check if it needs to be\r\nallowlisted in the
cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.\r\n- [ ] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [ ] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_note:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n###
Identify risks\r\n\r\nn/a\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>","sha":"8534f0a35d671240b1cff02d1d31a7f3b8bfe9a5"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204988","number":204988,"mergeCommit":{"message":"[Fleet]
Improve text strings in new agent binary download section
(elastic#204988)\n\n## Summary\r\nCloses elastic#139151 \r\n\r\nChanged placeholder
and help text to be more descriptive (using approved\r\ntext from
issue).\r\n\r\n\r\n### Checklist\r\n\r\nCheck the PR satisfies following
conditions. \r\n\r\nReviewers should verify this PR satisfies this list
as well.\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [ ] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] If a plugin
configuration key changed, check if it needs to be\r\nallowlisted in the
cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.\r\n- [ ] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [ ] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_note:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n###
Identify risks\r\n\r\nn/a\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>","sha":"8534f0a35d671240b1cff02d1d31a7f3b8bfe9a5"}}]}]
BACKPORT-->

Co-authored-by: Mason Herron <[email protected]>
  • Loading branch information
kibanamachine and Supplementing authored Jan 3, 2025
1 parent 2c63bdb commit 223c889
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21390,7 +21390,6 @@
"xpack.fleet.settings.editDownloadSourcesFlyout.editTitle": "Modifier la source de binaire pour les agents",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostInputLabel": "Hôte",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputDescription": "Adresse que vos agents utiliseront pour télécharger les fichiers binaires. Spécifiez le chemin d'accès au répertoire contenant les fichiers binaires. {guideLink}",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputPlaceholder": "Indiquer l’hôte",
"xpack.fleet.settings.editDownloadSourcesFlyout.nameInputLabel": "Nom",
"xpack.fleet.settings.editDownloadSourcesFlyout.nameInputPlaceholder": "Indiquer le nom",
"xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdLabel": "Proxy",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21248,7 +21248,6 @@
"xpack.fleet.settings.editDownloadSourcesFlyout.editTitle": "エージェントバイナリソースを編集",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostInputLabel": "ホスト",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputDescription": "エージェントがバイナリをダウンロードするために使用するダウンロード元アドレス。バイナリが含まれるディレクトリへのパスを指定します。{guideLink}",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputPlaceholder": "ホストを指定",
"xpack.fleet.settings.editDownloadSourcesFlyout.nameInputLabel": "名前",
"xpack.fleet.settings.editDownloadSourcesFlyout.nameInputPlaceholder": "名前を指定",
"xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdLabel": "プロキシ",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21330,7 +21330,6 @@
"xpack.fleet.settings.editDownloadSourcesFlyout.editTitle": "编辑代理二进制源",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostInputLabel": "主机",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputDescription": "您的代理将用于从中下载其二进制文件的地址。指定包含二进制文件的目录的路径。{guideLink}",
"xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputPlaceholder": "指定主机",
"xpack.fleet.settings.editDownloadSourcesFlyout.nameInputLabel": "名称",
"xpack.fleet.settings.editDownloadSourcesFlyout.nameInputPlaceholder": "指定名称",
"xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdLabel": "代理",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('EditOutputFlyout', () => {
expect(comp.queryByLabelText('Name')).not.toBeNull();
expect(comp.queryByLabelText('Host')).not.toBeNull();
expect(comp.queryByPlaceholderText('Specify name')).not.toBeNull();
expect(comp.queryByPlaceholderText('Specify host')).not.toBeNull();
expect(comp.queryByPlaceholderText('https://artifacts.elastic.co/downloads')).not.toBeNull();
});

it('should render the flyout if the provided download source is valid', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const EditDownloadSourceFlyout: React.FunctionComponent<EditDownloadSourc
<FormattedMessage
data-test-subj="editDownloadSourcesFlyout.hostHelpText"
id="xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputDescription"
defaultMessage="Address that your agents will use to download their binary from. Specify the path to the directory containing the binary. {guideLink}"
defaultMessage="Enter the address of the directory containing the binaries to download. {guideLink}"
values={{
guideLink: (
<EuiLink href={docLinks.links.fleet.settings} target="_blank" external>
Expand All @@ -129,12 +129,7 @@ export const EditDownloadSourceFlyout: React.FunctionComponent<EditDownloadSourc
data-test-subj="editDownloadSourcesFlyout.hostInput"
fullWidth
{...inputs.hostInput.props}
placeholder={i18n.translate(
'xpack.fleet.settings.editDownloadSourcesFlyout.hostsInputPlaceholder',
{
defaultMessage: 'Specify host',
}
)}
placeholder="https://artifacts.elastic.co/downloads"
/>
</EuiFormRow>
<EuiFormRow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const AgentBinarySection: React.FunctionComponent<AgentBinarySectionProps
<EuiText color="subdued" size="m">
<FormattedMessage
id="xpack.fleet.settings.downloadSourcesSection.Subtitle"
defaultMessage="Specify where the agents will download their binary from. Checked default will apply to all policies unless overwritten."
defaultMessage="List of sources used by Elastic agents to download their binaries. The default source applies to all agent policies that don't have a specific binary source specified."
/>
</EuiText>
<EuiSpacer size="m" />
Expand Down

0 comments on commit 223c889

Please sign in to comment.