Implement xpack.monitoring.elasticsearch.collection.enabled setting#33474
Merged
ycombinator merged 17 commits intoelastic:masterfrom Sep 18, 2018
Merged
Conversation
Collaborator
|
Pinging @elastic/es-core-infra |
39 tasks
ycombinator
commented
Sep 10, 2018
...rc/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollector.java
Outdated
Show resolved
Hide resolved
0123599 to
cd751df
Compare
pickypg
requested changes
Sep 13, 2018
Member
pickypg
left a comment
There was a problem hiding this comment.
Some ideas on simplifying this.
...ck/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java
Outdated
Show resolved
Hide resolved
...ck/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java
Show resolved
Hide resolved
...rc/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollector.java
Outdated
Show resolved
Hide resolved
df4964a to
66c7b2e
Compare
66c7b2e to
79a79c7
Compare
ycombinator
commented
Sep 14, 2018
| return this.elasticsearchCollectionEnabled; | ||
| } | ||
|
|
||
| public boolean shouldScheduleExecution() { |
Contributor
Author
There was a problem hiding this comment.
Should this and some of the other related methods in here be private or at least protected?
Member
There was a problem hiding this comment.
I'd be okay with either way. I even though about package protected after I initially wrote it (so it can be tested but not reused). But you're right it doesn't need to be public.
Contributor
Author
|
@pickypg Thanks for your feedback. I've simplified the implementation per your recommendation. This is ready for review again. |
pickypg
reviewed
Sep 14, 2018
Member
pickypg
left a comment
There was a problem hiding this comment.
Code LGTM. Just some minor doc comments.
| [source,yaml] | ||
| --------------------------------------------------- | ||
| xpack.monitoring.collection.enabled: true | ||
| xpack.monitoring.elasticsearch.collection.enabled: true |
| .. Verify that the `xpack.monitoring.enabled`, | ||
| `xpack.monitoring.collection.enabled`, and | ||
| `xpack.monitoring.elasticsearch.collection.enabled` settings are `true` on each | ||
| node in the cluster. By default, data collection is disabled. For more |
Member
There was a problem hiding this comment.
This second sentence is very confusing with this new setting in the mix.
By default
xpack.monitoring.collection.enabledis disabled (false), and that overridesxpack.monitoring.elasticsearch.collection.enabled, which defaults to being enabled (true). Both settings can be set dynamically at runtime.
(Or similar)
pickypg
reviewed
Sep 15, 2018
| This is different from xpack.monitoring.collection.enabled, which allows you to enable or disable | ||
| all monitoring collection. However, this setting simply disables the collection of Elasticsearch | ||
| data while still allowing other data (e.g., Kibana, Logstash, Beats, or APM Server monitoring data) | ||
| to use through this cluster. |
Member
There was a problem hiding this comment.
This is my own bad phrasing:
to use through this cluster.
should probably be
to pass through this cluster.
pickypg
reviewed
Sep 15, 2018
| } | ||
|
|
||
| public boolean isMonitoringActive() { | ||
| boolean isMonitoringActive() { |
Member
There was a problem hiding this comment.
This one is used in the Rest endpoint to silently block incoming traffic.
ycombinator
added a commit
to ycombinator/elasticsearch
that referenced
this pull request
Sep 18, 2018
…lastic#33474) * Implement xpack.monitoring.elasticsearch.collection.enabled setting * Fixing line lengths * Updating constructor calls in test * Removing unused import * Fixing line lengths in test classes * Make monitoringService.isElasticsearchCollectionEnabled() return true for tests * Remove wrong expectation * Adding unit tests for new flag to be false * Fixing line wrapping/indentation for better readability * Adding docs * Fixing logic in ClusterStatsCollector::shouldCollect * Rebasing with master and resolving conflicts * Simplifying implementation by gating scheduling * Doc fixes / improvements * Making methods package private * Fixing wording * Fixing method access
ycombinator
added a commit
that referenced
this pull request
Sep 18, 2018
…33474) (#33791) * Implement xpack.monitoring.elasticsearch.collection.enabled setting * Fixing line lengths * Updating constructor calls in test * Removing unused import * Fixing line lengths in test classes * Make monitoringService.isElasticsearchCollectionEnabled() return true for tests * Remove wrong expectation * Adding unit tests for new flag to be false * Fixing line wrapping/indentation for better readability * Adding docs * Fixing logic in ClusterStatsCollector::shouldCollect * Rebasing with master and resolving conflicts * Simplifying implementation by gating scheduling * Doc fixes / improvements * Making methods package private * Fixing wording * Fixing method access
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 #33290.
This PR implements an optional setting named
xpack.monitoring.elasticsearch.collection.enabled, defaulting totrue.This setting will determine whether X-Pack Monitoring (when active overall) should collect Elasticsearch metrics or not.