Skip to content

Commit 26fac70

Browse files
[Search][Configuration] Remove Enterprise Search node values (#208856)
## Summary This removes the config values associated with the enterprise search node. ### Checklist - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [x] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
1 parent 7587681 commit 26fac70

File tree

10 files changed

+30
-98
lines changed

10 files changed

+30
-98
lines changed

docs/settings/enterprise-search-settings.asciidoc

Lines changed: 0 additions & 26 deletions
This file was deleted.

docs/setup/settings.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,6 @@ include::{kibana-root}/docs/settings/alert-action-settings.asciidoc[]
691691
include::{kibana-root}/docs/settings/apm-settings.asciidoc[]
692692
include::{kibana-root}/docs/settings/banners-settings.asciidoc[]
693693
include::{kibana-root}/docs/settings/cases-settings.asciidoc[leveloffset=+1]
694-
include::{kibana-root}/docs/settings/enterprise-search-settings.asciidoc[]
695694
include::{kibana-root}/docs/settings/fleet-settings.asciidoc[]
696695
include::{kibana-root}/docs/settings/i18n-settings.asciidoc[]
697696
include::{kibana-root}/docs/settings/logging-settings.asciidoc[]

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ kibana_vars=(
8383
elasticsearch.ssl.truststore.path
8484
elasticsearch.ssl.verificationMode
8585
elasticsearch.username
86-
enterpriseSearch.accessCheckTimeout
87-
enterpriseSearch.accessCheckTimeoutWarning
88-
enterpriseSearch.host
8986
externalUrl.policy
9087
i18n.locale
9188
interactiveSetup.enabled

test/plugin_functional/test_suites/core_plugins/rendering.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
128128
'data_visualizer.resultLinks.fileBeat.enabled (boolean)',
129129
'dev_tools.deeplinks.navLinkStatus (string?)',
130130
'discover.experimental.enabledProfiles (array?)',
131-
'enterpriseSearch.host (string?)',
132-
'enterpriseSearch.ui.enabled (boolean?)',
133131
'home.disableWelcomeScreen (boolean?)',
134132
'management.deeplinks.navLinkStatus (string?)',
135133
'map.emsFileApiUrl (string?)',

x-pack/solutions/search/plugins/enterprise_search/common/types/index.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@ export interface Meta {
3535
page: MetaPage;
3636
}
3737

38-
export interface ClientConfigType {
39-
host?: string;
40-
ui: {
41-
enabled: boolean;
42-
};
43-
}
38+
// eslint-disable-next-line @typescript-eslint/no-empty-interface
39+
export interface ClientConfigType {}
4440

4541
export type { ConnectorStats } from './connector_stats';
4642
export type { ElasticsearchIndexWithPrivileges } from './indices';

x-pack/solutions/search/plugins/enterprise_search/public/applications/test_helpers/test_utils.test_helper.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export const mockKibanaProps: KibanaLogicProps = {
4545
isCloudEnabled: false,
4646
},
4747
config: {
48-
host: 'http://localhost:3002',
4948
ui: {
5049
enabled: true,
5150
},

x-pack/solutions/search/plugins/enterprise_search/public/plugin.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,6 @@ export class EnterpriseSearchPlugin implements Plugin {
209209
private isSidebarEnabled = true;
210210

211211
public setup(core: CoreSetup, plugins: PluginsSetup) {
212-
const { config } = this;
213-
if (!config.ui?.enabled) {
214-
return;
215-
}
216212
const { cloud, share } = plugins;
217213

218214
core.application.register({
@@ -481,9 +477,6 @@ export class EnterpriseSearchPlugin implements Plugin {
481477
private readonly sideNavDynamicItems$ = new BehaviorSubject<DynamicSideNavItems>({});
482478

483479
public start(core: CoreStart, plugins: PluginsStart) {
484-
if (!this.config.ui?.enabled) {
485-
return;
486-
}
487480
// This must be called here in start() and not in `applications/index.tsx` to prevent loading
488481
// race conditions with our apps' `routes.ts` being initialized before `renderApp()`
489482
docLinks.setDocLinks(core.docLinks);

x-pack/solutions/search/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,12 @@ export const mockMl = mlPluginServerMock.createSetupContract();
1818

1919
export const mockConfig: ConfigType = {
2020
enabled: true,
21-
host: 'http://localhost:3002',
22-
accessCheckTimeout: 5000,
23-
accessCheckTimeoutWarning: 300,
24-
ssl: {
25-
verificationMode: 'none',
26-
},
2721
hasConnectors: true,
2822
hasDefaultIngestPipeline: true,
2923
hasDocumentLevelSecurityEnabled: true,
3024
hasIncrementalSyncEnabled: true,
3125
hasNativeConnectors: true,
3226
hasWebCrawler: true,
33-
isCloud: false,
34-
ui: {
35-
enabled: true,
36-
},
3727
};
3828

3929
/**
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
import { schema, TypeOf } from '@kbn/config-schema';
9+
import { PluginConfigDescriptor } from '@kbn/core/server';
10+
11+
export const configSchema = schema.object({
12+
enabled: schema.boolean({ defaultValue: true }),
13+
hasConnectors: schema.boolean({ defaultValue: true }),
14+
hasDefaultIngestPipeline: schema.boolean({ defaultValue: true }),
15+
hasDocumentLevelSecurityEnabled: schema.boolean({ defaultValue: true }),
16+
hasIncrementalSyncEnabled: schema.boolean({ defaultValue: true }),
17+
hasNativeConnectors: schema.boolean({ defaultValue: true }),
18+
hasWebCrawler: schema.boolean({ defaultValue: false }),
19+
});
20+
21+
export type ConfigType = TypeOf<typeof configSchema>;
22+
23+
export const config: PluginConfigDescriptor<ConfigType> = {
24+
schema: configSchema,
25+
};

x-pack/solutions/search/plugins/enterprise_search/server/index.ts

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,11 @@
55
* 2.0.
66
*/
77

8-
import { schema, TypeOf } from '@kbn/config-schema';
9-
import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
8+
import { PluginInitializerContext } from '@kbn/core/server';
9+
10+
export { config, configSchema, type ConfigType } from './config';
1011

1112
export const plugin = async (initializerContext: PluginInitializerContext) => {
1213
const { EnterpriseSearchPlugin } = await import('./plugin');
1314
return new EnterpriseSearchPlugin(initializerContext);
1415
};
15-
16-
export const configSchema = schema.object({
17-
accessCheckTimeout: schema.number({ defaultValue: 5000 }),
18-
accessCheckTimeoutWarning: schema.number({ defaultValue: 300 }),
19-
customHeaders: schema.maybe(schema.object({}, { unknowns: 'allow' })),
20-
enabled: schema.boolean({ defaultValue: true }),
21-
hasConnectors: schema.boolean({ defaultValue: true }),
22-
hasDefaultIngestPipeline: schema.boolean({ defaultValue: true }),
23-
hasDocumentLevelSecurityEnabled: schema.boolean({ defaultValue: true }),
24-
hasIncrementalSyncEnabled: schema.boolean({ defaultValue: true }),
25-
hasNativeConnectors: schema.boolean({ defaultValue: true }),
26-
hasWebCrawler: schema.boolean({ defaultValue: false }),
27-
host: schema.maybe(schema.string()),
28-
isCloud: schema.boolean({ defaultValue: false }),
29-
ssl: schema.object({
30-
certificateAuthorities: schema.maybe(
31-
schema.oneOf([schema.arrayOf(schema.string(), { minSize: 1 }), schema.string()])
32-
),
33-
verificationMode: schema.oneOf(
34-
[schema.literal('none'), schema.literal('certificate'), schema.literal('full')],
35-
{ defaultValue: 'full' }
36-
),
37-
}),
38-
ui: schema.object({
39-
enabled: schema.boolean({ defaultValue: true }),
40-
}),
41-
});
42-
43-
export type ConfigType = TypeOf<typeof configSchema>;
44-
45-
export const config: PluginConfigDescriptor<ConfigType> = {
46-
deprecations: ({ unused }) => [unused('canDeployEntSearch', { level: 'warning' })],
47-
exposeToBrowser: {
48-
host: true,
49-
ui: true,
50-
},
51-
schema: configSchema,
52-
};
53-
54-
export const CRAWLERS_INDEX = '.ent-search-actastic-crawler2_configurations_v2';

0 commit comments

Comments
 (0)