Skip to content

Commit 8955bf7

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into ts_vector_layer
2 parents bf03713 + d512b5a commit 8955bf7

79 files changed

Lines changed: 984 additions & 963 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import { DeleteDocumentParams } from 'elasticsearch';
4444
import { DeleteScriptParams } from 'elasticsearch';
4545
import { DeleteTemplateParams } from 'elasticsearch';
4646
import { Duration } from 'moment';
47+
import { ElasticsearchClient as ElasticsearchClient_2 } from 'kibana/server';
4748
import { Ensure } from '@kbn/utility-types';
4849
import { EnvironmentMode } from '@kbn/config';
4950
import { ErrorToastOptions } from 'src/core/public/notifications';

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../core/server/mocks';
20+
import {
21+
savedObjectsRepositoryMock,
22+
loggingSystemMock,
23+
elasticsearchServiceMock,
24+
} from '../../../../../core/server/mocks';
2125
import {
2226
CollectorOptions,
2327
createUsageCollectionSetupMock,
@@ -50,6 +54,7 @@ describe('telemetry_application_usage', () => {
5054
const getUsageCollector = jest.fn();
5155
const registerType = jest.fn();
5256
const callCluster = jest.fn();
57+
const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
5358

5459
beforeAll(() =>
5560
registerApplicationUsageCollector(logger, usageCollectionMock, registerType, getUsageCollector)
@@ -62,7 +67,7 @@ describe('telemetry_application_usage', () => {
6267

6368
test('if no savedObjectClient initialised, return undefined', async () => {
6469
expect(collector.isReady()).toBe(false);
65-
expect(await collector.fetch(callCluster)).toBeUndefined();
70+
expect(await collector.fetch(callCluster, esClient)).toBeUndefined();
6671
jest.runTimersToTime(ROLL_INDICES_START);
6772
});
6873

@@ -80,7 +85,7 @@ describe('telemetry_application_usage', () => {
8085
jest.runTimersToTime(ROLL_TOTAL_INDICES_INTERVAL); // Force rollTotals to run
8186

8287
expect(collector.isReady()).toBe(true);
83-
expect(await collector.fetch(callCluster)).toStrictEqual({});
88+
expect(await collector.fetch(callCluster, esClient)).toStrictEqual({});
8489
expect(savedObjectClient.bulkCreate).not.toHaveBeenCalled();
8590
});
8691

@@ -137,7 +142,7 @@ describe('telemetry_application_usage', () => {
137142

138143
jest.runTimersToTime(ROLL_TOTAL_INDICES_INTERVAL); // Force rollTotals to run
139144

140-
expect(await collector.fetch(callCluster)).toStrictEqual({
145+
expect(await collector.fetch(callCluster, esClient)).toStrictEqual({
141146
appId: {
142147
clicks_total: total + 1 + 10,
143148
clicks_7_days: total + 1,
@@ -197,7 +202,7 @@ describe('telemetry_application_usage', () => {
197202

198203
getUsageCollector.mockImplementation(() => savedObjectClient);
199204

200-
expect(await collector.fetch(callCluster)).toStrictEqual({
205+
expect(await collector.fetch(callCluster, esClient)).toStrictEqual({
201206
appId: {
202207
clicks_total: 1,
203208
clicks_7_days: 0,

‎src/plugins/telemetry/server/plugin.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
SavedObjectsClient,
3535
Plugin,
3636
Logger,
37+
IClusterClient,
3738
} from '../../../core/server';
3839
import { registerRoutes } from './routes';
3940
import { registerCollection } from './telemetry_collection';
@@ -83,6 +84,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
8384
private readonly fetcherTask: FetcherTask;
8485
private savedObjectsClient?: ISavedObjectsRepository;
8586
private uiSettingsClient?: IUiSettingsClient;
87+
private elasticsearchClient?: IClusterClient;
8688

8789
constructor(initializerContext: PluginInitializerContext<TelemetryConfigType>) {
8890
this.logger = initializerContext.logger.get();
@@ -102,8 +104,11 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
102104
const currentKibanaVersion = this.currentKibanaVersion;
103105
const config$ = this.config$;
104106
const isDev = this.isDev;
105-
106-
registerCollection(telemetryCollectionManager, elasticsearch.legacy.client);
107+
registerCollection(
108+
telemetryCollectionManager,
109+
elasticsearch.legacy.client,
110+
() => this.elasticsearchClient
111+
);
107112
const router = http.createRouter();
108113

109114
registerRoutes({
@@ -126,14 +131,12 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
126131
};
127132
}
128133

129-
public async start(
130-
core: CoreStart,
131-
{ telemetryCollectionManager }: TelemetryPluginsDepsStart
132-
): Promise<TelemetryPluginStart> {
133-
const { savedObjects, uiSettings } = core;
134+
public async start(core: CoreStart, { telemetryCollectionManager }: TelemetryPluginsDepsStart) {
135+
const { savedObjects, uiSettings, elasticsearch } = core;
134136
this.savedObjectsClient = savedObjects.createInternalRepository();
135137
const savedObjectsClient = new SavedObjectsClient(this.savedObjectsClient);
136138
this.uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
139+
this.elasticsearchClient = elasticsearch.client;
137140

138141
try {
139142
await handleOldSettings(savedObjectsClient, this.uiSettingsClient);

‎src/plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_info.js‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/plugins/telemetry/server/telemetry_collection/__tests__/get_cluster_stats.js‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)