Skip to content

[7.x] [Telemetry] Separate the license retrieval from the stats in the usage collectors (#57332)#58450

Merged
afharo merged 1 commit intoelastic:7.xfrom
afharo:backport/7.x/pr-57332
Feb 25, 2020
Merged

[7.x] [Telemetry] Separate the license retrieval from the stats in the usage collectors (#57332)#58450
afharo merged 1 commit intoelastic:7.xfrom
afharo:backport/7.x/pr-57332

Conversation

@afharo
Copy link
Copy Markdown
Member

@afharo afharo commented Feb 25, 2020

Backports the following commits to 7.x:

…e collectors (elastic#57332)

* [Telemetry] Merge OSS and XPack usage collectors

* Create X-Pack collector again

* Separate the license retrieval from the stats

* Fix telemetry tests with new fields

* Use Promise.all to retrieve license and stats at the same time

* Fix moment mock

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@afharo afharo added the backport This PR is a backport of another PR label Feb 25, 2020
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@afharo afharo merged commit 000b776 into elastic:7.x Feb 25, 2020
@afharo afharo deleted the backport/7.x/pr-57332 branch February 25, 2020 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants