github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Synthetics] Fix license flaky fetch (#137828) (#137953)

Browse source 
(cherry picked from commit c03820a9c0)
This commit is contained in:
Shahzad 2022-08-03 12:34:33 +01:00 • committed by GitHub
parent 849b4d67d0
commit be5fe0b665
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/server/integration_tests/saved_objects/migrations/incompatible_cluster_routing_allocation.test.ts
View file

@ -90,8 +90,8 @@ async function updateRoutingAllocations(
[settingType]: { cluster: { routing: { allocation: { enable: value } } } },
});
}
// FLAKY: https://github.com/elastic/kibana/issues/136990
describe.skip('incompatible_cluster_routing_allocation', () => {
describe('incompatible_cluster_routing_allocation', () => {
let client: ElasticsearchClient;
let root: Root;

15
x-pack/plugins/synthetics/server/legacy_uptime/lib/telemetry/sender.ts
View file

@ -103,20 +103,27 @@ export class TelemetryEventsSender {
this.isSending = false;
}
private async fetchClusterInfo(): Promise<InfoResponse> {
private async fetchClusterInfo(): Promise<InfoResponse | undefined> {
if (this.esClient === undefined || this.esClient === null) {
throw Error('elasticsearch client is unavailable: cannot retrieve cluster information');
}
return await this.esClient.info();
try {
return await this.esClient.info();
} catch (e) {
this.logger.debug(`Error fetching cluster information: ${e}`);
}
}
private async fetchLicenseInfo() {
if (this.esClient === undefined || this.esClient === null) {
throw Error('elasticsearch client is unavailable: cannot retrieve license information');
}
return await this.esClient.license.get();
try {
return await this.esClient.license.get();
} catch (e) {
this.logger.debug(`Error fetching license information: ${e}`);
}
}
public async sendEvents(telemetryUrl: string, queue: TelemetryQueue<any>) {