Skip to content

Commit 6446bdb

Browse files
codebraincodebrain
authored
Add pretty names (and other properties) to the cluster stats response. #3766 (#3780)
1 parent d3a7fe9 commit 6446bdb

File tree

9 files changed

+91
-67
lines changed

9 files changed

+91
-67
lines changed

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

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ public class ClusterNodesStats
99
[DataMember(Name ="count")]
1010
public ClusterNodeCount Count { get; internal set; }
1111

12+
[DataMember(Name ="discovery_types")]
13+
public IReadOnlyDictionary<string, int> DiscoveryTypes { get; internal set; }
14+
1215
[DataMember(Name ="fs")]
1316
public ClusterFileSystem FileSystem { get; internal set; }
1417

1518
[DataMember(Name ="jvm")]
1619
public ClusterJvm Jvm { get; internal set; }
1720

21+
[DataMember(Name ="network_types")]
22+
public ClusterNetworkTypes NetworkTypes { get; internal set; }
23+
1824
[DataMember(Name ="os")]
1925
public ClusterOperatingSystemStats OperatingSystem { get; internal set; }
2026

@@ -29,33 +35,31 @@ public class ClusterNodesStats
2935
}
3036

3137
[DataContract]
32-
public class ClusterFileSystem
38+
public class ClusterNetworkTypes
3339
{
34-
[DataMember(Name ="available")]
35-
public string Available { get; internal set; }
40+
[DataMember(Name ="http_types")]
41+
public IReadOnlyDictionary<string, int> HttpTypes { get; internal set; }
42+
43+
[DataMember(Name ="transport_types")]
44+
public IReadOnlyDictionary<string, int> TransportTypes { get; internal set; }
45+
}
3646

47+
[DataContract]
48+
public class ClusterFileSystem
49+
{
3750
[DataMember(Name ="available_in_bytes")]
3851
public long AvailableInBytes { get; internal set; }
3952

40-
[DataMember(Name ="free")]
41-
public string Free { get; internal set; }
42-
4353
[DataMember(Name ="free_in_bytes")]
4454
public long FreeInBytes { get; internal set; }
4555

46-
[DataMember(Name ="total")]
47-
public string Total { get; internal set; }
48-
4956
[DataMember(Name ="total_in_bytes")]
5057
public long TotalInBytes { get; internal set; }
5158
}
5259

5360
[DataContract]
5461
public class ClusterJvm
5562
{
56-
[DataMember(Name ="max_uptime")]
57-
public string MaxUptime { get; internal set; }
58-
5963
[DataMember(Name ="max_uptime_in_millis")]
6064
public long MaxUptimeInMilliseconds { get; internal set; }
6165

@@ -72,6 +76,12 @@ public class ClusterJvm
7276
[DataContract]
7377
public class ClusterJvmVersion
7478
{
79+
[DataMember(Name ="bundled_jdk")]
80+
public bool BundledJdk { get; internal set; }
81+
82+
[DataMember(Name ="using_bundled_jdk")]
83+
public bool? UsingBundledJdk { get; internal set; }
84+
7585
[DataMember(Name ="count")]
7686
public int Count { get; internal set; }
7787

@@ -91,15 +101,9 @@ public class ClusterJvmVersion
91101
[DataContract]
92102
public class ClusterJvmMemory
93103
{
94-
[DataMember(Name ="heap_max")]
95-
public string HeapMax { get; internal set; }
96-
97104
[DataMember(Name ="heap_max_in_bytes")]
98105
public long HeapMaxInBytes { get; internal set; }
99106

100-
[DataMember(Name ="heap_used")]
101-
public string HeapUsed { get; set; }
102-
103107
[DataMember(Name ="heap_used_in_bytes")]
104108
public long HeapUsedInBytes { get; internal set; }
105109
}
@@ -143,8 +147,33 @@ public class ClusterOperatingSystemStats
143147
[DataMember(Name ="available_processors")]
144148
public int AvailableProcessors { get; internal set; }
145149

150+
[DataMember(Name ="mem")]
151+
public OperatingSystemMemoryInfo Memory { get; internal set; }
152+
146153
[DataMember(Name ="names")]
147154
public IReadOnlyCollection<ClusterOperatingSystemName> Names { get; internal set; }
155+
156+
[DataMember(Name ="pretty_names")]
157+
public IReadOnlyCollection<ClusterOperatingSystemPrettyNane> PrettyNames { get; internal set; }
158+
}
159+
160+
[DataContract]
161+
public class OperatingSystemMemoryInfo
162+
{
163+
[DataMember(Name ="free_in_bytes")]
164+
public long FreeBytes { get; internal set; }
165+
166+
[DataMember(Name ="free_percent")]
167+
public int FreePercent { get; internal set; }
168+
169+
[DataMember(Name ="total_in_bytes")]
170+
public long TotalBytes { get; internal set; }
171+
172+
[DataMember(Name ="used_in_bytes")]
173+
public long UsedBytes { get; internal set; }
174+
175+
[DataMember(Name ="used_percent")]
176+
public int UsedPercent { get; internal set; }
148177
}
149178

150179
[DataContract]

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

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

10+
[DataMember(Name ="cluster_uuid")]
11+
public string ClusterUUID { get; internal set; }
12+
1013
[DataMember(Name ="indices")]
1114
public ClusterIndicesStats Indices { get; internal set; }
1215

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

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

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

@@ -91,6 +94,16 @@ public class NodeOperatingSystemInfo
9194
public string Version { get; internal set; }
9295
}
9396

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ namespace Nest
55
[DataContract]
66
public class CompletionStats
77
{
8-
[DataMember(Name ="size")]
9-
public string Size { get; set; }
10-
118
[DataMember(Name ="size_in_bytes")]
129
public long SizeInBytes { get; set; }
1310
}

‎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: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Runtime.Serialization;
1+
using System.Collections.Generic;
2+
using System.Runtime.Serialization;
23

34
namespace Nest
45
{
@@ -11,17 +12,20 @@ public class PluginStats
1112
[DataMember(Name ="description")]
1213
public string Description { get; set; }
1314

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

17-
[DataMember(Name ="jvm")]
18-
public bool Jvm { get; set; }
18+
[DataMember(Name ="extended_plugins")]
19+
public IReadOnlyCollection<string> ExtendedPlugins { get; set; }
1920

2021
[DataMember(Name ="name")]
2122
public string Name { get; set; }
2223

23-
[DataMember(Name ="site")]
24-
public bool Site { get; set; }
24+
[DataMember(Name = "has_native_controller")]
25+
public bool? HasNativeController { get; set; }
26+
27+
[DataMember(Name ="java_version")]
28+
public string JavaVersion { get; set; }
2529

2630
[DataMember(Name ="version")]
2731
public string Version { get; set; }

‎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: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Runtime.Serialization;
1+
using System.Collections.Generic;
2+
using System.Runtime.Serialization;
23

34
namespace Nest
45
{
@@ -8,70 +9,43 @@ public class SegmentsStats
89
[DataMember(Name ="count")]
910
public long Count { get; set; }
1011

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

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

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

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

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

3827
[DataMember(Name ="memory_in_bytes")]
3928
public long MemoryInBytes { get; set; }
4029

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

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

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

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

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

71-
[DataMember(Name ="version_map_memory")]
72-
public string VersionMapMemory { get; set; }
73-
7445
[DataMember(Name ="version_map_memory_in_bytes")]
7546
public long VersionMapMemoryInBytes { get; set; }
47+
48+
[DataMember(Name ="file_sizes")]
49+
public IReadOnlyDictionary<string, ShardFileSizeInfo> FileSizes { get; internal set; }
7650
}
7751
}

‎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)