Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Search][Configuration] Remove Enterprise Search node values #208856

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions docs/settings/enterprise-search-settings.asciidoc

This file was deleted.

1 change: 0 additions & 1 deletion docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +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?)',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export interface Meta {
}

export interface ClientConfigType {
host?: string;
ui: {
enabled: boolean;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export const mockKibanaProps: KibanaLogicProps = {
isCloudEnabled: false,
},
config: {
host: 'http://localhost:3002',
ui: {
enabled: true,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +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,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* 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 }),
ui: schema.object({
enabled: schema.boolean({ defaultValue: true }),
}),
});

export type ConfigType = TypeOf<typeof configSchema>;

export const config: PluginConfigDescriptor<ConfigType> = {
deprecations: ({ unusedFromRoot }) => [
unusedFromRoot('enterpriseSearch.host', { level: 'critical' }),
TattdCodeMonkey marked this conversation as resolved.
Show resolved Hide resolved
unusedFromRoot('enterpriseSearch.ssl', { level: 'critical' }),
unusedFromRoot('enterpriseSearch.accessCheckTimeout', { level: 'critical' }),
unusedFromRoot('enterpriseSearch.accessCheckTimeoutWarning', { level: 'critical' }),
unusedFromRoot('enterpriseSearch.customHeaders', { level: 'critical' }),
unusedFromRoot('enterpriseSearch.isCloud', { level: 'warning' }),
TattdCodeMonkey marked this conversation as resolved.
Show resolved Hide resolved
],
exposeToBrowser: {
ui: true,
},
schema: configSchema,
};
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof configSchema>;

export const config: PluginConfigDescriptor<ConfigType> = {
deprecations: ({ unused }) => [unused('canDeployEntSearch', { level: 'warning' })],
exposeToBrowser: {
host: true,
ui: true,
},
schema: configSchema,
};

export const CRAWLERS_INDEX = '.ent-search-actastic-crawler2_configurations_v2';