[8.15] [Inference Endpoints View] Deletion, search and filtering of i…

…nference endpoints (#186206) (#187887) # Backport This will backport the following commits from `main` to `8.15`: - [[Inference Endpoints View] Deletion, search and filtering of inference endpoints (#186206)](#186206)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)
elastic · Jul 9, 2024 · ee7fd95 · ee7fd95
1 parent 2193e94
commit ee7fd95
Show file tree

Hide file tree

Showing 70 changed files with 2,458 additions and 204 deletions.
diff --git a/packages/deeplinks/search/constants.ts b/packages/deeplinks/search/constants.ts
@@ -8,7 +8,7 @@
 
 export const ENTERPRISE_SEARCH_APP_ID = 'enterpriseSearch';
 export const ENTERPRISE_SEARCH_CONTENT_APP_ID = 'enterpriseSearchContent';
-export const ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID = 'enterpriseSearchInferenceEndpoints';
+export const ENTERPRISE_SEARCH_RELEVANCE_APP_ID = 'enterpriseSearchRelevance';
 export const ENTERPRISE_SEARCH_APPLICATIONS_APP_ID = 'enterpriseSearchApplications';
 export const ENTERPRISE_SEARCH_ANALYTICS_APP_ID = 'enterpriseSearchAnalytics';
 export const ENTERPRISE_SEARCH_APPSEARCH_APP_ID = 'appSearch';

diff --git a/packages/deeplinks/search/deep_links.ts b/packages/deeplinks/search/deep_links.ts
@@ -12,6 +12,7 @@ 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,
@@ -23,6 +24,7 @@ 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;
@@ -38,10 +40,13 @@ export type ApplicationsLinkId = 'searchApplications' | 'playground';
 
 export type AppsearchLinkId = 'engines';
 
+export type RelevanceLinkId = 'inferenceEndpoints';
+
 export type DeepLinkId =
   | EnterpriseSearchApp
   | EnterpriseSearchContentApp
   | EnterpriseSearchApplicationsApp
+  | EnterpriseSearchRelevanceApp
   | EnterpriseSearchAnalyticsApp
   | EnterpriseSearchAppsearchApp
   | EnterpriseSearchWorkplaceSearchApp
@@ -52,4 +57,5 @@ export type DeepLinkId =
   | SearchHomepage
   | `${EnterpriseSearchContentApp}:${ContentLinkId}`
   | `${EnterpriseSearchApplicationsApp}:${ApplicationsLinkId}`
-  | `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`;
+  | `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`
+  | `${EnterpriseSearchRelevanceApp}:${RelevanceLinkId}`;
diff --git a/packages/deeplinks/search/index.ts b/packages/deeplinks/search/index.ts
@@ -9,7 +9,7 @@
 export {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID,
+  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,

diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
@@ -135,7 +135,7 @@ export const applicationUsageSchema = {
   canvas: commonSchema,
   enterpriseSearch: commonSchema,
   enterpriseSearchContent: commonSchema,
-  enterpriseSearchInferenceEndpoints: commonSchema,
+  enterpriseSearchRelevance: commonSchema,
   enterpriseSearchAnalytics: commonSchema,
   enterpriseSearchApplications: commonSchema,
   enterpriseSearchAISearch: commonSchema,

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -2098,7 +2098,7 @@
             }
           }
         },
