Cherry-pick #8192 to 6.x: Get rid of errors generated by xpack code for elasticsearch/shard
metricset
#8285
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.
Cherry-pick of PR #8192 to 6.x branch. Original message:
I was testing the
elasticsearch/shard
metricset withxpack.enabled: true
onmaster
and ran into a few errors:Investigating a bit I found that:
node
andrelocating_node
can sometimes be returned asnull
in theGET _cluster/state/version,master_node,nodes,routing_table
Elasticsearch API response used by this metricset, andnumber
field has been renamed in the Elasticserach API response toshard
now. I can't find when it wasnumber
but it is definitelyshard
now.This PR updates the code to get rid of these errors.
It also un-hardcodes the name of the monitoring index set in
data_xpack.go
.Testing this PR
Enable the
elasticsearch
metricset:Edit
modules.d/elasticsearch.yml
and setmetricsets: [ "shard" ]
andxpack.enabled: true
.Run metricbeat:
Check in Elasticsearch that you don't have any documents in
metricbeat-*
for theelasticsearch
module (since we are usingxpack.enabled: true
).Check in Elasticsearch that you have documents in
.monitoring-es-6-mb-*
withtype:shard