github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.12] [Enterprise Search] Kibana connector License updates. (#172930) (#173263)

Browse source 
# Backport

This will backport the following commits from `main` to `8.12`:
- [[Enterprise Search] Kibana connector License updates.
(#172930)](https://github.com/elastic/kibana/pull/172930)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Efe Gürkan
YALAMAN","email":"efeguerkan.yalaman@elastic.co"},"sourceCommit":{"committedDate":"2023-12-13T11:40:33Z","message":"[Enterprise
Search] Kibana connector License updates. (#172930)\n\nFollowing
connector configurations are updated.\r\n\r\nAzure Blob
Storage\r\nGoogle Cloud Storage\r\nPostgres\r\nMSSQL\r\nAmazon
S3\r\nMongoDB\r\nMySQL\r\n\r\n\r\n<img width=\"1045\" alt=\"Screenshot
2023-12-08 at 11 53
46\"\r\nsrc=\"8269ccf3-9497-4411-bd2a-d2c11768cebc\">\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5085d237d94de0a77f578e336f1c008e3c9a611f","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:EnterpriseSearch","v8.12.0","v8.13.0"],"number":172930,"url":"https://github.com/elastic/kibana/pull/172930","mergeCommit":{"message":"[Enterprise
Search] Kibana connector License updates. (#172930)\n\nFollowing
connector configurations are updated.\r\n\r\nAzure Blob
Storage\r\nGoogle Cloud Storage\r\nPostgres\r\nMSSQL\r\nAmazon
S3\r\nMongoDB\r\nMySQL\r\n\r\n\r\n<img width=\"1045\" alt=\"Screenshot
2023-12-08 at 11 53
46\"\r\nsrc=\"8269ccf3-9497-4411-bd2a-d2c11768cebc\">\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5085d237d94de0a77f578e336f1c008e3c9a611f"}},"sourceBranch":"main","suggestedTargetBranches":["8.12"],"targetPullRequestStates":[{"branch":"8.12","label":"v8.12.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/172930","number":172930,"mergeCommit":{"message":"[Enterprise
Search] Kibana connector License updates. (#172930)\n\nFollowing
connector configurations are updated.\r\n\r\nAzure Blob
Storage\r\nGoogle Cloud Storage\r\nPostgres\r\nMSSQL\r\nAmazon
S3\r\nMongoDB\r\nMySQL\r\n\r\n\r\n<img width=\"1045\" alt=\"Screenshot
2023-12-08 at 11 53
46\"\r\nsrc=\"8269ccf3-9497-4411-bd2a-d2c11768cebc\">\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"5085d237d94de0a77f578e336f1c008e3c9a611f"}}]}]
BACKPORT-->

Co-authored-by: Efe Gürkan YALAMAN <efeguerkan.yalaman@elastic.co>
This commit is contained in:
Kibana Machine 2023-12-13 07:57:05 -05:00 • committed by GitHub
parent 408e5a718e
commit 34a5ab1ca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 339 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/kbn-search-connectors/connectors.ts
View file

@ -25,7 +25,7 @@ export interface ConnectorServerSideDefinition {
export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'azure_blob_storage.svg',
isBeta: true,
isBeta: false,
isNative: true,
keywords: ['cloud', 'azure', 'blob', 's3', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.azureBlob.name', {
@ -76,8 +76,8 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
},
{
iconPath: 'google_cloud_storage.svg',
isBeta: true,
isNative: false,
isBeta: false,
isNative: true,
keywords: ['google', 'cloud', 'blob', 's3', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.googleCloud.name', {
defaultMessage: 'Google Cloud Storage',
@ -116,7 +116,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
},
{
iconPath: 'mssql.svg',
isBeta: true,
isBeta: false,
isNative: true,
keywords: ['mssql', 'microsoft', 'sql', 'database', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.microsoftSQL.name', {
@ -136,7 +136,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
},
{
iconPath: 'postgresql.svg',
isBeta: true,
isBeta: false,
isNative: true,
keywords: ['postgresql', 'sql', 'database', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.postgresql.name', {
@ -147,7 +147,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'salesforce.svg',
isBeta: true,
isNative: false,
isNative: true,
isTechPreview: false,
keywords: ['salesforce', 'cloud', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.salesforce.name', {
@ -191,7 +191,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'oracle.svg',
isBeta: true,
isNative: false,
isNative: true,
keywords: ['oracle', 'sql', 'database', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.oracle.name', {
defaultMessage: 'Oracle',
@ -210,8 +210,8 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
},
{
iconPath: 's3.svg',
isBeta: true,
isNative: false,
isBeta: false,
isNative: true,
keywords: ['s3', 'cloud', 'amazon', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.s3.name', {
defaultMessage: 'S3',

331
packages/kbn-search-connectors/types/native_connectors.ts
View file

@ -489,6 +489,9 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
advanced: { enabled: true },
basic: { enabled: true },
},
[FeatureName.DOCUMENT_LEVEL_SECURITY]: {
enabled: true,
},
},
name: i18n.translate('searchConnectors.nativeConnectors.confluence.name', {
defaultMessage: 'Confluence',
@ -777,6 +780,64 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
features: {},
serviceType: 'github',
},
google_cloud_storage: {
features: {},
configuration: {
service_account_credentials: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTAREA,
label: i18n.translate('searchConnectors.nativeConnectors.googleCloudStorage.label', {
defaultMessage: 'Google Cloud service account JSON',
}),
options: [],
order: 1,
required: true,
sensitive: true,
tooltip: null,
type: FieldType.STRING,
ui_restrictions: [],
validations: [],
value: '',
},
retry_count: {
default_value: 3,
depends_on: [],
display: DisplayType.NUMERIC,
label: i18n.translate('searchConnectors.nativeConnectors.googleCloudStorage.retry.label', {
defaultMessage: 'Maximum retries for failed requests',
}),
options: [],
order: 2,
required: false,
sensitive: false,
tooltip: null,
type: FieldType.INTEGER,
ui_restrictions: ['advanced'],
validations: [],
value: '',
},
use_text_extraction_service: {
default_value: null,
depends_on: [],
display: DisplayType.TOGGLE,
label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
options: [],
order: 3,
required: true,
sensitive: false,
tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
type: FieldType.BOOLEAN,
ui_restrictions: ['advanced'],
validations: [],
value: false,
},
},
name: i18n.translate('searchConnectors.content.nativeConnectors.googleCloud.name', {
defaultMessage: 'Google Cloud Storage',
}),
serviceType: 'google_cloud_storage',
},
google_drive: {
configuration: {
service_account_credentials: {
@ -1268,6 +1329,9 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
advanced: { enabled: true },
basic: { enabled: true },
},
[FeatureName.DOCUMENT_LEVEL_SECURITY]: {
enabled: true,
},
},
name: i18n.translate('searchConnectors.nativeConnectors.jira.name', {
defaultMessage: 'Jira',
@ -2554,13 +2618,258 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
}),
serviceType: 'postgresql',
},
s3: {
configuration: {
buckets: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTAREA,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.buckets.label', {
defaultMessage: 'AWS Buckets',
}),
options: [],
order: 1,
required: true,
sensitive: false,
tooltip: i18n.translate('searchConnectors.content.nativeConnectors.s3.buckets.tooltip', {
defaultMessage: 'AWS Buckets are ignored when Advanced Sync Rules are used.',
}),
type: FieldType.LIST,
ui_restrictions: [],
validations: [],
value: '',
},
aws_access_key_id: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.accessKey.label', {
defaultMessage: 'AWS Access Key Id',
}),
options: [],
order: 2,
required: true,
sensitive: false,
tooltip: null,
type: FieldType.STRING,
ui_restrictions: [],
validations: [],
value: '',
},
aws_secret_access_key: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.secretKey.label', {
defaultMessage: 'AWS Secret Key',
}),
options: [],
order: 3,
required: true,
sensitive: true,
tooltip: null,
type: FieldType.STRING,
ui_restrictions: [],
validations: [],
value: '',
},
read_timeout: {
default_value: 90,
depends_on: [],
display: DisplayType.NUMERIC,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.readTimeout.label', {
defaultMessage: 'Read timeout',
}),
options: [],
order: 4,
required: false,
sensitive: false,
tooltip: null,
type: FieldType.INTEGER,
ui_restrictions: ['advanced'],
validations: [],
value: '',
},
connect_timeout: {
default_value: 90,
depends_on: [],
display: DisplayType.NUMERIC,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.connectTimeout.label', {
defaultMessage: 'Connection timeout',
}),
options: [],
order: 5,
required: false,
sensitive: false,
tooltip: null,
type: FieldType.INTEGER,
ui_restrictions: ['advanced'],
validations: [],
value: '',
},
max_attempts: {
default_value: 5,
depends_on: [],
display: DisplayType.NUMERIC,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.maxAttempts.label', {
defaultMessage: 'Maximum retry attempts',
}),
options: [],
order: 6,
required: false,
sensitive: false,
tooltip: null,
type: FieldType.INTEGER,
ui_restrictions: ['advanced'],
validations: [],
value: '',
},
page_size: {
default_value: 100,
depends_on: [],
display: DisplayType.NUMERIC,
label: i18n.translate('searchConnectors.content.nativeConnectors.s3.maxPageSize.label', {
defaultMessage: 'Maximum size of page',
}),
options: [],
order: 7,
required: false,
sensitive: false,
tooltip: null,
type: FieldType.INTEGER,
ui_restrictions: ['advanced'],
validations: [],
value: '',
},
use_text_extraction_service: {
default_value: null,
depends_on: [],
display: DisplayType.TOGGLE,
label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
options: [],
order: 8,
required: true,
sensitive: false,
tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
type: FieldType.BOOLEAN,
ui_restrictions: ['advanced'],
validations: [],
value: false,
},
},
features: {},
name: i18n.translate('searchConnectors.content.nativeConnectors.s3.name', {
defaultMessage: 'S3',
}),
serviceType: 's3',
},
salesforce: {
features: {},
configuration: {
domain: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: i18n.translate('searchConnectors.content.nativeConnectors.salesforce.domain.label', {
defaultMessage: 'Domain',
}),
options: [],
order: 1,
required: true,
sensitive: false,
tooltip: i18n.translate(
'searchConnectors.content.nativeConnectors.salesforce.domain.tooltip',
{
defaultMessage:
"The domain for your Salesforce instance. If your Salesforce URL is, the domain would be 'foo'.",
}
),
type: FieldType.STRING,
ui_restrictions: [],
validations: [],
value: '',
},
client_id: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: i18n.translate(
'searchConnectors.content.nativeConnectors.salesforce.clientId.label',
{
defaultMessage: 'Client ID',
}
),
options: [],
order: 2,
required: true,
sensitive: true,
tooltip: i18n.translate(
'searchConnectors.content.nativeConnectors.salesforce.clientId.tooltip',
{
defaultMessage:
"The client id for your OAuth2-enabled connected app. Also called 'consumer key'",
}
),
type: FieldType.STRING,
ui_restrictions: [],
validations: [],
value: '',
},
client_secret: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: i18n.translate(
'searchConnectors.content.nativeConnectors.salesforce.clientSecret.label',
{ defaultMessage: 'Client Secret' }
),
options: [],
order: 3,
required: true,
sensitive: true,
tooltip: i18n.translate(
'searchConnectors.content.nativeConnectors.salesforce.clientSecret.tooltip',
{
defaultMessage:
"The client secret for your OAuth2-enabled connected app. Also called 'consumer secret'",
}
),
type: FieldType.STRING,
ui_restrictions: [],
validations: [],
value: '',
},
use_text_extraction_service: {
default_value: null,
depends_on: [],
display: DisplayType.TOGGLE,
label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
options: [],
order: 4,
required: true,
sensitive: false,
tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
type: FieldType.BOOLEAN,
ui_restrictions: ['advanced'],
validations: [],
value: false,
},
},
name: i18n.translate('searchConnectors.content.nativeConnectors.salesforce.name', {
defaultMessage: 'Salesforce',
}),
serviceType: 'salesforce',
},
servicenow: {
configuration: {
url: {
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: 'Service URL',
label: i18n.translate('searchConnectors.nativeConnectors.servicenow.url.label', {
defaultMessage: 'Service URL',
}),
options: [],
order: 1,
required: true,
@ -2575,7 +2884,9 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
default_value: null,
depends_on: [],
display: DisplayType.TEXTAREA,
label: 'Username',
label: i18n.translate('searchConnectors.nativeConnectors.servicenow.username.label', {
defaultMessage: 'Username',
}),
options: [],
order: 2,
required: true,
@ -2590,7 +2901,9 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
default_value: null,
depends_on: [],
display: DisplayType.TEXTBOX,
label: 'Password',
label: i18n.translate('searchConnectors.nativeConnectors.servicenow.password.label', {
defaultMessage: 'Password',
}),
options: [],
order: 3,
required: true,
@ -2604,13 +2917,17 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
services: {
default_value: null,
depends_on: [],
label: i18n.translate('searchConnectors.nativeConnectors.servicenow.services.label', {
defaultMessage: 'Comma-separated list of services',
}),
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.',
tooltip: i18n.translate('searchConnectors.nativeConnectors.servicenow.services.tooltip', {
defaultMessage: 'List of services is ignored when Advanced Sync Rules are used.',
}),
type: FieldType.LIST,
ui_restrictions: [],
validations: [],
@ -2620,7 +2937,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
default_value: 3,
depends_on: [],
display: DisplayType.NUMERIC,
label: 'Retries per request',
label: RETRIES_PER_REQUEST_LABEL,
options: [],
order: 5,
required: false,
@ -2635,7 +2952,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
default_value: 10,
depends_on: [],
display: DisplayType.NUMERIC,
label: 'Maximum concurrent downloads',
label: MAX_CONCURRENT_DOWNLOADS_LABEL,
options: [],
order: 6,
required: false,

6
x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/constants.ts
View file

@ -21,6 +21,7 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
externalAuthDocsUrl: 'https://learn.microsoft.com/azure/storage/common/authorize-data-access',
externalDocsUrl: 'https://learn.microsoft.com/azure/storage/blobs/',
icon: CONNECTOR_ICONS.azure_blob_storage,
platinumOnly: true,
},
box: {
docsUrl: docLinks.connectorsBox,
@ -68,6 +69,7 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
externalAuthDocsUrl: 'https://cloud.google.com/storage/docs/authentication',
externalDocsUrl: 'https://cloud.google.com/storage/docs',
icon: CONNECTOR_ICONS.google_cloud_storage,
platinumOnly: true,
},
google_drive: {
docsUrl: docLinks.connectorsGoogleDrive,
@ -88,6 +90,7 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
externalAuthDocsUrl: 'https://www.mongodb.com/docs/atlas/app-services/authentication/',
externalDocsUrl: 'https://www.mongodb.com/docs/',
icon: CONNECTOR_ICONS.mongodb,
platinumOnly: true,
},
mssql: {
docsUrl: docLinks.connectorsMicrosoftSQL,
@ -95,11 +98,13 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
'https://learn.microsoft.com/sql/relational-databases/security/authentication-access/getting-started-with-database-engine-permissions',
externalDocsUrl: 'https://learn.microsoft.com/sql/',
icon: CONNECTOR_ICONS.microsoft_sql,
platinumOnly: true,
},
mysql: {
docsUrl: docLinks.connectorsMySQL,
externalDocsUrl: 'https://dev.mysql.com/doc/',
icon: CONNECTOR_ICONS.mysql,
platinumOnly: true,
},
network_drive: {
docsUrl: docLinks.connectorsNetworkDrive,
@ -140,6 +145,7 @@ export const CONNECTORS_DICT: Record<string, ConnectorClientSideDefinition> = {
externalAuthDocsUrl: 'https://docs.aws.amazon.com/s3/index.html',
externalDocsUrl: '',
icon: CONNECTOR_ICONS.amazon_s3,
platinumOnly: true,
},
salesforce: {
docsUrl: docLinks.connectorsSalesforce,