Add Data - Adding cloud reset password link to cloud instructions (#62835)

* Adding cloud reset password link to cloud filebeat instructions * Auditbeat gets the cool reset password link * And the other beats instructions get the awesome password reset link * Changing the i18n id to more closely match the on-prem cloud id * Changing text for forgot password * Removing now unused translations * "Forgot your password" -> "Forgot the password" * "Elastic Cloud UI" -> "Elastic Cloud" Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2025-04-23 01:13:23 -04:00 · 2020-04-09 07:43:36 -07:00 · 2020-04-09 07:43:36 -07:00 · 90d2b18bc5
commit 90d2b18bc5
parent f9ba963af9
11 changed files with 61 additions and 173 deletions
--- a/src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts
@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
+import { cloudPasswordAndResetLink } from './cloud_instructions';

 export const createAuditbeatInstructions = (context?: TutorialContext) => ({
  INSTALL: {
@ -305,13 +306,7 @@ export const createAuditbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.auditbeatCloudInstructions.config.osxTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    DEB: {
      title: i18n.translate('home.tutorials.common.auditbeatCloudInstructions.config.debTitle', {
@ -327,13 +322,7 @@ export const createAuditbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.auditbeatCloudInstructions.config.debTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    RPM: {
      title: i18n.translate('home.tutorials.common.auditbeatCloudInstructions.config.rpmTitle', {
@ -349,13 +338,7 @@ export const createAuditbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.auditbeatCloudInstructions.config.rpmTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    WINDOWS: {
      title: i18n.translate(
@ -374,13 +357,7 @@ export const createAuditbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.auditbeatCloudInstructions.config.windowsTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
  },
 });
--- a/src/plugins/home/server/tutorials/instructions/cloud_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/cloud_instructions.ts
@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { i18n } from '@kbn/i18n';
+
+export const cloudPasswordAndResetLink = i18n.translate(
+  'home.tutorials.common.cloudInstructions.passwordAndResetLink',
+  {
+    defaultMessage:
+      'Where {passwordTemplate} is the password of the `elastic` user.' +
+      `\\{#config.cloud.resetPasswordUrl\\}
+      Forgot the password? [Reset in Elastic Cloud](\\{config.cloud.resetPasswordUrl\\}).
+      \\{/config.cloud.resetPasswordUrl\\}`,
+    values: { passwordTemplate: '`<password>`' },
+  }
+);
--- a/src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts
@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
+import { cloudPasswordAndResetLink } from './cloud_instructions';

 export const createFilebeatInstructions = (context?: TutorialContext) => ({
  INSTALL: {
@ -299,13 +300,7 @@ export const createFilebeatCloudInstructions = () => ({
        },
      }),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.filebeatCloudInstructions.config.osxTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    DEB: {
      title: i18n.translate('home.tutorials.common.filebeatCloudInstructions.config.debTitle', {
@ -318,13 +313,7 @@ export const createFilebeatCloudInstructions = () => ({
        },
      }),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.filebeatCloudInstructions.config.debTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    RPM: {
      title: i18n.translate('home.tutorials.common.filebeatCloudInstructions.config.rpmTitle', {
@ -337,13 +326,7 @@ export const createFilebeatCloudInstructions = () => ({
        },
      }),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.filebeatCloudInstructions.config.rpmTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    WINDOWS: {
      title: i18n.translate('home.tutorials.common.filebeatCloudInstructions.config.windowsTitle', {
@ -359,13 +342,7 @@ export const createFilebeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.filebeatCloudInstructions.config.windowsTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
  },
 });
--- a/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts
@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
+import { cloudPasswordAndResetLink } from './cloud_instructions';

 export const createFunctionbeatInstructions = (context?: TutorialContext) => ({
  INSTALL: {
@ -200,13 +201,7 @@ export const createFunctionbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.functionbeatCloudInstructions.config.osxTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    WINDOWS: {
      title: i18n.translate(
@ -225,13 +220,7 @@ export const createFunctionbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.functionbeatCloudInstructions.config.windowsTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
  },
 });
--- a/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts
@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
+import { cloudPasswordAndResetLink } from './cloud_instructions';

 export const createHeartbeatInstructions = (context?: TutorialContext) => ({
  INSTALL: {
@ -280,13 +281,7 @@ export const createHeartbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.heartbeatCloudInstructions.config.osxTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    DEB: {
      title: i18n.translate('home.tutorials.common.heartbeatCloudInstructions.config.debTitle', {
@ -302,13 +297,7 @@ export const createHeartbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.heartbeatCloudInstructions.config.debTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    RPM: {
      title: i18n.translate('home.tutorials.common.heartbeatCloudInstructions.config.rpmTitle', {
@ -324,13 +313,7 @@ export const createHeartbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.heartbeatCloudInstructions.config.rpmTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    WINDOWS: {
      title: i18n.translate(
@ -349,13 +332,7 @@ export const createHeartbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.heartbeatCloudInstructions.config.windowsTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
  },
 });
--- a/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts
@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
+import { cloudPasswordAndResetLink } from './cloud_instructions';

 export const createMetricbeatInstructions = (context?: TutorialContext) => ({
  INSTALL: {
@ -295,13 +296,7 @@ export const createMetricbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.metricbeatCloudInstructions.config.osxTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    DEB: {
      title: i18n.translate('home.tutorials.common.metricbeatCloudInstructions.config.debTitle', {
@ -317,13 +312,7 @@ export const createMetricbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.metricbeatCloudInstructions.config.debTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    RPM: {
      title: i18n.translate('home.tutorials.common.metricbeatCloudInstructions.config.rpmTitle', {
@ -339,13 +328,7 @@ export const createMetricbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.metricbeatCloudInstructions.config.rpmTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
    WINDOWS: {
      title: i18n.translate(
@ -364,13 +347,7 @@ export const createMetricbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.metricbeatCloudInstructions.config.windowsTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
  },
 });
--- a/src/plugins/home/server/tutorials/instructions/winlogbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/winlogbeat_instructions.ts
@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
+import { cloudPasswordAndResetLink } from './cloud_instructions';

 export const createWinlogbeatInstructions = (context?: TutorialContext) => ({
  INSTALL: {
@ -130,13 +131,7 @@ export const createWinlogbeatCloudInstructions = () => ({
        }
      ),
      commands: ['cloud.id: "{config.cloud.id}"', 'cloud.auth: "elastic:<password>"'],
-      textPost: i18n.translate(
-        'home.tutorials.common.winlogbeatCloudInstructions.config.windowsTextPost',
-        {
-          defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.',
-          values: { passwordTemplate: '`<password>`' },
-        }
-      ),
+      textPost: cloudPasswordAndResetLink,
    },
  },
 });
--- a/x-pack/plugins/cloud/public/plugin.ts
+++ b/x-pack/plugins/cloud/public/plugin.ts
@ -11,6 +11,7 @@ import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';

 interface CloudConfigType {
  id?: string;
+  resetPasswordUrl?: string;
 }

 interface CloudSetupDependencies {
@ -26,13 +27,13 @@ export class CloudPlugin implements Plugin<CloudSetup> {
  constructor(private readonly initializerContext: PluginInitializerContext) {}

  public async setup(core: CoreSetup, { home }: CloudSetupDependencies) {
-    const { id } = this.initializerContext.config.get<CloudConfigType>();
+    const { id, resetPasswordUrl } = this.initializerContext.config.get<CloudConfigType>();
    const isCloudEnabled = getIsCloudEnabled(id);

    if (home) {
      home.environment.update({ cloud: isCloudEnabled });
      if (isCloudEnabled) {
-        home.tutorials.setVariable('cloud', { id });
+        home.tutorials.setVariable('cloud', { id, resetPasswordUrl });
      }
    }

--- a/x-pack/plugins/cloud/server/config.ts
+++ b/x-pack/plugins/cloud/server/config.ts
@ -21,6 +21,7 @@ const configSchema = schema.object({
  enabled: schema.boolean({ defaultValue: true }),
  id: schema.maybe(schema.string()),
  apm: schema.maybe(apmConfigSchema),
+  resetPasswordUrl: schema.maybe(schema.string()),
 });

 export type CloudConfigType = TypeOf<typeof configSchema>;
@ -28,6 +29,7 @@ export type CloudConfigType = TypeOf<typeof configSchema>;
 export const config: PluginConfigDescriptor<CloudConfigType> = {
  exposeToBrowser: {
    id: true,
+    resetPasswordUrl: true,
  },
  schema: configSchema,
 };
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@ -1196,16 +1196,12 @@
    "home.tutorials.common.auditbeat.cloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.auditbeat.premCloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.auditbeat.premInstructions.gettingStarted.title": "はじめに",
-    "home.tutorials.common.auditbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.auditbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.auditbeatCloudInstructions.config.debTitle": "構成を編集する",
-    "home.tutorials.common.auditbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.auditbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.auditbeatCloudInstructions.config.osxTitle": "構成を編集する",
-    "home.tutorials.common.auditbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.auditbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.auditbeatCloudInstructions.config.rpmTitle": "構成を編集する",
-    "home.tutorials.common.auditbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.auditbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.auditbeatCloudInstructions.config.windowsTitle": "構成を編集する",
    "home.tutorials.common.auditbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
@ -1247,16 +1243,12 @@
    "home.tutorials.common.filebeat.cloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.filebeat.premCloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.filebeat.premInstructions.gettingStarted.title": "はじめに",
-    "home.tutorials.common.filebeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.filebeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.filebeatCloudInstructions.config.debTitle": "構成を編集する",
-    "home.tutorials.common.filebeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.filebeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.filebeatCloudInstructions.config.osxTitle": "構成を編集する",
-    "home.tutorials.common.filebeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.filebeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.filebeatCloudInstructions.config.rpmTitle": "構成を編集する",
-    "home.tutorials.common.filebeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.filebeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.filebeatCloudInstructions.config.windowsTitle": "構成を編集する",
    "home.tutorials.common.filebeatEnableInstructions.debTextPost": "「/etc/filebeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
@ -1311,10 +1303,8 @@
    "home.tutorials.common.functionbeatAWSInstructions.textPost": "「<your-access-key>」と「<your-secret-access-key>」がアカウント資格情報、「us-east-1」がご希望の地域です。",
    "home.tutorials.common.functionbeatAWSInstructions.textPre": "環境で AWS アカウント認証情報を設定します。",
    "home.tutorials.common.functionbeatAWSInstructions.title": "AWS 認証情報の設定",
-    "home.tutorials.common.functionbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.functionbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.functionbeatCloudInstructions.config.osxTitle": "構成を編集する",
-    "home.tutorials.common.functionbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.functionbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.functionbeatCloudInstructions.config.windowsTitle": "構成を編集する",
    "home.tutorials.common.functionbeatEnableOnPremInstructions.defaultTextPost": "「<cloudwatch-log-group>」が投入するロググループの名前で、「<unique-bucket-name>」が Functionbeat デプロイのステージングに使用されるが有効な S3 バケット名です。",
@ -1345,16 +1335,12 @@
    "home.tutorials.common.heartbeat.cloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.heartbeat.premCloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.heartbeat.premInstructions.gettingStarted.title": "はじめに",
-    "home.tutorials.common.heartbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.heartbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.heartbeatCloudInstructions.config.debTitle": "構成を編集する",
-    "home.tutorials.common.heartbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.heartbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.heartbeatCloudInstructions.config.osxTitle": "構成を編集する",
-    "home.tutorials.common.heartbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.heartbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.heartbeatCloudInstructions.config.rpmTitle": "構成を編集する",
-    "home.tutorials.common.heartbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.heartbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.heartbeatCloudInstructions.config.windowsTitle": "構成を編集する",
    "home.tutorials.common.heartbeatEnableCloudInstructions.debTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
@ -1414,16 +1400,12 @@
    "home.tutorials.common.metricbeat.cloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.metricbeat.premCloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.metricbeat.premInstructions.gettingStarted.title": "はじめに",
-    "home.tutorials.common.metricbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.metricbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.metricbeatCloudInstructions.config.debTitle": "構成を編集する",
-    "home.tutorials.common.metricbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.metricbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.metricbeatCloudInstructions.config.osxTitle": "構成を編集する",
-    "home.tutorials.common.metricbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.metricbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.metricbeatCloudInstructions.config.rpmTitle": "構成を編集する",
-    "home.tutorials.common.metricbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.metricbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.metricbeatCloudInstructions.config.windowsTitle": "構成を編集する",
    "home.tutorials.common.metricbeatEnableInstructions.debTextPost": "「/etc/metricbeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
@ -1478,7 +1460,6 @@
    "home.tutorials.common.winlogbeat.cloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.winlogbeat.premCloudInstructions.gettingStarted.title": "はじめに",
    "home.tutorials.common.winlogbeat.premInstructions.gettingStarted.title": "はじめに",
-    "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
    "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
    "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTitle": "構成を編集する",
    "home.tutorials.common.winlogbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@ -1197,16 +1197,12 @@
    "home.tutorials.common.auditbeat.cloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.auditbeat.premCloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.auditbeat.premInstructions.gettingStarted.title": "入门",
-    "home.tutorials.common.auditbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.auditbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.auditbeatCloudInstructions.config.debTitle": "编辑配置",
-    "home.tutorials.common.auditbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.auditbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.auditbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "home.tutorials.common.auditbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.auditbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.auditbeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "home.tutorials.common.auditbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.auditbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.auditbeatCloudInstructions.config.windowsTitle": "编辑配置",
    "home.tutorials.common.auditbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
@ -1248,16 +1244,12 @@
    "home.tutorials.common.filebeat.cloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.filebeat.premCloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.filebeat.premInstructions.gettingStarted.title": "入门",
-    "home.tutorials.common.filebeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.filebeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.filebeatCloudInstructions.config.debTitle": "编辑配置",
-    "home.tutorials.common.filebeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.filebeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.filebeatCloudInstructions.config.osxTitle": "编辑配置",
-    "home.tutorials.common.filebeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.filebeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.filebeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "home.tutorials.common.filebeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.filebeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.filebeatCloudInstructions.config.windowsTitle": "编辑配置",
    "home.tutorials.common.filebeatEnableInstructions.debTextPost": "在 `/etc/filebeat/modules.d/{moduleName}.yml` 文件中修改设置。",
@ -1312,10 +1304,8 @@
    "home.tutorials.common.functionbeatAWSInstructions.textPost": "其中 `<your-access-key>` 和 `<your-secret-access-key>` 是您的帐户凭据，`us-east-1` 是所需的地区。",
    "home.tutorials.common.functionbeatAWSInstructions.textPre": "在环境中设置您的 AWS 帐户凭据：",
    "home.tutorials.common.functionbeatAWSInstructions.title": "设置 AWS 凭据",
-    "home.tutorials.common.functionbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.functionbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.functionbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "home.tutorials.common.functionbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.functionbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.functionbeatCloudInstructions.config.windowsTitle": "编辑配置",
    "home.tutorials.common.functionbeatEnableOnPremInstructions.defaultTextPost": "其中 `<cloudwatch-log-group>` 是要采集的日志组名称，`<unique-bucket-name>` 是将用于暂存 Functionbeat 部署的有效 S3 存储桶名称。",
@ -1346,16 +1336,12 @@
    "home.tutorials.common.heartbeat.cloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.heartbeat.premCloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.heartbeat.premInstructions.gettingStarted.title": "入门",
-    "home.tutorials.common.heartbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.heartbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.heartbeatCloudInstructions.config.debTitle": "编辑配置",
-    "home.tutorials.common.heartbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.heartbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.heartbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "home.tutorials.common.heartbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.heartbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.heartbeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "home.tutorials.common.heartbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.heartbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.heartbeatCloudInstructions.config.windowsTitle": "编辑配置",
    "home.tutorials.common.heartbeatEnableCloudInstructions.debTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
@ -1415,16 +1401,12 @@
    "home.tutorials.common.metricbeat.cloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.metricbeat.premCloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.metricbeat.premInstructions.gettingStarted.title": "入门",
-    "home.tutorials.common.metricbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.metricbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.metricbeatCloudInstructions.config.debTitle": "编辑配置",
-    "home.tutorials.common.metricbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.metricbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.metricbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "home.tutorials.common.metricbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.metricbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.metricbeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "home.tutorials.common.metricbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.metricbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.metricbeatCloudInstructions.config.windowsTitle": "编辑配置",
    "home.tutorials.common.metricbeatEnableInstructions.debTextPost": "在 `/etc/metricbeat/modules.d/{moduleName}.yml` 文件中修改设置。",
@ -1479,7 +1461,6 @@
    "home.tutorials.common.winlogbeat.cloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.winlogbeat.premCloudInstructions.gettingStarted.title": "入门",
    "home.tutorials.common.winlogbeat.premInstructions.gettingStarted.title": "入门",
-    "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
    "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
    "home.tutorials.common.winlogbeatCloudInstructions.config.windowsTitle": "编辑配置",
    "home.tutorials.common.winlogbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",