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

[Search] refactor: rename ent-search elasticsearch app id (#165241)

Browse source 
## Summary

Updated the elasticsearch app id in the enterprise search plugin from
'elasticsearch' to 'enterpriseSearchElasticsearch'. This is to remove
any possible permission or privelege conflicts with the route
`/app/elasticsearch`, which is registerd by serverless search.

### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
This commit is contained in:
Rodney Norris 2023-08-30 12:34:52 -05:00 • committed by GitHub
parent bab03d4606
commit 1e347652cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
View file

@ -139,7 +139,7 @@ export const applicationUsageSchema = {
enterpriseSearchApplications: commonSchema,
enterpriseSearchEsre: commonSchema,
enterpriseSearchVectorSearch: commonSchema,
elasticsearch: commonSchema,
enterpriseSearchElasticsearch: commonSchema,
appSearch: commonSchema,
workplaceSearch: commonSchema,
searchExperiences: commonSchema,

2
src/plugins/telemetry/schema/oss_plugins.json
View file

@ -2622,7 +2622,7 @@
}
}
},
"elasticsearch": {
"enterpriseSearchElasticsearch": {
"properties": {
"appId": {
"type": "keyword",

2
x-pack/plugins/enterprise_search/common/constants.ts
View file

@ -79,7 +79,7 @@ export const ANALYTICS_PLUGIN = {
};
export const ELASTICSEARCH_PLUGIN = {
ID: 'elasticsearch',
ID: 'enterpriseSearchElasticsearch',
NAME: i18n.translate('xpack.enterpriseSearch.elasticsearch.productName', {
defaultMessage: 'Elasticsearch',
}),

4
x-pack/plugins/enterprise_search/server/plugin.ts
View file

@ -203,7 +203,7 @@ export class EnterpriseSearchPlugin implements Plugin<void, EnterpriseSearchPlug
enterpriseSearchApplications: showEnterpriseSearch,
enterpriseSearchEsre: showEnterpriseSearch,
enterpriseSearchVectorSearch: showEnterpriseSearch,
elasticsearch: showEnterpriseSearch,
enterpriseSearchElasticsearch: showEnterpriseSearch,
appSearch: hasAppSearchAccess && config.canDeployEntSearch,
workplaceSearch: hasWorkplaceSearchAccess && config.canDeployEntSearch,
searchExperiences: showEnterpriseSearch,
@ -215,7 +215,7 @@ export class EnterpriseSearchPlugin implements Plugin<void, EnterpriseSearchPlug
enterpriseSearchApplications: showEnterpriseSearch,
enterpriseSearchEsre: showEnterpriseSearch,
enterpriseSearchVectorSearch: showEnterpriseSearch,
elasticsearch: showEnterpriseSearch,
enterpriseSearchElasticsearch: showEnterpriseSearch,
appSearch: hasAppSearchAccess && config.canDeployEntSearch,
workplaceSearch: hasWorkplaceSearchAccess && config.canDeployEntSearch,
searchExperiences: showEnterpriseSearch,

2
x-pack/test/accessibility/apps/enterprise_search.ts
View file

@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('loads a landing page with product cards', async function () {
await retry.waitFor(
'Elasticsearch product card visible',
async () => await testSubjects.exists('elasticsearchProductCard')
async () => await testSubjects.exists('enterpriseSearchElasticsearchProductCard')
);
await retry.waitFor(
'Search Applications product card visible',

2
x-pack/test/scalability/apis/api.core.capabilities.json
View file

@ -35,7 +35,7 @@
"method": "POST",
"path": "/api/core/capabilities",
"query": "?useDefaultCapabilities=true",
"body": "{\"applications\":[\"error\",\"status\",\"kibana\",\"dev_tools\",\"r\",\"short_url_redirect\",\"home\",\"management\",\"space_selector\",\"security_access_agreement\",\"security_capture_url\",\"security_login\",\"security_logout\",\"security_logged_out\",\"security_overwritten_session\",\"security_account\",\"reportingRedirect\",\"graph\",\"discover\",\"integrations\",\"fleet\",\"ingestManager\",\"visualize\",\"canvas\",\"dashboards\",\"lens\",\"maps\",\"osquery\",\"observability-overview\",\"ml\",\"uptime\",\"synthetics\",\"securitySolutionUI\",\"siem\",\"logs\",\"metrics\",\"infra\",\"monitoring\",\"enterpriseSearch\",\"enterpriseSearchContent\",\"enterpriseSearchAnalytics\",\"elasticsearch\",\"appSearch\",\"workplaceSearch\",\"searchExperiences\",\"apm\",\"ux\",\"kibanaOverview\"]}",
"body": "{\"applications\":[\"error\",\"status\",\"kibana\",\"dev_tools\",\"r\",\"short_url_redirect\",\"home\",\"management\",\"space_selector\",\"security_access_agreement\",\"security_capture_url\",\"security_login\",\"security_logout\",\"security_logged_out\",\"security_overwritten_session\",\"security_account\",\"reportingRedirect\",\"graph\",\"discover\",\"integrations\",\"fleet\",\"ingestManager\",\"visualize\",\"canvas\",\"dashboards\",\"lens\",\"maps\",\"osquery\",\"observability-overview\",\"ml\",\"uptime\",\"synthetics\",\"securitySolutionUI\",\"siem\",\"logs\",\"metrics\",\"infra\",\"monitoring\",\"enterpriseSearch\",\"enterpriseSearchContent\",\"enterpriseSearchAnalytics\",\"enterpriseSearchElasticsearch\",\"appSearch\",\"workplaceSearch\",\"searchExperiences\",\"apm\",\"ux\",\"kibanaOverview\"]}",
"headers": {
"Cookie": "",
"Kbn-Version": "",

4
x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
View file

@ -69,7 +69,7 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
'enterpriseSearchApplications',
'enterpriseSearchEsre',
'enterpriseSearchVectorSearch',
'elasticsearch',
'enterpriseSearchElasticsearch',
'appSearch',
'workplaceSearch',
'searchExperiences',
@ -99,7 +99,7 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
'enterpriseSearchApplications',
'enterpriseSearchEsre',
'enterpriseSearchVectorSearch',
'elasticsearch',
'enterpriseSearchElasticsearch',
'appSearch',
'observabilityAIAssistant',
'workplaceSearch',

2
x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts
View file

@ -56,6 +56,7 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
'enterpriseSearchApplications',
'enterpriseSearchEsre',
'enterpriseSearchVectorSearch',
'enterpriseSearchElasticsearch',
'appSearch',
'workplaceSearch'
)
@ -75,6 +76,7 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
'enterpriseSearchApplications',
'enterpriseSearchEsre',
'enterpriseSearchVectorSearch',
'enterpriseSearchElasticsearch',
'observabilityAIAssistant',
'appSearch',
'workplaceSearch',

2
x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
View file

@ -33,7 +33,7 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
'enterpriseSearchApplications',
'enterpriseSearchEsre',
'enterpriseSearchVectorSearch',
'elasticsearch',
'enterpriseSearchElasticsearch',
'appSearch',
'workplaceSearch',
'searchExperiences',

1
x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
View file

@ -25,6 +25,7 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
'enterpriseSearchApplications',
'enterpriseSearchEsre',
'enterpriseSearchVectorSearch',
'enterpriseSearchElasticsearch',
'appSearch',
'workplaceSearch',
];