Remove most job specifics from setup state hook

Author: weltenwort

x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts

@@ -12,7 +12,7 @@ import { kfetch } from 'ui/kfetch';
 
 import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
 import { getJobIdPrefix } from '../../../../../common/log_analysis';
-import { jobCustomSettingsRT } from './ml_api_types';
+// import { jobCustomSettingsRT } from './ml_api_types';
 
 export const callSetupMlModuleAPI = async (
   moduleId: string,
@@ -21,8 +21,8 @@ export const callSetupMlModuleAPI = async (
   spaceId: string,
   sourceId: string,
   indexPattern: string,
-  timeField: string,
-  bucketSpan: number
+  jobOverrides: SetupMlModuleJobOverrides[] = [],
+  datafeedOverrides: SetupMlModuleDatafeedOverrides[] = []
 ) => {
   const response = await kfetch({
     method: 'POST',
@@ -34,25 +34,27 @@ export const callSetupMlModuleAPI = async (
         indexPatternName: indexPattern,
         prefix: getJobIdPrefix(spaceId, sourceId),
         startDatafeed: true,
-        jobOverrides: [
-          {
-            job_id: 'log-entry-rate' as const,
-            analysis_config: {
-              bucket_span: `${bucketSpan}ms`,
-            },
-            data_description: {
-              time_field: timeField,
-            },
-            custom_settings: {
-              logs_source_config: {
-                indexPattern,
-                timestampField: timeField,
-                bucketSpan,
-              },
-            },
-          },
-        ],
-        datafeedOverrides: [],
+        jobOverrides,
+        datafeedOverrides,
+        // jobOverrides: [
+        //   {
+        //     job_id: 'log-entry-rate' as const,
+        //     analysis_config: {
+        //       bucket_span: `${bucketSpan}ms`,
+        //     },
+        //     data_description: {
+        //       time_field: timeField,
+        //     },
+        //     custom_settings: {
+        //       logs_source_config: {
+        //         indexPattern,
+        //         timestampField: timeField,
+        //         bucketSpan,
+        //       },
+        //     },
+        //   },
+        // ],
+        // datafeedOverrides: [],
       })
     ),
   });
@@ -68,23 +70,30 @@ const setupMlModuleTimeParamsRT = rt.partial({
   end: rt.number,
 });
 
-const setupMlModuleLogEntryRateJobOverridesRT = rt.type({
-  job_id: rt.literal('log-entry-rate'),
-  analysis_config: rt.type({
-    bucket_span: rt.string,
-  }),
-  data_description: rt.type({
-    time_field: rt.string,
-  }),
-  custom_settings: jobCustomSettingsRT,
-});
+const setupMlModuleJobOverridesRT = rt.object;
+
+type SetupMlModuleJobOverrides = rt.TypeOf<typeof setupMlModuleJobOverridesRT>;
+
+const setupMlModuleDatafeedOverridesRT = rt.object;
+
+type SetupMlModuleDatafeedOverrides = rt.TypeOf<typeof setupMlModuleDatafeedOverridesRT>;
+// const setupMlModuleLogEntryRateJobOverridesRT = rt.type({
+//   job_id: rt.literal('log-entry-rate'),
+//   analysis_config: rt.type({
+//     bucket_span: rt.string,
+//   }),
+//   data_description: rt.type({
+//     time_field: rt.string,
+//   }),
+//   custom_settings: jobCustomSettingsRT,
+// });
 
 const setupMlModuleRequestParamsRT = rt.type({
   indexPatternName: rt.string,
   prefix: rt.string,
   startDatafeed: rt.boolean,
-  jobOverrides: rt.array(setupMlModuleLogEntryRateJobOverridesRT),
-  datafeedOverrides: rt.array(rt.object),
+  jobOverrides: rt.array(setupMlModuleJobOverridesRT),
+  datafeedOverrides: rt.array(setupMlModuleDatafeedOverridesRT),
 });
 
 const setupMlModuleRequestPayloadRT = rt.intersection([

x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_jobs.tsx

@@ -20,20 +20,20 @@ export const useLogAnalysisJobs = <JobType extends string>({
   moduleId,
   sourceId,
   spaceId,
-  timeField,
+  jobParameters,
 }: {
   indexPattern: string;
   jobTypes: JobType[];
   moduleId: string;
   sourceId: string;
   spaceId: string;
-  timeField: string;
+  jobParameters: { timestampField: string };
 }) => {
   const { cleanupMLResources } = useLogAnalysisCleanup({ sourceId, spaceId });
-  const [statusState, dispatch] = useStatusState({
+  const [statusState, dispatch] = useStatusState(jobTypes, {
     bucketSpan,
     indexPattern,
-    timestampField: timeField,
+    timestampField: jobParameters.timestampField,
   });
 
   const [fetchModuleDefinitionRequest, fetchModuleDefinition] = useTrackedPromise(
@@ -74,8 +74,25 @@ export const useLogAnalysisJobs = <JobType extends string>({
           spaceId,
           sourceId,
           indices.join(','),
-          timeField,
-          bucketSpan
+          [
+            {
+              job_id: 'log-entry-rate' as const,
+              analysis_config: {
+                bucket_span: `${bucketSpan}ms`,
+              },
+              data_description: {
+                time_field: jobParameters.timestampField,
+              },
+              custom_settings: {
+                logs_source_config: {
+                  indexPattern,
+                  timestampField: jobParameters.timestampField,
+                  bucketSpan,
+                },
+              },
+            },
+          ],
+          []
         );
       },
       onResolve: ({ datafeeds, jobs }: SetupMlModuleResponsePayload) => {
@@ -85,7 +102,7 @@ export const useLogAnalysisJobs = <JobType extends string>({
         dispatch({ type: 'failedSetup' });
       },
     },
-    [spaceId, sourceId, timeField, bucketSpan]
+    [spaceId, sourceId, jobParameters.timestampField, bucketSpan]
   );
 
   const [fetchJobStatusRequest, fetchJobStatus] = useTrackedPromise(