From a4d3c0203f70cc777c35172ba622d1781708773a Mon Sep 17 00:00:00 2001
From: Sander Philipse <94373878+sphilipse@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:14:07 +0200
Subject: [PATCH] [Enterprise Search] Update connectors for 8.10 (#162909)

## Summary

This adds native connectors, updates existing connectors, and rebrands
the Enterprise Search tag to Search in the Integrations page.
---
 .../custom_integrations/common/index.ts       |   3 +-
 .../apis/custom_integration/integrations.ts   |   2 +-
 .../common/connectors/connectors.ts           |  14 +-
 .../common/connectors/native_connectors.ts    | 209 ++++++++++++
 .../enterprise_search/server/integrations.ts  | 320 +++++++++++-------
 .../translations/translations/fr-FR.json      |   7 -
 .../translations/translations/ja-JP.json      |   7 -
 .../translations/translations/zh-CN.json      |   7 -
 8 files changed, 412 insertions(+), 157 deletions(-)

diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts
index 93d91553dcd4..570735d6e1e8 100755
--- a/src/plugins/custom_integrations/common/index.ts
+++ b/src/plugins/custom_integrations/common/index.ts
@@ -78,7 +78,6 @@ export const INTEGRATION_CATEGORY_DISPLAY: {
   web: { title: 'Web Server', parent_id: 'observability' },
   web_application_firewall: { title: 'Web Application Firewall', parent_id: 'security' },
   websphere: { title: 'WebSphere Application Server', parent_id: 'observability' },
-  workplace_search: { title: 'Workplace Search', parent_id: 'enterprise_search' },
   workplace_search_content_source: {
     title: 'Workplace Search Content Source',
     parent_id: 'enterprise_search',
@@ -120,7 +119,7 @@ export interface IntegrationCategoryCount {
 // TODO: consider i18n
 export const SHIPPER_DISPLAY = {
   beats: 'Beats',
-  enterprise_search: 'Enterprise Search',
+  enterprise_search: 'Search',
   language_clients: 'Language clients',
   other: 'Other',
   sample_data: 'Sample data',
diff --git a/test/api_integration/apis/custom_integration/integrations.ts b/test/api_integration/apis/custom_integration/integrations.ts
index a924b416f30c..67d7c8caf213 100644
--- a/test/api_integration/apis/custom_integration/integrations.ts
+++ b/test/api_integration/apis/custom_integration/integrations.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         expect(resp.body).to.be.an('array');
 
-        expect(resp.body.length).to.be(49);
+        expect(resp.body.length).to.be(50);
 
         // Test for sample data card
         expect(resp.body.findIndex((c: { id: string }) => c.id === 'sample_data_all')).to.be.above(
diff --git a/x-pack/plugins/enterprise_search/common/connectors/connectors.ts b/x-pack/plugins/enterprise_search/common/connectors/connectors.ts
index 1acdb588b2f3..1c5a3f30dcc4 100644
--- a/x-pack/plugins/enterprise_search/common/connectors/connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/connectors/connectors.ts
@@ -48,6 +48,16 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     }),
     serviceType: 'jira',
   },
+  {
+    iconPath: 'github.svg',
+    isBeta: true,
+    isNative: false,
+    keywords: ['github', 'cloud', 'connector'],
+    name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.github.name', {
+      defaultMessage: 'GitHub & GitHub Enterprise Server',
+    }),
+    serviceType: 'github',
+  },
   {
     iconPath: 'google_cloud_storage.svg',
     isBeta: true,
@@ -132,7 +142,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     iconPath: 'dropbox.svg',
     isBeta: true,
-    isNative: false,
+    isNative: true,
     isTechPreview: false,
     keywords: ['dropbox', 'connector'],
     name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.dropbox.name', {
@@ -163,7 +173,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     iconPath: 'servicenow.svg',
     isBeta: true,
-    isNative: false,
+    isNative: true,
     isTechPreview: false,
     keywords: ['servicenow', 'cloud', 'connector'],
     name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.serviceNow.name', {
diff --git a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
index 0bf427a7496e..e62457691832 100644
--- a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
@@ -418,6 +418,111 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
     }),
     serviceType: 'confluence',
   },
