[APM] Fleet: Update "switch to datastreams" wording for apm migration (#113574)

* removing data stream in favor of Elastic agent

* fixing i18n

* addressing pr changes

* capitalization

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

x-pack/plugins/apm/public/components/app/Settings/schema/confirm_switch_modal.tsx

@@ -46,7 +46,7 @@ export function ConfirmSwitchModal({
       confirmButtonText={i18n.translate(
         'xpack.apm.settings.schema.confirm.switchButtonText',
         {
-          defaultMessage: 'Switch to data streams',
+          defaultMessage: 'Switch to Elastic Agent',
         }
       )}
       defaultFocusedButton="confirm"
@@ -78,7 +78,7 @@ export function ConfirmSwitchModal({
         title={i18n.translate(
           'xpack.apm.settings.schema.confirm.irreversibleWarning.title',
           {
-            defaultMessage: `Switching to data streams is an irreversible action`,
+            defaultMessage: `Switching to Elastic Agent is an irreversible action`,
           }
         )}
         color="warning"
@@ -132,7 +132,7 @@ export function ConfirmSwitchModal({
           label={i18n.translate(
             'xpack.apm.settings.schema.confirm.checkboxLabel',
             {
-              defaultMessage: `I confirm that I wish to switch to data streams`,
+              defaultMessage: `I confirm that I wish to switch to Elastic Agent`,
             }
           )}
           checked={isConfirmChecked}

x-pack/plugins/apm/public/components/app/Settings/schema/migration_in_progress_panel.tsx

@@ -20,7 +20,7 @@ export function MigrationInProgressPanel() {
           icon={<EuiLoadingSpinner size="xl" />}
           title={i18n.translate(
             'xpack.apm.settings.schema.migrationInProgressPanelTitle',
-            { defaultMessage: 'Switching to data streams...' }
+            { defaultMessage: 'Switching to Elastic Agent...' }
           )}
           description={i18n.translate(
             'xpack.apm.settings.schema.migrationInProgressPanelDescription',

x-pack/plugins/apm/public/components/app/Settings/schema/schema_overview.tsx

@@ -7,7 +7,6 @@
 
 import {
   EuiButton,
-  EuiCallOut,
   EuiCard,
   EuiFlexGroup,
   EuiFlexItem,
@@ -86,7 +85,7 @@ export function SchemaOverview({
                 />
               }
               title={i18n.translate('xpack.apm.settings.schema.success.title', {
-                defaultMessage: 'Data streams successfully setup!',
+                defaultMessage: 'Elastic Agent successfully setup!',
               })}
               description={i18n.translate(
                 'xpack.apm.settings.schema.success.description',
@@ -139,17 +138,17 @@ export function SchemaOverview({
         <EuiFlexItem />
         <EuiFlexItem style={{ minWidth: '250px' }}>
           <EuiCard
-            icon={<EuiIcon size="xxl" type="documents" />}
+            icon={<EuiIcon size="xxl" type="node" />}
             title={i18n.translate(
               'xpack.apm.settings.schema.migrate.classicIndices.title',
-              { defaultMessage: 'Classic APM indices' }
+              { defaultMessage: 'APM Server binary' }
             )}
             display="subdued"
             description={i18n.translate(
               'xpack.apm.settings.schema.migrate.classicIndices.description',
               {
                 defaultMessage:
-                  'You are currently using classic APM indices for your data. This data schema is going away and is being replaced by data streams in Elastic Stack version 8.0.',
+                  'You are currently using APM Server binary. This legacy option is deprecated since version 7.16 and is being replaced by a manages APM Server in Elastic Agent from version 8.0.',
               }
             )}
             footer={
@@ -168,21 +167,6 @@ export function SchemaOverview({
         </EuiFlexItem>
         <EuiFlexItem style={{ minWidth: '250px' }}>
           <EuiCard
-            betaBadgeLabel={i18n.translate(
-              'xpack.apm.settings.schema.migrate.dataStreams.betaBadge.label',
-              { defaultMessage: 'Beta' }
-            )}
-            betaBadgeTitle={i18n.translate(
-              'xpack.apm.settings.schema.migrate.dataStreams.betaBadge.title',
-              { defaultMessage: 'Data streams' }
-            )}
-            betaBadgeTooltipContent={i18n.translate(
-              'xpack.apm.settings.schema.migrate.dataStreams.betaBadge.description',
-              {
-                defaultMessage:
-                  'The switch to data streams is not GA. Please help us by reporting any bugs.',
-              }
-            )}
             image={
               <div>
                 <img src={rocketLaunchGraphic} alt="rocket launch" />
@@ -190,13 +174,13 @@ export function SchemaOverview({
             }
             title={i18n.translate(
               'xpack.apm.settings.schema.migrate.dataStreams.title',
-              { defaultMessage: 'Data streams' }
+              { defaultMessage: 'Elastic Agent' }
             )}
             description={i18n.translate(
               'xpack.apm.settings.schema.migrate.dataStreams.description',
               {
                 defaultMessage:
-                  'Going forward, any newly ingested data gets stored in data streams. Previously ingested data remains in classic APM indices. The APM and UX apps will continue to support both indices.',
+                  'Your APM Server will need to be managed by Elastic Agent from version 8.0 and onwards. You can run Elastic Agent on Cloud, ECE or self-managed and install the Elastic APM integration in order to continue ingesting APM data.',
               }
             )}
             footer={
@@ -216,7 +200,7 @@ export function SchemaOverview({
                   >
                     {i18n.translate(
                       'xpack.apm.settings.schema.migrate.dataStreams.buttonText',
-                      { defaultMessage: 'Switch to data streams' }
+                      { defaultMessage: 'Switch to Elastic Agent' }
                     )}
                   </EuiButton>
                 </EuiToolTip>
@@ -238,7 +222,7 @@ export function SchemaOverviewHeading() {
       <EuiText color="subdued">
         <FormattedMessage
           id="xpack.apm.settings.schema.descriptionText"
-          defaultMessage="We have created a simple and seamless process for switching from the classic APM indices to immediately take advantage of the new data streams features. Beware this action is {irreversibleEmphasis} and can only be performed by a {superuserEmphasis} with access to Fleet. Learn more about {dataStreamsDocLink}."
+          defaultMessage="We have created a simple and seamless process for switching from APM Server binary to Elastic Agent. Beware this action is {irreversibleEmphasis} and can only be performed by a {superuserEmphasis} with access to Fleet. Learn more about {elasticAgentDocLink}."
           values={{
             irreversibleEmphasis: (
               <strong>
@@ -256,15 +240,15 @@ export function SchemaOverviewHeading() {
                 )}
               </strong>
             ),
-            dataStreamsDocLink: (
+            elasticAgentDocLink: (
               <ElasticDocsLink
                 section="/apm/server"
                 path="/apm-integration-data-streams.html"
                 target="_blank"
               >
                 {i18n.translate(
-                  'xpack.apm.settings.schema.descriptionText.dataStreamsDocLinkText',
-                  { defaultMessage: 'data streams' }
+                  'xpack.apm.settings.schema.descriptionText.elasticAgentDocLinkText',
+                  { defaultMessage: 'Elastic Agent' }
                 )}
               </ElasticDocsLink>
             ),
@@ -272,30 +256,6 @@ export function SchemaOverviewHeading() {
         />
       </EuiText>
       <EuiSpacer size="m" />
-      <EuiFlexGroup justifyContent="center">
-        <EuiFlexItem />
-        <EuiFlexItem grow={2}>
-          <EuiCallOut
-            size="s"
-            title={i18n.translate(
-              'xpack.apm.settings.schema.descriptionText.betaCalloutTitle',
-              { defaultMessage: 'Data streams are beta in APM' }
-            )}
-            iconType="alert"
-            color="warning"
-          >
-            {i18n.translate(
-              'xpack.apm.settings.schema.descriptionText.betaCalloutMessage',
-              {
-                defaultMessage:
-                  'This functionality is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
-              }
-            )}
-          </EuiCallOut>
-        </EuiFlexItem>
-        <EuiFlexItem />
-      </EuiFlexGroup>
-      <EuiSpacer size="m" />
     </>
   );
 }
@@ -338,7 +298,7 @@ function getDisabledReason({
     return (
       <FormattedMessage
         id="xpack.apm.settings.schema.disabledReason"
-        defaultMessage="Switch to data streams is unavailable: {reasons}"
+        defaultMessage="Switch to Elastic Agent is unavailable: {reasons}"
         values={{
           reasons: (
             <ul>

x-pack/plugins/translations/translations/ja-JP.json

@@ -6762,10 +6762,6 @@
     "xpack.apm.settings.schema.confirm.title": "選択内容を確認してください",
     "xpack.apm.settings.schema.confirm.unsupportedConfigs.descriptionText": "互換性のあるカスタムapm-server.ymlユーザー設定がFleetサーバー設定に移動されます。削除する前に互換性のない設定について通知されます。",
     "xpack.apm.settings.schema.confirm.unsupportedConfigs.title": "次のapm-server.ymlユーザー設定は互換性がないため削除されます",
-    "xpack.apm.settings.schema.descriptionText": "クラシックAPMインデックスから切り替え、新しいデータストリーム機能をすぐに活用するためのシンプルでシームレスなプロセスを構築しました。このアクションは{irreversibleEmphasis}。また、Fleetへのアクセス権が付与された{superuserEmphasis}のみが実行できます。{dataStreamsDocLink}の詳細を参照してください。",
-    "xpack.apm.settings.schema.descriptionText.betaCalloutMessage": "この機能はベータ段階で、変更される可能性があります。デザインとコードはオフィシャルGA機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません。",
-    "xpack.apm.settings.schema.descriptionText.betaCalloutTitle": "APMのデータストリームはベータです",
-    "xpack.apm.settings.schema.descriptionText.dataStreamsDocLinkText": "データストリーム",
     "xpack.apm.settings.schema.descriptionText.irreversibleEmphasisText": "元に戻せません",
     "xpack.apm.settings.schema.descriptionText.superuserEmphasisText": "スーパーユーザー",
     "xpack.apm.settings.schema.disabledReason": "データストリームへの切り替えを使用できません: {reasons}",
@@ -6775,9 +6771,6 @@
     "xpack.apm.settings.schema.migrate.classicIndices.currentSetup": "現在の設定",
     "xpack.apm.settings.schema.migrate.classicIndices.description": "現在、データのクラシックAPMインデックスを使用しています。このデータスキーマは廃止予定であり、Elastic Stackバージョン8.0でデータストリームに置換されます。",
     "xpack.apm.settings.schema.migrate.classicIndices.title": "クラシックAPMインデックス",
-    "xpack.apm.settings.schema.migrate.dataStreams.betaBadge.description": "データストリームへの切り替えはGAではありません。不具合が発生したら報告してください。",
-    "xpack.apm.settings.schema.migrate.dataStreams.betaBadge.label": "ベータ",
-    "xpack.apm.settings.schema.migrate.dataStreams.betaBadge.title": "データストリーム",
     "xpack.apm.settings.schema.migrate.dataStreams.buttonText": "データストリームに切り替える",
     "xpack.apm.settings.schema.migrate.dataStreams.description": "今後、新しく取り込まれたデータはすべてデータストリームに格納されます。以前に取り込まれたデータはクラシックAPMインデックスに残ります。APMおよびUXアプリは引き続き両方のインデックスをサポートします。",
     "xpack.apm.settings.schema.migrate.dataStreams.title": "データストリーム",

x-pack/plugins/translations/translations/zh-CN.json

@@ -6815,10 +6815,6 @@
     "xpack.apm.settings.schema.confirm.title": "请确认您的选择",
     "xpack.apm.settings.schema.confirm.unsupportedConfigs.descriptionText": "系统会替您将兼容的定制 apm-server.yml 用户设置移到 Fleet 服务器设置。我们将会让您了解哪些设置不兼容后，才会移除它们。",
     "xpack.apm.settings.schema.confirm.unsupportedConfigs.title": "以下 apm-server.yml 用户设置不兼容，将会被移除",
-    "xpack.apm.settings.schema.descriptionText": "从经典 APM 索引切换是简单且无缝的过程，让您可以立即利用新的数据流功能。注意，此操作{irreversibleEmphasis}，且只能由对 Fleet 具有访问权限的{superuserEmphasis}执行。详细了解{dataStreamsDocLink}。",
-    "xpack.apm.settings.schema.descriptionText.betaCalloutMessage": "此功能为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束。",
-    "xpack.apm.settings.schema.descriptionText.betaCalloutTitle": "数据流在 APM 中为公测版",
-    "xpack.apm.settings.schema.descriptionText.dataStreamsDocLinkText": "数据流",
     "xpack.apm.settings.schema.descriptionText.irreversibleEmphasisText": "不可逆",
     "xpack.apm.settings.schema.descriptionText.superuserEmphasisText": "超级用户",
     "xpack.apm.settings.schema.disabledReason": "无法切换到数据流：{reasons}",
@@ -6828,9 +6824,6 @@
     "xpack.apm.settings.schema.migrate.classicIndices.currentSetup": "当前设置",
     "xpack.apm.settings.schema.migrate.classicIndices.description": "您当前正将经典 APM 索引用于您的数据。此数据架构将退役，将在 Elastic Stack 版本 8.0 中由数据流替代。",
     "xpack.apm.settings.schema.migrate.classicIndices.title": "经典 APM 索引",
-    "xpack.apm.settings.schema.migrate.dataStreams.betaBadge.description": "切换到数据流尚未正式发布。请通过报告错误来帮助我们。",
-    "xpack.apm.settings.schema.migrate.dataStreams.betaBadge.label": "公测版",
-    "xpack.apm.settings.schema.migrate.dataStreams.betaBadge.title": "数据流",
     "xpack.apm.settings.schema.migrate.dataStreams.buttonText": "切换到数据流",
     "xpack.apm.settings.schema.migrate.dataStreams.description": "将来，任何新采集的数据都将存储在数据流中。之前采集的数据仍在经典 APM 索引中。APM 和 UX 应用将继续支持这两种索引。",
     "xpack.apm.settings.schema.migrate.dataStreams.title": "数据流",