Skip to content

Commit 13a4d76

Browse files
codebraincodebrain
committed
Add pretty names (and other properties) to the cluster stats response. #3766 
1 parent 117d3b6 commit 13a4d76

File tree

8 files changed

+75
-38
lines changed

8 files changed

+75
-38
lines changed

‎src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ public class ClusterNodesStats
1515
[DataMember(Name ="jvm")]
1616
public ClusterJvm Jvm { get; internal set; }
1717

18+
[DataMember(Name ="network_types")]
19+
public ClusterNetworkTypes NetworkTypes { get; internal set; }
20+
1821
[DataMember(Name ="os")]
1922
public ClusterOperatingSystemStats OperatingSystem { get; internal set; }
2023

@@ -28,6 +31,16 @@ public class ClusterNodesStats
2831
public IReadOnlyCollection<string> Versions { get; internal set; }
2932
}
3033

34+
[DataContract]
35+
public class ClusterNetworkTypes
36+
{
37+
[DataMember(Name ="http_types")]
38+
public IReadOnlyDictionary<string, int> HttpTypes { get; internal set; }
39+
40+
[DataMember(Name ="transport_types")]
41+
public IReadOnlyDictionary<string, int> TransportTypes { get; internal set; }
42+
}
43+
3144
[DataContract]
3245
public class ClusterFileSystem
3346
{
@@ -143,8 +156,33 @@ public class ClusterOperatingSystemStats
143156
[DataMember(Name ="available_processors")]
144157
public int AvailableProcessors { get; internal set; }
145158

159+
[DataMember(Name ="mem")]
160+
public OperatingSystemMemoryInfo Memory { get; internal set; }
161+
146162
[DataMember(Name ="names")]
147163
public IReadOnlyCollection<ClusterOperatingSystemName> Names { get; internal set; }
164+
165+
[DataMember(Name ="pretty_names")]
166+
public IReadOnlyCollection<ClusterOperatingSystemPrettyNane> PrettyNames { get; internal set; }
167+
}
168+
169+
[DataContract]
170+
public class OperatingSystemMemoryInfo
171+
{
172+
[DataMember(Name ="free_in_bytes")]
173+
public long FreeBytes { get; internal set; }
174+
175+
[DataMember(Name ="free_percent")]
176+
public int FreePercent { get; internal set; }
177+
178+
[DataMember(Name ="total_in_bytes")]
179+
public long TotalBytes { get; internal set; }
180+
181+
[DataMember(Name ="used_in_bytes")]
182+
public long UsedBytes { get; internal set; }
183+
184+
[DataMember(Name ="used_percent")]
185+
public int UsedPercent { get; internal set; }
148186
}
149187

150188
[DataContract]

‎src/Nest/Cluster/ClusterStats/ClusterStatsResponse.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ public class ClusterStatsResponse : NodesResponseBase
66
{
77
[DataMember(Name ="cluster_name")]
88
public string ClusterName { get; internal set; }
9+
10+
[DataMember(Name ="cluster_uuid")]
11+
public string ClusterUUID { get; internal set; }
912

1013
[DataMember(Name ="indices")]
1114
public ClusterIndicesStats Indices { get; internal set; }

‎src/Nest/Cluster/NodesInfo/NodeInfo.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ public class NodeOperatingSystemInfo
8080
[DataMember(Name = "name")]
8181
public string Name { get; internal set; }
8282

83+
[DataMember(Name = "pretty_name")]
84+
public string PrettyName { get; internal set; }
85+
8386
[DataMember(Name = "refresh_interval_in_millis")]
8487
public int RefreshInterval { get; internal set; }
8588

@@ -90,6 +93,16 @@ public class NodeOperatingSystemInfo
9093
public string Version { get; internal set; }
9194
}
9295

96+
[DataContract]
97+
public class ClusterOperatingSystemPrettyNane
98+
{
99+
[DataMember(Name = "count")]
100+
public int Count { get; internal set; }
101+
102+
[DataMember(Name = "pretty_name")]
103+
public string PrettyName { get; internal set; }
104+
}
105+
93106
[DataContract]
94107
public class NodeInfoOSCPU
95108
{

‎src/Nest/CommonOptions/Stats/FieldDataStats.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ public class FielddataStats
88
[DataMember(Name ="evictions")]
99
public long Evictions { get; set; }
1010

11-
[DataMember(Name ="memory_size")]
12-
public string MemorySize { get; set; }
13-
1411
[DataMember(Name ="memory_size_in_bytes")]
1512
public long MemorySizeInBytes { get; set; }
1613
}

‎src/Nest/CommonOptions/Stats/PluginStats.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public class PluginStats
1111
[DataMember(Name ="description")]
1212
public string Description { get; set; }
1313

14+
[DataMember(Name ="elasticsearch_version")]
15+
public string ElasticsearchVersion { get; set; }
16+
1417
[DataMember(Name ="isolated")]
1518
public bool Isolated { get; set; }
1619

@@ -23,6 +26,12 @@ public class PluginStats
2326
[DataMember(Name ="site")]
2427
public bool Site { get; set; }
2528