+  dropbox: {
+    configuration: {
+      path: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTBOX,
+        label: 'Path to fetch files/folders',
+        options: [],
+        order: 1,
+        required: false,
+        sensitive: false,
+        tooltip: 'This configurable field is ignored when Advanced Sync Rules are used.',
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '/',
+      },
+      app_key: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTBOX,
+        label: 'App key',
+        options: [],
+        order: 2,
+        placeholder: '',
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      app_secret: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTBOX,
+        label: 'App secret',
+        options: [],
+        order: 3,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      refresh_token: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTBOX,
+        label: 'Refresh token',
+        options: [],
+        order: 4,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      retry_count: {
+        default_value: 3,
+        depends_on: [],
+        display: DisplayType.NUMERIC,
+        label: 'Retries per request',
+        options: [],
+        order: 5,
+        required: false,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.INTEGER,
+        ui_restrictions: ['advanced'],
+        validations: [],
+        value: 3,
+      },
+      concurrent_downloads: {
+        default_value: 100,
+        depends_on: [],
+        display: DisplayType.NUMERIC,
+        label: 'Maximum concurrent downloads',
+        options: [],
+        order: 6,
+        required: false,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.INTEGER,
+        ui_restrictions: ['advanced'],
+        validations: [],
+        value: 100,
+      },
+    },
+    features: {
+      [FeatureName.SYNC_RULES]: {
+        advanced: { enabled: true },
+        basic: { enabled: true },
+      },
+    },
+    name: i18n.translate('xpack.enterpriseSearch.nativeConnectors.dropbox.name', {
+      defaultMessage: 'Dropbox',
+    }),
+    serviceType: 'dropbox',
+  },
   jira: {
     configuration: {
       data_source: {
@@ -1490,6 +1595,110 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
     }),
     serviceType: 'postgresql',
   },
+  servicenow: {
+    configuration: {
+      url: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTBOX,
+        label: 'Service URL',
+        options: [],
+        order: 1,
+        required: true,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: 'http://127.0.0.1:9318',
+      },
+      username: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTAREA,
+        label: 'Username',
+        options: [],
+        order: 2,
+        required: true,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      password: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTBOX,
+        label: 'Password',
+        options: [],
+        order: 3,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      services: {
+        default_value: null,
+        depends_on: [],
+        display: DisplayType.TEXTAREA,
+        label: 'Comma-separated list of services',
+        options: [],
+        order: 4,
+        required: true,
+        sensitive: false,
+        tooltip: 'List of services is ignored when Advanced Sync Rules are used.',
+        type: FieldType.LIST,
+        ui_restrictions: [],
+        validations: [],
+        value: '*',
+      },
+      retry_count: {
+        default_value: 3,
+        depends_on: [],
+        display: DisplayType.NUMERIC,
+        label: 'Retries per request',
+        options: [],
+        order: 5,
+        required: false,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.INTEGER,
+        ui_restrictions: ['advanced'],
+        validations: [],
+        value: 3,
+      },
+      concurrent_downloads: {
+        default_value: 10,
+        depends_on: [],
+        display: DisplayType.NUMERIC,
+        label: 'Maximum concurrent downloads',
+        options: [],
+        order: 6,
+        required: false,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.INTEGER,
+        ui_restrictions: ['advanced'],
+        validations: [],
+        value: 10,
+      },
+    },
+    features: {
+      [FeatureName.SYNC_RULES]: {
+        advanced: { enabled: true },
+        basic: { enabled: true },
+      },
+    },
+    name: i18n.translate('xpack.enterpriseSearch.nativeConnectors.servicenow.name', {
+      defaultMessage: 'ServiceNow',
+    }),
+    serviceType: 'servicenow',
+  },
   sharepoint_online: {
     configuration: {
       tenant_id: {
diff --git a/x-pack/plugins/enterprise_search/server/integrations.ts b/x-pack/plugins/enterprise_search/server/integrations.ts
index 10d72d235fc1..8e60b6b73ff4 100644
--- a/x-pack/plugins/enterprise_search/server/integrations.ts
+++ b/x-pack/plugins/enterprise_search/server/integrations.ts
@@ -32,7 +32,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your files and folders stored on Box with Workplace Search.',
       }
     ),
-    categories: ['enterprise_search', 'workplace_search', 'workplace_search_content_source'],
+    categories: ['enterprise_search', 'workplace_search_content_source'],
   },
   {
     id: 'gmail',
@@ -45,30 +45,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your emails managed by Gmail with Workplace Search.',
       }
     ),
