Merge branch '7.8' into backport/7.8/pr-65652

elastic · May 11, 2020 · f98d29f · f98d29f
2 parents 5cad8d6 + f59df00
commit f98d29f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.../public/application/jobs/jobs_list/components/create_watch_flyout/create_watch_service.js b/.../public/application/jobs/jobs_list/components/create_watch_flyout/create_watch_service.js
@@ -157,6 +157,7 @@ class CreateWatchService {
             id,
             type: 'json',
             isNew: false, // Set to false, as we want to allow watches to be overwritten.
+            isActive: true,
             watch,
           },
         };

diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
@@ -14,6 +14,13 @@ const callWithRequest: APICaller = (method: string) => {
     if (method === 'fieldCaps') {
       resolve({ fields: [] });
       return;
+    } else if (method === 'ml.info') {
+      resolve({
+        limits: {
+          effective_max_model_memory_limit: '100MB',
+          max_model_memory_limit: '1GB',
+        },
+      });
     }
     resolve({});
   }) as Promise<any>;