Skip to content

Commit

Permalink
[8.13] Add tiles and integrations for Jira Data Center and Confluence…
Browse files Browse the repository at this point in the history
… Data Center (elastic#177436) (elastic#177558)

# Backport

This will backport the following commits from `main` to `8.13`:
- [Add tiles and integrations for Jira Data Center and Confluence Data
Center (elastic#177436)](elastic#177436)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Artem
Shelkovnikov","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-02-22T00:49:21Z","message":"Add
tiles and integrations for Jira Data Center and Confluence Data Center
(elastic#177436)\n\n## Summary\r\n\r\nThis PR adds tiles for two
connectors:\r\n\r\n- Jira Data Center\r\n- Confluence Data
Center\r\n\r\nThese connectors internally use same service types: `jira`
and\r\n`confluence`. They re-use documentation for these connectors - it
can be\r\nfound in the same pages as for original Jira/Confluence
connectors.\r\n\r\nThe tiles are added to Enterprise Search connectors
page + into\r\nintegrations page. See screenshots.\r\n\r\n<img
width=\"1217\" alt=\"Screenshot 2024-02-21 at 14 10
20\"\r\nsrc=\"https://github.com/elastic/kibana/assets/12238374/da944de9-828b-453b-ad38-1695ae3d557a\">\r\n\r\n<img
width=\"1217\" alt=\"Screenshot 2024-02-21 at 14 11
09\"\r\nsrc=\"https://github.com/elastic/kibana/assets/12238374/aaac975e-e423-42a3-846b-628e9e673b5a\">\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[x]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [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### For
maintainers\r\n\r\n- [ ] This was checked for breaking API changes and
was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"c2dedc957a029c7b51a2abad4e4d79922d5d77ea","branchLabelMapping":{"^v8.14.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:feature","backport:prev-minor","v8.13.0","v8.14.0"],"title":"Add
tiles and integrations for Jira Data Center and Confluence Data
Center","number":177436,"url":"https://github.com/elastic/kibana/pull/177436","mergeCommit":{"message":"Add
tiles and integrations for Jira Data Center and Confluence Data Center
(elastic#177436)\n\n## Summary\r\n\r\nThis PR adds tiles for two
connectors:\r\n\r\n- Jira Data Center\r\n- Confluence Data
Center\r\n\r\nThese connectors internally use same service types: `jira`
and\r\n`confluence`. They re-use documentation for these connectors - it
can be\r\nfound in the same pages as for original Jira/Confluence
connectors.\r\n\r\nThe tiles are added to Enterprise Search connectors
page + into\r\nintegrations page. See screenshots.\r\n\r\n<img
width=\"1217\" alt=\"Screenshot 2024-02-21 at 14 10
20\"\r\nsrc=\"https://github.com/elastic/kibana/assets/12238374/da944de9-828b-453b-ad38-1695ae3d557a\">\r\n\r\n<img
width=\"1217\" alt=\"Screenshot 2024-02-21 at 14 11
09\"\r\nsrc=\"https://github.com/elastic/kibana/assets/12238374/aaac975e-e423-42a3-846b-628e9e673b5a\">\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[x]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [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### For
maintainers\r\n\r\n- [ ] This was checked for breaking API changes and
was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"c2dedc957a029c7b51a2abad4e4d79922d5d77ea"}},"sourceBranch":"main","suggestedTargetBranches":["8.13"],"targetPullRequestStates":[{"branch":"8.13","label":"v8.13.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.14.0","branchLabelMappingKey":"^v8.14.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/177436","number":177436,"mergeCommit":{"message":"Add
tiles and integrations for Jira Data Center and Confluence Data Center
(elastic#177436)\n\n## Summary\r\n\r\nThis PR adds tiles for two
connectors:\r\n\r\n- Jira Data Center\r\n- Confluence Data
Center\r\n\r\nThese connectors internally use same service types: `jira`
and\r\n`confluence`. They re-use documentation for these connectors - it
can be\r\nfound in the same pages as for original Jira/Confluence
connectors.\r\n\r\nThe tiles are added to Enterprise Search connectors
page + into\r\nintegrations page. See screenshots.\r\n\r\n<img
width=\"1217\" alt=\"Screenshot 2024-02-21 at 14 10
20\"\r\nsrc=\"https://github.com/elastic/kibana/assets/12238374/da944de9-828b-453b-ad38-1695ae3d557a\">\r\n\r\n<img
width=\"1217\" alt=\"Screenshot 2024-02-21 at 14 11
09\"\r\nsrc=\"https://github.com/elastic/kibana/assets/12238374/aaac975e-e423-42a3-846b-628e9e673b5a\">\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[x]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [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### For
maintainers\r\n\r\n- [ ] This was checked for breaking API changes and
was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"c2dedc957a029c7b51a2abad4e4d79922d5d77ea"}}]}]
BACKPORT-->

Co-authored-by: Artem Shelkovnikov <[email protected]>
  • Loading branch information
kibanamachine and artem-shelkovnikov authored Feb 22, 2024
1 parent ba53b41 commit 553b27a
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 1 deletion.
22 changes: 22 additions & 0 deletions packages/kbn-search-connectors/connectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
}),
serviceType: 'confluence',
},
{
iconPath: 'confluence_cloud.svg',
isBeta: false,
isNative: true,
isTechPreview: true,
keywords: ['confluence', 'data', 'center', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.confluence_data_center.name', {
defaultMessage: 'Confluence Data Center',
}),
serviceType: 'confluence',
},
{
iconPath: 'dropbox.svg',
isBeta: false,
Expand All @@ -64,6 +75,17 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
}),
serviceType: 'jira',
},
{
iconPath: 'jira_cloud.svg',
isBeta: false,
isTechPreview: true,
isNative: true,
keywords: ['jira', 'data', 'center', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.jira_data_center.name', {
defaultMessage: 'Jira Data Center',
}),
serviceType: 'jira',
},
{
iconPath: 'github.svg',
isBeta: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {

expect(resp.body).to.be.an('array');

expect(resp.body.length).to.be(54);
expect(resp.body.length).to.be(56);

// Test for sample data card
expect(resp.body.findIndex((c: { id: string }) => c.id === 'sample_data_all')).to.be.above(
Expand Down
63 changes: 63 additions & 0 deletions x-pack/plugins/enterprise_search/server/integrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,34 @@ export const registerEnterpriseSearchIntegrations = (
shipper: 'enterprise_search',
isBeta: false,
});
customIntegrations.registerCustomIntegration({
id: 'confluence_data_center',
title: i18n.translate(
'xpack.enterpriseSearch.integrations.connectors.confluenceDataCenterTitle',
{
defaultMessage: 'Confluence Data Center',
}
),
description: i18n.translate(
'xpack.enterpriseSearch.integrations.connectors.confluenceDataCenterDescription',
{
defaultMessage: 'Search over your content on Confluence Data Center.',
}
),
categories: ['enterprise_search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
uiInternalPath:
'/app/enterprise_search/content/search_indices/new_index/connector?service_type=confluence',
icons: [
{
type: 'svg',
src: http.basePath.prepend(
'/plugins/enterpriseSearch/assets/source_icons/confluence_cloud.svg'
),
},
],
shipper: 'enterprise_search',
isBeta: false,
});
customIntegrations.registerCustomIntegration({
id: 'jira_cloud',
title: i18n.translate('xpack.enterpriseSearch.integrations.connectors.jiraCloudTitle', {
Expand Down Expand Up @@ -850,6 +878,41 @@ export const registerEnterpriseSearchIntegrations = (
shipper: 'enterprise_search',
isBeta: false,
});
customIntegrations.registerCustomIntegration({
id: 'jira_data_center',
title: i18n.translate(
'xpack.enterpriseSearch.integrations.connectors.jiraDataCenterCloudTitle',
{
defaultMessage: 'Jira Data Center',
}
),
description: i18n.translate(
'xpack.enterpriseSearch.integrations.connectors.jiraDataCenterDescription',
{
defaultMessage: 'Search over your content on Jira Data Center.',
}
),
categories: [
'enterprise_search',
'elastic_stack',
'custom',
'connector',
'connector_client',
...nativeSearchTag,
],
uiInternalPath:
'/app/enterprise_search/content/search_indices/new_index/connector?service_type=jira',
icons: [
{
type: 'svg',
src: http.basePath.prepend(
'/plugins/enterpriseSearch/assets/source_icons/jira_cloud.svg'
),
},
],
shipper: 'enterprise_search',
isBeta: false,
});

customIntegrations.registerCustomIntegration({
id: 'jira_server',
Expand Down

0 comments on commit 553b27a

Please sign in to comment.