-    categories: [
-      'enterprise_search',
-      'google_cloud',
-      'workplace_search',
-      'workplace_search_content_source',
-    ],
-  },
-  {
-    id: 'google_drive',
-    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveName', {
-      defaultMessage: 'Google Drive',
-    }),
-    description: i18n.translate(
-      'xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription',
-      {
-        defaultMessage: 'Search over your documents on Google Drive with Workplace Search.',
-      }
-    ),
-    categories: [
-      'enterprise_search',
-      'google_cloud',
-      'workplace_search',
-      'workplace_search_content_source',
-    ],
+    categories: ['enterprise_search', 'google_cloud', 'workplace_search_content_source'],
   },
   {
     id: 'onedrive',
@@ -81,27 +58,9 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your files stored on OneDrive with Workplace Search.',
       }
     ),
-    categories: [
-      'enterprise_search',
-      'azure',
-      'workplace_search',
-      'workplace_search_content_source',
-    ],
+    categories: ['enterprise_search', 'azure', 'workplace_search_content_source'],
     uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/one_drive',
   },
-  {
-    id: 'salesforce',
-    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName', {
-      defaultMessage: 'Salesforce',
-    }),
-    description: i18n.translate(
-      'xpack.enterpriseSearch.workplaceSearch.integrations.salesforceDescription',
-      {
-        defaultMessage: 'Search over your content on Salesforce with Workplace Search.',
-      }
-    ),
-    categories: ['enterprise_search', 'workplace_search', 'workplace_search_content_source'],
-  },
   {
     id: 'salesforce_sandbox',
     title: i18n.translate(
@@ -116,7 +75,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your content on Salesforce Sandbox with Workplace Search.',
       }
     ),
-    categories: ['enterprise_search', 'workplace_search', 'workplace_search_content_source'],
+    categories: ['enterprise_search', 'workplace_search_content_source'],
   },
   {
     id: 'slack',
@@ -129,7 +88,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your messages on Slack with Workplace Search.',
       }
     ),
-    categories: ['enterprise_search', 'workplace_search', 'workplace_search_content_source'],
+    categories: ['enterprise_search', 'workplace_search_content_source'],
   },
   {
     id: 'zendesk',
@@ -142,37 +101,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your tickets on Zendesk with Workplace Search.',
       }
     ),
-    categories: ['enterprise_search', 'workplace_search', 'workplace_search_content_source'],
-  },
-  {
-    id: 'github',
-    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.githubName', {
-      defaultMessage: 'GitHub',
-    }),
-    description: i18n.translate(
-      'xpack.enterpriseSearch.workplaceSearch.integrations.githubDescription',
-      {
-        defaultMessage: 'Search over your projects and repos on GitHub with Workplace Search.',
-      }
-    ),
-    categories: ['enterprise_search', 'workplace_search', 'content_source'],
-  },
-  {
-    id: 'github_enterprise_server',
-    title: i18n.translate(
-      'xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerName',
-      {
-        defaultMessage: 'GitHub Enterprise Server',
-      }
-    ),
-    description: i18n.translate(
-      'xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerDescription',
-      {
-        defaultMessage:
-          'Search over your projects and repos on GitHub Enterprise Server with Workplace Search.',
-      }
-    ),
-    categories: ['enterprise_search', 'workplace_search', 'content_source'],
+    categories: ['enterprise_search', 'workplace_search_content_source'],
   },
 ];
 
@@ -282,6 +211,7 @@ export const registerEnterpriseSearchIntegrations = (
         'datastore',
         'connector',
         'connector_client',
+        ...nativeSearchTag,
       ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=dropbox',
@@ -295,54 +225,83 @@ export const registerEnterpriseSearchIntegrations = (
       isBeta: false,
     });
 
-    // TODO: Review around BC 2/3 whether github is ready
+    customIntegrations.registerCustomIntegration({
+      id: 'dropbox_paper',
+      title: i18n.translate('xpack.enterpriseSearch.content.integrations.dropboxPaper', {
+        defaultMessage: 'Dropbox Paper',
+      }),
+      description: i18n.translate(
+        'xpack.enterpriseSearch.content.integrations.dropboxPaperDescription',
+        {
+          defaultMessage: 'Search over your files and folders stored on Dropbox Paper.',
+        }
+      ),
+      categories: [
+        'enterprise_search',
+        'elastic_stack',
+        'datastore',
+        'connector',
+        'connector_client',
+        ...nativeSearchTag,
+      ],
+      uiInternalPath:
+        '/app/enterprise_search/content/search_indices/new_index/connector?service_type=dropbox',
+      icons: [
+        {
+          type: 'svg',
+          src: http.basePath.prepend('/plugins/enterpriseSearch/assets/source_icons/dropbox.svg'),
+        },
+      ],
+      shipper: 'enterprise_search',
+      isBeta: false,
+    });
 
-    // customIntegrations.registerCustomIntegration({
-    //   id: 'github',
-    //   title: i18n.translate('xpack.enterpriseSearch.content.integrations.github', {
-    //     defaultMessage: 'GitHub',
-    //   }),
-    //   description: i18n.translate('xpack.enterpriseSearch.content.integrations.githubDescription', {
-    //     defaultMessage: 'Search over your projects and repos on GitHub.',
-    //   }),
-    //   categories: ['enterprise_search', 'elastic_stack', 'connector', 'connector_client'],
-    //   uiInternalPath:
-    //     '/app/enterprise_search/content/search_indices/new_index/connector?service_type=github',
-    //   icons: [
-    //     {
-    //       type: 'svg',
-    //       src: http.basePath.prepend('/plugins/enterpriseSearch/assets/source_icons/github.svg'),
-    //     },
-    //   ],
-    //   shipper: 'enterprise_search',
-    //   isBeta: false,
-    // });
+    customIntegrations.registerCustomIntegration({
+      id: 'github',
+      title: i18n.translate('xpack.enterpriseSearch.content.integrations.github', {
+        defaultMessage: 'GitHub',
+      }),
+      description: i18n.translate('xpack.enterpriseSearch.content.integrations.githubDescription', {
+        defaultMessage: 'Search over your projects and repos on GitHub.',
+      }),
+      categories: ['enterprise_search', 'elastic_stack', 'connector', 'connector_client'],
+      uiInternalPath:
+        '/app/enterprise_search/content/search_indices/new_index/connector?service_type=github',
+      icons: [
+        {
+          type: 'svg',
+          src: http.basePath.prepend('/plugins/enterpriseSearch/assets/source_icons/github.svg'),
+        },
+      ],
+      shipper: 'enterprise_search',
+      isBeta: false,
+    });
 
-    // customIntegrations.registerCustomIntegration({
-    //   id: 'github_server',
-    //   title: i18n.translate('xpack.enterpriseSearch.content.integrations.githubServer', {
-    //     defaultMessage: 'GitHub Enterprise Server',
-    //   }),
-    //   description: i18n.translate(
-    //     'xpack.enterpriseSearch.content.integrations.githubServerDescription',
-    //     {
-    //       defaultMessage: 'Search over your projects and repos on GitHub.',
-    //     }
-    //   ),
-    //   categories: ['enterprise_search', 'elastic_stack', 'connector', 'connector_client'],
-    //   uiInternalPath:
-    //     '/app/enterprise_search/content/search_indices/new_index/connector?service_type=github',
-    //   icons: [
-    //     {
-    //       type: 'svg',
-    //       src: http.basePath.prepend(
-    //         '/plugins/enterpriseSearch/assets/source_icons/github_enterprise_server.svg'
-    //       ),
-    //     },
-    //   ],
-    //   shipper: 'enterprise_search',
-    //   isBeta: false,
-    // });
+    customIntegrations.registerCustomIntegration({
+      id: 'github_server',
+      title: i18n.translate('xpack.enterpriseSearch.content.integrations.githubServer', {
+        defaultMessage: 'GitHub Enterprise Server',
+      }),
+      description: i18n.translate(
+        'xpack.enterpriseSearch.content.integrations.githubServerDescription',
+        {
+          defaultMessage: 'Search over your projects and repos on GitHub.',
+        }
+      ),
+      categories: ['enterprise_search', 'elastic_stack', 'connector', 'connector_client'],
+      uiInternalPath:
+        '/app/enterprise_search/content/search_indices/new_index/connector?service_type=github',
+      icons: [
+        {
+          type: 'svg',
+          src: http.basePath.prepend(
+            '/plugins/enterpriseSearch/assets/source_icons/github_enterprise_server.svg'
+          ),
+        },
+      ],
+      shipper: 'enterprise_search',
+      isBeta: false,
+    });
 
     customIntegrations.registerCustomIntegration({
       id: 'mongodb',
@@ -416,7 +375,7 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over data stored on custom data sources.',
         }
       ),
