Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Enterprise Search] Update connector integrations for 8.9 #160532

Merged
merged 5 commits into from
Jun 27, 2023
Merged

[Enterprise Search] Update connector integrations for 8.9 #160532

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
544a258
[Enterprise Search] Update connector integrations for 8.9
sphilipse Jun 26, 2023
f11553f
Fix doc links
sphilipse Jun 26, 2023
14914ce
Merge branch 'main' into ent-search-update-8-9-connector-integrations
kibanamachine Jun 26, 2023
b12e805
Remove github until confirmed
sphilipse Jun 27, 2023
ba997b3
Fix FTR
sphilipse Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/kbn-doc-links/src/get_doc_links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
connectorsAzureBlobStorage: `${ENTERPRISE_SEARCH_DOCS}connectors-azure-blob.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`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did the Github connector land in time for 8.9?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait actually hold on, let me double check

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay removed it again because it's not ready yet

connectorsGoogleCloudStorage: `${ENTERPRISE_SEARCH_DOCS}connectors-google-cloud.html`,
connectorsJira: `${ENTERPRISE_SEARCH_DOCS}connectors-jira.html`,
connectorsMicrosoftSQL: `${ENTERPRISE_SEARCH_DOCS}connectors-ms-sql.html`,
Expand All @@ -146,6 +148,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
connectorsOracle: `${ENTERPRISE_SEARCH_DOCS}connectors-oracle.html`,
connectorsPostgreSQL: `${ENTERPRISE_SEARCH_DOCS}connectors-postgresql.html`,
connectorsS3: `${ENTERPRISE_SEARCH_DOCS}connectors-s3.html`,
connectorsServiceNow: `${ENTERPRISE_SEARCH_DOCS}connectors-servicenow.html`,
connectorsSharepoint: `${ENTERPRISE_SEARCH_DOCS}connectors-sharepoint.html`,
connectorsSharepointOnline: `${ENTERPRISE_SEARCH_DOCS}connectors-sharepoint-online.html`,
connectorsWorkplaceSearch: `${ENTERPRISE_SEARCH_DOCS}connectors.html#connectors-workplace-search`,
Expand Down
3 changes: 3 additions & 0 deletions packages/kbn-doc-links/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ export interface DocLinks {
readonly connectorsClients: string;
readonly connectorsConfluence: string;
readonly connectorsContentExtraction: string;
readonly connectorsDropbox: string;
readonly connectorsGithub: string;
readonly connectorsGoogleCloudStorage: string;
readonly connectorsJira: string;
readonly connectorsMicrosoftSQL: string;
Expand All @@ -130,6 +132,7 @@ export interface DocLinks {
readonly connectorsOracle: string;
readonly connectorsPostgreSQL: string;
readonly connectorsS3: string;
readonly connectorsServiceNow: string;
readonly connectorsSharepoint: string;
readonly connectorsSharepointOnline: string;
readonly connectorsWorkplaceSearch: string;
Expand Down
7 changes: 4 additions & 3 deletions src/plugins/custom_integrations/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ export const INTEGRATION_CATEGORY_DISPLAY: {
config_management: { title: 'Config management', parent_id: undefined },
connector: { title: 'Connector', parent_id: 'enterprise_search' },
connector_client: { title: 'Connector Client', parent_id: 'enterprise_search' },
connector_package: { title: 'Connector Package', parent_id: 'enterprise_search' },
containers: { title: 'Containers', parent_id: undefined },
content_source: { title: 'Content Source', parent_id: 'enterprise_search' },
crawler: { title: 'Crawler', parent_id: 'enterprise_search' },
credential_management: { title: 'Credential Management', parent_id: 'security' },
crm: { title: 'CRM', parent_id: undefined },
Expand Down Expand Up @@ -81,7 +79,10 @@ export const INTEGRATION_CATEGORY_DISPLAY: {
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',
},
// Kibana added
apm: { title: 'APM', parent_id: undefined },
};
Expand Down
122 changes: 72 additions & 50 deletions x-pack/plugins/enterprise_search/common/connectors/connectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,46 @@ export interface ConnectorServerSideDefinition {
}

export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'azure_blob_storage.svg',
isBeta: true,
isNative: true,
keywords: ['cloud', 'azure', 'blob', 's3', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.azureBlob.name', {
defaultMessage: 'Azure Blob Storage',
}),
serviceType: 'azure_blob_storage',
},
{
iconPath: 'confluence_cloud.svg',
isBeta: true,
isNative: true,
keywords: ['confluence', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.confluence.name', {
defaultMessage: 'Confluence Cloud & Server',
}),
serviceType: 'confluence',
},
{
iconPath: 'jira_cloud.svg',
isBeta: true,
isNative: true,
keywords: ['jira', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.jira.name', {
defaultMessage: 'Jira Cloud & Server',
}),
serviceType: 'jira',
},
{
iconPath: 'google_cloud_storage.svg',
isBeta: true,
isNative: true,
keywords: ['google', 'cloud', 'blob', 's3', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.googleCloud.name', {
defaultMessage: 'Google Cloud Storage',
}),
serviceType: 'google_cloud_storage',
},
{
iconPath: 'mongodb.svg',
isBeta: false,
Expand Down Expand Up @@ -49,64 +89,57 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
serviceType: 'mssql',
},
{
iconPath: 'postgresql.svg',
iconPath: 'network_drive.svg',
isBeta: true,
isNative: true,
keywords: ['postgresql', 'sql', 'database', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.postgresql.name', {
defaultMessage: 'PostgreSQL',
keywords: ['network', 'drive', 'file', 'directory', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.networkDrive.name', {
defaultMessage: 'Network drive',
}),
serviceType: 'postgresql',
serviceType: 'network_drive',
},
{
iconPath: 'azure_blob_storage.svg',
iconPath: 'postgresql.svg',
isBeta: true,
isNative: true,
keywords: ['cloud', 'azure', 'blob', 's3', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.azureBlob.name', {
defaultMessage: 'Azure Blob Storage',
keywords: ['postgresql', 'sql', 'database', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.postgresql.name', {
defaultMessage: 'PostgreSQL',
}),
serviceType: 'azure_blob_storage',
serviceType: 'postgresql',
},
{
iconPath: 'confluence_cloud.svg',
isBeta: true,
iconPath: 'sharepoint_online.svg',
isBeta: false,
isNative: true,
keywords: ['confluence', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.confluence.name', {
defaultMessage: 'Confluence Cloud & Server',
isTechPreview: false,
keywords: ['sharepoint', 'office365', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.sharepoint_online.name', {
defaultMessage: 'Sharepoint Online',
}),
serviceType: 'confluence',
serviceType: 'sharepoint_online',
},
{
iconPath: 'google_cloud_storage.svg',
iconPath: 'dropbox.svg',
isBeta: true,
isNative: false,
keywords: ['google', 'cloud', 'blob', 's3', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.googleCloud.name', {
defaultMessage: 'Google Cloud Storage',
}),
serviceType: 'google_cloud_storage',
},
{
iconPath: 'jira_cloud.svg',
isBeta: true,
isNative: true,
keywords: ['jira', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.jira.name', {
defaultMessage: 'Jira Cloud & Server',
isTechPreview: false,
keywords: ['dropbox', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.dropbox.name', {
defaultMessage: 'Dropbox',
}),
serviceType: 'jira',
serviceType: 'dropbox',
},
{
iconPath: 'network_drive.svg',
iconPath: 'github.svg',
isBeta: true,
isNative: true,
keywords: ['network', 'drive', 'file', 'directory', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.networkDrive.name', {
defaultMessage: 'Network drive',
isNative: false,
isTechPreview: false,
keywords: ['github', 'cloud', 'server', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.github.name', {
defaultMessage: 'GitHub',
}),
serviceType: 'network_drive',
serviceType: 'github',
},
{
iconPath: 'oracle.svg',
Expand All @@ -129,27 +162,16 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
serviceType: 's3',
},
{
iconPath: 'sharepoint.svg',
iconPath: 'sharepoint_server.svg',
isBeta: true,
isNative: false,
isTechPreview: false,
keywords: ['sharepoint', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.sharepoint.name', {
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.sharepointServer.name', {
defaultMessage: 'Sharepoint Server',
}),
serviceType: 'sharepoint_server',
},
{
iconPath: 'sharepoint_online.svg',
isBeta: false,
isNative: true,
isTechPreview: false,
keywords: ['sharepoint', 'office365', 'cloud', 'connector'],
name: i18n.translate('xpack.enterpriseSearch.content.nativeConnectors.sharepoint_online.name', {
defaultMessage: 'Sharepoint Online',
}),
serviceType: 'sharepoint_online',
},
{
iconPath: 'custom.svg',
isBeta: true,
Expand Down
18 changes: 18 additions & 0 deletions ...lic/applications/enterprise_search_content/components/search_index/connector/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
externalDocsUrl: '',
icon: CONNECTOR_ICONS.custom,
},
dropbox: {
docsUrl: docLinks.connectorsDropbox,
externalAuthDocsUrl: '',
externalDocsUrl: '',
icon: CONNECTOR_ICONS.dropbox,
},
github: {
docsUrl: docLinks.connectorsGithub,
externalAuthDocsUrl: '',
externalDocsUrl: '',
icon: CONNECTOR_ICONS.github,
},
google_cloud_storage: {
docsUrl: docLinks.connectorsGoogleCloudStorage,
externalAuthDocsUrl: 'https://cloud.google.com/storage/docs/authentication',
Expand Down Expand Up @@ -86,6 +98,12 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
externalDocsUrl: '',
icon: CONNECTOR_ICONS.amazon_s3,
},
servicenow: {
docsUrl: docLinks.connectorsServiceNow,
externalAuthDocsUrl: '',
externalDocsUrl: '',
icon: CONNECTOR_ICONS.servicenow,
},
sharepoint: {
docsUrl: docLinks.connectorsSharepoint,
externalAuthDocsUrl: '',
Expand Down
9 changes: 9 additions & 0 deletions x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class DocLinks {
public connectorsClients: string;
public connectorsConfluence: string;
public connectorsContentExtraction: string;
public connectorsDropbox: string;
public connectorsGithub: string;
public connectorsGoogleCloudStorage: string;
public connectorsJira: string;
public connectorsMicrosoftSQL: string;
Expand All @@ -76,6 +78,7 @@ class DocLinks {
public connectorsOracle: string;
public connectorsPostgreSQL: string;
public connectorsS3: string;
public connectorsServiceNow: string;
public connectorsSharepoint: string;
public connectorsSharepointOnline: string;
public connectorsWorkplaceSearch: string;
Expand Down Expand Up @@ -219,6 +222,8 @@ class DocLinks {
this.connectorsConfluence = '';
this.connectorsContentExtraction = '';
this.connectorsClients = '';
this.connectorsDropbox = '';
this.connectorsGithub = '';
this.connectorsGoogleCloudStorage = '';
this.connectorsJira = '';
this.connectorsMicrosoftSQL = '';
Expand All @@ -229,6 +234,7 @@ class DocLinks {
this.connectorsOracle = '';
this.connectorsPostgreSQL = '';
this.connectorsS3 = '';
this.connectorsServiceNow = '';
this.connectorsSharepoint = '';
this.connectorsSharepointOnline = '';
this.connectorsWorkplaceSearch = '';
Expand Down Expand Up @@ -373,6 +379,8 @@ class DocLinks {
this.connectorsConfluence = docLinks.links.enterpriseSearch.connectorsConfluence;
this.connectorsContentExtraction = docLinks.links.enterpriseSearch.connectorsContentExtraction;
this.connectorsClients = docLinks.links.enterpriseSearch.connectorsClients;
this.connectorsDropbox = docLinks.links.enterpriseSearch.connectorsDropbox;
this.connectorsGithub = docLinks.links.enterpriseSearch.connectorsGithub;
this.connectorsGoogleCloudStorage =
docLinks.links.enterpriseSearch.connectorsGoogleCloudStorage;
this.connectorsJira = docLinks.links.enterpriseSearch.connectorsJira;
Expand All @@ -384,6 +392,7 @@ class DocLinks {
this.connectorsOracle = docLinks.links.enterpriseSearch.connectorsOracle;
this.connectorsPostgreSQL = docLinks.links.enterpriseSearch.connectorsPostgreSQL;
this.connectorsS3 = docLinks.links.enterpriseSearch.connectorsS3;
this.connectorsServiceNow = docLinks.links.enterpriseSearch.connectorsServiceNow;
this.connectorsSharepoint = docLinks.links.enterpriseSearch.connectorsSharepoint;
this.connectorsSharepointOnline = docLinks.links.enterpriseSearch.connectorsSharepointOnline;
this.connectorsWorkplaceSearch = docLinks.links.enterpriseSearch.connectorsWorkplaceSearch;
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugins/enterprise_search/public/applications/shared/icons/connector_icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import azure_blob_storage from '../../../assets/source_icons/azure_blob_storage.svg';
import confluence_cloud from '../../../assets/source_icons/confluence_cloud.svg';
import custom from '../../../assets/source_icons/custom.svg';
import dropbox from '../../../assets/source_icons/dropbox.svg';
import github from '../../../assets/source_icons/github.svg';
import google_cloud_storage from '../../../assets/source_icons/google_cloud_storage.svg';
import jira_cloud from '../../../assets/source_icons/jira_cloud.svg';
import mongodb from '../../../assets/source_icons/mongodb.svg';
Expand All @@ -17,6 +19,7 @@ import network_drive from '../../../assets/source_icons/network_drive.svg';
import oracle from '../../../assets/source_icons/oracle.svg';
import postgresql from '../../../assets/source_icons/postgresql.svg';
import amazon_s3 from '../../../assets/source_icons/s3.svg';
import servicenow from '../../../assets/source_icons/servicenow.svg';
import sharepoint from '../../../assets/source_icons/sharepoint.svg';
import sharepoint_online from '../../../assets/source_icons/sharepoint_online.svg';

Expand All @@ -25,6 +28,8 @@ export const CONNECTOR_ICONS = {
azure_blob_storage,
confluence_cloud,
custom,
dropbox,
github,
google_cloud_storage,
jira_cloud,
microsoft_sql,
Expand All @@ -33,6 +38,7 @@ export const CONNECTOR_ICONS = {
network_drive,
oracle,
postgresql,
servicenow,
sharepoint,
sharepoint_online,
};
1 change: 1 addition & 0 deletions x-pack/plugins/enterprise_search/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const configSchema = schema.object({
hasNativeConnectors: schema.boolean({ defaultValue: true }),
hasWebCrawler: schema.boolean({ defaultValue: true }),
host: schema.maybe(schema.string()),
isCloud: schema.boolean({ defaultValue: false }),
ssl: schema.object({
certificateAuthorities: schema.maybe(
schema.oneOf([schema.arrayOf(schema.string(), { minSize: 1 }), schema.string()])
Expand Down
Loading