Skip to content

Commit

Permalink
[8.x] [UA] More descriptive backup your data text (#204529) (#204554)
Browse files Browse the repository at this point in the history 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[UA] More descriptive backup your data text
(#204529)](#204529)

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

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

<!--BACKPORT [{"author":{"name":"Jean-Louis
Leysens","email":"jeanlouis.leysens@elastic.co"},"sourceCommit":{"committedDate":"2024-12-17T11:35:23Z","message":"[UA]
More descriptive backup your data text (#204529)\n\n##
Summary\r\n\r\nClose
https://github.com/elastic/kibana-team/issues/1359\r\n\r\n###
Notes\r\n\r\nDid not update links as, per the issue request, the
\"Create snapshot\"\r\nbutton already links to either the snapshots page
on Cloud or the\r\nSnapshot & Restore on prem.\r\n\r\n### On
prem\r\n\r\n* Slight tweak to wording\r\n* Made link open in a new
tab\r\n\r\n<img width=\"1099\" alt=\"Screenshot 2024-12-16 at 14 04
58\"\r\nsrc=\"https://github.com/user-attachments/assets/46486e30-42e5-4ba1-bd90-4ba3454d5093\"\r\n/>\r\n\r\n\r\n###
Cloud\r\n* Added always visible descriptive paragraph\r\n\r\n####
Success\r\n\r\n<img width=\"1264\" alt=\"Screenshot 2024-12-16 at 14 00
26\"\r\nsrc=\"https://github.com/user-attachments/assets/fa855def-257c-4ed0-a17c-b71bcb99bd76\"\r\n/>\r\n\r\n####
Error\r\n\r\n<img width=\"566\" alt=\"Screenshot 2024-12-16 at 13 57
53\"\r\nsrc=\"https://github.com/user-attachments/assets/b65b8d8e-887a-4523-b566-e951381d46cd\"\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---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5b68294e1d313e7460492ccd83da269304193e0f","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","Feature:Upgrade
Assistant","v9.0.0","backport:version","v8.18.0","v8.17.1"],"title":"[UA]
More descriptive backup your data
text","number":204529,"url":"https://github.com/elastic/kibana/pull/204529","mergeCommit":{"message":"[UA]
More descriptive backup your data text (#204529)\n\n##
Summary\r\n\r\nClose
https://github.com/elastic/kibana-team/issues/1359\r\n\r\n###
Notes\r\n\r\nDid not update links as, per the issue request, the
\"Create snapshot\"\r\nbutton already links to either the snapshots page
on Cloud or the\r\nSnapshot & Restore on prem.\r\n\r\n### On
prem\r\n\r\n* Slight tweak to wording\r\n* Made link open in a new
tab\r\n\r\n<img width=\"1099\" alt=\"Screenshot 2024-12-16 at 14 04
58\"\r\nsrc=\"https://github.com/user-attachments/assets/46486e30-42e5-4ba1-bd90-4ba3454d5093\"\r\n/>\r\n\r\n\r\n###
Cloud\r\n* Added always visible descriptive paragraph\r\n\r\n####
Success\r\n\r\n<img width=\"1264\" alt=\"Screenshot 2024-12-16 at 14 00
26\"\r\nsrc=\"https://github.com/user-attachments/assets/fa855def-257c-4ed0-a17c-b71bcb99bd76\"\r\n/>\r\n\r\n####
Error\r\n\r\n<img width=\"566\" alt=\"Screenshot 2024-12-16 at 13 57
53\"\r\nsrc=\"https://github.com/user-attachments/assets/b65b8d8e-887a-4523-b566-e951381d46cd\"\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---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5b68294e1d313e7460492ccd83da269304193e0f"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204529","number":204529,"mergeCommit":{"message":"[UA]
More descriptive backup your data text (#204529)\n\n##
Summary\r\n\r\nClose
https://github.com/elastic/kibana-team/issues/1359\r\n\r\n###
Notes\r\n\r\nDid not update links as, per the issue request, the
\"Create snapshot\"\r\nbutton already links to either the snapshots page
on Cloud or the\r\nSnapshot & Restore on prem.\r\n\r\n### On
prem\r\n\r\n* Slight tweak to wording\r\n* Made link open in a new
tab\r\n\r\n<img width=\"1099\" alt=\"Screenshot 2024-12-16 at 14 04
58\"\r\nsrc=\"https://github.com/user-attachments/assets/46486e30-42e5-4ba1-bd90-4ba3454d5093\"\r\n/>\r\n\r\n\r\n###
Cloud\r\n* Added always visible descriptive paragraph\r\n\r\n####
Success\r\n\r\n<img width=\"1264\" alt=\"Screenshot 2024-12-16 at 14 00
26\"\r\nsrc=\"https://github.com/user-attachments/assets/fa855def-257c-4ed0-a17c-b71bcb99bd76\"\r\n/>\r\n\r\n####
Error\r\n\r\n<img width=\"566\" alt=\"Screenshot 2024-12-16 at 13 57
53\"\r\nsrc=\"https://github.com/user-attachments/assets/b65b8d8e-887a-4523-b566-e951381d46cd\"\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---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5b68294e1d313e7460492ccd83da269304193e0f"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Jean-Louis Leysens <jeanlouis.leysens@elastic.co>
  • Loading branch information
@kibanamachine @jloleysens
kibanamachine and jloleysens authored Dec 17, 2024
1 parent c4b5665 commit 1cb2fad
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
10 changes: 9 additions & 1 deletion ...ins/upgrade_assistant/public/application/components/overview/backup_step/cloud_backup.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,16 @@ export const CloudBackup: React.FunctionComponent<Props> = ({

return (
<>
<EuiText>
<p>
{i18n.translate('xpack.upgradeAssistant.overview.cloudBackup.description', {
defaultMessage: 'Back up your data using snapshots before proceeding.',
})}
</p>
</EuiText>
<EuiSpacer size="m" />
{statusMessage}
<EuiSpacer size="s" />
<EuiSpacer size="m" />
{/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
<EuiButton
href={cloudSnapshotsUrl}
Expand Down
5 changes: 3 additions & 2 deletions ...s/upgrade_assistant/public/application/components/overview/backup_step/on_prem_backup.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const SnapshotRestoreAppLink: React.FunctionComponent = () => {
// eslint-disable-next-line @elastic/eui/href-or-on-click
<EuiButton
href={snapshotRestoreUrl}
target="_blank"
onClick={() => {
uiMetricService.trackUiMetric(METRIC_TYPE.CLICK, UIM_BACKUP_DATA_ON_PREM_CLICK);
}}
Expand All @@ -46,12 +47,12 @@ export const OnPremBackup: React.FunctionComponent = () => {
<EuiText>
<p>
{i18n.translate('xpack.upgradeAssistant.overview.backupStepDescription', {
defaultMessage: 'Make sure you have a current snapshot before making any changes.',
defaultMessage: 'Make sure you have a current snapshot before proceeding.',
})}
</p>
</EuiText>

<EuiSpacer size="s" />
<EuiSpacer size="m" />

<SnapshotRestoreAppLink />
</>
Expand Down

0 comments on commit 1cb2fad

Please sign in to comment.