Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Enterprise Search] xpack/usage analytics collections count #96063

Merged
merged 13 commits into from
May 18, 2023
Merged

[Enterprise Search] xpack/usage analytics collections count #96063

merged 13 commits into from
May 18, 2023

Conversation

sloanelybutsurely
Copy link

@sloanelybutsurely sloanelybutsurely commented May 12, 2023 •
edited
Loading

  • updates enterprise search xpack/usage to include a count of analytics collections

@sloanelybutsurely sloanelybutsurely force-pushed the ent-search-4402-analytics-collections-count branch from aa532bb to 8ae75fa Compare May 12, 2023 18:48
@sloanelybutsurely sloanelybutsurely changed the base branch from main to 8.8 May 12, 2023 18:48
@sloanelybutsurely sloanelybutsurely added >feature :EnterpriseSearch/Application Enterprise Search Team:Enterprise Search Meta label for Enterprise Search team labels May 12, 2023
@sloanelybutsurely sloanelybutsurely marked this pull request as ready for review May 12, 2023 19:57
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/ent-search-eng (Team:Enterprise Search)

joemcelroy
joemcelroy approved these changes May 15, 2023
View reviewed changes
Copy link
Member

@joemcelroy joemcelroy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

jimczi
jimczi reviewed May 15, 2023
View reviewed changes
Copy link
Contributor

@jimczi jimczi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic looks good but let's wait for #96104 to be merged. Sorry if it wasn't clear but we shouldn't merge directly in 8.8, I suggested to use the branch only to unblock testing locally.

@sloanelybutsurely
Copy link
Author

The logic looks good but let's wait for #96104 to be merged. Sorry if it wasn't clear but we shouldn't merge directly in 8.8, I suggested to use the branch only to unblock testing locally.

yeah that's fine. i can easily rebase against main once that's in. i just didn't want to have to wait for reviews

@sloanelybutsurely sloanelybutsurely force-pushed the ent-search-4402-analytics-collections-count branch from 62a3cd1 to 1620df2 Compare May 15, 2023 16:14
@sloanelybutsurely sloanelybutsurely changed the base branch from 8.8 to main May 15, 2023 16:14
@sloanelybutsurely
Copy link
Author

apologies for the force-push. had to switch base branches

@sloanelybutsurely
Copy link
Author

@elasticmachine merge upstream

@sloanelybutsurely
Copy link
Author

@elasticmachine merge upstream

kderusso
kderusso approved these changes May 16, 2023
View reviewed changes
Copy link
Member

@kderusso kderusso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

...rg/elasticsearch/xpack/core/application/EnterpriseSearchFeatureSetUsageSerializingTests.java Outdated Show resolved Hide resolved
...gin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/100_usage.yml Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice tests 👍

@sloanelybutsurely
Copy link
Author

@elasticmachine merge upstream

@sloanelybutsurely
Copy link
Author

@elasticmachine merge upstream

@sloanelybutsurely
Copy link
Author

@elasticmachine test this please

@sloanelybutsurely sloanelybutsurely merged commit e45158f into elastic:main May 18, 2023
@craigtaverner craigtaverner mentioned this pull request May 26, 2023
Closed
This was referenced May 26, 2023
Merged
Merged
@sloanelybutsurely
Copy link
Author

💚 All backports created successfully

Status Branch Result
✅ 8.8

Questions ?

Please refer to the Backport tool documentation

sloanelybutsurely pushed a commit to sloanelybutsurely/elasticsearch that referenced this pull request Jun 1, 2023
[Enterprise Search] xpack/usage analytics collections count (elastic#…
44d5458 
…96063)

* add analytics collections count to xpack usage

* get analytics collections similarly to search apps

* update EnterpriseSearchFeatureSetUsageSerializingTests

* add analytics coll. counts to usage test

* spotless apply

* add analytics collection count assertions to usage test

* use COUNT static constant in serializing test

* conditionally read/write analytics collections usage

---------

Co-authored-by: Elastic Machine <[email protected]>
(cherry picked from commit e45158f)
sloanelybutsurely pushed a commit that referenced this pull request Jun 1, 2023
[8.8] [Enterprise Search] xpack/usage analytics collections count (#9…
0d19ba1 
…6063) (#96495)

* [Enterprise Search] xpack/usage analytics collections count (#96063)

* add analytics collections count to xpack usage

* get analytics collections similarly to search apps

* update EnterpriseSearchFeatureSetUsageSerializingTests

* add analytics coll. counts to usage test

* spotless apply

* add analytics collection count assertions to usage test

* use COUNT static constant in serializing test

* conditionally read/write analytics collections usage

---------

Co-authored-by: Elastic Machine <[email protected]>
(cherry picked from commit e45158f)

* lower version for analytics usage to 8.8.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jimczi jimczi jimczi left review comments

@kderusso kderusso kderusso approved these changes

@ioanatia ioanatia ioanatia approved these changes

@joemcelroy joemcelroy joemcelroy approved these changes

@afoucret afoucret Awaiting requested review from afoucret

Assignees
No one assigned
Labels
:EnterpriseSearch/Application Enterprise Search >feature Team:Enterprise Search Meta label for Enterprise Search team v8.9.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@sloanelybutsurely @elasticsearchmachine @joemcelroy @jimczi @ioanatia @kderusso @elasticmachine