From 1acf855f2dddfeddf09a92256899e90385213fd4 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Wed, 7 Nov 2018 09:04:28 -0500
Subject: [PATCH] Use the newly added remote_cluster field for ccr (#25248)

---
 .../server/routes/api/v1/elasticsearch/ccr.js   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
index bd711c65ac4f..b3e85cdcee1e 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
@@ -87,6 +87,7 @@ function buildRequest(req, config, esIndexPattern) {
       'hits.hits.inner_hits.by_shard.hits.hits._source.ccr_stats.time_since_last_read_millis',
       'aggregations.by_follower_index.buckets.key',
       'aggregations.by_follower_index.buckets.leader_index.buckets.key',
+      'aggregations.by_follower_index.buckets.leader_index.buckets.remote_cluster.buckets.key',
       'aggregations.by_follower_index.buckets.by_shard_id.buckets.key',
       'aggregations.by_follower_index.buckets.by_shard_id.buckets.ops_synced.value',
       'aggregations.by_follower_index.buckets.by_shard_id.buckets.lag_ops.value',
@@ -139,6 +140,14 @@ function buildRequest(req, config, esIndexPattern) {
               terms: {
                 field: 'ccr_stats.leader_index',
                 size: 1
+              },
+              aggs: {
+                remote_cluster: {
+                  terms: {
+                    field: 'ccr_stats.remote_cluster',
+                    size: 1
+                  }
+                }
               }
             },
             by_shard_id: {
@@ -200,12 +209,8 @@ export function ccrRoute(server) {
         const buckets = get(response, 'aggregations.by_follower_index.buckets');
         const data = buckets.reduce((accum, bucket) => {
           const leaderIndex = get(bucket, 'leader_index.buckets[0].key');
-          let follows = leaderIndex;
-          if (follows.includes(':')) {
-            const followsSplit = follows.split(':');
-            follows = `${followsSplit[1]} on ${followsSplit[0]}`;
-          }
-
+          const remoteCluster = get(bucket, 'leader_index.buckets[0].remote_cluster.buckets[0].key');
+          const follows = remoteCluster ? `${leaderIndex} on ${remoteCluster}` : leaderIndex;
           const stat = {
             id: bucket.key,
             index: bucket.key,