mirror of
https://github.com/elastic/kibana.git
synced 2025-04-25 02:09:32 -04:00
# Backport This will backport the following commits from `main` to `8.11`: - [[Enterprise Search] Add missing native connector configurations (#169128)](https://github.com/elastic/kibana/pull/169128) <!--- 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-10-18T11:45:45Z","message":"[Enterprise Search] Add missing native connector configurations (#169128)\n\n## Summary\r\n\r\nAdd missing configurations for some native connectors.\r\n\r\nAdded missing Document Level Security for Network,Jira and Confluence\r\n<img width=\"749\" alt=\"Screenshot 2023-10-17 at 17 35 37\"\r\nsrc=\"962102df
-83a2-4c04-a4c6-ff38ecc5a6ee\">\r\n<img width=\"624\" alt=\"Screenshot 2023-10-17 at 17 36 06\"\r\nsrc=\"2d270236
-5083-4be9-98b7-087bd3fa0adc\">\r\n<img width=\"574\" alt=\"Screenshot 2023-10-17 at 17 36 59\"\r\nsrc=\"c42f3cf5
-d582-433e-b1b4-632d414de349\">\r\n\r\nAdd enumarate and fetch_subsites for Sharepoint Online\r\n\r\n<img width=\"760\" alt=\"Screenshot 2023-10-17 at 17 39 27\"\r\nsrc=\"c6ac9e87
-53ea-46e7-a5de-2a479abb64ef\">\r\n\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"2015c9f6861253029d4c7ee465b5e241ed983318","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:EnterpriseSearch","v8.11.0","v8.12.0"],"number":169128,"url":"https://github.com/elastic/kibana/pull/169128","mergeCommit":{"message":"[Enterprise Search] Add missing native connector configurations (#169128)\n\n## Summary\r\n\r\nAdd missing configurations for some native connectors.\r\n\r\nAdded missing Document Level Security for Network,Jira and Confluence\r\n<img width=\"749\" alt=\"Screenshot 2023-10-17 at 17 35 37\"\r\nsrc=\"962102df
-83a2-4c04-a4c6-ff38ecc5a6ee\">\r\n<img width=\"624\" alt=\"Screenshot 2023-10-17 at 17 36 06\"\r\nsrc=\"2d270236
-5083-4be9-98b7-087bd3fa0adc\">\r\n<img width=\"574\" alt=\"Screenshot 2023-10-17 at 17 36 59\"\r\nsrc=\"c42f3cf5
-d582-433e-b1b4-632d414de349\">\r\n\r\nAdd enumarate and fetch_subsites for Sharepoint Online\r\n\r\n<img width=\"760\" alt=\"Screenshot 2023-10-17 at 17 39 27\"\r\nsrc=\"c6ac9e87
-53ea-46e7-a5de-2a479abb64ef\">\r\n\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"2015c9f6861253029d4c7ee465b5e241ed983318"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"8.11","label":"v8.11.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/169128","number":169128,"mergeCommit":{"message":"[Enterprise Search] Add missing native connector configurations (#169128)\n\n## Summary\r\n\r\nAdd missing configurations for some native connectors.\r\n\r\nAdded missing Document Level Security for Network,Jira and Confluence\r\n<img width=\"749\" alt=\"Screenshot 2023-10-17 at 17 35 37\"\r\nsrc=\"962102df
-83a2-4c04-a4c6-ff38ecc5a6ee\">\r\n<img width=\"624\" alt=\"Screenshot 2023-10-17 at 17 36 06\"\r\nsrc=\"2d270236
-5083-4be9-98b7-087bd3fa0adc\">\r\n<img width=\"574\" alt=\"Screenshot 2023-10-17 at 17 36 59\"\r\nsrc=\"c42f3cf5
-d582-433e-b1b4-632d414de349\">\r\n\r\nAdd enumarate and fetch_subsites for Sharepoint Online\r\n\r\n<img width=\"760\" alt=\"Screenshot 2023-10-17 at 17 39 27\"\r\nsrc=\"c6ac9e87
-53ea-46e7-a5de-2a479abb64ef\">\r\n\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>","sha":"2015c9f6861253029d4c7ee465b5e241ed983318"}}]}] BACKPORT--> Co-authored-by: Efe Gürkan YALAMAN <efeguerkan.yalaman@elastic.co>
This commit is contained in:
parent
df0ab9bba7
commit
51b9ab361a
2 changed files with 96 additions and 2 deletions
|
@ -68,7 +68,7 @@ export type ConnectorConfiguration = Record<
|
||||||
> & {
|
> & {
|
||||||
extract_full_html?: { label: string; value: boolean }; // This only exists for Crawler
|
extract_full_html?: { label: string; value: boolean }; // This only exists for Crawler
|
||||||
use_document_level_security?: ConnectorConfigProperties;
|
use_document_level_security?: ConnectorConfigProperties;
|
||||||
use_text_extraction_service?: ConnectorConfigProperties; // This only exists for SharePoint Online
|
use_text_extraction_service?: ConnectorConfigProperties;
|
||||||
};
|
};
|
||||||
|
|
||||||
export interface ConnectorScheduling {
|
export interface ConnectorScheduling {
|
||||||
|
|
|
@ -444,6 +444,21 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
|
||||||
],
|
],
|
||||||
value: 50,
|
value: 50,
|
||||||
},
|
},
|
||||||
|
use_document_level_security: {
|
||||||
|
default_value: null,
|
||||||
|
depends_on: [],
|
||||||
|
display: DisplayType.TOGGLE,
|
||||||
|
label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
|
||||||
|
options: [],
|
||||||
|
order: 6,
|
||||||
|
required: true,
|
||||||
|
sensitive: false,
|
||||||
|
tooltip: ENABLE_DOCUMENT_LEVEL_SECURITY_TOOLTIP,
|
||||||
|
type: FieldType.BOOLEAN,
|
||||||
|
ui_restrictions: [],
|
||||||
|
validations: [],
|
||||||
|
value: false,
|
||||||
|
},
|
||||||
use_text_extraction_service: {
|
use_text_extraction_service: {
|
||||||
default_value: false,
|
default_value: false,
|
||||||
depends_on: [],
|
depends_on: [],
|
||||||
|
@ -730,7 +745,6 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
|
||||||
ui_restrictions: ['advanced'],
|
ui_restrictions: ['advanced'],
|
||||||
validations: [],
|
validations: [],
|
||||||
value: 3,
|
value: 3,
|
||||||
display_value: 3,
|
|
||||||
},
|
},
|
||||||
use_text_extraction_service: {
|
use_text_extraction_service: {
|
||||||
default_value: null,
|
default_value: null,
|
||||||
|
@ -1204,6 +1218,21 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
|
||||||
],
|
],
|
||||||
value: 100,
|
value: 100,
|
||||||
},
|
},
|
||||||
|
use_document_level_security: {
|
||||||
|
default_value: null,
|
||||||
|
depends_on: [],
|
||||||
|
display: DisplayType.TOGGLE,
|
||||||
|
label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
|
||||||
|
options: [],
|
||||||
|
order: 6,
|
||||||
|
required: true,
|
||||||
|
sensitive: false,
|
||||||
|
tooltip: ENABLE_DOCUMENT_LEVEL_SECURITY_TOOLTIP,
|
||||||
|
type: FieldType.BOOLEAN,
|
||||||
|
ui_restrictions: [],
|
||||||
|
validations: [],
|
||||||
|
value: false,
|
||||||
|
},
|
||||||
use_text_extraction_service: {
|
use_text_extraction_service: {
|
||||||
default_value: false,
|
default_value: false,
|
||||||
depends_on: [],
|
depends_on: [],
|
||||||
|
@ -1845,6 +1874,21 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
|
||||||
validations: [],
|
validations: [],
|
||||||
value: '',
|
value: '',
|
||||||
},
|
},
|
||||||
|
use_document_level_security: {
|
||||||
|
default_value: null,
|
||||||
|
depends_on: [],
|
||||||
|
display: DisplayType.TOGGLE,
|
||||||
|
label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
|
||||||
|
options: [],
|
||||||
|
order: 6,
|
||||||
|
required: true,
|
||||||
|
sensitive: false,
|
||||||
|
tooltip: ENABLE_DOCUMENT_LEVEL_SECURITY_TOOLTIP,
|
||||||
|
type: FieldType.BOOLEAN,
|
||||||
|
ui_restrictions: [],
|
||||||
|
validations: [],
|
||||||
|
value: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
[FeatureName.SYNC_RULES]: {
|
[FeatureName.SYNC_RULES]: {
|
||||||
|
@ -2559,6 +2603,56 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
|
||||||
validations: [],
|
validations: [],
|
||||||
value: true,
|
value: true,
|
||||||
},
|
},
|
||||||
|
enumerate_all_sites: {
|
||||||
|
default_value: true,
|
||||||
|
depends_on: [],
|
||||||
|
display: DisplayType.TOGGLE,
|
||||||
|
label: i18n.translate(
|
||||||
|
'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
|
||||||
|
{ defaultMessage: 'Enumerate all sites?' }
|
||||||
|
),
|
||||||
|
options: [],
|
||||||
|
order: 6,
|
||||||
|
required: false,
|
||||||
|
sensitive: false,
|
||||||
|
tooltip: i18n.translate(
|
||||||
|
'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesTooltip',
|
||||||
|
{
|
||||||
|
defaultMessage:
|
||||||
|
'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
type: FieldType.BOOLEAN,
|
||||||
|
ui_restrictions: [],
|
||||||
|
validations: [],
|
||||||
|
value: true,
|
||||||
|
},
|
||||||
|
fetch_subsites: {
|
||||||
|
default_value: false,
|
||||||
|
depends_on: [{ field: 'enumerate_all_sites', value: false }],
|
||||||
|
display: DisplayType.TOGGLE,
|
||||||
|
label: i18n.translate(
|
||||||
|
'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
|
||||||
|
{
|
||||||
|
defaultMessage: 'Fetch sub-sites of configured sites?',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
options: [],
|
||||||
|
order: 7,
|
||||||
|
required: false,
|
||||||
|
sensitive: false,
|
||||||
|
tooltip: i18n.translate(
|
||||||
|
'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesTooltip',
|
||||||
|
{
|
||||||
|
defaultMessage:
|
||||||
|
'Whether subsites of the configured site(s) should be automatically fetched.',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
type: FieldType.BOOLEAN,
|
||||||
|
ui_restrictions: [],
|
||||||
|
validations: [],
|
||||||
|
value: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
[FeatureName.SYNC_RULES]: {
|
[FeatureName.SYNC_RULES]: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue