From d904fa5931fcf8b7ebfc0c2fd6fbad272b9861f7 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Mon, 21 Dec 2015 14:27:47 +0100
Subject: [PATCH] Marvel: Restore cluster_state.nodes

Original commit: elastic/x-pack-elasticsearch@7cf33baf2a4e21c9000e9388a5d2a98d2b4f445a
---
 .../agent/renderer/cluster/ClusterStateRenderer.java  |  1 +
 .../src/main/resources/marvel_index_template.json     |  3 +++
 .../collector/cluster/ClusterStateCollectorTests.java |  1 +
 .../src/test/resources/samples/cluster_state.json     | 11 ++++++++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRenderer.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRenderer.java
index abf759d88b1..78f473edbcc 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRenderer.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRenderer.java
@@ -22,6 +22,7 @@ public class ClusterStateRenderer extends AbstractRenderer<ClusterStateMarvelDoc
             "cluster_state.master_node",
             "cluster_state.state_uuid",
             "cluster_state.status",
+            "cluster_state.nodes",
     };
 
     public ClusterStateRenderer() {
diff --git a/elasticsearch/x-pack/marvel/src/main/resources/marvel_index_template.json b/elasticsearch/x-pack/marvel/src/main/resources/marvel_index_template.json
index c6cb56e3421..59ba3c3c915 100644
--- a/elasticsearch/x-pack/marvel/src/main/resources/marvel_index_template.json
+++ b/elasticsearch/x-pack/marvel/src/main/resources/marvel_index_template.json
@@ -186,6 +186,9 @@
               "type": "string",
               "index": "not_analyzed"
             },
+            "nodes": {
+              "enabled": false
+            },
             "shards": {
               "type": "object"
             }
diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollectorTests.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollectorTests.java
index d31fb8005e2..24e897a6fd9 100644
--- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollectorTests.java
+++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollectorTests.java
@@ -170,6 +170,7 @@ public class ClusterStateCollectorTests extends AbstractCollectorTestCase {
                 case ClusterStateCollector.TYPE:
                     ClusterStateMarvelDoc clusterStateMarvelDoc = (ClusterStateMarvelDoc) marvelDoc;
                     assertThat(clusterStateMarvelDoc.getClusterState().getRoutingTable().allShards(), hasSize(nbShards));
+                    assertThat(clusterStateMarvelDoc.getClusterState().getNodes().getSize(), equalTo(internalCluster().size()));
                     break;
 
                 case ClusterStateCollector.NODES_TYPE:
diff --git a/elasticsearch/x-pack/marvel/src/test/resources/samples/cluster_state.json b/elasticsearch/x-pack/marvel/src/test/resources/samples/cluster_state.json
index 24ec82416a9..7066face4ab 100644
--- a/elasticsearch/x-pack/marvel/src/test/resources/samples/cluster_state.json
+++ b/elasticsearch/x-pack/marvel/src/test/resources/samples/cluster_state.json
@@ -5,6 +5,15 @@
     "status": "yellow",
     "version": 14,
     "state_uuid": "lj0hNoO9QaeNa1eR2ukktQ",
-    "master_node": "__node_id__"
+    "master_node": "__node_id__",
+    "nodes": {
+      "__node_id__": {
+        "name": "Box",
+        "transport_address": "inet[/127.0.0.1:9300]",
+        "attributes": {
+          "local": "true"
+        }
+      }
+    }
   }
 }
\ No newline at end of file