[Fleet] Use metering API in serverless #200063
Merged
+193
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nchaulet
added
bug
|
Pinging @elastic/fleet (Team:Fleet) |
|
@elasticmachine merge upstream |
| @@ -51,10 +56,22 @@ export const getListHandler: RequestHandler = async (context, request, response) | |||
| }; | |||
|
|
|||
| try { | |||
| const useMeteringApi = appContextService.getConfig()?.internal?.useMeteringApi; | |||
There was a problem hiding this comment.
I'm wondering if we could use the metering API in stateful too, or is it only for serverless?
There was a problem hiding this comment.
Unfortunately it's only available in serverless
| dataStreamService.getAllFleetDataStreams(esClient), | ||
| dataStreamService.getAllFleetDataStreamsStats(esClient), | ||
| useMeteringApi |
There was a problem hiding this comment.
nit: we could simplify by moving these out of Promise.all and await the dataStreamService call below in the conditional
| ? undefined | ||
| : dataStreamService.getAllFleetDataStreamsStats(elasticsearch.client.asSecondaryAuthUser), | ||
| useMeteringApi | ||
| ? dataStreamService.getAllFleetMeteringStats(elasticsearch.client.asSecondaryAuthUser) |
There was a problem hiding this comment.
why use asSecondaryAuthUser here?
There was a problem hiding this comment.
The API is only available as internal, and calling it as current user fail for that reason.
juliaElastic
approved these changes
Nov 14, 2024
azasypkin
approved these changes
Nov 14, 2024
|
@elasticmachine merge upstream |
💚 Build Succeeded
Metrics [docs]
History
cc @nchaulet |
|
@elastic/security-solution can we get some eyes on this please? |
|
Starting backport for target branches: 8.x |
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
nchaulet
added a commit
to nchaulet/kibana
that referenced
this pull request
Nov 19, 2024
(cherry picked from commit 1fd3f41) # Conflicts: # x-pack/plugins/fleet/server/config.ts
2 tasks
nchaulet
added a commit
that referenced
this pull request
Nov 19, 2024
# Backport This will backport the following commits from `main` to `8.x`: - [[Fleet] Use metering API in serverless (#200063)](#200063) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-18T21:36:27Z","message":"[Fleet] Use metering API in serverless (#200063)","sha":"1fd3f412e13ed234524915cc87d058f05b840528","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"number":200063,"url":"https://github.com/elastic/kibana/pull/200063","mergeCommit":{"message":"[Fleet] Use metering API in serverless (#200063)","sha":"1fd3f412e13ed234524915cc87d058f05b840528"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/200063","number":200063,"mergeCommit":{"message":"[Fleet] Use metering API in serverless (#200063)","sha":"1fd3f412e13ed234524915cc87d058f05b840528"}}]}] BACKPORT-->
CAWilson94
pushed a commit
to CAWilson94/kibana
that referenced
this pull request
Dec 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Resolve #198737
Fix the
GET /api/fleet/datastreamsused to power the datastreams tab in fleet to not use_datastreams/_statsin serverless but the metering API instead.Tests
I added specific test in serverless for that endpoint
And you can test locally by running kibana in serverless and check the datastreams tab is working