From d4a9e7b7cb66b707a583b2a60fb537a81ad3c80d Mon Sep 17 00:00:00 2001
From: Liam Thompson <32779855+leemthompo@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:07:40 +0200
Subject: [PATCH] [Search] Update connectors doc links & find/replace terms
 (#194423)

## Summary

- Update doc links now that connectors live in the Elasticsearch guide
- Update terms:
  - Native connectors -> _Elastic managed connectors_
  - Connector clients -> _Self-managed connectors_

(cherry picked from commit ddab54f0a830106b47ca23d57caeeadb6a8898e7)
---
 packages/kbn-doc-links/src/get_doc_links.ts   | 70 +++++++++----------
 .../connector_configuration.tsx               |  4 +-
 .../native_connector_configuration.tsx        |  6 +-
 .../components/connector_detail/overview.tsx  |  7 +-
 .../components/connectors/connectors.tsx      |  4 +-
 .../select_connector/connector_checkable.tsx  |  6 +-
 .../connector_description_badge_popout.tsx    |  4 +-
 .../select_connector/native_popover.tsx       |  2 +-
 .../select_connector/select_connector.tsx     | 19 ++---
 .../new_index/new_search_index_page.tsx       |  4 +-
 .../connector/api_key_configuration.tsx       |  2 +-
 .../convert_connector.tsx                     | 15 ++--
 .../components/search_index/overview.tsx      |  2 +-
 .../search_indices/indices_table.tsx          |  2 +-
 .../convert_connector_modal.tsx               |  2 +-
 .../platinum_license_popover.tsx              | 10 ++-
 .../applications/shared/constants/labels.ts   |  4 +-
 .../connector_config/connector_index_name.tsx |  2 +-
 .../components/connectors_callout.tsx         |  2 +-
 19 files changed, 91 insertions(+), 76 deletions(-)

diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
index f7a239e359eb9..658f891b6d07e 100644
--- a/packages/kbn-doc-links/src/get_doc_links.ts
+++ b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -160,39 +160,39 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       buildConnector: `${ENTERPRISE_SEARCH_DOCS}build-connector.html`,
       bulkApi: `${ELASTICSEARCH_DOCS}docs-bulk.html`,
       configuration: `${ENTERPRISE_SEARCH_DOCS}configuration.html`,
-      connectors: `${ENTERPRISE_SEARCH_DOCS}connectors.html`,
-      connectorsClientDeploy: `${ENTERPRISE_SEARCH_DOCS}deploy-connector-client.html`,
-      connectorsMappings: `${ENTERPRISE_SEARCH_DOCS}connectors-usage.html#connectors-usage-index-create-configure-existing-index`,
-      connectorsAzureBlobStorage: `${ENTERPRISE_SEARCH_DOCS}connectors-azure-blob.html`,
-      connectorsBox: `${ENTERPRISE_SEARCH_DOCS}connectors-box.html`,
-      connectorsClients: `${ENTERPRISE_SEARCH_DOCS}connectors.html#connectors-build`,
-      connectorsConfluence: `${ENTERPRISE_SEARCH_DOCS}connectors-confluence.html`,
-      connectorsDropbox: `${ENTERPRISE_SEARCH_DOCS}connectors-dropbox.html`,
-      connectorsContentExtraction: `${ENTERPRISE_SEARCH_DOCS}connectors-content-extraction.html`,
-      connectorsGithub: `${ENTERPRISE_SEARCH_DOCS}connectors-github.html`,
-      connectorsGmail: `${ENTERPRISE_SEARCH_DOCS}connectors-gmail.html`,
-      connectorsGoogleCloudStorage: `${ENTERPRISE_SEARCH_DOCS}connectors-google-cloud.html`,
-      connectorsGoogleDrive: `${ENTERPRISE_SEARCH_DOCS}connectors-google-drive.html`,
-      connectorsJira: `${ENTERPRISE_SEARCH_DOCS}connectors-jira.html`,
-      connectorsMicrosoftSQL: `${ENTERPRISE_SEARCH_DOCS}connectors-ms-sql.html`,
-      connectorsMongoDB: `${ENTERPRISE_SEARCH_DOCS}connectors-mongodb.html`,
-      connectorsMySQL: `${ENTERPRISE_SEARCH_DOCS}connectors-mysql.html`,
-      connectorsNative: `${ENTERPRISE_SEARCH_DOCS}connectors.html#connectors-native`,
-      connectorsNetworkDrive: `${ENTERPRISE_SEARCH_DOCS}connectors-network-drive.html`,
-      connectorsNotion: `${ENTERPRISE_SEARCH_DOCS}connectors-notion.html`,
-      connectorsOneDrive: `${ENTERPRISE_SEARCH_DOCS}connectors-onedrive.html`,
-      connectorsOracle: `${ENTERPRISE_SEARCH_DOCS}connectors-oracle.html`,
-      connectorsOutlook: `${ENTERPRISE_SEARCH_DOCS}connectors-outlook.html`,
-      connectorsPostgreSQL: `${ENTERPRISE_SEARCH_DOCS}connectors-postgresql.html`,
-      connectorsRedis: `${ENTERPRISE_SEARCH_DOCS}connectors-redis.html`,
-      connectorsS3: `${ENTERPRISE_SEARCH_DOCS}connectors-s3.html`,
-      connectorsSalesforce: `${ENTERPRISE_SEARCH_DOCS}connectors-salesforce.html`,
-      connectorsServiceNow: `${ENTERPRISE_SEARCH_DOCS}connectors-servicenow.html`,
-      connectorsSharepoint: `${ENTERPRISE_SEARCH_DOCS}connectors-sharepoint.html`,
-      connectorsSharepointOnline: `${ENTERPRISE_SEARCH_DOCS}connectors-sharepoint-online.html`,
-      connectorsSlack: `${ENTERPRISE_SEARCH_DOCS}connectors-slack.html`,
-      connectorsTeams: `${ENTERPRISE_SEARCH_DOCS}connectors-teams.html`,
-      connectorsZoom: `${ENTERPRISE_SEARCH_DOCS}connectors-zoom.html`,
+      connectors: `${ELASTICSEARCH_DOCS}es-connectors.html`,
+      connectorsClientDeploy: `${ELASTICSEARCH_DOCS}es-build-connector.html#es-connectors-deploy-connector-service`,
+      connectorsMappings: `${ELASTICSEARCH_DOCS}es-connectors-usage.html#es-connectors-usage-index-create-configure-existing-index`,
+      connectorsAzureBlobStorage: `${ELASTICSEARCH_DOCS}es-connectors-azure-blob.html`,
+      connectorsBox: `${ELASTICSEARCH_DOCS}es-connectors-box.html`,
+      connectorsClients: `${ELASTICSEARCH_DOCS}es-connectors.html#es-connectors-build`,
+      connectorsConfluence: `${ELASTICSEARCH_DOCS}es-connectors-confluence.html`,
+      connectorsDropbox: `${ELASTICSEARCH_DOCS}es-connectors-dropbox.html`,
+      connectorsContentExtraction: `${ELASTICSEARCH_DOCS}es-connectors-content-extraction.html`,
+      connectorsGithub: `${ELASTICSEARCH_DOCS}es-connectors-github.html`,
+      connectorsGmail: `${ELASTICSEARCH_DOCS}es-connectors-gmail.html`,
+      connectorsGoogleCloudStorage: `${ELASTICSEARCH_DOCS}es-connectors-google-cloud.html`,
+      connectorsGoogleDrive: `${ELASTICSEARCH_DOCS}es-connectors-google-drive.html`,
+      connectorsJira: `${ELASTICSEARCH_DOCS}es-connectors-jira.html`,
+      connectorsMicrosoftSQL: `${ELASTICSEARCH_DOCS}es-connectors-ms-sql.html`,
+      connectorsMongoDB: `${ELASTICSEARCH_DOCS}es-connectors-mongodb.html`,
+      connectorsMySQL: `${ELASTICSEARCH_DOCS}es-connectors-mysql.html`,
+      connectorsNative: `${ELASTICSEARCH_DOCS}es-connectors.html#es-connectors-native`,
+      connectorsNetworkDrive: `${ELASTICSEARCH_DOCS}es-connectors-network-drive.html`,
+      connectorsNotion: `${ELASTICSEARCH_DOCS}es-connectors-notion.html`,
+      connectorsOneDrive: `${ELASTICSEARCH_DOCS}es-connectors-onedrive.html`,
+      connectorsOracle: `${ELASTICSEARCH_DOCS}es-connectors-oracle.html`,
+      connectorsOutlook: `${ELASTICSEARCH_DOCS}es-connectors-outlook.html`,
+      connectorsPostgreSQL: `${ELASTICSEARCH_DOCS}es-connectors-postgresql.html`,
+      connectorsRedis: `${ELASTICSEARCH_DOCS}es-connectors-redis.html`,
+      connectorsS3: `${ELASTICSEARCH_DOCS}es-connectors-s3.html`,
+      connectorsSalesforce: `${ELASTICSEARCH_DOCS}es-connectors-salesforce.html`,
+      connectorsServiceNow: `${ELASTICSEARCH_DOCS}es-connectors-servicenow.html`,
+      connectorsSharepoint: `${ELASTICSEARCH_DOCS}es-connectors-sharepoint.html`,
+      connectorsSharepointOnline: `${ELASTICSEARCH_DOCS}es-connectors-sharepoint-online.html`,
+      connectorsSlack: `${ELASTICSEARCH_DOCS}es-connectors-slack.html`,
+      connectorsTeams: `${ELASTICSEARCH_DOCS}es-connectors-teams.html`,
+      connectorsZoom: `${ELASTICSEARCH_DOCS}es-connectors-zoom.html`,
       crawlerExtractionRules: `${ENTERPRISE_SEARCH_DOCS}crawler-extraction-rules.html`,
       crawlerManaging: `${ENTERPRISE_SEARCH_DOCS}crawler-managing.html`,
       crawlerOverview: `${ENTERPRISE_SEARCH_DOCS}crawler.html`,
@@ -224,8 +224,8 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       semanticTextField: `${ELASTICSEARCH_DOCS}semantic-text.html`,
       start: `${ENTERPRISE_SEARCH_DOCS}start.html`,
       supportedNlpModels: `${MACHINE_LEARNING_DOCS}ml-nlp-model-ref.html`,
-      syncRules: `${ENTERPRISE_SEARCH_DOCS}sync-rules.html`,
-      syncRulesAdvanced: `${ENTERPRISE_SEARCH_DOCS}sync-rules.html#sync-rules-advanced`,
+      syncRules: `${ELASTICSEARCH_DOCS}es-sync-rules.html`,
+      syncRulesAdvanced: `${ELASTICSEARCH_DOCS}es-sync-rules.html#es-sync-rules-advanced`,
       trainedModels: `${MACHINE_LEARNING_DOCS}ml-trained-models.html`,
       textEmbedding: `${MACHINE_LEARNING_DOCS}ml-nlp-model-ref.html#ml-nlp-model-ref-text-embedding`,
       troubleshootSetup: `${ENTERPRISE_SEARCH_DOCS}troubleshoot-setup.html`,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
index e0aa934f17954..fe8039b811f33 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
@@ -109,11 +109,11 @@ export const ConnectorConfiguration: React.FC = () => {
                 {connector.is_native
                   ? i18n.translate(
                       'xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.nativeConnector',
-                      { defaultMessage: 'Native connector' }
+                      { defaultMessage: 'Elastic managed connector' }
                     )
                   : i18n.translate(
                       'xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.connectorClient',
-                      { defaultMessage: 'Connector client' }
+                      { defaultMessage: 'Self-managed connector' }
                     )}
               </EuiBadge>
             </EuiFlexItem>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
index fac70afd156d2..29a54c913301a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
@@ -105,11 +105,11 @@ export const NativeConnectorConfiguration: React.FC = () => {
                 {connector.is_native
                   ? i18n.translate(
                       'xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.nativeConnector',
-                      { defaultMessage: 'Native connector' }
+                      { defaultMessage: 'Elastic managed connector' }
                     )
                   : i18n.translate(
                       'xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.connectorClient',
-                      { defaultMessage: 'Connector client' }
+                      { defaultMessage: 'Self-managed connector' }
                     )}
               </EuiBadge>
             </EuiFlexItem>
@@ -132,7 +132,7 @@ export const NativeConnectorConfiguration: React.FC = () => {
                     'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.text',
                     {
                       defaultMessage:
-                        'Native connectors require a running Enterprise Search instance to sync content from source.',
+                        'Elastic managed connectors require a running Enterprise Search instance.',
                     }
                   )}
                 </p>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx
index 7e5b5cf61b475..906c64ccae8e2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx
@@ -167,7 +167,8 @@ export const ConnectorDetailOverview: React.FC = () => {
             title={i18n.translate(
               'xpack.enterpriseSearch.content.connectors.overview.nativeCloudCallout.title',
               {
-                defaultMessage: 'Native connectors are no longer supported outside Elastic Cloud',
+                defaultMessage:
+                  'Elastic managed connectors (formerly native connectors) are no longer supported outside Elastic Cloud',
               }
             )}
           >
@@ -176,7 +177,7 @@ export const ConnectorDetailOverview: React.FC = () => {
               <p>
                 <FormattedMessage
                   id="xpack.enterpriseSearch.content.connectors.overview.nativeCloudCallout.content"
-                  defaultMessage="Convert it to a {link}, to be self-managed on your own infrastructure. Native connectors are available only in your Elastic Cloud deployment."
+                  defaultMessage="Convert it to a {link}, to be self-hosted on your own infrastructure. Elastic managed connectors are available only in your Elastic Cloud deployment."
                   values={{
                     link: (
                       <EuiLink
@@ -187,7 +188,7 @@ export const ConnectorDetailOverview: React.FC = () => {
                       >
                         {i18n.translate(
                           'xpack.enterpriseSearch.content.connectors.overview.nativeCloudCallout.connectorClient',
-                          { defaultMessage: 'connector client' }
+                          { defaultMessage: 'self-managed connector' }
                         )}
                       </EuiLink>
                     ),
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/connectors.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/connectors.tsx
index eab42df85cc2f..a29f6c540b7ce 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/connectors.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/connectors.tsx
@@ -160,7 +160,7 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
                             {i18n.translate(
                               'xpack.enterpriseSearch.connectors.newNativeConnectorButtonLabel',
                               {
-                                defaultMessage: 'New Native Connector',
+                                defaultMessage: 'New Elastic managed Connector',
                               }
                             )}
                           </EuiContextMenuItem>,
@@ -176,7 +176,7 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
                           >
                             {i18n.translate(
                               'xpack.enterpriseSearch.connectors.newConnectorsClientButtonLabel',
-                              { defaultMessage: 'New Connector Client' }
+                              { defaultMessage: 'New Self-managed Connector' }
                             )}
                           </EuiContextMenuItem>,
                         ]}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_checkable.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_checkable.tsx
index 2a1f00a6396df..d92718ac1c64e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_checkable.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_checkable.tsx
@@ -159,7 +159,7 @@ export const ConnectorCheckable: React.FC<ConnectorCheckableProps> = ({
                                 'xpack.enterpriseSearch.content.newIndex.selectConnector.openNativePopoverLabel',
                                 {
                                   defaultMessage:
-                                    'Open popover with information about native connectors',
+                                    'Open popover with information about Elastic managed connectors',
                                 }
                               )}
                               iconType="questionInCircle"
@@ -220,7 +220,7 @@ export const ConnectorCheckable: React.FC<ConnectorCheckableProps> = ({
                           >
                             {i18n.translate(
                               'xpack.enterpriseSearch.connectorCheckable.setupANativeConnectorContextMenuItemLabel',
-                              { defaultMessage: 'Setup a Native Connector' }
+                              { defaultMessage: 'Set up an Elastic managed connector' }
                             )}
                           </EuiContextMenuItem>,
                           <EuiSpacer key="spacer" size="s" />,
@@ -233,7 +233,7 @@ export const ConnectorCheckable: React.FC<ConnectorCheckableProps> = ({
                           >
                             {i18n.translate(
                               'xpack.enterpriseSearch.connectorCheckable.setupAConnectorClientContextMenuItemLabel',
-                              { defaultMessage: 'Setup a Connector Client' }
+                              { defaultMessage: 'Set up a self-managed connector' }
                             )}
                           </EuiContextMenuItem>,
                         ]}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_description_badge_popout.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_description_badge_popout.tsx
index f4af323ab034d..4063a4a75266d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_description_badge_popout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/connector_description_badge_popout.tsx
@@ -105,10 +105,10 @@ export const ConnectorDescriptionBadge: React.FC<ConnectorDescriptionBadgeProps>
         >
           {isNative
             ? i18n.translate('xpack.enterpriseSearch.selectConnector.nativeBadgeLabel', {
-                defaultMessage: 'Native',
+                defaultMessage: 'Elastic managed',
               })
             : i18n.translate('xpack.enterpriseSearch.selectConnector.connectorClientBadgeLabel', {
-                defaultMessage: 'Connector client',
+                defaultMessage: 'Self-managed',
               })}
         </EuiBadge>
       }
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/native_popover.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/native_popover.tsx
index 226d4a96c6978..9e940cc31289f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/native_popover.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/native_popover.tsx
@@ -64,7 +64,7 @@ export const NativePopover: React.FC<NativePopoverProps> = ({
             'xpack.enterpriseSearch.content.newIndex.selectConnectore.nativePopover.description',
             {
               defaultMessage:
-                'Native connectors are hosted on Elastic Cloud. Get started with a free 14-day trial.',
+                'Elastic managed connectors are hosted on Elastic Cloud. Get started with a free 14-day trial.',
             }
           )}
         </p>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/select_connector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/select_connector.tsx
index f569d3c5cff2a..01d7136a65ecb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/select_connector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/select_connector/select_connector.tsx
@@ -118,7 +118,8 @@ export const SelectConnector: React.FC = () => {
         description: i18n.translate(
           'xpack.enterpriseSearch.content.indices.selectConnector.description',
           {
-            defaultMessage: "Choose which third-party data source you'd like to sync to Elastic.",
+            defaultMessage:
+              "Select which third-party data source you'd like to sync to Elastic. All data sources are supported by self-managed connectors. Check the availability for Elastic managed connectors by using the filters.",
           }
         ),
         pageTitle: i18n.translate('xpack.enterpriseSearch.content.indices.selectConnector.title', {
@@ -161,7 +162,7 @@ export const SelectConnector: React.FC = () => {
                     {i18n.translate(
                       'xpack.enterpriseSearch.content.indices.selectConnector.nativeLabel',
                       {
-                        defaultMessage: 'Native connectors',
+                        defaultMessage: 'Elastic managed',
                       }
                     )}
                   </EuiFacetButton>
@@ -177,7 +178,7 @@ export const SelectConnector: React.FC = () => {
                   {i18n.translate(
                     'xpack.enterpriseSearch.content.indices.selectConnector.connectorClients',
                     {
-                      defaultMessage: 'Connector clients',
+                      defaultMessage: 'Self-managed',
                     }
                   )}
                 </EuiFacetButton>
@@ -193,7 +194,7 @@ export const SelectConnector: React.FC = () => {
                     {i18n.translate(
                       'xpack.enterpriseSearch.content.indices.selectConnector.nativeLabel',
                       {
-                        defaultMessage: 'Native connectors',
+                        defaultMessage: 'Elastic managed',
                       }
                     )}
                   </EuiFacetButton>
@@ -234,7 +235,7 @@ export const SelectConnector: React.FC = () => {
                       <h4>
                         {i18n.translate(
                           'xpack.enterpriseSearch.selectConnector.nativeConnectorsTitleLabel',
-                          { defaultMessage: 'Native connectors' }
+                          { defaultMessage: 'Elastic managed connectors' }
                         )}
                       </h4>
                     </EuiTitle>
@@ -249,7 +250,7 @@ export const SelectConnector: React.FC = () => {
                       'xpack.enterpriseSearch.selectConnector.p.areAvailableDirectlyWithinLabel',
                       {
                         defaultMessage:
-                          'Available directly within Elastic Cloud deployments. No additional infrastructure is required. You can also convert native connectors to self-hosted connector clients.',
+                          'Available directly within Elastic Cloud deployments. No additional infrastructure is required. You can also convert Elastic managed connectors to self-managed connectors.',
                       }
                     )}
                   </p>
@@ -268,7 +269,7 @@ export const SelectConnector: React.FC = () => {
                       <h4>
                         {i18n.translate(
                           'xpack.enterpriseSearch.selectConnector.h4.connectorClientsLabel',
-                          { defaultMessage: 'Connector clients' }
+                          { defaultMessage: 'Self-managed connectors' }
                         )}
                       </h4>
                     </EuiTitle>
@@ -283,7 +284,7 @@ export const SelectConnector: React.FC = () => {
                       'xpack.enterpriseSearch.selectConnector.p.deployConnectorsOnYourLabel',
                       {
                         defaultMessage:
-                          'Deploy connectors on your own infrastructure. You can also customize existing connector clients, or build your own using our connector framework.',
+                          'Deploy connectors on your own infrastructure. You can also customize existing self-managed connectors, or build your own using our connector framework.',
                       }
                     )}
                   </p>
@@ -363,7 +364,7 @@ export const SelectConnector: React.FC = () => {
                 <p>
                   <FormattedMessage
                     id="xpack.enterpriseSearch.content.indices.selectConnector.cloudCallout.description"
-                    defaultMessage="Native connectors are hosted on Elastic Cloud. Get started with a free 14-day trial."
+                    defaultMessage="Elastic managed connectors are hosted on Elastic Cloud. Get started with a free 14-day trial."
                   />
                 </p>
                 <EuiButton
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
index 56ce81695c0af..1b2889301d6a9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
@@ -152,7 +152,7 @@ const getConnectorModeBadge = (isNative?: boolean) => {
       <EuiBadge iconSide="right">
         <FormattedMessage
           id="xpack.enterpriseSearch.getConnectorTypeBadge.nativeBadgeLabel"
-          defaultMessage="Native connector"
+          defaultMessage="Elastic managed connector"
         />
       </EuiBadge>
     );
@@ -161,7 +161,7 @@ const getConnectorModeBadge = (isNative?: boolean) => {
     return (
       <EuiBadge iconSide="right">
         {i18n.translate('xpack.enterpriseSearch.getConnectorTypeBadge.connectorClientBadgeLabel', {
-          defaultMessage: 'Connector client',
+          defaultMessage: 'Self-managed',
         })}
       </EuiBadge>
     );
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/api_key_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/api_key_configuration.tsx
index 29655218034dd..f6d59a7c25dd7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/api_key_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/api_key_configuration.tsx
@@ -103,7 +103,7 @@ export const ApiKeyConfig: React.FC<{
             ? i18n.translate(
                 'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.apiKey.description',
                 {
-                  defaultMessage: `This native connector's API key {apiKeyName} is managed internally by Elasticsearch. The connector uses this API key to index documents into the {indexName} index. To refresh your API key, click "Generate API key".`,
+                  defaultMessage: `This Elastic managed connector's API key {apiKeyName} is managed internally by Elasticsearch. The connector uses this API key to index documents into the {indexName} index. To refresh your API key, click "Generate API key".`,
                   values: {
                     apiKeyName: `${indexName}-connector`,
                     indexName,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx
index 5b1478086aadb..a4aa192491452 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx
@@ -53,20 +53,27 @@ export const ConvertConnector: React.FC = () => {
       <EuiText size="s">
         <FormattedMessage
           id="xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.description"
-          defaultMessage="Want to self-host this native connector? Convert it to a {link}, to be self-managed on your own infrastructure. You'll need to convert this connector if you want to customize the code using our Python framework."
+          defaultMessage="Want to self-host this connector? Convert it to a {link}, to be managed on your own infrastructure. You'll need to convert this connector if you want to customize the code using our Python framework."
           values={{
             link: (
-              <EuiLink href={docLinks.buildConnector} target="_blank">
+              <EuiLink
+                data-test-subj="enterpriseSearchConvertConnectorSelfManagedConnectorLink"
+                href={docLinks.buildConnector}
+                target="_blank"
+              >
                 {i18n.translate(
                   'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.linkTitle',
-                  { defaultMessage: 'connector client' }
+                  { defaultMessage: 'self-managed connector' }
                 )}
               </EuiLink>
             ),
           }}
         />
         <EuiSpacer size="l" />
-        <EuiButton onClick={() => showModal()}>
+        <EuiButton
+          data-test-subj="enterpriseSearchConvertConnectorConvertConnectorButton"
+          onClick={() => showModal()}
+        >
           {i18n.translate(
             'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.buttonTitle',
             { defaultMessage: 'Convert connector' }
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/overview.tsx
index 2baf9bb2b530c..80021c5c20c00 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/overview.tsx
@@ -88,7 +88,7 @@ export const SearchIndexOverview: React.FC = () => {
                       >
                         {i18n.translate(
                           'xpack.enterpriseSearch.content.searchIndex.nativeCloudCallout.connectorClient',
-                          { defaultMessage: 'connector client' }
+                          { defaultMessage: 'self-managed connector' }
                         )}
                       </EuiLink>
                     ),
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/indices_table.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/indices_table.tsx
index 244e4a48eca54..4e34ffde4922b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/indices_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/indices_table.tsx
@@ -120,7 +120,7 @@ export const IndicesTable: React.FC<IndicesTableProps> = ({
             ? i18n.translate(
                 'xpack.enterpriseSearch.content.searchIndices.ingestionmethod.nativeConnector',
                 {
-                  defaultMessage: 'Native connector',
+                  defaultMessage: 'Elastic managed connector',
                 }
               )
             : ingestionMethodToText(index.ingestionMethod)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/convert_connector_modal/convert_connector_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/convert_connector_modal/convert_connector_modal.tsx
index c05b155e38b2e..35e348df1334c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/convert_connector_modal/convert_connector_modal.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/convert_connector_modal/convert_connector_modal.tsx
@@ -46,7 +46,7 @@ export const ConvertConnectorModal: React.FC = () => {
             'xpack.enterpriseSearch.searchApplications.searchApplication.indices.convertIndexConfirm.description',
             {
               defaultMessage:
-                "Once you convert a native connector to a self-managed connector client this can't be undone.",
+                "Converting an Elastic managed connector to a self-managed connector can't be undone.",
             }
           )}
         </p>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/platinum_license_popover/platinum_license_popover.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/platinum_license_popover/platinum_license_popover.tsx
index acb6f69e60406..154f5d7a16afe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/platinum_license_popover/platinum_license_popover.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/platinum_license_popover/platinum_license_popover.tsx
@@ -64,7 +64,7 @@ export const PlatinumLicensePopover: React.FC<PlatinumLicensePopoverProps> = ({
             'xpack.enterpriseSearch.content.newIndex.selectConnector.upgradeContent',
             {
               defaultMessage:
-                'Connector clients sending data to a self-managed Elasticsearch instance require at least a Platinum license.',
+                'Self-managed connectors sending data to a self-managed Elasticsearch instance require at least a Platinum license.',
             }
           )}
         </p>
@@ -72,7 +72,12 @@ export const PlatinumLicensePopover: React.FC<PlatinumLicensePopoverProps> = ({
       <EuiPopoverFooter>
         <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
           <EuiFlexItem grow={false}>
-            <EuiButton iconType="popout" target="_blank" href={docLinks.licenseManagement}>
+            <EuiButton
+              data-test-subj="enterpriseSearchPlatinumLicensePopoverSubscriptionPlansButton"
+              iconType="popout"
+              target="_blank"
+              href={docLinks.licenseManagement}
+            >
               {i18n.translate(
                 'xpack.enterpriseSearch.content.newIndex.selectConnector.subscriptionButtonLabel',
                 {
@@ -83,6 +88,7 @@ export const PlatinumLicensePopover: React.FC<PlatinumLicensePopoverProps> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
+              data-test-subj="enterpriseSearchPlatinumLicensePopoverManageLicenseButton"
               iconType="wrench"
               iconSide="right"
               onClick={() =>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts b/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts
index 33db1e29e5161..f1da7cefa5cc0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/constants/labels.ts
@@ -28,7 +28,7 @@ export const BETA_LABEL = i18n.translate('xpack.enterpriseSearch.betaLabel', {
 });
 
 export const NATIVE_LABEL = i18n.translate('xpack.enterpriseSearch.nativeLabel', {
-  defaultMessage: 'Native',
+  defaultMessage: 'Elastic managed',
 });
 
 export const NAME_LABEL = i18n.translate('xpack.enterpriseSearch.nameLabel', {
@@ -50,7 +50,7 @@ export const LEARN_MORE_LINK = i18n.translate('xpack.enterpriseSearch.learnMore.
 export const CONNECTOR_CLIENT_LABEL = i18n.translate(
   'xpack.enterpriseSearch.connectorClientLabel',
   {
-    defaultMessage: 'Connector Client',
+    defaultMessage: 'Self-managed',
   }
 );
 
diff --git a/x-pack/plugins/serverless_search/public/application/components/connectors/connector_config/connector_index_name.tsx b/x-pack/plugins/serverless_search/public/application/components/connectors/connector_config/connector_index_name.tsx
index 6282b02d7968a..a421af47a0a79 100644
--- a/x-pack/plugins/serverless_search/public/application/components/connectors/connector_config/connector_index_name.tsx
+++ b/x-pack/plugins/serverless_search/public/application/components/connectors/connector_config/connector_index_name.tsx
@@ -108,7 +108,7 @@ export const ConnectorIndexName: React.FC<ConnectorIndexNameProps> = ({ connecto
               <p>
                 <FormattedMessage
                   id="xpack.serverlessSearch.connectors.config.preprocessData.description"
-                  defaultMessage="Use ingest pipelines to preprocess data before indexing into Elasticsearch. Note that connector clients use the {clientIngestionPipeline} pipeline for preprocessing."
+                  defaultMessage="Use ingest pipelines to preprocess data before indexing into Elasticsearch. Note that self-managed connectors use the {clientIngestionPipeline} pipeline for preprocessing."
                   values={{
                     clientIngestionPipeline: <EuiCode>{DEFAULT_INGESTION_PIPELINE}</EuiCode>,
                   }}
diff --git a/x-pack/plugins/serverless_search/public/application/components/connectors_callout.tsx b/x-pack/plugins/serverless_search/public/application/components/connectors_callout.tsx
index fd23316c6e4d4..52fb878d4b619 100644
--- a/x-pack/plugins/serverless_search/public/application/components/connectors_callout.tsx
+++ b/x-pack/plugins/serverless_search/public/application/components/connectors_callout.tsx
@@ -16,7 +16,7 @@ export const ConnectorsCallout = () => {
   return (
     <EuiCallOut
       title={i18n.translate('xpack.serverlessSearch.selectClient.connectorsCallout.title', {
-        defaultMessage: 'Sync your data with a connector client',
+        defaultMessage: 'Sync your data with a self-managed connector',
       })}
       size="s"
       iconType="iInCircle"