From 875313e751e70131185459533bd1bfae74efc32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Fri, 15 Nov 2024 06:58:20 +0100
Subject: [PATCH] Remove `modelId` from config (#200181)

Follow up to https://github.com/elastic/kibana/pull/186499

This removes `modelId` from the config file. We don't need it anymore
since it can be supplied as a url param. Currently it's only needed in
the setup route (`POST /internal/observability_ai_assistant/kb/setup`)
---
 .../observability_ai_assistant/server/config.ts              | 1 -
 .../observability_ai_assistant/server/plugin.ts              | 5 -----
 .../configs/index.ts                                         | 2 --
 .../test_suites/observability/ai_assistant/config.ts         | 4 ----
 4 files changed, 12 deletions(-)

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/config.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/config.ts
index 4df8891bd06fc..2f36d27889c14 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/config.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/config.ts
@@ -9,7 +9,6 @@ import { schema, type TypeOf } from '@kbn/config-schema';
 
 export const config = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
-  modelId: schema.maybe(schema.string()), // TODO: Remove
   scope: schema.maybe(schema.oneOf([schema.literal('observability'), schema.literal('search')])),
   enableKnowledgeBase: schema.boolean({ defaultValue: true }),
 });
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
index 98a6232563054..b2b5736fd1d6f 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
@@ -116,11 +116,6 @@ export class ObservabilityAIAssistantPlugin
 
     // Using once to make sure the same model ID is used during service init and Knowledge base setup
     const getSearchConnectorModelId = once(async () => {
-      // TODO: Remove this once the modelId is removed from the config
-      const configModelId = this.config.modelId;
-      if (configModelId) {
-        return configModelId;
-      }
       const defaultModelId = '.elser_model_2';
       const [_, pluginsStart] = await core.getStartServices();
       // Wait for the license to be available so the ML plugin's guards pass once we ask for ELSER stats
diff --git a/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts b/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts
index 4a39c31b0a3a7..75f7bb628b4be 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts
@@ -8,7 +8,6 @@
 import { mapValues } from 'lodash';
 import path from 'path';
 import { createTestConfig, CreateTestConfig } from '../common/config';
-import { SUPPORTED_TRAINED_MODELS } from '../../functional/services/ml/api';
 
 export const observabilityAIAssistantDebugLogger = {
   name: 'plugins.observabilityAIAssistant',
@@ -31,7 +30,6 @@ export const observabilityAIAssistantFtrConfigs = {
         __dirname,
         '../../../../test/analytics/plugins/analytics_ftr_helpers'
       ),
-      'xpack.observabilityAIAssistant.modelId': SUPPORTED_TRAINED_MODELS.TINY_ELSER.name, // TODO: Remove
     },
   },
 };
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts b/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts
index 14078f228c7c8..01e470d2a7d88 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/config.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { SUPPORTED_TRAINED_MODELS } from '@kbn/test-suites-xpack/functional/services/ml/api';
 import { createTestConfig } from '../../../config.base';
 import { ObservabilityAIAssistantServices } from './common/ftr_provider_context';
 import { services as inheritedServices } from '../../../services';
@@ -28,7 +27,4 @@ export default createTestConfig({
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
   esServerArgs: ['xpack.ml.dfa.enabled=false'],
-  kbnServerArgs: [
-    `--xpack.observabilityAIAssistant.modelId=${SUPPORTED_TRAINED_MODELS.TINY_ELSER.name}`, // TODO: Remove
-  ],
 });