Adds new elasticsearch client to telemetry plugin

src/plugins/data/server/server.api.md

@@ -44,6 +44,7 @@ import { DeleteDocumentParams } from 'elasticsearch';
 import { DeleteScriptParams } from 'elasticsearch';
 import { DeleteTemplateParams } from 'elasticsearch';
 import { Duration } from 'moment';
+import { ElasticsearchClient as ElasticsearchClient_2 } from 'kibana/server';
 import { Ensure } from '@kbn/utility-types';
 import { EnvironmentMode } from '@kbn/config';
 import { ErrorToastOptions } from 'src/core/public/notifications';

src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts

@@ -17,7 +17,11 @@
  * under the License.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../core/server/mocks';
+import {
+  savedObjectsRepositoryMock,
+  loggingSystemMock,
+  elasticsearchServiceMock,
+} from '../../../../../core/server/mocks';
 import {
   CollectorOptions,
   createUsageCollectionSetupMock,
@@ -50,6 +54,7 @@ describe('telemetry_application_usage', () => {
   const getUsageCollector = jest.fn();
   const registerType = jest.fn();
   const callCluster = jest.fn();
+  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
 
   beforeAll(() =>
     registerApplicationUsageCollector(logger, usageCollectionMock, registerType, getUsageCollector)
@@ -62,7 +67,7 @@ describe('telemetry_application_usage', () => {
 
   test('if no savedObjectClient initialised, return undefined', async () => {
     expect(collector.isReady()).toBe(false);
-    expect(await collector.fetch(callCluster)).toBeUndefined();
+    expect(await collector.fetch(callCluster, esClient)).toBeUndefined();
     jest.runTimersToTime(ROLL_INDICES_START);
   });
 
@@ -80,7 +85,7 @@ describe('telemetry_application_usage', () => {
     jest.runTimersToTime(ROLL_TOTAL_INDICES_INTERVAL); // Force rollTotals to run
 
     expect(collector.isReady()).toBe(true);
-    expect(await collector.fetch(callCluster)).toStrictEqual({});
+    expect(await collector.fetch(callCluster, esClient)).toStrictEqual({});
     expect(savedObjectClient.bulkCreate).not.toHaveBeenCalled();
   });
 
@@ -137,7 +142,7 @@ describe('telemetry_application_usage', () => {
 
     jest.runTimersToTime(ROLL_TOTAL_INDICES_INTERVAL); // Force rollTotals to run
 
-    expect(await collector.fetch(callCluster)).toStrictEqual({
+    expect(await collector.fetch(callCluster, esClient)).toStrictEqual({
       appId: {
         clicks_total: total + 1 + 10,
         clicks_7_days: total + 1,
@@ -197,7 +202,7 @@ describe('telemetry_application_usage', () => {
 
     getUsageCollector.mockImplementation(() => savedObjectClient);
 
-    expect(await collector.fetch(callCluster)).toStrictEqual({
+    expect(await collector.fetch(callCluster, esClient)).toStrictEqual({
       appId: {
         clicks_total: 1,
         clicks_7_days: 0,

src/plugins/telemetry/server/plugin.ts

@@ -34,6 +34,7 @@ import {
   SavedObjectsClient,
   Plugin,
   Logger,
+  IClusterClient,
 } from '../../../core/server';
 import { registerRoutes } from './routes';
 import { registerCollection } from './telemetry_collection';
@@ -83,6 +84,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
   private readonly fetcherTask: FetcherTask;
   private savedObjectsClient?: ISavedObjectsRepository;
   private uiSettingsClient?: IUiSettingsClient;
+  private elasticsearchClient?: IClusterClient;
 
   constructor(initializerContext: PluginInitializerContext<TelemetryConfigType>) {
     this.logger = initializerContext.logger.get();
@@ -102,8 +104,11 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
     const currentKibanaVersion = this.currentKibanaVersion;
     const config$ = this.config$;
     const isDev = this.isDev;
-
-    registerCollection(telemetryCollectionManager, elasticsearch.legacy.client);
+    registerCollection(
+      telemetryCollectionManager,
+      elasticsearch.legacy.client,
+      () => this.elasticsearchClient
+    );
     const router = http.createRouter();
 
     registerRoutes({
@@ -126,14 +131,12 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
     };
   }
 
-  public async start(
-    core: CoreStart,
-    { telemetryCollectionManager }: TelemetryPluginsDepsStart
-  ): Promise<TelemetryPluginStart> {
-    const { savedObjects, uiSettings } = core;
+  public async start(core: CoreStart, { telemetryCollectionManager }: TelemetryPluginsDepsStart) {
+    const { savedObjects, uiSettings, elasticsearch } = core;
     this.savedObjectsClient = savedObjects.createInternalRepository();
     const savedObjectsClient = new SavedObjectsClient(this.savedObjectsClient);
     this.uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
+    this.elasticsearchClient = elasticsearch.client;
 
     try {
       await handleOldSettings(savedObjectsClient, this.uiSettingsClient);