HLRC: Add xpack usage api #31975
Merged
HLRC: Add xpack usage api #31975
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
This commit adds the _xpack/usage api to the high level rest client. Currently in the transport api, the usage data is exposed in a limited fashion, at most giving one level of helper methods for the inner keys of data, but then exposing thos subobjects as maps of objects. Rather than making parsers for every set of usage data from each feature, this PR exposes the entire set of usage data as a map of maps.
|
Pinging @elastic/es-core-infra |
nik9000
requested changes
Jul 11, 2018
| Map<String, Object> monitoringUsage = usages.get("monitoring"); | ||
| assertThat(monitoringUsage.get("available"), is(true)); | ||
| assertThat(monitoringUsage.get("enabled"), is(true)); | ||
| assertThat(monitoringUsage.get("collection_enabled"), is(false)); |
| ==== Execution | ||
|
|
||
| Detailed information about the usage of features from {xpack} can be | ||
| retrieved using the `xpackUsage()` method: |
There was a problem hiding this comment.
The name isn't quite right here. I suspect the name in xpackInfo isn't right either now that I see this. I bet I didn't catch that in the rename....
There was a problem hiding this comment.
I think the name is correct. What do you think it should be?
There was a problem hiding this comment.
Ah ic, xpackUsage is the helper method in RequestConverters.
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| * Licensed to Elasticsearch under one or more contributor |
There was a problem hiding this comment.
I think this'll cause the build to fail.
| import org.elasticsearch.action.ActionRequestValidationException; | ||
|
|
||
| /** A dummy request object solely for the purpose of boilerplate. */ | ||
| public class XPackUsageRequest extends ActionRequest { |
There was a problem hiding this comment.
It looks to me like there is a master_node_timeout that you can set on the request. Maybe we move the one in x-pack into the protocol and use it instead?
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class XPackUsageResponse { |
There was a problem hiding this comment.
May as well stick javadoc on it. It'll be mostly ceremonial but it might help someone who hasn't figured out the naming convention yet.
|
@nik9000 I think I have addressed all your comments. |
nik9000
approved these changes
Jul 12, 2018
| @@ -1096,6 +1097,11 @@ static Request xPackInfo(XPackInfoRequest infoRequest) { | |||
| return request; | |||
| } | |||
|
|
|||
| @SuppressWarnings("unused") | |||
| @@ -1096,6 +1097,11 @@ static Request xPackInfo(XPackInfoRequest infoRequest) { | |||
| return request; | |||
| } | |||
|
|
|||
| @SuppressWarnings("unused") | |||
| static Request xpackUsage(XPackUsageRequest request) { | |||
| return new Request(HttpGet.METHOD_NAME, "/_xpack/usage"); | |||
There was a problem hiding this comment.
Can you add the master timeout?
rjernst
added a commit
that referenced
this pull request
Jul 14, 2018
This commit adds the _xpack/usage api to the high level rest client. Currently in the transport api, the usage data is exposed in a limited fashion, at most giving one level of helper methods for the inner keys of data, but then exposing thos subobjects as maps of objects. Rather than making parsers for every set of usage data from each feature, this PR exposes the entire set of usage data as a map of maps.
martijnvg
added a commit
that referenced
this pull request
Jul 16, 2018
* es/6.x: Use correct formatting for links (#29460) Revert "Adds a new auto-interval date histogram (#28993)" Revert "fix typo" fix typo Adds a new auto-interval date histogram (#28993) [Rollup] Replace RollupIT with a ESRestTestCase version (#31977) [Rollup] Fix duplicate field names in test (#32075) [Tests] Fix failure due to changes exception message (#32036) [Test] Mute MlJobIT#testDeleteJobAfterMissingAliases Replace Ingest ScriptContext with Custom Interface (#32003) (#32060) Cleanup Duplication in `PainlessScriptEngine` (#31991) (#32061) HLRC: Add xpack usage api (#31975) Clean Up Snapshot Create Rest API (#31779)
98 tasks
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.
This commit adds the _xpack/usage api to the high level rest client.
Currently in the transport api, the usage data is exposed in a limited
fashion, at most giving one level of helper methods for the inner keys
of data, but then exposing thos subobjects as maps of objects. Rather
than making parsers for every set of usage data from each feature, this
PR exposes the entire set of usage data as a map of maps.