[7.x] Migrate Beats Management UI to KP (#65791) (#66774)

elastic · May 15, 2020 · db807df · db807df
1 parent 4e3b9e0
commit db807df
Show file tree

Hide file tree

Showing 107 changed files with 562 additions and 509 deletions.
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
@@ -7,7 +7,7 @@
     "xpack.alerting": "plugins/alerting",
     "xpack.alertingBuiltins": "plugins/alerting_builtins",
     "xpack.apm": ["legacy/plugins/apm", "plugins/apm"],
-    "xpack.beatsManagement": "legacy/plugins/beats_management",
+    "xpack.beatsManagement": ["legacy/plugins/beats_management", "plugins/beats_management"],
     "xpack.canvas": "plugins/canvas",
     "xpack.dashboard": "plugins/dashboard_enhanced",
     "xpack.crossClusterReplication": "plugins/cross_cluster_replication",

diff --git a/x-pack/legacy/plugins/beats_management/common/constants/index.ts b/x-pack/legacy/plugins/beats_management/common/constants/index.ts
@@ -9,4 +9,4 @@ export { INDEX_NAMES } from './index_names';
 export { PLUGIN } from './plugin';
 export { LICENSES, REQUIRED_LICENSES, REQUIRED_ROLES } from './security';
 export { TABLE_CONFIG } from './table';
-export const BASE_PATH = '/management/beats_management';
+export const BASE_PATH = '/management/beats/beats_management';
diff --git a/x-pack/legacy/plugins/beats_management/index.ts b/x-pack/legacy/plugins/beats_management/index.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import Joi from 'joi';
-import { resolve } from 'path';
 import { PLUGIN } from './common/constants';
 import { CONFIG_PREFIX } from './common/constants/plugin';
 import { initServerWithKibana } from './server/kibana.index';
@@ -29,10 +28,6 @@ export function beats(kibana: any) {
   return new kibana.Plugin({
     id: PLUGIN.ID,
     require: ['kibana', 'elasticsearch', 'xpack_main'],
-    publicDir: resolve(__dirname, 'public'),
-    uiExports: {
-      managementSections: ['plugins/beats_management'],
-    },
     config: () => config,
     configPrefix: CONFIG_PREFIX,
     init(server: KibanaLegacyServer) {

diff --git a/...legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts b/...legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts
diff --git a/x-pack/legacy/plugins/beats_management/public/lib/compose/memory.ts b/x-pack/legacy/plugins/beats_management/public/lib/compose/memory.ts
diff --git a/x-pack/legacy/plugins/beats_management/scripts/fake_env.ts b/x-pack/legacy/plugins/beats_management/scripts/fake_env.ts
@@ -9,7 +9,8 @@ import request from 'request';
 import uuidv4 from 'uuid/v4';
 import { configBlockSchemas } from '../common/config_schemas';
 import { BeatTag } from '../common/domain_types';
-import { compose } from '../public/lib/compose/scripts';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { compose } from '../../../../plugins/beats_management/public/lib/compose/scripts';
 const args = process.argv.slice(2);
 const chance = new Chance();
 

diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/events/adapter_types.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/events/adapter_types.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { BeatEvent } from '../../../../common/domain_types';
-import { FrameworkUser } from '../../../../public/lib/adapters/framework/adapter_types';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { FrameworkUser } from '../../../../../../../plugins/beats_management/public/lib/adapters/framework/adapter_types';
 
 export interface BeatEventsAdapter {
   bulkInsert(user: FrameworkUser, beatId: string, events: BeatEvent[]): Promise<void>;

diff --git a/.../plugins/beats_management/server/lib/adapters/events/elasticsearch_beat_events_adapter.ts b/.../plugins/beats_management/server/lib/adapters/events/elasticsearch_beat_events_adapter.ts
@@ -5,7 +5,8 @@
  */
 
 import { BeatEvent } from '../../../../common/domain_types';
-import { FrameworkUser } from '../../../../public/lib/adapters/framework/adapter_types';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { FrameworkUser } from '../../../../../../../plugins/beats_management/public/lib/adapters/framework/adapter_types';
 import { DatabaseAdapter } from '../database/adapter_types';
 import { BeatEventsAdapter } from './adapter_types';