Skip to content

Commit 593298e

Browse files
pgayvalletpgayvallet
authored
remove legacy kibana plugin (#76064)
* remove legacy kibana plugin * as ES as a dependency to security instead of kibana * remove 'kibana' plugin presence check in so mixin * moved the `kibana` config section to the server
1 parent 182e0de commit 593298e

9 files changed

Lines changed: 11 additions & 103 deletions

File tree

‎src/legacy/core_plugins/kibana/index.js‎

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

‎src/legacy/core_plugins/kibana/package.json‎

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

‎src/legacy/core_plugins/kibana/public/index.scss‎

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

‎src/legacy/core_plugins/kibana/server/ui_setting_defaults.js‎

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

‎src/legacy/server/config/schema.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,15 @@ export default () =>
231231
locale: Joi.string().default('en'),
232232
}).default(),
233233

234+
// temporarily moved here from the (now deleted) kibana legacy plugin
235+
kibana: Joi.object({
236+
enabled: Joi.boolean().default(true),
237+
index: Joi.string().default('.kibana'),
238+
autocompleteTerminateAfter: Joi.number().integer().min(1).default(100000),
239+
// TODO Also allow units here like in elasticsearch config once this is moved to the new platform
240+
autocompleteTimeout: Joi.number().integer().min(1).default(1000),
241+
}).default(),
242+
234243
savedObjects: Joi.object({
235244
maxImportPayloadBytes: Joi.number().default(10485760),
236245
maxImportExportSize: Joi.number().default(10000),

‎src/legacy/server/saved_objects/saved_objects_mixin.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ export function savedObjectsMixin(kbnServer, server) {
3939

4040
server.decorate('server', 'kibanaMigrator', migrator);
4141

42-
const warn = (message) => server.log(['warning', 'saved-objects'], message);
43-
// we use kibana.index which is technically defined in the kibana plugin, so if
44-
// we don't have the plugin (mainly tests) we can't initialize the saved objects
45-
if (!kbnServer.pluginSpecs.some((p) => p.getId() === 'kibana')) {
46-
warn('Saved Objects uninitialized because the Kibana plugin is disabled.');
47-
return;
48-
}
49-
5042
const serializer = kbnServer.newPlatform.start.core.savedObjects.createSerializer();
5143

5244
const createRepository = (callCluster, includedHiddenTypes = []) => {

‎src/legacy/server/saved_objects/saved_objects_mixin.test.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,6 @@ describe('Saved Objects Mixin', () => {
161161
};
162162
});
163163

164-
describe('no kibana plugin', () => {
165-
it('should not try to create anything', () => {
166-
mockKbnServer.pluginSpecs.some = () => false;
167-
savedObjectsMixin(mockKbnServer, mockServer);
168-
expect(mockServer.log).toHaveBeenCalledWith(expect.any(Array), expect.any(String));
169-
expect(mockServer.decorate).toHaveBeenCalledWith(
170-
'server',
171-
'kibanaMigrator',
172-
expect.any(Object)
173-
);
174-
expect(mockServer.decorate).toHaveBeenCalledTimes(1);
175-
expect(mockServer.route).not.toHaveBeenCalled();
176-
});
177-
});
178-
179164
describe('Saved object service', () => {
180165
let service;
181166

‎x-pack/legacy/plugins/security/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const security = (kibana: Record<string, any>) =>
1111
new kibana.Plugin({
1212
id: 'security',
1313
publicDir: resolve(__dirname, 'public'),
14-
require: ['kibana'],
14+
require: ['elasticsearch'],
1515
configPrefix: 'xpack.security',
1616
config: (Joi: Root) =>
1717
Joi.object({ enabled: Joi.boolean().default(true) })

‎x-pack/legacy/plugins/spaces/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const spaces = (kibana: Record<string, any>) =>
1616
id: 'spaces',
1717
configPrefix: 'xpack.spaces',
1818
publicDir: resolve(__dirname, 'public'),
19-
require: ['kibana', 'elasticsearch', 'xpack_main'],
19+
require: ['elasticsearch', 'xpack_main'],
2020
config(Joi: any) {
2121
return Joi.object({
2222
enabled: Joi.boolean().default(true),

0 commit comments

Comments
 (0)