Check Kibana version for stats API availability #7697
Merged
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
ruflin
reviewed
Jul 24, 2018
metricbeat/module/kibana/kibana.go
Outdated
| } | ||
|
|
||
| var data common.MapStr | ||
| json.Unmarshal(content, &data) |
There was a problem hiding this comment.
We should check the error here.
metricbeat/module/kibana/kibana.go
Outdated
| defer http.SetURI(currentURI) // Reset after this request | ||
|
|
||
| // Parse the URI to replace the path | ||
| u, _ := url.Parse(currentURI) |
There was a problem hiding this comment.
Should we check the error here?
| @@ -49,6 +58,13 @@ type MetricSet struct { | |||
| xPackEnabled bool | |||
| } | |||
|
|
|||
| func isKibanaStatsAPIAvailable(kibanaVersion string) bool { | |||
| currenVersion := semver.New(kibanaVersion) | |||
There was a problem hiding this comment.
We have an internal version package which could be used here.
|
@ruflin Addressed review feedback and squashed to single commit. |
ruflin
reviewed
Jul 24, 2018
metricbeat/module/kibana/kibana.go
Outdated
| return "", err | ||
| } | ||
|
|
||
| return version.(string), nil |
There was a problem hiding this comment.
What if version.number does not contain a string?
Metricbeat will now exit with a helpful error message if the user is running against a version of Kibana that doesn't yet have the stats API implemented in it.
|
@ycombinator Can you create a follow up PR that cleans up the FIXME part? |
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.
Metricbeat will now exit with a helpful error message if the user is running against a version of Kibana that doesn't yet have the stats API implemented in it.
To test this PR
Run Elasticsearch 6.3.0.
Run Kibana 6.3.0.
Using this PR, enable the kibana module in metricbeat.
Modify
modules.d/kibana.ymland enable thestatsmetricset.Run metricbeat.
Verify that metricbeat exits with a helpful error message about the Kibana stats API not being available.