Merge pull request #5 from jasonrhodes/np-help_reinstate-legacy-infra…

…-plugin-for-saved-object-mappings

Initiates legacy plugin correctly with proper dummy config

x-pack/index.js

@@ -26,6 +26,7 @@ import { consoleExtensions } from './legacy/plugins/console_extensions';
 import { spaces } from './legacy/plugins/spaces';
 import { kueryAutocompleteInitializer } from './legacy/plugins/kuery_autocomplete';
 import { canvas } from './legacy/plugins/canvas';
+import { infra } from './legacy/plugins/infra';
 import { taskManager } from './legacy/plugins/task_manager';
 import { rollup } from './legacy/plugins/rollup';
 import { siem } from './legacy/plugins/siem';
@@ -67,6 +68,7 @@ module.exports = function(kibana) {
     consoleExtensions(kibana),
     indexLifecycleManagement(kibana),
     kueryAutocompleteInitializer(kibana),
+    infra(kibana),
     taskManager(kibana),
     rollup(kibana),
     transform(kibana),

x-pack/legacy/plugins/infra/index.ts

@@ -3,18 +3,23 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { Root } from 'joi';
 import { savedObjectMappings } from '../../../plugins/infra/server';
 
-export const APP_ID = 'infra';
-
 export function infra(kibana: any) {
   return new kibana.Plugin({
-    id: APP_ID,
+    id: 'infra',
     configPrefix: 'xpack.infra',
     require: ['kibana', 'elasticsearch'],
     uiExports: {
       mappings: savedObjectMappings,
     },
+    config(Joi: Root) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+      })
+        .unknown()
+        .default();
+    },
   });
 }