29+
[DataMember(Name = "has_native_controller")]
30+
public bool? HasNativeController { get; set; }
31+
32+
[DataMember(Name ="java_version")]
33+
public string JavaVersion { get; set; }
34+
2635
[DataMember(Name ="version")]
2736
public string Version { get; set; }
2837
}

‎src/Nest/CommonOptions/Stats/QueryCacheStats.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ public class QueryCacheStats
1717
[DataMember(Name ="hit_count")]
1818
public long HitCount { get; set; }
1919

20-
[DataMember(Name ="memory_size")]
21-
public string MemorySize { get; set; }
22-
2320
[DataMember(Name ="memory_size_in_bytes")]
2421
public long MemorySizeInBytes { get; set; }
2522

‎src/Nest/CommonOptions/Stats/SegmentsStats.cs

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,69 +8,39 @@ public class SegmentsStats
88
[DataMember(Name ="count")]
99
public long Count { get; set; }
1010

11-
[DataMember(Name ="doc_values_memory")]
12-
public string DocValuesMemory { get; set; }
13-
1411
[DataMember(Name ="doc_values_memory_in_bytes")]
1512
public long DocValuesMemoryInBytes { get; set; }
1613

17-
[DataMember(Name ="fixed_bit_set_memory")]
18-
public string FixedBitSetMemory { get; set; }
19-
2014
[DataMember(Name ="fixed_bit_set_memory_in_bytes")]
2115
public long FixedBitSetMemoryInBytes { get; set; }
2216

23-
[DataMember(Name ="index_writer_max_memory")]
24-
public string IndexWriterMaxMemory { get; set; }
25-
2617
[DataMember(Name ="index_writer_max_memory_in_bytes")]
2718
public long IndexWriterMaxMemoryInBytes { get; set; }
2819

29-
[DataMember(Name ="index_writer_memory")]
30-
public string IndexWriterMemory { get; set; }
31-
3220
[DataMember(Name ="index_writer_memory_in_bytes")]
3321
public long IndexWriterMemoryInBytes { get; set; }
3422

35-
[DataMember(Name ="memory")]
36-
public string Memory { get; set; }
23+
[DataMember(Name ="max_unsafe_auto_id_timestamp")]
24+
public string MaximumUnsafeAutoIdTimestamp { get; set; }
3725

3826
[DataMember(Name ="memory_in_bytes")]
3927
public long MemoryInBytes { get; set; }
4028

41-
[DataMember(Name ="norms_memory")]
42-
public string NormsMemory { get; set; }
43-
4429
[DataMember(Name ="norms_memory_in_bytes")]
4530
public long NormsMemoryInBytes { get; set; }
4631

47-
[DataMember(Name ="points_memory")]
48-
public string PointsMemory { get; set; }
49-
5032
[DataMember(Name ="points_memory_in_bytes")]
5133
public long PointsMemoryInBytes { get; set; }
5234

53-
[DataMember(Name ="stored_fields_memory")]
54-
public string StoredFieldsMemory { get; set; }
55-
5635
[DataMember(Name ="stored_fields_memory_in_bytes")]
5736
public long StoredFieldsMemoryInBytes { get; set; }
5837

59-
[DataMember(Name ="terms_memory")]
60-
public string TermsMemory { get; set; }
61-
6238
[DataMember(Name ="terms_memory_in_bytes")]
6339
public long TermsMemoryInBytes { get; set; }
6440

65-
[DataMember(Name ="term_vectors_memory")]
66-
public string TermVectorsMemory { get; set; }
67-
6841
[DataMember(Name ="term_vectors_memory_in_bytes")]
6942
public long TermVectorsMemoryInBytes { get; set; }
7043

71-
[DataMember(Name ="version_map_memory")]
72-
public string VersionMapMemory { get; set; }
73-
7444
[DataMember(Name ="version_map_memory_in_bytes")]
7545
public long VersionMapMemoryInBytes { get; set; }
7646
}

‎src/Tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ protected override LazyResponses ClientUsage() => Calls(
2828
protected override void ExpectResponse(ClusterStatsResponse response)
2929
{
3030
response.ClusterName.Should().NotBeNullOrWhiteSpace();
31+
32+
if (base.Cluster.ClusterConfiguration.Version >= "6.8.0")
33+
response.ClusterUUID.Should().NotBeNullOrWhiteSpace();
34+
3135
response.NodeStatistics.Should().NotBeNull();
3236
response.Status.Should().NotBe(ClusterStatus.Red);
3337
response.Timestamp.Should().BeGreaterThan(0);
@@ -67,6 +71,12 @@ protected void Assert(ClusterNodesStats nodes)
6771

6872
nodes.OperatingSystem.Names.Should().NotBeEmpty();
6973

74+
if (base.Cluster.ClusterConfiguration.Version >= "6.8.0")
75+
{
76+
nodes.OperatingSystem.Memory.Should().NotBeNull();
77+
nodes.OperatingSystem.PrettyNames.Should().NotBeNull();
78+
}
79+
7080
var plugins = nodes.Plugins;
7181
plugins.Should().NotBeEmpty();
7282

0 commit comments

Comments
 (0)