Revised node roles aggregate and remove OS mem for cluster stats

Add node roles to node stats
Closes #2011

Author: russcam

src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs

@@ -23,9 +23,9 @@ public class ClusterNodesStats
 
 		[JsonProperty("fs")]
 		public ClusterFileSystem FileSystem { get; internal set; }
-		
+
 		[JsonProperty("plugins")]
-		public List<PluginStats> Plugins { get; internal set; } 
+		public List<PluginStats> Plugins { get; internal set; }
 	}
 
 	[JsonObject]
@@ -80,7 +80,7 @@ public class ClusterJvmVersion
 		public string VmVendor { get; internal set; }
 
 		[JsonProperty("count")]
-		public int Count { get; internal set; }	
+		public int Count { get; internal set; }
 	}
 
 	[JsonObject]
@@ -135,22 +135,13 @@ public class ClusterOperatingSystemStats
 		[JsonProperty("available_processors")]
 		public int AvailableProcessors { get; internal set; }
 
-		[JsonProperty("mem")]
-		public ClusterOperatingSystemMemory Memory { get; internal set; }
+		[JsonProperty("allocated_processors")]
+		public int AllocatedProcessors { get; internal set; }
 
 		[JsonProperty("names")]
 		public List<ClusterOperatingSystemName> Names { get; internal set; }
 	}
 
-	[JsonObject]
-	public class ClusterOperatingSystemMemory
-	{
-		[JsonProperty("total")]
-		public string Total { get; internal set; }
-		[JsonProperty("total_in_bytes")]
-		public long TotalInBytes { get; internal set; }
-	}
-
 	[JsonObject]
 	public class ClusterOperatingSystemName
 	{
@@ -167,16 +158,16 @@ public class ClusterNodeCount
 		[JsonProperty("total")]
 		public int Total { get; internal set; }
 
-		[JsonProperty("master_only")]
-		public int MasterOnly { get; internal set; }
+		[JsonProperty("coordinating_only")]
+		public int CoordinatingOnly { get; internal set; }
 
-		[JsonProperty("data_only")]
-		public int DataOnly { get; internal set; }
+		[JsonProperty("master")]
+		public int Master { get; internal set; }
 
-		[JsonProperty("master_data")]
-		public int MasterData { get; internal set; }
+		[JsonProperty("data")]
+		public int Data { get; internal set; }
 
-		[JsonProperty("client")]
-		public int Client { get; internal set; }
+		[JsonProperty("ingest")]
+		public int Ingest { get; internal set; }
 	}
 }

src/Nest/Cluster/NodesInfo/NodeInfo.cs

@@ -28,6 +28,13 @@ public class NodeInfo
 		[JsonProperty(PropertyName = "http_address")]
 		public string HttpAddress { get; internal set; }
 
+		/// <summary>
+		/// All of the different roles that the node fulfills. An empty
+		/// collection means that the node is a coordinating only node.
+		/// </summary>
+		[JsonProperty("roles")]
+		public List<NodeRole> Roles { get; internal set; }
+
 		[JsonProperty(PropertyName = "settings")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
 		public DynamicResponse Settings { get; internal set; }
@@ -56,9 +63,6 @@ public class NodeInfo
 
 		[JsonProperty("plugins")]
 		public List<PluginStats> Plugins { get; internal set; }
-
-		[JsonProperty("roles")]
-		public List<NodeRole> Roles { get; internal set; }
 	}
 
 	[JsonObject]

src/Nest/Cluster/NodesStats/NodeStats.cs

@@ -21,6 +21,13 @@ public class NodeStats
 		[JsonProperty("ip")]
 		public IEnumerable<string> Ip { get; internal set; }
 
+		/// <summary>
+		/// All of the different roles that the node fulfills. An empty
+		/// collection means that the node is a coordinating only node.
+		/// </summary>
+		[JsonProperty("roles")]
+		public IEnumerable<NodeRole> Roles { get; internal set; }
+
 		[JsonProperty("indices")]
 		public IndexStats Indices { get; internal set; }
 

src/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs

@@ -37,7 +37,7 @@ protected void Assert(ClusterNodesStats nodes)
 		{
 			nodes.Should().NotBeNull();
 			nodes.Count.Should().NotBeNull();
-			nodes.Count.MasterData.Should().BeGreaterOrEqualTo(1);
+			nodes.Count.Master.Should().BeGreaterOrEqualTo(1);
 
 			nodes.FileSystem.Should().NotBeNull();
 			nodes.FileSystem.AvailableInBytes.Should().BeGreaterThan(0);
@@ -61,7 +61,7 @@ protected void Assert(ClusterNodesStats nodes)
 
 			nodes.OperatingSystem.Should().NotBeNull();
 			nodes.OperatingSystem.AvailableProcessors.Should().BeGreaterThan(0);
-			nodes.OperatingSystem.Memory.Should().NotBeNull();
+			nodes.OperatingSystem.AllocatedProcessors.Should().BeGreaterThan(0);
 
 			nodes.OperatingSystem.Names.Should().NotBeEmpty();
 

src/Tests/Cluster/NodesStats/NodesStatsApiTests.cs

@@ -52,6 +52,7 @@ protected void Assert(NodeStats node)
 			node.TransportAddress.Should().NotBeNullOrWhiteSpace();
 			node.Host.Should().NotBeNullOrWhiteSpace();
 			node.Ip.Should().NotBeEmpty();
+			node.Roles.Should().NotBeNullOrEmpty();
 		}
 
 		protected void Assert(IndexStats index)