Skip to content

Commit e45618a

Browse files
russcamrusscam
committed
Add voting_only to ClusterNodeStats and XPackInfo
Relates: #4001 This commit adds voting_only to ClusterNodeStats and XPackUsageResponse. VotingOnly is supported only in the default distribution (cherry picked from commit 92c12b7)
1 parent c583948 commit e45618a

File tree

3 files changed

+71
-60
lines changed

3 files changed

+71
-60
lines changed

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

+63-60
Original file line numberDiff line numberDiff line change
@@ -6,217 +6,220 @@ namespace Nest
66
[DataContract]
77
public class ClusterNodesStats
88
{
9-
[DataMember(Name ="count")]
9+
[DataMember(Name = "count")]
1010
public ClusterNodeCount Count { get; internal set; }
1111

12-
[DataMember(Name ="discovery_types")]
12+
[DataMember(Name = "discovery_types")]
1313
public IReadOnlyDictionary<string, int> DiscoveryTypes { get; internal set; }
1414

15-
[DataMember(Name ="packaging_types")]
16-
public IReadOnlyCollection<NodePackagingType> PackagingTypes { get; internal set; }
17-
18-
[DataMember(Name ="fs")]
15+
[DataMember(Name = "fs")]
1916
public ClusterFileSystem FileSystem { get; internal set; }
2017

21-
[DataMember(Name ="jvm")]
18+
[DataMember(Name = "jvm")]
2219
public ClusterJvm Jvm { get; internal set; }
2320

24-
[DataMember(Name ="network_types")]
21+
[DataMember(Name = "network_types")]
2522
public ClusterNetworkTypes NetworkTypes { get; internal set; }
2623

27-
[DataMember(Name ="os")]
24+
[DataMember(Name = "os")]
2825
public ClusterOperatingSystemStats OperatingSystem { get; internal set; }
2926

30-
[DataMember(Name ="plugins")]
27+
[DataMember(Name = "packaging_types")]
28+
public IReadOnlyCollection<NodePackagingType> PackagingTypes { get; internal set; }
29+
30+
[DataMember(Name = "plugins")]
3131
public IReadOnlyCollection<PluginStats> Plugins { get; internal set; }
3232

33-
[DataMember(Name ="process")]
33+
[DataMember(Name = "process")]
3434
public ClusterProcess Process { get; internal set; }
3535

36-
[DataMember(Name ="versions")]
36+
[DataMember(Name = "versions")]
3737
public IReadOnlyCollection<string> Versions { get; internal set; }
3838
}
3939

4040
public class NodePackagingType
4141
{
42-
[DataMember(Name ="flavor")]
42+
[DataMember(Name = "count")]
43+
public int Count { get; internal set; }
44+
45+
[DataMember(Name = "flavor")]
4346
public string Flavor { get; internal set; }
4447

45-
[DataMember(Name ="type")]
48+
[DataMember(Name = "type")]
4649
public string Type { get; internal set; }
47-
48-
[DataMember(Name ="count")]
49-
public int Count { get; internal set; }
5050
}
5151

5252
[DataContract]
5353
public class ClusterNetworkTypes
5454
{
55-
[DataMember(Name ="http_types")]
55+
[DataMember(Name = "http_types")]
5656
public IReadOnlyDictionary<string, int> HttpTypes { get; internal set; }
5757

58-
[DataMember(Name ="transport_types")]
58+
[DataMember(Name = "transport_types")]
5959
public IReadOnlyDictionary<string, int> TransportTypes { get; internal set; }
6060
}
6161

6262
[DataContract]
6363
public class ClusterFileSystem
6464
{
65-
[DataMember(Name ="available_in_bytes")]
65+
[DataMember(Name = "available_in_bytes")]
6666
public long AvailableInBytes { get; internal set; }
6767

68-
[DataMember(Name ="free_in_bytes")]
68+
[DataMember(Name = "free_in_bytes")]
6969
public long FreeInBytes { get; internal set; }
7070

71-
[DataMember(Name ="total_in_bytes")]
71+
[DataMember(Name = "total_in_bytes")]
7272
public long TotalInBytes { get; internal set; }
7373
}
7474

