From 6fde69c333827fe73ff3c2cca9d344748faf2a08 Mon Sep 17 00:00:00 2001 From: Dana Axinte <53751979+dana-axinte@users.noreply.github.com> Date: Thu, 10 Apr 2025 13:50:37 +0100 Subject: [PATCH] CloudMigrations: Make improvements to the text content (#103770) * change copy configuration * comma and this token after token creation * securely migrate and you'll need token * add caret and modify steps * period after check failed resources * learn about migrating v1 * building snapshot reduce text * right caret connect to a cloud stack * building snapshot reduce text v2 * make i18n-extract after merge --- pkg/services/navtree/navtreeimpl/admin.go | 2 +- .../app/core/utils/navBarItem-translations.ts | 5 +-- .../cloud/EmptyState/InfoPane.tsx | 4 +-- .../cloud/EmptyState/MigrationStepsPane.tsx | 16 +++++++--- .../MigrationTokenPane/CreateTokenModal.tsx | 2 +- .../EmptyState/CallToAction/ConnectModal.tsx | 4 +-- .../onprem/EmptyState/InfoPaneRight.tsx | 9 +++--- .../features/migrate-to-cloud/onprem/Page.tsx | 2 +- .../migrate-to-cloud/onprem/SnapshotCTAs.tsx | 14 ++------- public/locales/en-US/grafana.json | 31 ++++++++++--------- 10 files changed, 42 insertions(+), 47 deletions(-) diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go index a503df84852..8e5fa5db84d 100644 --- a/pkg/services/navtree/navtreeimpl/admin.go +++ b/pkg/services/navtree/navtreeimpl/admin.go @@ -56,7 +56,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink generalNodeLinks = append(generalNodeLinks, &navtree.NavLink{ Text: "Migrate to Grafana Cloud", Id: "migrate-to-cloud", - SubTitle: "Copy configuration from your self-managed installation to a cloud stack", + SubTitle: "Copy resources from your self-managed installation to a cloud stack", Url: s.cfg.AppSubURL + "/admin/migrate-to-cloud", }) } diff --git a/public/app/core/utils/navBarItem-translations.ts b/public/app/core/utils/navBarItem-translations.ts index b278a27f7c0..2431301fcc3 100644 --- a/public/app/core/utils/navBarItem-translations.ts +++ b/public/app/core/utils/navBarItem-translations.ts @@ -284,10 +284,7 @@ export function getNavSubTitle(navId: string | undefined) { case 'storage': return t('nav.storage.subtitle', 'Manage file storage'); case 'migrate-to-cloud': - return t( - 'nav.migrate-to-cloud.subtitle', - 'Copy configuration from your self-managed installation to a cloud stack' - ); + return t('nav.migrate-to-cloud.subtitle', 'Copy resources from your self-managed installation to a cloud stack'); case 'support-bundles': return t('nav.support-bundles.subtitle', 'Download support bundles'); case 'admin': diff --git a/public/app/features/migrate-to-cloud/cloud/EmptyState/InfoPane.tsx b/public/app/features/migrate-to-cloud/cloud/EmptyState/InfoPane.tsx index 9e8029ff64b..0aabf679563 100644 --- a/public/app/features/migrate-to-cloud/cloud/EmptyState/InfoPane.tsx +++ b/public/app/features/migrate-to-cloud/cloud/EmptyState/InfoPane.tsx @@ -6,8 +6,8 @@ export const InfoPane = () => { return ( - You can migrate some resources from your self-managed Grafana installation to this cloud stack. To do this - securely, you'll need to generate a migration token. Your self-managed instance will use the token to + You can securely migrate some resources from your self-managed Grafana installation to this cloud stack. To get + started, you'll need to generate a migration token. Your self-managed instance will use the token to authenticate with this cloud stack. diff --git a/public/app/features/migrate-to-cloud/cloud/EmptyState/MigrationStepsPane.tsx b/public/app/features/migrate-to-cloud/cloud/EmptyState/MigrationStepsPane.tsx index 32d12e86924..c04a597be2c 100644 --- a/public/app/features/migrate-to-cloud/cloud/EmptyState/MigrationStepsPane.tsx +++ b/public/app/features/migrate-to-cloud/cloud/EmptyState/MigrationStepsPane.tsx @@ -23,7 +23,8 @@ export const MigrationStepsPane = () => {
  1. - Log in to your self-managed instance and navigate to Administration, General, Migrate to Grafana Cloud. + Log in to your self-managed instance and navigate to Administration > General > Migrate to Grafana + Cloud.
  2. @@ -33,17 +34,24 @@ export const MigrationStepsPane = () => {
  3. - You'll be prompted for a migration token. Generate one from this screen. + You'll be prompted for a migration token. Generate one from this screen. Enter your token and click + "Connect to this stack".
  4. - In your self-managed instance, select "Upload everything" to upload data sources and - dashboards to this cloud stack. + After connecting to the cloud stack, click "Build snapshot" to create a snapshot of your + self-managed instance.
  5. + After a snapshot is created, click "Upload snapshot" to copy the resources to your cloud + stack. + +
    6. +
  6. + If some of your data sources will not work over the public internet, you’ll need to install Private Data Source Connect in your self-managed environment. diff --git a/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/CreateTokenModal.tsx b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/CreateTokenModal.tsx index d5a499a3af1..30f95e22756 100644 --- a/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/CreateTokenModal.tsx +++ b/public/app/features/migrate-to-cloud/cloud/MigrationTokenPane/CreateTokenModal.tsx @@ -41,7 +41,7 @@ function TokenSuccessContent({ migrationToken }: { migrationToken: string }) { - Log into your cloud stack and navigate to Administration, General, Migrate to Grafana Cloud. Create a - migration token on that screen and paste the token here. + Log into your cloud stack and navigate to Administration > General > Migrate to Grafana Cloud. + Create a migration token on that screen and paste the token here. diff --git a/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx index 01173bab9e8..0b00b5cb6e8 100644 --- a/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx +++ b/public/app/features/migrate-to-cloud/onprem/EmptyState/InfoPaneRight.tsx @@ -7,7 +7,7 @@ export const InfoPaneRight = () => { return ( @@ -27,13 +27,12 @@ export const InfoPaneRight = () => { - Once you connect this installation to a cloud stack, you'll be able to upload data sources and - dashboards. + You can use the migration assistant to migrate a large proportion of your Grafana resources. diff --git a/public/app/features/migrate-to-cloud/onprem/Page.tsx b/public/app/features/migrate-to-cloud/onprem/Page.tsx index 0331310888c..01c4ea23ec3 100644 --- a/public/app/features/migrate-to-cloud/onprem/Page.tsx +++ b/public/app/features/migrate-to-cloud/onprem/Page.tsx @@ -542,7 +542,7 @@ function getError(props: GetErrorProps): ErrorDescription | undefined { if (errorCount > 0) { msgBody = t( 'migrate-to-cloud.onprem.migration-finished-with-errors-body', - 'The migration has completed, but some items could not be migrated to the cloud stack. Check the failed resources for more details' + 'The migration has completed, but some items could not be migrated to the cloud stack. Check the failed resources for more details.' ); } else if (warningCount > 0) { msgBody = t( diff --git a/public/app/features/migrate-to-cloud/onprem/SnapshotCTAs.tsx b/public/app/features/migrate-to-cloud/onprem/SnapshotCTAs.tsx index 92f9cb58cab..3986728d17e 100644 --- a/public/app/features/migrate-to-cloud/onprem/SnapshotCTAs.tsx +++ b/public/app/features/migrate-to-cloud/onprem/SnapshotCTAs.tsx @@ -48,20 +48,10 @@ export function CreatingSnapshotCTA(props: SnapshotCTAProps) { const { disabled, isLoading, onClick } = props; return ( - } - > + }> - We're creating a point-in-time snapshot of the current state of this installation. Once the snapshot is - complete. you'll be able to upload it to Grafana Cloud. - - - - - - Creating a snapshot typically takes less than two minutes. + We're gathering your resources for migration to Grafana Cloud. This should only take a moment. diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index 8896283e525..db2f25857ac 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -5335,14 +5335,14 @@ "when-complete": "Once the snapshot is complete, you will be able to upload it to your cloud stack." }, "building-snapshot": { - "description": "We're creating a point-in-time snapshot of the current state of this installation. Once the snapshot is complete. you'll be able to upload it to Grafana Cloud.", + "description": "We're gathering your resources for migration to Grafana Cloud. This should only take a moment.", "description-eta": "Creating a snapshot typically takes less than two minutes.", - "title": "Building installation snapshot" + "title": "Building snapshot" }, "can-i-move": { - "body": "Once you connect this installation to a cloud stack, you'll be able to upload data sources and dashboards.", - "link-title": "Learn about migrating other settings", - "title": "Can I move this installation to Grafana Cloud?" + "body": "You can use the migration assistant to migrate a large proportion of your Grafana resources.", + "link-title": "Learn about migrating to Grafana Cloud", + "title": "Where can I learn more about migrating to Grafana Cloud?" }, "configure-snapshot": { "description": "Select which resources you want to include in the snapshot to migrate.", @@ -5357,7 +5357,7 @@ "body-token": "Your self-managed Grafana installation needs special access to securely migrate content. You'll need to create a migration token on your chosen cloud stack.", "body-token-field": "Migration token", "body-token-field-placeholder": "Paste token here", - "body-token-instructions": "Log into your cloud stack and navigate to Administration, General, Migrate to Grafana Cloud. Create a migration token on that screen and paste the token here.", + "body-token-instructions": "Log into your cloud stack and navigate to Administration > General > Migrate to Grafana Cloud. Create a migration token on that screen and paste the token here.", "body-view-stacks": "View my cloud stacks", "cancel": "Cancel", "connect": "Connect to this stack", @@ -5401,11 +5401,12 @@ "body": "The migration process must be started from your self-managed Grafana instance.", "configure-pdc-link": "Configure PDC for this stack", "link-title": "Learn more about Private Data Source Connect", - "step-1": "Log in to your self-managed instance and navigate to Administration, General, Migrate to Grafana Cloud.", + "step-1": "Log in to your self-managed instance and navigate to Administration > General > Migrate to Grafana Cloud.", "step-2": "Select \"Migrate this instance to Cloud\".", - "step-3": "You'll be prompted for a migration token. Generate one from this screen.", - "step-4": "In your self-managed instance, select \"Upload everything\" to upload data sources and dashboards to this cloud stack.", - "step-5": "If some of your data sources will not work over the public internet, you’ll need to install Private Data Source Connect in your self-managed environment.", + "step-3": "You'll be prompted for a migration token. Generate one from this screen. Enter your token and click \"Connect to this stack\".", + "step-4": "After connecting to the cloud stack, click \"Build snapshot\" to create a snapshot of your self-managed instance.", + "step-5": "After a snapshot is created, click \"Upload snapshot\" to copy the resources to your cloud stack.", + "step-6": "If some of your data sources will not work over the public internet, you’ll need to install Private Data Source Connect in your self-managed environment.", "title": "Performing a migration" }, "is-it-secure": { @@ -5414,7 +5415,7 @@ "title": "Is it secure?" }, "migrate-to-this-stack": { - "body": "You can migrate some resources from your self-managed Grafana installation to this cloud stack. To do this securely, you'll need to generate a migration token. Your self-managed instance will use the token to authenticate with this cloud stack.", + "body": "You can securely migrate some resources from your self-managed Grafana installation to this cloud stack. To get started, you'll need to generate a migration token. Your self-managed instance will use the token to authenticate with this cloud stack.", "link-title": "View the full migration guide", "title": "Let us help you migrate to this stack" }, @@ -5432,7 +5433,7 @@ "modal-close": "Close", "modal-copy-and-close": "Copy to clipboard and close", "modal-copy-button": "Copy to clipboard", - "modal-field-description": "Copy the token now as you will not be able to see it again. Losing a token requires creating a new one.", + "modal-field-description": "Copy the token now, as you will not be able to see it again. Losing this token requires creating a new one.", "modal-field-label": "Token", "modal-title": "Migration token created", "status": "Current status: <2>" @@ -5449,7 +5450,7 @@ "get-session-error-title": "Error loading migration configuration", "get-snapshot-error-title": "Error loading snapshot", "migration-finished-with-caveat-title": "Resource migration complete", - "migration-finished-with-errors-body": "The migration has completed, but some items could not be migrated to the cloud stack. Check the failed resources for more details", + "migration-finished-with-errors-body": "The migration has completed, but some items could not be migrated to the cloud stack. Check the failed resources for more details.", "migration-finished-with-warnings-body": "The migration has completed with some warnings. Check individual resources for more details", "snapshot-error-status-body": "There was an error creating the snapshot or starting the migration process. See the Grafana server logs for more details", "snapshot-error-status-title": "Error migrating resources", @@ -5461,7 +5462,7 @@ "pdc": { "body": "Exposing your data sources to the internet can raise security concerns. Private data source connect (PDC) allows Grafana Cloud to access your existing data sources over a secure network tunnel.", "link-title": "Learn about PDC", - "title": "Not all my data sources are on the public internet" + "title": "What if not all my data sources are on the public internet?" }, "pricing": { "body": "Grafana Cloud has a generous free plan and a 14 day unlimited usage trial. After your trial expires, you'll be billed based on usage over the free plan limits.", @@ -5796,7 +5797,7 @@ "subtitle": "Manage folder dashboards and permissions" }, "migrate-to-cloud": { - "subtitle": "Copy configuration from your self-managed installation to a cloud stack", + "subtitle": "Copy resources from your self-managed installation to a cloud stack", "title": "Migrate to Grafana Cloud" }, "monitoring": {