diff --git a/docs/settings/enterprise-search-settings.asciidoc b/docs/settings/enterprise-search-settings.asciidoc deleted file mode 100644 index 736a7614b31ed..0000000000000 --- a/docs/settings/enterprise-search-settings.asciidoc +++ /dev/null @@ -1,26 +0,0 @@ -[role="xpack"] -[[enterprise-search-settings-kb]] -=== Enterprise Search settings in {kib} -++++ -Enterprise Search settings -++++ - -On Elastic Cloud, you do not need to configure any settings to use Enterprise Search in {kib}. It is enabled by default. On self-managed installations, you must configure `enterpriseSearch.host`. - -`enterpriseSearch.host`:: -The http(s) URL of your Enterprise Search instance. For example, in a local self-managed setup, -set this to `http://localhost:3002`. Authentication between {kib} and the Enterprise Search host URL, -such as via OAuth, is not supported. You can also -{enterprise-search-ref}/configure-ssl-tls.html#configure-ssl-tls-in-kibana[configure {kib} to trust -your Enterprise Search TLS certificate authority]. - - -`enterpriseSearch.accessCheckTimeout`:: -When launching the Enterprise Search UI, the maximum number of milliseconds for {kib} to wait -for a response from Enterprise Search -before considering the attempt failed and logging a warning. -Default: 5000. - -`enterpriseSearch.accessCheckTimeoutWarning`:: -When launching the Enterprise Search UI, the maximum number of milliseconds for {kib} to wait for a response from -Enterprise Search before logging a warning. Default: 300. diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc index ceef418ed9e89..2ca3fc626e353 100644 --- a/docs/setup/settings.asciidoc +++ b/docs/setup/settings.asciidoc @@ -691,7 +691,6 @@ include::{kibana-root}/docs/settings/alert-action-settings.asciidoc[] include::{kibana-root}/docs/settings/apm-settings.asciidoc[] include::{kibana-root}/docs/settings/banners-settings.asciidoc[] include::{kibana-root}/docs/settings/cases-settings.asciidoc[leveloffset=+1] -include::{kibana-root}/docs/settings/enterprise-search-settings.asciidoc[] include::{kibana-root}/docs/settings/fleet-settings.asciidoc[] include::{kibana-root}/docs/settings/i18n-settings.asciidoc[] include::{kibana-root}/docs/settings/logging-settings.asciidoc[] diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker index 81d3c515b7e58..6fe947789330d 100755 --- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker +++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker @@ -83,9 +83,6 @@ kibana_vars=( elasticsearch.ssl.truststore.path elasticsearch.ssl.verificationMode elasticsearch.username - enterpriseSearch.accessCheckTimeout - enterpriseSearch.accessCheckTimeoutWarning - enterpriseSearch.host externalUrl.policy i18n.locale interactiveSetup.enabled diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts index 9f8e35a4a1bda..2f98bb3bdde07 100644 --- a/test/plugin_functional/test_suites/core_plugins/rendering.ts +++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts @@ -128,8 +128,6 @@ export default function ({ getService }: PluginFunctionalProviderContext) { 'data_visualizer.resultLinks.fileBeat.enabled (boolean)', 'dev_tools.deeplinks.navLinkStatus (string?)', 'discover.experimental.enabledProfiles (array?)', - 'enterpriseSearch.host (string?)', - 'enterpriseSearch.ui.enabled (boolean?)', 'home.disableWelcomeScreen (boolean?)', 'management.deeplinks.navLinkStatus (string?)', 'map.emsFileApiUrl (string?)', diff --git a/x-pack/solutions/search/plugins/enterprise_search/common/types/index.ts b/x-pack/solutions/search/plugins/enterprise_search/common/types/index.ts index d5341e7c3b278..e24599070be12 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/common/types/index.ts +++ b/x-pack/solutions/search/plugins/enterprise_search/common/types/index.ts @@ -35,12 +35,8 @@ export interface Meta { page: MetaPage; } -export interface ClientConfigType { - host?: string; - ui: { - enabled: boolean; - }; -} +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface ClientConfigType {} export type { ConnectorStats } from './connector_stats'; export type { ElasticsearchIndexWithPrivileges } from './indices'; diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/test_helpers/test_utils.test_helper.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/test_helpers/test_utils.test_helper.tsx index cf685b5a64b29..17d6aac7af03e 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/test_helpers/test_utils.test_helper.tsx +++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/test_helpers/test_utils.test_helper.tsx @@ -45,7 +45,6 @@ export const mockKibanaProps: KibanaLogicProps = { isCloudEnabled: false, }, config: { - host: 'http://localhost:3002', ui: { enabled: true, }, diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/plugin.ts b/x-pack/solutions/search/plugins/enterprise_search/public/plugin.ts index 98e5fa35be834..c83ea90b6843f 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/public/plugin.ts +++ b/x-pack/solutions/search/plugins/enterprise_search/public/plugin.ts @@ -209,10 +209,6 @@ export class EnterpriseSearchPlugin implements Plugin { private isSidebarEnabled = true; public setup(core: CoreSetup, plugins: PluginsSetup) { - const { config } = this; - if (!config.ui?.enabled) { - return; - } const { cloud, share } = plugins; core.application.register({ @@ -481,9 +477,6 @@ export class EnterpriseSearchPlugin implements Plugin { private readonly sideNavDynamicItems$ = new BehaviorSubject({}); public start(core: CoreStart, plugins: PluginsStart) { - if (!this.config.ui?.enabled) { - return; - } // This must be called here in start() and not in `applications/index.tsx` to prevent loading // race conditions with our apps' `routes.ts` being initialized before `renderApp()` docLinks.setDocLinks(core.docLinks); diff --git a/x-pack/solutions/search/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts b/x-pack/solutions/search/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts index 61b8d34aae7c9..323b5e0de3844 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts +++ b/x-pack/solutions/search/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts @@ -18,22 +18,12 @@ export const mockMl = mlPluginServerMock.createSetupContract(); export const mockConfig: ConfigType = { enabled: true, - host: 'http://localhost:3002', - accessCheckTimeout: 5000, - accessCheckTimeoutWarning: 300, - ssl: { - verificationMode: 'none', - }, hasConnectors: true, hasDefaultIngestPipeline: true, hasDocumentLevelSecurityEnabled: true, hasIncrementalSyncEnabled: true, hasNativeConnectors: true, hasWebCrawler: true, - isCloud: false, - ui: { - enabled: true, - }, }; /** diff --git a/x-pack/solutions/search/plugins/enterprise_search/server/config.ts b/x-pack/solutions/search/plugins/enterprise_search/server/config.ts new file mode 100644 index 0000000000000..6ff050188a33c --- /dev/null +++ b/x-pack/solutions/search/plugins/enterprise_search/server/config.ts @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { schema, TypeOf } from '@kbn/config-schema'; +import { PluginConfigDescriptor } from '@kbn/core/server'; + +export const configSchema = schema.object({ + enabled: schema.boolean({ defaultValue: true }), + hasConnectors: schema.boolean({ defaultValue: true }), + hasDefaultIngestPipeline: schema.boolean({ defaultValue: true }), + hasDocumentLevelSecurityEnabled: schema.boolean({ defaultValue: true }), + hasIncrementalSyncEnabled: schema.boolean({ defaultValue: true }), + hasNativeConnectors: schema.boolean({ defaultValue: true }), + hasWebCrawler: schema.boolean({ defaultValue: false }), +}); + +export type ConfigType = TypeOf; + +export const config: PluginConfigDescriptor = { + schema: configSchema, +}; diff --git a/x-pack/solutions/search/plugins/enterprise_search/server/index.ts b/x-pack/solutions/search/plugins/enterprise_search/server/index.ts index c4715bace36cf..e4823b74d6b62 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/server/index.ts +++ b/x-pack/solutions/search/plugins/enterprise_search/server/index.ts @@ -5,50 +5,11 @@ * 2.0. */ -import { schema, TypeOf } from '@kbn/config-schema'; -import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server'; +import { PluginInitializerContext } from '@kbn/core/server'; + +export { config, configSchema, type ConfigType } from './config'; export const plugin = async (initializerContext: PluginInitializerContext) => { const { EnterpriseSearchPlugin } = await import('./plugin'); return new EnterpriseSearchPlugin(initializerContext); }; - -export const configSchema = schema.object({ - accessCheckTimeout: schema.number({ defaultValue: 5000 }), - accessCheckTimeoutWarning: schema.number({ defaultValue: 300 }), - customHeaders: schema.maybe(schema.object({}, { unknowns: 'allow' })), - enabled: schema.boolean({ defaultValue: true }), - hasConnectors: schema.boolean({ defaultValue: true }), - hasDefaultIngestPipeline: schema.boolean({ defaultValue: true }), - hasDocumentLevelSecurityEnabled: schema.boolean({ defaultValue: true }), - hasIncrementalSyncEnabled: schema.boolean({ defaultValue: true }), - hasNativeConnectors: schema.boolean({ defaultValue: true }), - hasWebCrawler: schema.boolean({ defaultValue: false }), - host: schema.maybe(schema.string()), - isCloud: schema.boolean({ defaultValue: false }), - ssl: schema.object({ - certificateAuthorities: schema.maybe( - schema.oneOf([schema.arrayOf(schema.string(), { minSize: 1 }), schema.string()]) - ), - verificationMode: schema.oneOf( - [schema.literal('none'), schema.literal('certificate'), schema.literal('full')], - { defaultValue: 'full' } - ), - }), - ui: schema.object({ - enabled: schema.boolean({ defaultValue: true }), - }), -}); - -export type ConfigType = TypeOf; - -export const config: PluginConfigDescriptor = { - deprecations: ({ unused }) => [unused('canDeployEntSearch', { level: 'warning' })], - exposeToBrowser: { - host: true, - ui: true, - }, - schema: configSchema, -}; - -export const CRAWLERS_INDEX = '.ent-search-actastic-crawler2_configurations_v2';