Merge pull request #1390 from elastic/feature/cat-nodes-file-descs

fix #1350 added new columns in the cat nodes API

Author: gmarz

src/Nest/Domain/Cat/CatNodesRecord.cs

@@ -63,6 +63,14 @@ public class CatNodesRecord : ICatRecord
 		internal string _diskAvail { get; set; }
 		public string DiskAvailable { get { return this._diskAvail ?? this._disk ?? this._d ?? this._disk_avail; }}
 
+		[JsonProperty("heap.current")]
+		internal string _heap_current { get; set; }
+		[JsonProperty("hc")]
+		internal string _hc { get; set; }
+		[JsonProperty("heapCurrent")]
+		internal string _heapCurrent { get; set; }
+		public string HeapCurrent { get { return this._heapCurrent ?? this._hc ?? this._heap_current; }}
+
 		[JsonProperty("heap.percent")]
 		internal string _heap_percent { get; set; }
 		[JsonProperty("hp")]
@@ -79,6 +87,14 @@ public class CatNodesRecord : ICatRecord
 		internal string _heapMax { get; set; }
 		public string HeapMax { get { return this._heapMax ?? this._hm ?? this._heap_max; }}
 
+		[JsonProperty("ram.current")]
+		internal string _ram_current { get; set; }
+		[JsonProperty("rc")]
+		internal string _rc { get; set; }
+		[JsonProperty("ramCurrent")]
+		internal string _ramCurrent { get; set; }
+		public string RamCurrent { get { return this._ramCurrent ?? this._rc ?? this._ram_current; }}
+
 		[JsonProperty("ram.percent")]
 		internal string _ram_percent { get; set; }
 		[JsonProperty("rp")]
@@ -187,6 +203,30 @@ public class CatNodesRecord : ICatRecord
 		internal string _flushTotalTime { get; set; }
 		public string FlushTotalTime { get { return this._flushTotalTime ?? this._ftt ?? this._flush_total_time; }}
 
+		[JsonProperty("file_desc.current")]
+		internal int? _file_desc_current { get; set; }
+		[JsonProperty("fdc")]
+		internal int? _fdc { get; set; }
+		[JsonProperty("fileDescriptorCurrent")]
+		internal int? _fileDescriptorCurrent { get; set; }
+		public int? FileDescriptorCurrent { get { return this._fileDescriptorCurrent ?? this._fdc ?? this._file_desc_current; }}
+
+		[JsonProperty("file_desc.percent")]
+		internal int? _file_desc_percent { get; set; }
+		[JsonProperty("fdp")]
+		internal int? _fdp { get; set; }
+		[JsonProperty("fileDescriptorPercent")]
+		internal int? _fileDescriptorPercent { get; set; }
+		public int? FileDescriptorPercent { get { return this._fileDescriptorPercent ?? this._fdp ?? this._file_desc_percent; }}
+
+		[JsonProperty("file_desc.max")]
+		internal int? _file_desc_max { get; set; }
+		[JsonProperty("fdm")]
+		internal int? _fdm { get; set; }
+		[JsonProperty("fileDescriptorMax")]
+		internal int? _fileDescriptorMax { get; set; }
+		public int? FileDescriptorMax { get { return this._fileDescriptorMax ?? this._fdm ?? this._file_desc_max; }}
+
 		[JsonProperty("get.current")]
 		internal string _get_current { get; set; }
 		[JsonProperty("gc")]

src/Tests/Nest.Tests.Integration/Core/Cat/CatTests.cs

@@ -138,6 +138,18 @@ public void CatNodes()
 			TestCat(() => this._client.CatNodes(v => v.H("b")), r => !r.Build.IsNullOrEmpty());
 		}
 
+		[Test]
+		public void CatNodesFileDescriptors()
+		{
+			TestCat(() => this._client.CatNodes(v => v.H("b", "fdc", "fdp", "fdm")), r => 
+				!r.Build.IsNullOrEmpty()
+				&& r.FileDescriptorCurrent.HasValue && r.FileDescriptorCurrent.Value > 0
+				&& r.FileDescriptorPercent.HasValue 
+				&& r.FileDescriptorMax.HasValue 
+
+			);
+		}
+
 		[Test]
 		public async void CatNodesAsync()
 		{