Merge branch 'main' into rnorris/es/fix-ml-inference-pipeline-name-he…

…lptext
elastic · Sep 21, 2022 · fd567b6 · fd567b6
2 parents a4c3cd0 + 77f7329
commit fd567b6
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "dashboarding"
   ],
   "private": true,
-  "version": "8.5.0",
+  "version": "8.6.0",
   "branch": "main",
   "types": "./kibana.d.ts",
   "tsdocMetadata": "./build/tsdoc-metadata.json",

diff --git a/packages/core/analytics/core-analytics-server-internal/src/analytics_service.test.ts b/packages/core/analytics/core-analytics-server-internal/src/analytics_service.test.ts
@@ -22,16 +22,26 @@ describe('AnalyticsService', () => {
     expect(analyticsClientMock.registerContextProvider).toHaveBeenCalledTimes(1);
     await expect(
       await firstValueFrom(analyticsClientMock.registerContextProvider.mock.calls[0][0].context$)
-    ).toMatchInlineSnapshot(`
+    ).toMatchInlineSnapshot(
+      {
+        branch: 'main',
+        buildNum: 9007199254740991,
+        buildSha: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+        isDev: true,
+        isDistributable: false,
+        version: expect.any(String),
+      },
+      `
             Object {
               "branch": "main",
               "buildNum": 9007199254740991,
               "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
               "isDev": true,
               "isDistributable": false,
-              "version": "8.5.0",
+              "version": Any<String>,
             }
-          `);
+          `
+    );
   });
 
   test('should register the `performance_metric` event type on creation', () => {

diff --git a/x-pack/package.json b/x-pack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "x-pack",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "author": "Elastic",
   "private": true,
   "license": "Elastic-License",

diff --git a/...ns/enterprise_search_content/components/search_index/pipelines/ml_inference/utils.test.ts b/...ns/enterprise_search_content/components/search_index/pipelines/ml_inference/utils.test.ts
@@ -31,11 +31,6 @@ describe('ml inference utils', () => {
             ner: {},
           },
         }),
-        makeFakeModel({
-          inference_config: {
-            classification: {},
-          },
-        }),
         makeFakeModel({
           inference_config: {
             text_classification: {},
@@ -53,6 +48,16 @@ describe('ml inference utils', () => {
             },
           },
         }),
+        makeFakeModel({
+          inference_config: {
+            question_answering: {},
+          },
+        }),
+        makeFakeModel({
+          inference_config: {
+            fill_mask: {},
+          },
+        }),
       ];
 
       for (const model of models) {
@@ -61,7 +66,14 @@ describe('ml inference utils', () => {
     });
 
     it('returns false for expected models', () => {
-      const models: TrainedModelConfigResponse[] = [makeFakeModel({})];
+      const models: TrainedModelConfigResponse[] = [
+        makeFakeModel({}),
+        makeFakeModel({
+          inference_config: {
+            classification: {},
+          },
+        }),
+      ];
 
       for (const model of models) {
         expect(isSupportedMLModel(model)).toBe(false);

diff --git a/...cations/enterprise_search_content/components/search_index/pipelines/ml_inference/utils.ts b/...cations/enterprise_search_content/components/search_index/pipelines/ml_inference/utils.ts
@@ -11,10 +11,11 @@ import { TrainedModelConfigResponse } from '@kbn/ml-plugin/common/types/trained_
 import { AddInferencePipelineFormErrors, InferencePipelineConfiguration } from './types';
 
 const NLP_CONFIG_KEYS = [
+  'fill_mask',
   'ner',
-  'classification',
   'text_classification',
   'text_embedding',
+  'question_answering',
   'zero_shot_classification',
 ];
 export const isSupportedMLModel = (model: TrainedModelConfigResponse): boolean => {

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -96,7 +96,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
     });
 
-    describe('when there is data,', () => {
+    // Version specific: https://github.com/elastic/kibana/issues/141298
+    describe.skip('when there is data,', () => {
       before(async () => {
         indexedData = await endpointTestResources.loadEndpointData({ numHosts: 3 });
         await pageObjects.endpoint.navigateToEndpointList();