From 3a74422b565d061a81f4de6c564f8d73ddeed761 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 12 Sep 2018 12:13:11 -0700 Subject: [PATCH 1/3] Only collect stats for specified indices --- .../xpack/monitoring/collector/ccr/CcrStatsCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java index fbb7505af4d07..d9186e9ddf9fc 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java @@ -72,7 +72,7 @@ protected Collection 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()); final CcrStatsAction.StatsResponses responses = ccrClient.stats(request).actionGet(getCollectionTimeout()); final long timestamp = timestamp(); From 73e2e8d107ee89dc3b613f0d7d9c27a0e6448348 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 12 Sep 2018 12:47:22 -0700 Subject: [PATCH 2/3] Removing unused import --- .../xpack/monitoring/collector/ccr/CcrStatsCollector.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java index d9186e9ddf9fc..5e017edc4cb8e 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java @@ -9,7 +9,6 @@ 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; From b6e05b9b6cb93f0efb5e5572290e3f014524187d Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 12 Sep 2018 12:47:38 -0700 Subject: [PATCH 3/3] Set lenientExpandOpen indices option --- .../xpack/monitoring/collector/ccr/CcrStatsCollector.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java index 5e017edc4cb8e..510f430d19647 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/ccr/CcrStatsCollector.java @@ -6,6 +6,7 @@ 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; @@ -72,6 +73,7 @@ protected Collection doCollect( try (ThreadContext.StoredContext ignore = stashWithOrigin(threadContext, MONITORING_ORIGIN)) { final CcrStatsAction.StatsRequest request = new CcrStatsAction.StatsRequest(); request.setIndices(getCollectionIndices()); + request.setIndicesOptions(IndicesOptions.lenientExpandOpen()); final CcrStatsAction.StatsResponses responses = ccrClient.stats(request).actionGet(getCollectionTimeout()); final long timestamp = timestamp();