-        "enterpriseSearchInferenceEndpoints": {
+        "enterpriseSearchRelevance": {
           "properties": {
             "appId": {
               "type": "keyword",

diff --git a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
@@ -201,6 +201,52 @@ export type InferenceServiceSettings =
         api_key: string;
         organization_id: string;
         url: string;
+        model_id: string;
+      };
+    }
+  | {
+      service: 'mistral';
+      service_settings: {
+        api_key: string;
+        model: string;
+        max_input_tokens: string;
+        rate_limit: {
+          requests_per_minute: number;
+        };
+      };
+    }
+  | {
+      service: 'cohere';
+      service_settings: {
+        similarity: string;
+        dimensions: string;
+        model_id: string;
+        embedding_type: string;
+      };
+    }
+  | {
+      service: 'azureaistudio';
+      service_settings: {
+        target: string;
+        provider: string;
+        embedding_type: string;
+      };
+    }
+  | {
+      service: 'azureopenai';
+      service_settings: {
+        resource_name: string;
+        deployment_id: string;
+        api_version: string;
+      };
+    }
+  | {
+      service: 'googleaistudio';
+      service_settings: {
+        model_id: string;
+        rate_limit: {
+          requests_per_minute: number;
+        };
       };
     }
   | {

diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -8,7 +8,7 @@
 import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID,
+  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
@@ -178,7 +178,7 @@ export const VECTOR_SEARCH_PLUGIN = {
 };
 
 export const INFERENCE_ENDPOINTS_PLUGIN = {
-  ID: ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID,
+  ID: ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   NAME: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.productName', {
     defaultMessage: 'Inference Endpoints',
   }),

diff --git a/...plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts b/...plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
@@ -10,6 +10,7 @@ import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 export const mockLicensingValues = {
   license: licensingMock.createLicense(),
   hasPlatinumLicense: false,
+  hasEnterpriseLicense: true,
   hasGoldLicense: false,
   isTrial: false,
   canManageLicense: true,

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
@@ -40,6 +40,8 @@ import {
 import { INFERENCE_ENDPOINTS_PATH } from '../../enterprise_search_relevance/routes';
 import { KibanaLogic } from '../kibana';
 
+import { LicensingLogic } from '../licensing';
+
 import { generateNavLink } from './nav_link_helpers';
 
 /**
@@ -51,7 +53,11 @@ import { generateNavLink } from './nav_link_helpers';
 export const useEnterpriseSearchNav = (alwaysReturn = false) => {
   const { isSearchHomepageEnabled, searchHomepage, isSidebarEnabled, productAccess } =
     useValues(KibanaLogic);
+
+  const { hasEnterpriseLicense } = useValues(LicensingLogic);
+
   const indicesNavItems = useIndicesNav();
+
   if (!isSidebarEnabled && !alwaysReturn) return undefined;
 
   const navItems: Array<EuiSideNavItemTypeEnhanced<unknown>> = [
@@ -154,25 +160,29 @@ export const useEnterpriseSearchNav = (alwaysReturn = false) => {
         defaultMessage: 'Build',
       }),
     },
-    {
-      id: 'relevance',
-      items: [
-        {
-          id: 'inference_endpoints',
-          name: i18n.translate('xpack.enterpriseSearch.nav.inferenceEndpointsTitle', {
-            defaultMessage: 'Inference Endpoints',
-          }),
-          ...generateNavLink({
-            shouldNotCreateHref: true,
-            shouldShowActiveForSubroutes: true,
-            to: INFERENCE_ENDPOINTS_PLUGIN.URL + INFERENCE_ENDPOINTS_PATH,
-          }),
-        },
-      ],
-      name: i18n.translate('xpack.enterpriseSearch.nav.relevanceTitle', {
-        defaultMessage: 'Relevance',
-      }),
-    },
+    ...(hasEnterpriseLicense
+      ? [
+          {
+            id: 'relevance',
+            items: [
+              {
+                id: 'inference_endpoints',
+                name: i18n.translate('xpack.enterpriseSearch.nav.inferenceEndpointsTitle', {
+                  defaultMessage: 'Inference Endpoints',
+                }),
+                ...generateNavLink({
+                  shouldNotCreateHref: true,
+                  shouldShowActiveForSubroutes: true,
+                  to: INFERENCE_ENDPOINTS_PLUGIN.URL + INFERENCE_ENDPOINTS_PATH,
+                }),
+              },
+            ],
+            name: i18n.translate('xpack.enterpriseSearch.nav.relevanceTitle', {
+              defaultMessage: 'Relevance',
+            }),
+          },
+        ]
+      : []),
     {
       id: 'es_getting_started',
       items: [

diff --git a/...ck/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts b/...ck/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
@@ -167,6 +167,38 @@ describe('LicensingLogic', () => {
       });
     });
 
+    describe('hasEnterpriseLicense', () => {
+      it('is true for enterprise and trial licenses', () => {
+        updateLicense({ status: 'active', type: 'enterprise' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(true);
+
+        updateLicense({ status: 'active', type: 'trial' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(true);
+      });
+
+      it('is false if the current license is expired', () => {
+        updateLicense({ status: 'expired', type: 'enterprise' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'expired', type: 'trial' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+      });
+
+      it('is false for licenses below enterprise', () => {
+        updateLicense({ status: 'active', type: 'gold' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'active', type: 'platinum' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'active', type: 'basic' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'active', type: 'standard' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+      });
+    });
+
     describe('isTrial', () => {
       it('is true for active trial license', () => {
         updateLicense({ status: 'active', type: 'trial' });

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
@@ -13,6 +13,7 @@ import { ILicense } from '@kbn/licensing-plugin/public';
 interface LicensingValues {
   license: ILicense | null;
   licenseSubscription: Subscription | null;
+  hasEnterpriseLicense: boolean;
   hasPlatinumLicense: boolean;
   hasGoldLicense: boolean;
   isTrial: boolean;
@@ -52,6 +53,13 @@ export const LicensingLogic = kea<MakeLogicType<LicensingValues, LicensingAction
         return license?.isActive && qualifyingLicenses.includes(license?.type);
       },
     ],
+    hasEnterpriseLicense: [
+      (selectors) => [selectors.license],
+      (license) => {
+        const qualifyingLicenses = ['enterprise', 'trial'];
+        return license?.isActive && qualifyingLicenses.includes(license?.type);
+      },
+    ],
     hasGoldLicense: [
       (selectors) => [selectors.license],
       (license) => {

diff --git a/x-pack/plugins/enterprise_search/public/navigation_tree.ts b/x-pack/plugins/enterprise_search/public/navigation_tree.ts
@@ -211,7 +211,7 @@ export const getNavigationTreeDefinition = ({
                   }),
                 },
                 {
-                  children: [{ link: 'searchInferenceEndpoints' }],
+                  children: [{ link: 'enterpriseSearchRelevance:inferenceEndpoints' }],
                   id: 'relevance',
                   title: i18n.translate('xpack.enterpriseSearch.searchNav.relevance', {
                     defaultMessage: 'Relevance',