[ML] Integrates into serverless kibana

packages/default-nav/ml/default_navigation.ts

@@ -23,9 +23,9 @@ export type MlNodeDefinition = NodeDefinitionWithChildren<DeepLinkId, Navigation
 export const defaultNavigation: MlNodeDefinition = {
   id: 'rootNav:ml',
   title: i18n.translate('defaultNavigation.ml.machineLearning', {
-    defaultMessage: 'Machine learning',
+    defaultMessage: 'Machine Learning',
   }),
-  icon: 'indexMapping',
+  icon: 'machineLearningApp',
   children: [
     {
       title: '',
@@ -65,7 +65,7 @@ export const defaultNavigation: MlNodeDefinition = {
     {
       id: 'data_frame_analytics',
       title: i18n.translate('defaultNavigation.ml.dataFrameAnalytics', {
-        defaultMessage: 'Data frame analytics',
+        defaultMessage: 'Data Frame Analytics',
       }),
       children: [
         {
@@ -83,7 +83,7 @@ export const defaultNavigation: MlNodeDefinition = {
     {
       id: 'model_management',
       title: i18n.translate('defaultNavigation.ml.modelManagement', {
-        defaultMessage: 'Model management',
+        defaultMessage: 'Model Management',
       }),
       children: [
         {
@@ -97,7 +97,7 @@ export const defaultNavigation: MlNodeDefinition = {
     {
       id: 'data_visualizer',
       title: i18n.translate('defaultNavigation.ml.dataVisualizer', {
-        defaultMessage: 'Data visualizer',
+        defaultMessage: 'Data Visualizer',
       }),
       children: [
         {
@@ -121,14 +121,14 @@ export const defaultNavigation: MlNodeDefinition = {
       }),
       children: [
         {
-          title: i18n.translate('defaultNavigation.ml.explainLogRateSpikes', {
-            defaultMessage: 'Explain log rate spikes',
-          }),
           link: 'ml:explainLogRateSpikes',
         },
         {
           link: 'ml:logPatternAnalysis',
         },
+        {
+          link: 'ml:changePointDetections',
+        },
       ],
     },
   ],

x-pack/plugins/enterprise_search/server/routes/enterprise_search/indices.test.ts

@@ -8,9 +8,8 @@
 import { MockRouter, mockDependencies } from '../../__mocks__';
 
 import { RequestHandlerContext } from '@kbn/core/server';
-import { MlTrainedModels } from '@kbn/ml-plugin/server';
 
-import { SharedServices } from '@kbn/ml-plugin/server/shared_services';
+import type { MlPluginSetup, MlTrainedModels } from '@kbn/ml-plugin/server';
 
 import { ErrorCode } from '../../../common/types/error_codes';
 
@@ -168,7 +167,7 @@ describe('Enterprise Search Managed Indices', () => {
   });
 
   describe('GET /internal/enterprise_search/indices/{indexName}/ml_inference/pipeline_processors', () => {
-    let mockMl: SharedServices;
+    let mockMl: MlPluginSetup;
     let mockTrainedModelsProvider: MlTrainedModels;
 
     beforeEach(() => {
@@ -195,7 +194,7 @@ describe('Enterprise Search Managed Indices', () => {
 
       mockMl = {
         trainedModelsProvider: () => Promise.resolve(mockTrainedModelsProvider),
-      } as unknown as jest.Mocked<SharedServices>;
+      } as unknown as jest.Mocked<MlPluginSetup>;
 
       registerIndexRoutes({
         ...mockDependencies,
@@ -1069,7 +1068,7 @@ describe('Enterprise Search Managed Indices', () => {
 
   describe('GET /internal/enterprise_search/pipelines/ml_inference', () => {
     let mockTrainedModelsProvider: MlTrainedModels;
-    let mockMl: SharedServices;
+    let mockMl: MlPluginSetup;
 
     beforeEach(() => {
       const context = {
@@ -1095,7 +1094,7 @@ describe('Enterprise Search Managed Indices', () => {
 
       mockMl = {
         trainedModelsProvider: () => Promise.resolve(mockTrainedModelsProvider),
-      } as unknown as jest.Mocked<SharedServices>;
+      } as unknown as jest.Mocked<MlPluginSetup>;
 
       registerIndexRoutes({
         ...mockDependencies,
@@ -1134,7 +1133,7 @@ describe('Enterprise Search Managed Indices', () => {
   });
 
   describe('POST /internal/enterprise_search/ml/models/{modelName}', () => {
-    let mockMl: SharedServices;
+    let mockMl: MlPluginSetup;
     let mockTrainedModelsProvider: MlTrainedModels;
 
     beforeEach(() => {
@@ -1156,7 +1155,7 @@ describe('Enterprise Search Managed Indices', () => {
 
       mockMl = {
         trainedModelsProvider: () => Promise.resolve(mockTrainedModelsProvider),
-      } as unknown as jest.Mocked<SharedServices>;
+      } as unknown as jest.Mocked<MlPluginSetup>;
 
       registerIndexRoutes({
         ...mockDependencies,
@@ -1198,7 +1197,7 @@ describe('Enterprise Search Managed Indices', () => {
   });
 
   describe('POST /internal/enterprise_search/ml/models/{modelName}/deploy', () => {
-    let mockMl: SharedServices;
+    let mockMl: MlPluginSetup;
     let mockTrainedModelsProvider: MlTrainedModels;
 
     beforeEach(() => {
@@ -1220,7 +1219,7 @@ describe('Enterprise Search Managed Indices', () => {
 
       mockMl = {
         trainedModelsProvider: () => Promise.resolve(mockTrainedModelsProvider),
-      } as unknown as jest.Mocked<SharedServices>;
+      } as unknown as jest.Mocked<MlPluginSetup>;
 
       registerIndexRoutes({
         ...mockDependencies,
@@ -1262,7 +1261,7 @@ describe('Enterprise Search Managed Indices', () => {
   });
 
   describe('GET /internal/enterprise_search/ml/models/{modelName}', () => {
-    let mockMl: SharedServices;
+    let mockMl: MlPluginSetup;
     let mockTrainedModelsProvider: MlTrainedModels;
 
     beforeEach(() => {
@@ -1283,7 +1282,7 @@ describe('Enterprise Search Managed Indices', () => {
 
       mockMl = {
         trainedModelsProvider: () => Promise.resolve(mockTrainedModelsProvider),
-      } as unknown as jest.Mocked<SharedServices>;
+      } as unknown as jest.Mocked<MlPluginSetup>;
 
       registerIndexRoutes({
         ...mockDependencies,

x-pack/plugins/ml/common/types/capabilities.ts

@@ -18,6 +18,12 @@ export const apmUserMlCapabilities = {
   canGetJobs: false,
 };
 
+export const featureMlCapabilities = {
+  isADEnabled: true,
+  isDFAEnabled: true,
+  isNLPEnabled: true,
+};
+
 export const userMlCapabilities = {
   // Anomaly Detection
   canGetJobs: false,
@@ -80,19 +86,21 @@ export const adminMlCapabilities = {
   canStartStopTrainedModels: false,
 };
 
+export type FeatureMlCapabilities = typeof featureMlCapabilities;
 export type UserMlCapabilities = typeof userMlCapabilities;
 export type AdminMlCapabilities = typeof adminMlCapabilities;
-export type MlCapabilities = UserMlCapabilities & AdminMlCapabilities;
+export type MlCapabilities = FeatureMlCapabilities & UserMlCapabilities & AdminMlCapabilities;
 export type MlCapabilitiesKey = keyof MlCapabilities;
 
-export const basicLicenseMlCapabilities = [
+export const basicLicenseMlCapabilities: MlCapabilitiesKey[] = [
   'canFindFileStructure',
   'canGetFieldInfo',
   'canGetMlInfo',
-] as Array<keyof MlCapabilities>;
+];
 
 export function getDefaultCapabilities(): MlCapabilities {
   return {
+    ...featureMlCapabilities,
     ...userMlCapabilities,
     ...adminMlCapabilities,
   };
@@ -101,8 +109,13 @@ export function getDefaultCapabilities(): MlCapabilities {
 export function getPluginPrivileges() {
   const apmUserMlCapabilitiesKeys = Object.keys(apmUserMlCapabilities);
   const userMlCapabilitiesKeys = Object.keys(userMlCapabilities);
+  const featureMlCapabilitiesKeys = Object.keys(featureMlCapabilities);
   const adminMlCapabilitiesKeys = Object.keys(adminMlCapabilities);
-  const allMlCapabilitiesKeys = [...adminMlCapabilitiesKeys, ...userMlCapabilitiesKeys];
+  const allMlCapabilitiesKeys = [
+    ...featureMlCapabilitiesKeys,
+    ...adminMlCapabilitiesKeys,
+    ...userMlCapabilitiesKeys,
+  ];
 
   const savedObjects = [
     'index-pattern',
@@ -143,10 +156,13 @@ export function getPluginPrivileges() {
     },
     user: {
       ...privilege,
-      api: ['fileUpload:analyzeFile', ...userMlCapabilitiesKeys.map((k) => `ml:${k}`)],
+      api: [
+        'fileUpload:analyzeFile',
+        ...[...featureMlCapabilitiesKeys, ...userMlCapabilitiesKeys].map((k) => `ml:${k}`),
+      ],
       catalogue: [PLUGIN_ID],
       management: { insightsAndAlerting: [] },
-      ui: userMlCapabilitiesKeys,
+      ui: [...featureMlCapabilitiesKeys, ...userMlCapabilitiesKeys],
       savedObject: {
         all: [],
         read: savedObjects,
@@ -182,3 +198,50 @@ export interface MlCapabilitiesResponse {
 }
 
 export type ResolveMlCapabilities = (request: KibanaRequest) => Promise<MlCapabilities | null>;
+
+interface FeatureCapabilities {
+  ad: MlCapabilitiesKey[];
+  dfa: MlCapabilitiesKey[];
+  nlp: MlCapabilitiesKey[];
+}
+
+export const featureCapabilities: FeatureCapabilities = {
+  ad: [
+    'canGetJobs',
+    'canGetDatafeeds',
+    'canGetCalendars',
+    'canGetAnnotations',
+    'canCreateAnnotation',
+    'canDeleteAnnotation',
+    'canCreateJob',
+    'canDeleteJob',
+    'canOpenJob',
+    'canCloseJob',
+    'canResetJob',
+    'canUpdateJob',
+    'canForecastJob',
+    'canCreateDatafeed',
+    'canDeleteDatafeed',
+    'canStartStopDatafeed',
+    'canUpdateDatafeed',
+    'canPreviewDatafeed',
+    'canGetFilters',
+    'canCreateCalendar',
+    'canDeleteCalendar',
+    'canCreateFilter',
+    'canDeleteFilter',
+  ],
+  dfa: [
+    'canGetDataFrameAnalytics',
+    'canCreateDataFrameAnalytics',
+    'canDeleteDataFrameAnalytics',
+    'canStartStopDataFrameAnalytics',
+  ],
+  nlp: [
+    'canGetTrainedModels',
+    'canTestTrainedModels',
+    'canCreateTrainedModels',
+    'canDeleteTrainedModels',
+    'canStartStopTrainedModels',
+  ],
+};

x-pack/plugins/ml/public/application/app.tsx

@@ -9,7 +9,8 @@ import React, { type FC, useMemo } from 'react';
 import './_index.scss';
 import ReactDOM from 'react-dom';
 import { pick } from 'lodash';
-import { AppMountParameters, CoreStart, HttpStart } from '@kbn/core/public';
+
+import type { AppMountParameters, CoreStart, HttpStart } from '@kbn/core/public';
 import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { DatePickerContextProvider } from '@kbn/ml-date-picker';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
@@ -33,6 +34,7 @@ import { mlUsageCollectionProvider } from './services/usage_collection';
 import { MlRouter } from './routing';
 import { mlApiServicesProvider } from './services/ml_api_service';
 import { HttpService } from './services/http_service';
+import type { PageDependencies } from './routing/router';
 
 export type MlDependencies = Omit<
   MlSetupDependencies,
@@ -48,12 +50,6 @@ interface AppProps {
 
 const localStorage = new Storage(window.localStorage);
 
-// temporary function to hardcode the serverless state
-// this will be replaced by the true serverless information from kibana
-export function isServerless() {
-  return false;
-}
-
 /**
  * Provides global services available across the entire ML app.
  */
@@ -65,7 +61,6 @@ export function getMlGlobalServices(httpStart: HttpStart, usageCollection?: Usag
     httpService,
     mlApiServices,
     mlUsageCollection: mlUsageCollectionProvider(usageCollection),
-    isServerless,
     mlCapabilities: new MlCapabilitiesService(mlApiServices),
     mlLicense: new MlLicense(),
   };
@@ -78,7 +73,7 @@ export interface MlServicesContext {
 export type MlGlobalServices = ReturnType<typeof getMlGlobalServices>;
 
 const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
-  const pageDeps = {
+  const pageDeps: PageDependencies = {
     history: appMountParams.history,
     setHeaderActionMenu: appMountParams.setHeaderActionMenu,
     setBreadcrumbs: coreStart.chrome!.setBreadcrumbs,