[Monitoring] Add cluster metadata to cluster_stats docs#33860
Merged
ycombinator merged 12 commits intoelastic:masterfrom Sep 25, 2018
Merged
[Monitoring] Add cluster metadata to cluster_stats docs#33860ycombinator merged 12 commits intoelastic:masterfrom
ycombinator merged 12 commits intoelastic:masterfrom
Conversation
Collaborator
|
Pinging @elastic/es-core-infra |
AthenaEryma
reviewed
Sep 19, 2018
...ain/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java
Outdated
Show resolved
Hide resolved
65263ff to
8f3dfb3
Compare
Contributor
Author
Contributor
Author
|
This is ready for an initial review now. As discussed in #33691, I'm deliberately not adding anything to the index template or I don't believe we need any version checking in the code (owing to cluster metadata only being added in 6.5), but I'd like reviewers to confirm that. I still need to add/update tests. |
AthenaEryma
approved these changes
Sep 19, 2018
pickypg
approved these changes
Sep 20, 2018
Member
pickypg
left a comment
There was a problem hiding this comment.
LGTM. You won't need version checks because none of this leaves the node in a way that requires serialization between nodes.
81404dc to
f5d204e
Compare
This was referenced Sep 25, 2018
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
* WIP * Adding cluster metadata to cluster stats monitoring doc * Fixing checkstyle errors * Adding missing license header * Updating tests * Getting cluster settings from cluster state * Removing more unnecessary changes * Adding cluster metadata settings to cluster_stats docs * Updating test to include cluster metadata * Fixing checkstyle * Guarding against NPE * Updating test fixture
ycombinator
added a commit
to ycombinator/elasticsearch
that referenced
this pull request
Nov 1, 2018
* WIP * Adding cluster metadata to cluster stats monitoring doc * Fixing checkstyle errors * Adding missing license header * Updating tests * Getting cluster settings from cluster state * Removing more unnecessary changes * Adding cluster metadata settings to cluster_stats docs * Updating test to include cluster metadata * Fixing checkstyle * Guarding against NPE * Updating test fixture
ycombinator
added a commit
that referenced
this pull request
Nov 5, 2018
) Backport of #33860 and #34040. This PR teaches Monitoring to collect cluster metadata, if any is set, and index it into `cluster_stats` docs in `.monitoring-es-*`. After this PR, `cluster_stats` docs in `.monitoring-es-*` will contain an additional top-level `cluster_settings` field like so: ``` { ... "cluster_settings": { "cluster": { "metadata": { ... } } } } ```
ycombinator
added a commit
to elastic/beats
that referenced
this pull request
Nov 8, 2018
…data to cluster_stats docs (#8990) Cherry-pick of PR #8445 to 6.x branch. Original message: Porting over elastic/elasticsearch#33860 to the Metricbeat Elasticsearch module (X-Pack Monitoring code path). This PR teaches Elasticsearch X-Pack Monitoring to collect cluster metadata, if any is set, and index it into `cluster_stats` docs in `.monitoring-es-6-mb-*`. After this PR, `cluster_stats` docs in `.monitoring-es-6-mb-*` will contain an additional top-level `cluster_settings` field like so: ``` { ... "cluster_settings": { "cluster": { "metadata": { ... } } } } ```
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Resolves #33691.
This PR teaches Monitoring to collect cluster metadata, if any is set, and index it into
cluster_statsdocs in.monitoring-es-*.After this PR,
cluster_statsdocs in.monitoring-es-*will contain an additional top-levelcluster_settingsfield like so: