Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement xpack.monitoring.elasticsearch.collection.enabled setting #33474

Merged
merged 17 commits into from
Sep 18, 2018
Merged

Implement xpack.monitoring.elasticsearch.collection.enabled setting #33474

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a669f67
Implement xpack.monitoring.elasticsearch.collection.enabled setting
ycombinator Sep 6, 2018
dfc6ebe
Fixing line lengths
ycombinator Sep 6, 2018
07b3bd6
Updating constructor calls in test
ycombinator Sep 6, 2018
ccbdbcf
Removing unused import
ycombinator Sep 6, 2018
b17ed78
Fixing line lengths in test classes
ycombinator Sep 6, 2018
cb17765
Make monitoringService.isElasticsearchCollectionEnabled() return true…
ycombinator Sep 7, 2018
e003f31
Remove wrong expectation
ycombinator Sep 7, 2018
a610e00
Adding unit tests for new flag to be false
ycombinator Sep 8, 2018
00c9e4b
Fixing line wrapping/indentation for better readability
ycombinator Sep 8, 2018
f5cfa91
Adding docs
ycombinator Sep 8, 2018
871fc3b
Fixing logic in ClusterStatsCollector::shouldCollect
ycombinator Sep 10, 2018
cd751df
Rebasing with master and resolving conflicts
ycombinator Sep 13, 2018
79a79c7
Simplifying implementation by gating scheduling
ycombinator Sep 14, 2018
9f6a208
Doc fixes / improvements
ycombinator Sep 15, 2018
8d3e931
Making methods package private
ycombinator Sep 15, 2018
94749fc
Fixing wording
ycombinator Sep 17, 2018
5adbb8d
Fixing method access
ycombinator Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ public TimeValue getInterval() {
return interval;
}

public boolean isMonitoringActive() {
boolean isMonitoringActive() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is used in the Rest endpoint to silently block incoming traffic.

return isStarted() && enabled;
}

public boolean isElasticsearchCollectionEnabled() {
boolean isElasticsearchCollectionEnabled() {
return this.elasticsearchCollectionEnabled;
}

public boolean shouldScheduleExecution() {
boolean shouldScheduleExecution() {
return isElasticsearchCollectionEnabled() && isMonitoringActive();
}

Expand Down