7575
[DataContract]
7676
public class ClusterJvm
7777
{
78-
[DataMember(Name ="max_uptime_in_millis")]
78+
[DataMember(Name = "max_uptime_in_millis")]
7979
public long MaxUptimeInMilliseconds { get; internal set; }
8080

81-
[DataMember(Name ="mem")]
81+
[DataMember(Name = "mem")]
8282
public ClusterJvmMemory Memory { get; internal set; }
8383

84-
[DataMember(Name ="threads")]
84+
[DataMember(Name = "threads")]
8585
public long Threads { get; internal set; }
8686

87-
[DataMember(Name ="versions")]
87+
[DataMember(Name = "versions")]
8888
public IReadOnlyCollection<ClusterJvmVersion> Versions { get; internal set; }
8989
}
9090

9191
[DataContract]
9292
public class ClusterJvmVersion
9393
{
94-
[DataMember(Name ="bundled_jdk")]
94+
[DataMember(Name = "bundled_jdk")]
9595
public bool BundledJdk { get; internal set; }
9696

97-
[DataMember(Name ="using_bundled_jdk")]
98-
public bool? UsingBundledJdk { get; internal set; }
99-
100-
[DataMember(Name ="count")]
97+
[DataMember(Name = "count")]
10198
public int Count { get; internal set; }
10299

103-
[DataMember(Name ="version")]
100+
[DataMember(Name = "using_bundled_jdk")]
101+
public bool? UsingBundledJdk { get; internal set; }
102+
103+
[DataMember(Name = "version")]
104104
public string Version { get; internal set; }
105105

106-
[DataMember(Name ="vm_name")]
106+
[DataMember(Name = "vm_name")]
107107
public string VmName { get; internal set; }
108108

109-
[DataMember(Name ="vm_vendor")]
109+
[DataMember(Name = "vm_vendor")]
110110
public string VmVendor { get; internal set; }
111111

112-
[DataMember(Name ="vm_version")]
112+
[DataMember(Name = "vm_version")]
113113
public string VmVersion { get; internal set; }
114114
}
115115

116116
[DataContract]
117117
public class ClusterJvmMemory
118118
{
119-
[DataMember(Name ="heap_max_in_bytes")]
119+
[DataMember(Name = "heap_max_in_bytes")]
120120
public long HeapMaxInBytes { get; internal set; }
121121

122-
[DataMember(Name ="heap_used_in_bytes")]
122+
[DataMember(Name = "heap_used_in_bytes")]
123123
public long HeapUsedInBytes { get; internal set; }
124124
}
125125

126126
[DataContract]
127127
public class ClusterProcess
128128
{
129-
[DataMember(Name ="cpu")]
129+
[DataMember(Name = "cpu")]
130130
public ClusterProcessCpu Cpu { get; internal set; }
131131

132-
[DataMember(Name ="open_file_descriptors")]
132+
[DataMember(Name = "open_file_descriptors")]
133133
public ClusterProcessOpenFileDescriptors OpenFileDescriptors { get; internal set; }
134134
}
135135

136136
[DataContract]
137137
public class ClusterProcessCpu
138138
{
139-
[DataMember(Name ="percent")]
139+
[DataMember(Name = "percent")]
140140
public int Percent { get; internal set; }
141141
}
142142

143143
[DataContract]
144144
public class ClusterProcessOpenFileDescriptors
145145
{
146-
[DataMember(Name ="avg")]
146+
[DataMember(Name = "avg")]
147147
public long Avg { get; internal set; }
148148

149-
[DataMember(Name ="max")]
149+
[DataMember(Name = "max")]
150150
public long Max { get; internal set; }
151151

152-
[DataMember(Name ="min")]
152+
[DataMember(Name = "min")]
153153
public long Min { get; internal set; }
154154
}
155155

