Merge branch 'main' into change_url_for_getting_started

config/serverless.es.yml

@@ -116,9 +116,6 @@ xpack.ml.compatibleModuleType: 'search'
 
 data_visualizer.resultLinks.fileBeat.enabled: false
 
-# Search InferenceEndpoints
-xpack.searchInferenceEndpoints.ui.enabled: true
-
 # Search Notebooks
 xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json
 

config/serverless.oblt.yml

@@ -8,6 +8,7 @@ xpack.uptime.enabled: true
 xpack.securitySolution.enabled: false
 xpack.search.notebooks.enabled: false
 xpack.searchPlayground.enabled: false
+xpack.searchInferenceEndpoints.enabled: false
 
 ## Fine-tune the observability solution feature privileges. Also, refer to `serverless.yml` for the project-agnostic overrides.
 xpack.features.overrides:

config/serverless.security.yml

@@ -9,6 +9,7 @@ xpack.observability.enabled: false
 xpack.observabilityAIAssistant.enabled: false
 xpack.search.notebooks.enabled: false
 xpack.searchPlayground.enabled: false
+xpack.searchInferenceEndpoints.enabled: false
 
 ## Fine-tune the security solution feature privileges. Also, refer to `serverless.yml` for the project-agnostic overrides.
 xpack.features.overrides:

packages/deeplinks/search/constants.ts

@@ -9,7 +9,6 @@
 
 export const ENTERPRISE_SEARCH_APP_ID = 'enterpriseSearch';
 export const ENTERPRISE_SEARCH_CONTENT_APP_ID = 'enterpriseSearchContent';
-export const ENTERPRISE_SEARCH_RELEVANCE_APP_ID = 'searchInferenceEndpoints';
 export const ENTERPRISE_SEARCH_APPLICATIONS_APP_ID = 'enterpriseSearchApplications';
 export const ENTERPRISE_SEARCH_ANALYTICS_APP_ID = 'enterpriseSearchAnalytics';
 export const ENTERPRISE_SEARCH_APPSEARCH_APP_ID = 'appSearch';

packages/deeplinks/search/deep_links.ts

@@ -14,7 +14,6 @@ import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
-  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
   ENTERPRISE_SEARCH_WORKPLACESEARCH_APP_ID,
@@ -33,7 +32,6 @@ import {
 export type EnterpriseSearchApp = typeof ENTERPRISE_SEARCH_APP_ID;
 export type EnterpriseSearchContentApp = typeof ENTERPRISE_SEARCH_CONTENT_APP_ID;
 export type EnterpriseSearchApplicationsApp = typeof ENTERPRISE_SEARCH_APPLICATIONS_APP_ID;
-export type EnterpriseSearchRelevanceApp = typeof ENTERPRISE_SEARCH_RELEVANCE_APP_ID;
 export type EnterpriseSearchAnalyticsApp = typeof ENTERPRISE_SEARCH_ANALYTICS_APP_ID;
 export type EnterpriseSearchAppsearchApp = typeof ENTERPRISE_SEARCH_APPSEARCH_APP_ID;
 export type EnterpriseSearchWorkplaceSearchApp = typeof ENTERPRISE_SEARCH_WORKPLACESEARCH_APP_ID;
@@ -56,15 +54,14 @@ export type ApplicationsLinkId = 'searchApplications';
 
 export type AppsearchLinkId = 'engines';
 
-export type RelevanceLinkId = 'inferenceEndpoints';
+export type SearchInferenceEndpointsLinkId = 'inferenceEndpoints';
 
 export type SearchIndicesLinkId = typeof SEARCH_INDICES_CREATE_INDEX;
 
 export type DeepLinkId =
   | EnterpriseSearchApp
   | EnterpriseSearchContentApp
   | EnterpriseSearchApplicationsApp
-  | EnterpriseSearchRelevanceApp
   | EnterpriseSearchAnalyticsApp
   | EnterpriseSearchAppsearchApp
   | EnterpriseSearchWorkplaceSearchApp
@@ -77,7 +74,7 @@ export type DeepLinkId =
   | `${EnterpriseSearchContentApp}:${ContentLinkId}`
   | `${EnterpriseSearchApplicationsApp}:${ApplicationsLinkId}`
   | `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`
-  | `${EnterpriseSearchRelevanceApp}:${RelevanceLinkId}`
+  | `${SearchInferenceEndpointsId}:${SearchInferenceEndpointsLinkId}`
   | SearchStart
   | SearchIndices
   | SearchElasticsearch

packages/deeplinks/search/index.ts

@@ -10,7 +10,6 @@
 export {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,

x-pack/plugins/enterprise_search/common/constants.ts

@@ -10,7 +10,6 @@ import dedent from 'dedent';
 import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
@@ -200,22 +199,6 @@ export const SEMANTIC_SEARCH_PLUGIN = {
   URL: '/app/elasticsearch/semantic_search',
 };
 
-export const SEARCH_RELEVANCE_PLUGIN = {
-  ID: ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
-  NAME: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.productName', {
-    defaultMessage: 'Inference Endpoints',
-  }),
-  NAV_TITLE: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.navTitle', {
-    defaultMessage: 'Relevance',
-  }),
-  DESCRIPTION: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.description', {
-    defaultMessage: 'Manage your inference endpoints for semantic search and AI use cases.',
-  }),
-  URL: '/app/elasticsearch/relevance',
-  LOGO: 'logoEnterpriseSearch',
-  SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/',
-};
-
 export const CREATE_CONNECTOR_PLUGIN = {
   CLI_SNIPPET: dedent`./bin/connectors connector create
   --index-name my-index

x-pack/plugins/enterprise_search/common/locators/index.ts

@@ -6,15 +6,12 @@
  */
 
 import type { SharePluginSetup } from '@kbn/share-plugin/public';
-import { SerializableRecord } from '@kbn/utility-types';
 
 import {
   CreateIndexLocatorDefinition,
   type CreateIndexLocatorParams,
 } from './create_index_locator';
-import { SearchInferenceEndpointLocatorDefinition } from './inference_locator';
 
 export function registerLocators(share: SharePluginSetup) {
   share.url.locators.create<CreateIndexLocatorParams>(new CreateIndexLocatorDefinition());
-  share.url.locators.create<SerializableRecord>(new SearchInferenceEndpointLocatorDefinition());
 }

x-pack/plugins/enterprise_search/kibana.jsonc

@@ -34,7 +34,6 @@
       "guidedOnboarding",
       "console",
       "searchConnectors",
-      "searchInferenceEndpoints",
       "searchNavigation",
       "searchPlayground",
       "embeddable",

x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts

@@ -65,7 +65,6 @@ export const mockKibanaValues = {
     hasWebCrawler: true,
   },
   renderHeaderActions: jest.fn(),
-  searchInferenceEndpoints: null,
   security: securityMock.createStart(),
   setBreadcrumbs: jest.fn(),
   setChromeIsVisible: jest.fn(),