[7.x] TelemetryCollectionManager: Use X-Pack strategy as an OSS overw…

…rite (#84477) (#84733)
elastic · Dec 2, 2020 · a66a3e3 · a66a3e3
1 parent a9af362
commit a66a3e3
Show file tree

Hide file tree

Showing 20 changed files with 218 additions and 255 deletions.
diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import moment from 'moment';
 import { Observable, Subscription, timer } from 'rxjs';
 import { take } from 'rxjs/operators';
 // @ts-ignore
@@ -213,7 +212,6 @@ export class FetcherTask {
   private async fetchTelemetry() {
     return await this.telemetryCollectionManager!.getStats({
       unencrypted: false,
-      timestamp: moment().valueOf(),
     });
   }
 

diff --git a/src/plugins/telemetry/server/index.ts b/src/plugins/telemetry/server/index.ts
@@ -44,7 +44,6 @@ export const plugin = (initializerContext: PluginInitializerContext<TelemetryCon
 export { constants };
 export {
   getClusterUuids,
-  getLocalLicense,
   getLocalStats,
   TelemetryLocalStats,
   DATA_TELEMETRY_ID,

diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
@@ -33,9 +33,7 @@ import {
   SavedObjectsClient,
   Plugin,
   Logger,
-  IClusterClient,
   UiSettingsServiceStart,
-  SavedObjectsServiceStart,
 } from '../../../core/server';
 import { registerRoutes } from './routes';
 import { registerCollection } from './telemetry_collection';
@@ -88,8 +86,6 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
    */
   private readonly oldUiSettingsHandled$ = new AsyncSubject();
   private savedObjectsClient?: ISavedObjectsRepository;
-  private elasticsearchClient?: IClusterClient;
-  private savedObjectsService?: SavedObjectsServiceStart;
 
   constructor(initializerContext: PluginInitializerContext<TelemetryConfigType>) {
     this.logger = initializerContext.logger.get();
@@ -109,12 +105,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
     const currentKibanaVersion = this.currentKibanaVersion;
     const config$ = this.config$;
     const isDev = this.isDev;
-    registerCollection(
-      telemetryCollectionManager,
-      elasticsearch.legacy.client,
-      () => this.elasticsearchClient,
-      () => this.savedObjectsService
-    );
+    registerCollection(telemetryCollectionManager);
     const router = http.createRouter();
 
     registerRoutes({
@@ -138,11 +129,9 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
   }
 
   public start(core: CoreStart, { telemetryCollectionManager }: TelemetryPluginsDepsStart) {
-    const { savedObjects, uiSettings, elasticsearch } = core;
+    const { savedObjects, uiSettings } = core;
     const savedObjectsInternalRepository = savedObjects.createInternalRepository();
     this.savedObjectsClient = savedObjectsInternalRepository;
-    this.elasticsearchClient = elasticsearch.client;
-    this.savedObjectsService = savedObjects;
 
     // Not catching nor awaiting these promises because they should never reject
     this.handleOldUiSettings(uiSettings);

diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
@@ -66,7 +66,7 @@ export type TelemetryLocalStats = ReturnType<typeof handleLocalStats>;
  * @param {Object} config contains the usageCollection, callCluster (deprecated), the esClient and Saved Objects client scoped to the request or the internal repository, and the kibana request
  * @param {Object} StatsCollectionContext contains logger and version (string)
  */
-export const getLocalStats: StatsGetter<{}, TelemetryLocalStats> = async (
+export const getLocalStats: StatsGetter<TelemetryLocalStats> = async (
   clustersDetails,
   config,
   context

diff --git a/src/plugins/telemetry/server/telemetry_collection/index.ts b/src/plugins/telemetry/server/telemetry_collection/index.ts
@@ -24,6 +24,5 @@ export {
   buildDataTelemetryPayload,
 } from './get_data_telemetry';
 export { getLocalStats, TelemetryLocalStats } from './get_local_stats';
-export { getLocalLicense } from './get_local_license';
 export { getClusterUuids } from './get_cluster_stats';
 export { registerCollection } from './register_collection';
diff --git a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
@@ -36,27 +36,17 @@
  * under the License.
  */
 
-import { ILegacyClusterClient, SavedObjectsServiceStart } from 'kibana/server';
 import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
-import { IClusterClient } from '../../../../../src/core/server';
 import { getLocalStats } from './get_local_stats';
 import { getClusterUuids } from './get_cluster_stats';
-import { getLocalLicense } from './get_local_license';
 
 export function registerCollection(
-  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
-  esCluster: ILegacyClusterClient,
-  esClientGetter: () => IClusterClient | undefined,
-  soServiceGetter: () => SavedObjectsServiceStart | undefined
+  telemetryCollectionManager: TelemetryCollectionManagerPluginSetup
 ) {
-  telemetryCollectionManager.setCollection({
-    esCluster,
-    esClientGetter,
-    soServiceGetter,
+  telemetryCollectionManager.setCollectionStrategy({
     title: 'local',
     priority: 0,
     statsGetter: getLocalStats,
     clusterDetailsGetter: getClusterUuids,
-    licenseGetter: getLocalLicense,
   });
 }
diff --git a/src/plugins/telemetry_collection_manager/server/index.ts b/src/plugins/telemetry_collection_manager/server/index.ts
@@ -30,13 +30,11 @@ export function plugin(initializerContext: PluginInitializerContext) {
 export {
   TelemetryCollectionManagerPluginSetup,
   TelemetryCollectionManagerPluginStart,
-  ESLicense,
   StatsCollectionConfig,
   StatsGetter,
   StatsGetterConfig,
   StatsCollectionContext,
   ClusterDetails,
   ClusterDetailsGetter,
-  LicenseGetter,
   UsageStatsPayload,
 } from './types';