Skip to content

[CCR Monitoring] Only collect stats for specified indices #33646

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

Merged
merged 3 commits into from
Sep 12, 2018
Merged

[CCR Monitoring] Only collect stats for specified indices #33646

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a74422
Only collect stats for specified indices
ycombinator Sep 12, 2018
73e2e8d
Removing unused import
ycombinator Sep 12, 2018
b6e05b9
Set lenientExpandOpen indices option
ycombinator Sep 12, 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
5 changes: 3 additions & 2 deletions ...ing/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

package org.elasticsearch.xpack.monitoring.collector.ccr;

import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
Expand Down Expand Up @@ -72,7 +72,8 @@ protected Collection<MonitoringDoc> doCollect(
final ClusterState clusterState) throws Exception {
try (ThreadContext.StoredContext ignore = stashWithOrigin(threadContext, MONITORING_ORIGIN)) {
final CcrStatsAction.StatsRequest request = new CcrStatsAction.StatsRequest();
request.setIndices(Strings.EMPTY_ARRAY);
request.setIndices(getCollectionIndices());
Copy link
Contributor Author

@ycombinator ycombinator Sep 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Additionally, would it make sense to also set the following?

request.setIndicesOptions(IndicesOptions.lenientExpandOpen());

The IndexRecoveryCollector and IndexStatsCollector do this too.

Copy link
Member

@martijnvg martijnvg Sep 12, 2018

Choose a reason for hiding this comment

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

I think that makes sense. Otherwise we may throw an index not found exception if the index patterns the user is interested in does not yet exist.

Copy link
Member

@martijnvg martijnvg Sep 12, 2018

Choose a reason for hiding this comment

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

btw the build fails because of the removal of String.EMPTY_ARRAY its import is now unused.

Copy link
Member

@jasontedor jasontedor Sep 12, 2018

Choose a reason for hiding this comment

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

I agree.

request.setIndicesOptions(IndicesOptions.lenientExpandOpen());
final CcrStatsAction.StatsResponses responses = ccrClient.stats(request).actionGet(getCollectionTimeout());

final long timestamp = timestamp();
Expand Down