156156
[DataContract]
157157
public class ClusterOperatingSystemStats
158158
{
159-
[DataMember(Name ="allocated_processors")]
159+
[DataMember(Name = "allocated_processors")]
160160
public int AllocatedProcessors { get; internal set; }
161161

162-
[DataMember(Name ="available_processors")]
162+
[DataMember(Name = "available_processors")]
163163
public int AvailableProcessors { get; internal set; }
164164

165-
[DataMember(Name ="mem")]
165+
[DataMember(Name = "mem")]
166166
public OperatingSystemMemoryInfo Memory { get; internal set; }
167167

168-
[DataMember(Name ="names")]
168+
[DataMember(Name = "names")]
169169
public IReadOnlyCollection<ClusterOperatingSystemName> Names { get; internal set; }
170170

171-
[DataMember(Name ="pretty_names")]
171+
[DataMember(Name = "pretty_names")]
172172
public IReadOnlyCollection<ClusterOperatingSystemPrettyNane> PrettyNames { get; internal set; }
173173
}
174174

175175
[DataContract]
176176
public class OperatingSystemMemoryInfo
177177
{
178-
[DataMember(Name ="free_in_bytes")]
178+
[DataMember(Name = "free_in_bytes")]
179179
public long FreeBytes { get; internal set; }
180180

181-
[DataMember(Name ="free_percent")]
181+
[DataMember(Name = "free_percent")]
182182
public int FreePercent { get; internal set; }
183183

184-
[DataMember(Name ="total_in_bytes")]
184+
[DataMember(Name = "total_in_bytes")]
185185
public long TotalBytes { get; internal set; }
186186

187-
[DataMember(Name ="used_in_bytes")]
187+
[DataMember(Name = "used_in_bytes")]
188188
public long UsedBytes { get; internal set; }
189189

190-
[DataMember(Name ="used_percent")]
190+
[DataMember(Name = "used_percent")]
191191
public int UsedPercent { get; internal set; }
192192
}
193193

194194
[DataContract]
195195
public class ClusterOperatingSystemName
196196
{
197-
[DataMember(Name ="count")]
197+
[DataMember(Name = "count")]
198198
public int Count { get; internal set; }
199199

200-
[DataMember(Name ="name")]
200+
[DataMember(Name = "name")]
201201
public string Name { get; internal set; }
202202
}
203203

204204
[DataContract]
205205
public class ClusterNodeCount
206206
{
207-
[DataMember(Name ="coordinating_only")]
207+
[DataMember(Name = "coordinating_only")]
208208
public int CoordinatingOnly { get; internal set; }
209209

210-
[DataMember(Name ="data")]
210+
[DataMember(Name = "data")]
211211
public int Data { get; internal set; }
212212

213-
[DataMember(Name ="ingest")]
213+
[DataMember(Name = "ingest")]
214214
public int Ingest { get; internal set; }
215215

216-
[DataMember(Name ="master")]
216+
[DataMember(Name = "master")]
217217
public int Master { get; internal set; }
218218

219-
[DataMember(Name ="total")]
219+
[DataMember(Name = "total")]
220220
public int Total { get; internal set; }
221+
222+
[DataMember(Name = "voting_only")]
223+
public int VotingOnly { get; internal set; }
221224
}
222225
}

‎src/Nest/XPack/Info/XPackUsage/XPackUsageResponse.cs

+3
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ public class XPackUsageResponse : ResponseBase
6363

6464
[DataMember(Name = "security")]
6565
public SecurityUsage Security { get; internal set; }
66+
67+
[DataMember(Name = "voting_only")]
68+
public XPackUsage VotingOnly { get; internal set; }
6669
}
6770

6871
public class XPackUsage

‎src/Tests/Tests/XPack/Info/XPackInfoApiTests.cs

+5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
using Elastic.Xunit.XunitPlumbing;
33
using FluentAssertions;
44
using Nest;
5+
using Tests.Configuration;
56
using Tests.Core.ManagedElasticsearch.Clusters;
67
using Tests.Framework.EndpointTests;
78
using Tests.Framework.EndpointTests.TestState;
9+
using Tests.Core.Extensions;
810

911
namespace Tests.XPack.Info
1012
{
@@ -84,6 +86,9 @@ [I] public async Task XPackUsageResponse() => await Assert<XPackUsageResponse>(X
8486
r.Alerting.Count.Should().NotBeNull();
8587
r.Alerting.Execution.Should().NotBeNull();
8688
r.Alerting.Watch.Should().NotBeNull();
89+
90+
if (TestConfiguration.Instance.InRange(">=7.3.0"))
91+
r.VotingOnly.Should().NotBeNull();
8792
});
8893
}
8994
}

0 commit comments

Comments
 (0)