-      categories: ['enterprise_search', 'custom', 'elastic_stack', 'connector_client'],
+      categories: ['enterprise_search', 'custom', 'elastic_stack', 'connector', 'connector_client'],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=custom',
       icons: [
@@ -440,7 +399,15 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on PostgreSQL.',
         }
       ),
-      categories: ['enterprise_search', 'elastic_stack', 'custom', 'datastore'],
+      categories: [
+        'enterprise_search',
+        'elastic_stack',
+        'custom',
+        'datastore',
+        'connector',
+        'connector_client',
+        ...nativeSearchTag,
+      ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=postgresql',
       icons: [
@@ -466,7 +433,13 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on ServiceNow.',
         }
       ),
-      categories: ['enterprise_search', 'elastic_stack', 'connector', 'connector_client'],
+      categories: [
+        'enterprise_search',
+        'elastic_stack',
+        'connector',
+        'connector_client',
+        ...nativeSearchTag,
+      ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=service_now',
       icons: [
@@ -481,6 +454,35 @@ export const registerEnterpriseSearchIntegrations = (
       isBeta: false,
     });
 
+    customIntegrations.registerCustomIntegration({
+      id: 'salesforce',
+      title: i18n.translate('xpack.enterpriseSearch.integrations.salesforceName', {
+        defaultMessage: 'Salesforce',
+      }),
+      description: i18n.translate('xpack.enterpriseSearch.integrations.salesforceDescription', {
+        defaultMessage: 'Search over your content on Salesforce.',
+      }),
+      categories: [
+        'enterprise_search',
+        'elastic_stack',
+        'connector',
+        'connector_client',
+        ...nativeSearchTag,
+      ],
+      uiInternalPath:
+        '/app/enterprise_search/content/search_indices/new_index/connector?service_type=salesforce',
+      icons: [
+        {
+          type: 'svg',
+          src: http.basePath.prepend(
+            '/plugins/enterpriseSearch/assets/source_icons/salesforce.svg'
+          ),
+        },
+      ],
+      shipper: 'enterprise_search',
+      isBeta: false,
+    });
+
     customIntegrations.registerCustomIntegration({
       id: 'sharepoint_online',
       title: i18n.translate(
@@ -556,7 +558,14 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on Oracle.',
         }
       ),
-      categories: ['enterprise_search', 'elastic_stack', 'custom', 'datastore'],
+      categories: [
+        'enterprise_search',
+        'elastic_stack',
+        'custom',
+        'datastore',
+        'connector',
+        'connector_client',
+      ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=oracle',
       icons: [
@@ -580,7 +589,15 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on Microsoft SQL Server.',
         }
       ),
-      categories: ['enterprise_search', 'custom', 'elastic_stack', 'datastore'],
+      categories: [
+        'enterprise_search',
+        'custom',
+        'elastic_stack',
+        'datastore',
+        'connector',
+        'connector_client',
+        ...nativeSearchTag,
+      ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=mssql',
       icons: [
@@ -639,7 +656,13 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on Amazon S3.',
         }
       ),
-      categories: ['enterprise_search', 'datastore', 'elastic_stack'],
+      categories: [
+        'enterprise_search',
+        'datastore',
+        'elastic_stack',
+        'connector',
+        'connector_client',
+      ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=s3',
       icons: [
@@ -663,7 +686,7 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on Google Cloud Storage.',
         }
       ),
-      categories: ['enterprise_search', 'elastic_stack', 'custom'],
+      categories: ['enterprise_search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=google_cloud_storage',
       icons: [
@@ -678,6 +701,32 @@ export const registerEnterpriseSearchIntegrations = (
       isBeta: false,
     });
 
+    customIntegrations.registerCustomIntegration({
+      id: 'google_drive',
+      title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.googleDrive', {
+        defaultMessage: 'Google Drive',
+      }),
+      description: i18n.translate(
+        'xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription',
+        {
+          defaultMessage: 'Search over your content on Google Drive.',
+        }
+      ),
+      categories: ['enterprise_search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
+      uiInternalPath:
+        '/app/enterprise_search/content/search_indices/new_index/connector?service_type=google_drive',
+      icons: [
+        {
+          type: 'svg',
+          src: http.basePath.prepend(
+            '/plugins/enterpriseSearch/assets/source_icons/google_drive.svg'
+          ),
+        },
+      ],
+      shipper: 'enterprise_search',
+      isBeta: false,
+    });
+
     customIntegrations.registerCustomIntegration({
       id: 'azure_blob_storage',
       title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.azureBlob', {
@@ -689,7 +738,14 @@ export const registerEnterpriseSearchIntegrations = (
           defaultMessage: 'Search over your content on Azure Blob Storage.',
         }
       ),
-      categories: ['enterprise_search', 'elastic_stack', 'custom'],
+      categories: [
+        'enterprise_search',
+        'elastic_stack',
+        'custom',
+        'connector',
+        'connector_client',
+        ...nativeSearchTag,
+      ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=azure_blob_storage',
       icons: [
@@ -781,6 +837,7 @@ export const registerEnterpriseSearchIntegrations = (
         'connector',
         'connector_client',
         'jira',
+        ...nativeSearchTag,
       ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=jira',
@@ -814,6 +871,7 @@ export const registerEnterpriseSearchIntegrations = (
         'connector',
         'connector_client',
         'jira',
+        ...nativeSearchTag,
       ],
       uiInternalPath:
         '/app/enterprise_search/content/search_indices/new_index/connector?service_type=jira',
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 121f73ad0838..7ba4b6a05485 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -14876,16 +14876,11 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.azureBlobDescription": "Effectuez des recherches sur votre contenu sur Stockage Blob Azure avec Enterprise Search.",
     "xpack.enterpriseSearch.workplaceSearch.integrations.boxDescription": "Effectuez des recherches dans vos fichiers et dossiers stockés sur Box avec Workplace Search.",
     "xpack.enterpriseSearch.workplaceSearch.integrations.boxName": "Box",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubDescription": "Effectuez des recherches sur vos projets et référentiels sur GitHub avec Workplace Search.",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerDescription": "Effectuez des recherches sur vos projets et référentiels sur GitHub Enterprise avec Workplace Search.",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerName": "GitHub Enterprise Server",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubName": "GitHub",
     "xpack.enterpriseSearch.workplaceSearch.integrations.gmailDescription": "Effectuez des recherches dans vos e-mails gérés par Gmail avec Workplace Search.",
     "xpack.enterpriseSearch.workplaceSearch.integrations.gmailName": "Gmail",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleCloud": "Google Cloud Storage",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleCloudDescription": "Effectuez des recherches sur votre contenu sur Google Cloud Storage avec Enterprise Search.",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription": "Effectuez des recherches dans vos documents sur Google Drive avec Workplace Search.",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveName": "Google Drive",
     "xpack.enterpriseSearch.workplaceSearch.integrations.mongoDBDescription": "Recherchez dans votre contenu MongoDB avec Enterprise Search.",
     "xpack.enterpriseSearch.workplaceSearch.integrations.mongoDBName": "MongoDB",
     "xpack.enterpriseSearch.workplaceSearch.integrations.msSqlDescription": "Effectuez des recherches sur votre contenu sur Microsoft SQL Server avec Enterprise Search.",
@@ -14902,8 +14897,6 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.postgresqlName": "PostgreSQL",
     "xpack.enterpriseSearch.workplaceSearch.integrations.s3": "Amazon S3",
     "xpack.enterpriseSearch.workplaceSearch.integrations.s3Description": "Effectuez des recherches sur votre contenu sur Amazon S3 avec Enterprise Search.",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceDescription": "Effectuez des recherches dans votre contenu sur Salesforce avec Workplace Search.",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName": "Salesforce",
     "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxDescription": "Effectuez des recherches dans votre contenu sur Salesforce Sandbox avec Workplace Search.",
     "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxName": "Sandbox Salesforce",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription": "Effectuez des recherches dans vos fichiers stockés sur SharePoint Online avec Workplace Search.",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 0a083d4d31ee..c8fb1d7a7ae4 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -14890,16 +14890,11 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.azureBlobDescription": "エンタープライズ サーチでAzure Blob Storageのコンテンツを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.boxDescription": "Workplace Searchを使用して、Boxに保存されたファイルとフォルダーを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.boxName": "Box",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubDescription": "Workplace Searchを使用して、GitHubのプロジェクトとリポジトリを検索します。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerDescription": "Workplace Searchを使用して、GitHub Enterprise Serverのプロジェクトとリポジトリを検索します。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerName": "GitHub Enterprise Server",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubName": "GitHub",
     "xpack.enterpriseSearch.workplaceSearch.integrations.gmailDescription": "Workplace Searchを使用して、Gmailで管理された電子メールを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.gmailName": "Gmail",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleCloud": "Google Cloud Storage",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleCloudDescription": "エンタープライズ サーチでGoogle Cloud Storageのコンテンツを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription": "Workplace Searchを使用して、Google Driveのドキュメントを検索します。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveName": "Google Drive",
     "xpack.enterpriseSearch.workplaceSearch.integrations.mongoDBDescription": "エンタープライズ サーチでMongoDBコンテンツを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.mongoDBName": "MongoDB",
     "xpack.enterpriseSearch.workplaceSearch.integrations.msSqlDescription": "エンタープライズ サーチでMicrosoft SQL Serverのコンテンツを検索します。",
@@ -14916,8 +14911,6 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.postgresqlName": "PostgreSQL",
     "xpack.enterpriseSearch.workplaceSearch.integrations.s3": "Amazon S3",
     "xpack.enterpriseSearch.workplaceSearch.integrations.s3Description": "エンタープライズサーチでAmazon S3のコンテンツを検索します。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceDescription": "Workplace Searchを使用して、Salesforceのコンテンツを検索します。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName": "Salesforce",
     "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxDescription": "Workplace Searchを使用して、Salesforce Sandboxのコンテンツを検索します。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxName": "Salesforce Sandbox",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription": "Workplace Searchを使用して、SharePointに保存されたファイルを検索します。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index e45d8697e9a7..b526605b91e9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -14890,16 +14890,11 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.azureBlobDescription": "使用 Enterprise Search 在 Azure Blob 存储上搜索您的内容。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.boxDescription": "通过 Workplace Search 搜索存储在 Box 上的文件和文件夹。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.boxName": "Box",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubDescription": "通过 Workplace Search 搜索 GitHub 上的项目和存储库。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerDescription": "通过 Workplace Search 搜索 GitHub Enterprise Server 上的项目和存储库。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerName": "GitHub Enterprise Server",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.githubName": "GitHub",
     "xpack.enterpriseSearch.workplaceSearch.integrations.gmailDescription": "通过 Workplace Search 搜索由 Gmail 管理的电子邮件。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.gmailName": "Gmail",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleCloud": "Google Cloud Storage",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleCloudDescription": "使用 Enterprise Search 在 Google Cloud Storage 上搜索您的内容。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription": "通过 Workplace Search 搜索 Google 云端硬盘上的文档。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveName": "Google 云端硬盘",
     "xpack.enterpriseSearch.workplaceSearch.integrations.mongoDBDescription": "使用 Enterprise Search 搜索您的 MongoDB 内容。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.mongoDBName": "MongoDB",
     "xpack.enterpriseSearch.workplaceSearch.integrations.msSqlDescription": "使用 Enterprise Search 在 Microsoft SQL Server 上搜索您的内容。",
@@ -14916,8 +14911,6 @@
     "xpack.enterpriseSearch.workplaceSearch.integrations.postgresqlName": "PostgreSQL",
     "xpack.enterpriseSearch.workplaceSearch.integrations.s3": "Amazon S3",
     "xpack.enterpriseSearch.workplaceSearch.integrations.s3Description": "使用 Enterprise Search 在 Amazon S3 上搜索您的内容。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceDescription": "通过 Workplace Search 搜索 Salesforce 上的内容。",
-    "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName": "Salesforce",
     "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxDescription": "通过 Workplace Search 搜索 Salesforce Sandbox 上的内容。",
     "xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxName": "Salesforce Sandbox",
     "xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription": "通过 Workplace Search 搜索存储在 SharePoint Online 上的文件。",