removed legacy task manager

gmmorris · Apr 27, 2020 · a43d410 · a43d410
1 parent 7271fcc
commit a43d410
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 299 deletions.
diff --git a/x-pack/index.js b/x-pack/index.js
@@ -17,7 +17,6 @@ import { indexManagement } from './legacy/plugins/index_management';
 import { spaces } from './legacy/plugins/spaces';
 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';
 import { remoteClusters } from './legacy/plugins/remote_clusters';
@@ -41,7 +40,6 @@ module.exports = function(kibana) {
     canvas(kibana),
     indexManagement(kibana),
     infra(kibana),
-    taskManager(kibana),
     rollup(kibana),
     siem(kibana),
     remoteClusters(kibana),

diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
@@ -14,13 +14,7 @@ import mappings from './mappings.json';
 
 export const apm: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
-    require: [
-      'kibana',
-      'elasticsearch',
-      'xpack_main',
-      'apm_oss',
-      'task_manager'
-    ],
+    require: ['kibana', 'elasticsearch', 'xpack_main', 'apm_oss'],
     id: 'apm',
     configPrefix: 'xpack.apm',
     publicDir: resolve(__dirname, 'public'),

diff --git a/x-pack/legacy/plugins/task_manager/index.ts b/x-pack/legacy/plugins/task_manager/index.ts
diff --git a/x-pack/legacy/plugins/task_manager/server/index.ts b/x-pack/legacy/plugins/task_manager/server/index.ts
diff --git a/x-pack/legacy/plugins/task_manager/server/legacy.ts b/x-pack/legacy/plugins/task_manager/server/legacy.ts
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
@@ -171,15 +171,15 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
 
     const usageCollection = plugins.usageCollection;
     if (usageCollection) {
+      initializeActionsTelemetry(
+        this.telemetryLogger,
+        plugins.taskManager,
+        core,
+        await this.kibanaIndex
+      );
+
       core.getStartServices().then(async ([, startPlugins]: [CoreStart, any, any]) => {
         registerActionsUsageCollector(usageCollection, startPlugins.taskManager);
-
-        initializeActionsTelemetry(
-          this.telemetryLogger,
-          plugins.taskManager,
-          core,
-          await this.kibanaIndex
-        );
       });
     }
 

diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
@@ -148,15 +148,15 @@ export class AlertingPlugin {
 
     const usageCollection = plugins.usageCollection;
     if (usageCollection) {
+      initializeAlertingTelemetry(
+        this.telemetryLogger,
+        core,
+        plugins.taskManager,
+        await this.kibanaIndex
+      );
+
       core.getStartServices().then(async ([, startPlugins]: [CoreStart, any, any]) => {
         registerAlertsUsageCollector(usageCollection, startPlugins.taskManager);
-
-        initializeAlertingTelemetry(
-          this.telemetryLogger,
-          core,
-          plugins.taskManager,
-          await this.kibanaIndex
-        );
       });
     }
 

diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -38,6 +38,21 @@ export async function createApmTelemetry({
   taskManager: TaskManagerSetupContract;
   logger: Logger;
 }) {
+  taskManager.registerTaskDefinitions({
+    [APM_TELEMETRY_TASK_NAME]: {
+      title: 'Collect APM telemetry',
+      type: APM_TELEMETRY_TASK_NAME,
+      createTaskRunner: () => {
+        return {
+          run: async () => {
+            await collectAndStore();
+          },
+          cancel: async () => {}
+        };
+      }
+    }
+  });
+
   const savedObjectsClient = await getInternalSavedObjectsClient(core);
 
   const collectAndStore = async () => {
@@ -79,21 +94,6 @@ export async function createApmTelemetry({
     );
   };
 
-  taskManager.registerTaskDefinitions({
-    [APM_TELEMETRY_TASK_NAME]: {
-      title: 'Collect APM telemetry',
-      type: APM_TELEMETRY_TASK_NAME,
-      createTaskRunner: () => {
-        return {
-          run: async () => {
-            await collectAndStore();
-          },
-          cancel: async () => {}
-        };
-      }
-    }
-  });
-
   const collector = usageCollector.makeUsageCollector({
     type: 'apm',
     fetch: async () => {

diff --git a/x-pack/plugins/task_manager/server/create_task_manager.test.ts b/x-pack/plugins/task_manager/server/create_task_manager.test.ts
diff --git a/x-pack/plugins/task_manager/server/create_task_manager.ts b/x-pack/plugins/task_manager/server/create_task_manager.ts
diff --git a/x-pack/plugins/task_manager/server/mocks.ts b/x-pack/plugins/task_manager/server/mocks.ts
@@ -8,7 +8,6 @@ import { TaskManagerSetupContract, TaskManagerStartContract } from './plugin';
 
 const createSetupMock = () => {
   const mock: jest.Mocked<TaskManagerSetupContract> = {
-    registerLegacyAPI: jest.fn(),
     addMiddleware: jest.fn(),
     registerTaskDefinitions: jest.fn(),
   };