From fa8dd5603eb8e99395945d789f68f2db3ce77d5f Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Thu, 8 Jul 2021 12:28:00 -0500
Subject: [PATCH] Use deployment id instead of cloud id in tutorial link
 (#104779)

Fixes #104611.
---
 x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts | 7 ++++---
 x-pack/plugins/translations/translations/ja-JP.json      | 1 -
 x-pack/plugins/translations/translations/zh-CN.json      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
index 55adc756f31af..a595ae1dc8a8b 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -46,7 +46,8 @@ export function createElasticCloudInstructions(
 function getApmServerInstructionSet(
   cloudSetup?: CloudSetup
 ): InstructionSetSchema {
-  const cloudId = cloudSetup?.cloudId;
+  const deploymentId = cloudSetup?.deploymentId;
+
   return {
     title: i18n.translate('xpack.apm.tutorial.apmServer.title', {
       defaultMessage: 'APM Server',
@@ -59,8 +60,8 @@ function getApmServerInstructionSet(
             title: 'Enable the APM Server in the ESS console',
             textPre: i18n.translate('xpack.apm.tutorial.elasticCloud.textPre', {
               defaultMessage:
-                'To enable the APM Server go to [the Elastic Cloud console](https://cloud.elastic.co/deployments?q={cloudId}) and enable APM in the deployment settings. Once enabled, refresh this page.',
-              values: { cloudId },
+                'To enable the APM Server go to [the Elastic Cloud console](https://cloud.elastic.co/deployments/{deploymentId}/edit) and enable APM in the deployment settings. Once enabled, refresh this page.',
+              values: { deploymentId },
             }),
           },
         ],
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index fd0060f83a3e4..b21d4afbe0020 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5937,7 +5937,6 @@
     "xpack.apm.transactionsTable.notFoundLabel": "トランザクションが見つかりませんでした。",
     "xpack.apm.transactionsTable.throughputColumnLabel": "スループット",
     "xpack.apm.tutorial.apmServer.title": "APM Server",
-    "xpack.apm.tutorial.elasticCloud.textPre": "APM Server を有効にするには、[the Elastic Cloud console] (https://cloud.elastic.co/deployments?q={cloudId}) に移動し、展開設定で APM を有効にします。有効になったら、このページを更新してください。",
     "xpack.apm.tutorial.elasticCloudInstructions.title": "APM エージェント",
     "xpack.apm.tutorial.specProvider.artifacts.application.label": "APM を起動",
     "xpack.apm.unitLabel": "単位を選択",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d2a2f0be215d3..27a5a06f9ca7c 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5975,7 +5975,6 @@
     "xpack.apm.transactionsTable.notFoundLabel": "未找到任何事务。",
     "xpack.apm.transactionsTable.throughputColumnLabel": "吞吐量",
     "xpack.apm.tutorial.apmServer.title": "APM Server",
-    "xpack.apm.tutorial.elasticCloud.textPre": "要启用 APM Server，请前往 [Elastic Cloud 控制台](https://cloud.elastic.co/deployments?q={cloudId}) 并在部署设置中启用 APM。启用后，请刷新此页面。",
     "xpack.apm.tutorial.elasticCloudInstructions.title": "APM 代理",
     "xpack.apm.tutorial.specProvider.artifacts.application.label": "启动 APM",
     "xpack.apm.unitLabel": "选择单位",