Skip to content

Commit fd19c75

Browse files
codebraincodebrain
authored
6.8 release (#3774)
* Additional Rollup Stats (#3759) * XPack info and usage improvements. (#3764) * Add pretty names (and other properties) to the cluster stats response. (#3766) * Set obsolete warning on GeoShape properties. (#3770) * Add doc’s sequence number + primary term to get responses (#3767)
1 parent 7f0ac7c commit fd19c75

File tree

17 files changed

+379
-2
lines changed

17 files changed

+379
-2
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
[JsonProperty("jvm")]
1616
public ClusterJvm Jvm { get; internal set; }
1717

18+
[JsonProperty("network_types")]
19+
public ClusterNetworkTypes NetworkTypes { get; internal set; }
20+
1821
[JsonProperty("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+
[JsonObject]
35+
public class ClusterNetworkTypes
36+
{
37+
[JsonProperty("http_types")]
38+
public IReadOnlyDictionary<string, int> HttpTypes { get; internal set; }
39+
40+
[JsonProperty("transport_types")]
41+
public IReadOnlyDictionary<string, int> TransportTypes { get; internal set; }
42+
}
43+
3144
[JsonObject]
3245
public class ClusterFileSystem
3346
{
@@ -143,8 +156,33 @@ public class ClusterOperatingSystemStats
143156
[JsonProperty("available_processors")]
144157
public int AvailableProcessors { get; internal set; }
145158

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

150188
[JsonObject]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ public interface IClusterStatsResponse : INodesResponse
77
[JsonProperty("cluster_name")]
88
string ClusterName { get; }
99

10+
[JsonProperty("cluster_uuid")]
11+
string ClusterUUID { get; }
12+
1013
[JsonProperty("indices")]
1114
ClusterIndicesStats Indices { get; }
1215

@@ -24,6 +27,8 @@ public class ClusterStatsResponse : NodesResponseBase, IClusterStatsResponse
2427
{
2528
public string ClusterName { get; internal set; }
2629

30+
public string ClusterUUID { get; internal set; }
31+
2732
public ClusterIndicesStats Indices { get; internal set; }
2833

2934
public ClusterNodesStats Nodes { get; internal set; }

‎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
[JsonProperty("name")]
8282
public string Name { get; internal set; }
8383

84+
[JsonProperty("pretty_name")]
85+
public string PrettyName { get; internal set; }
86+
8487
[JsonProperty("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+
[JsonObject]
98+
public class ClusterOperatingSystemPrettyNane
99+
{
100+
[JsonProperty("pretty_name")]
101+
public string PrettyName { get; internal set; }
102+
103+
[JsonProperty("count")]
104+
public int Count { get; internal set; }
105+
}
106+
94107
[JsonObject]
95108
public class NodeInfoOSCPU
96109
{

‎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
[JsonProperty("description")]
1212
public string Description { get; set; }
1313

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

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

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public class SegmentsStats
3232
[JsonProperty("index_writer_memory_in_bytes")]
3333
public long IndexWriterMemoryInBytes { get; set; }
3434

35+
[JsonProperty("max_unsafe_auto_id_timestamp")]
36+
public string MaximumUnsafeAutoIdTimestamp { get; set; }
37+
3538
[JsonProperty("memory")]
3639
public string Memory { get; set; }
3740

‎src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ public interface IMultiGetHit<out TDocument> where TDocument : class
2323
string Type { get; }
2424

2525
long Version { get; }
26+
27+
long PrimaryTerm { get; }
28+
29+
long SequenceNumber { get; }
2630
}
2731

2832
[JsonObject]
@@ -58,5 +62,11 @@ public class MultiGetHit<TDocument> : IMultiGetHit<TDocument>
5862

5963
[JsonProperty("_version")]
6064
public long Version { get; internal set; }
65+
66+
[JsonProperty("_primary_term")]
67+
public long PrimaryTerm { get; internal set; }
68+
69+
[JsonProperty("_seq_no")]
70+
public long SequenceNumber { get; internal set; }
6171
}
6272
}

‎src/Nest/Document/Single/Get/GetResponse.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ public interface IGetResponse<out TDocument> : IResponse where TDocument : class
3333

3434
[JsonProperty("_version")]
3535
long Version { get; }
36+
37+
[JsonProperty("_primary_term")]
38+
long? PrimaryTerm { get; }
39+
40+
[JsonProperty("_seq_no")]
41+
long? SequenceNumber { get; }
3642
}
3743

3844
[JsonObject(MemberSerialization.OptIn)]
@@ -47,5 +53,7 @@ public class GetResponse<TDocument> : ResponseBase, IGetResponse<TDocument> wher
4753
public TDocument Source { get; internal set; }
4854
public string Type { get; internal set; }
4955
public long Version { get; internal set; }
56+
public long? PrimaryTerm { get; internal set; }
57+
public long? SequenceNumber { get; internal set; }
5058
}
5159
}

‎src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Diagnostics;
23
using Newtonsoft.Json;
34

@@ -23,6 +24,7 @@ public interface IGeoShapeProperty : IDocValuesProperty
2324
/// noting that large shapes will have greater false positives.
2425
/// </remarks>
2526
[JsonProperty("distance_error_pct")]
27+
[Obsolete("Removed in Elasticsearch 6.6")]
2628
double? DistanceErrorPercentage { get; set; }
2729

2830
/// <summary>
@@ -63,6 +65,7 @@ public interface IGeoShapeProperty : IDocValuesProperty
6365
/// so that geo_shape queries are optimal on a point only field.
6466
/// </summary>
6567
[JsonProperty("points_only")]
68+
[Obsolete("Removed in Elasticsearch 6.6")]
6669
bool? PointsOnly { get; set; }
6770

6871
/// <summary>
@@ -71,6 +74,7 @@ public interface IGeoShapeProperty : IDocValuesProperty
7174
/// the best tree_levels value to honor this precision.
7275
/// </summary>
7376
[JsonProperty("precision")]
77+
[Obsolete("Removed in Elasticsearch 6.6")]
7478
Distance Precision { get; set; }
7579

7680
/// <summary>
@@ -85,6 +89,7 @@ public interface IGeoShapeProperty : IDocValuesProperty
8589
/// Name of the PrefixTree implementation to be used.
8690
/// Defaults to <see cref="GeoTree.Geohash" />
8791
/// </summary>
92+
[Obsolete("Removed in Elasticsearch 6.6")]
8893
[JsonProperty("tree")]
8994
GeoTree? Tree { get; set; }
9095

@@ -96,6 +101,7 @@ public interface IGeoShapeProperty : IDocValuesProperty
96101
/// <see cref="Precision" /> parameter instead.
97102
/// </summary>
98103
[JsonProperty("tree_levels")]
104+
[Obsolete("Removed in Elasticsearch 6.6")]
99105
int? TreeLevels { get; set; }
100106

101107
/// <summary>
@@ -112,6 +118,7 @@ public class GeoShapeProperty : DocValuesPropertyBase, IGeoShapeProperty
112118
public GeoShapeProperty() : base(FieldType.GeoShape) { }
113119

114120
/// <inheritdoc />
121+
[Obsolete("Removed in Elasticsearch 6.6")]
115122
public double? DistanceErrorPercentage { get; set; }
116123

117124
/// <inheritdoc />
@@ -124,18 +131,22 @@ public GeoShapeProperty() : base(FieldType.GeoShape) { }
124131
public GeoOrientation? Orientation { get; set; }
125132

126133
/// <inheritdoc />
134+
[Obsolete("Removed in Elasticsearch 6.6")]
127135
public bool? PointsOnly { get; set; }
128136

129137
/// <inheritdoc />
138+
[Obsolete("Removed in Elasticsearch 6.6")]
130139
public Distance Precision { get; set; }
131140

132141
/// <inheritdoc />
133142
public GeoStrategy? Strategy { get; set; }
134143

135144
/// <inheritdoc />
145+
[Obsolete("Removed in Elasticsearch 6.6")]
136146
public GeoTree? Tree { get; set; }
137147

138148
/// <inheritdoc />
149+
[Obsolete("Removed in Elasticsearch 6.6")]
139150
public int? TreeLevels { get; set; }
140151

141152
/// <inheritdoc />
@@ -150,39 +161,55 @@ public class GeoShapePropertyDescriptor<T>
150161
{
151162
public GeoShapePropertyDescriptor() : base(FieldType.GeoShape) { }
152163

164+
165+
[Obsolete("Removed in Elasticsearch 6.6")]
153166
double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
154167
bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
155168
bool? IGeoShapeProperty.IgnoreZValue { get; set; }
156169
GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
170+
171+
[Obsolete("Removed in Elasticsearch 6.6")]
157172
bool? IGeoShapeProperty.PointsOnly { get; set; }
173+
174+
[Obsolete("Removed in Elasticsearch 6.6")]
158175
Distance IGeoShapeProperty.Precision { get; set; }
159176
GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
177+
178+
[Obsolete("Removed in Elasticsearch 6.6")]
160179
GeoTree? IGeoShapeProperty.Tree { get; set; }
180+
181+
[Obsolete("Removed in Elasticsearch 6.6")]
161182
int? IGeoShapeProperty.TreeLevels { get; set; }
162183

163184
bool? IGeoShapeProperty.Coerce { get; set; }
164185

165186
/// <inheritdoc cref="IGeoShapeProperty.Tree" />
187+
188+
[Obsolete("Removed in Elasticsearch 6.6")]
166189
public GeoShapePropertyDescriptor<T> Tree(GeoTree? tree) => Assign(tree, (a, v) => a.Tree = v);
167190

168191
/// <inheritdoc cref="IGeoShapeProperty.TreeLevels" />
192+
[Obsolete("Removed in Elasticsearch 6.6")]
169193
public GeoShapePropertyDescriptor<T> TreeLevels(int? treeLevels) => Assign(treeLevels, (a, v) => a.TreeLevels = v);
170194

171195
/// <inheritdoc cref="IGeoShapeProperty.Strategy" />
172196
public GeoShapePropertyDescriptor<T> Strategy(GeoStrategy? strategy) => Assign(strategy, (a, v) => a.Strategy = v);
173197

174198
/// <inheritdoc cref="IGeoShapeProperty.Precision" />
199+
[Obsolete("Removed in Elasticsearch 6.6")]
175200
public GeoShapePropertyDescriptor<T> Precision(double precision, DistanceUnit unit) =>
176201
Assign(new Distance(precision, unit), (a, v) => a.Precision = v);
177202

178203
/// <inheritdoc cref="IGeoShapeProperty.Orientation" />
179204
public GeoShapePropertyDescriptor<T> Orientation(GeoOrientation? orientation) => Assign(orientation, (a, v) => a.Orientation = v);
180205

181206
/// <inheritdoc cref="IGeoShapeProperty.DistanceErrorPercentage" />
207+
[Obsolete("Removed in Elasticsearch 6.6")]
182208
public GeoShapePropertyDescriptor<T> DistanceErrorPercentage(double? distanceErrorPercentage) =>
183209
Assign(distanceErrorPercentage, (a, v) => a.DistanceErrorPercentage = v);
184210

185211
/// <inheritdoc cref="IGeoShapeProperty.PointsOnly" />
212+
[Obsolete("Removed in Elasticsearch 6.6")]
186213
public GeoShapePropertyDescriptor<T> PointsOnly(bool? pointsOnly = true) => Assign(pointsOnly, (a, v) => a.PointsOnly = v);
187214

188215
/// <inheritdoc cref="IGeoShapeProperty.IgnoreMalformed" />

‎src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,33 @@ public class MinimalLicenseInformation
5555

5656
public class XPackFeatures
5757
{
58+
[JsonProperty("ccr")]
59+
public XPackFeature Ccr { get; internal set; }
60+
5861
[JsonProperty("graph")]
5962
public XPackFeature Graph { get; internal set; }
6063

64+
[JsonProperty("ilm")]
65+
public XPackFeature Ilm { get; internal set; }
66+
67+
[JsonProperty("logstash")]
68+
public XPackFeature Logstash { get; internal set; }
69+
6170
[JsonProperty("ml")]
6271
public XPackFeature MachineLearning { get; internal set; }
6372

6473
[JsonProperty("monitoring")]
6574
public XPackFeature Monitoring { get; internal set; }
6675

76+
[JsonProperty("rollup")]
77+
public XPackFeature Rollup { get; internal set; }
78+
6779
[JsonProperty("security")]
6880
public XPackFeature Security { get; internal set; }
6981

82+
[JsonProperty("sql")]
83+
public XPackFeature Sql { get; internal set; }
84+
7085
[JsonProperty("watcher")]
7186
public XPackFeature Watcher { get; internal set; }
7287
}

0 commit comments

Comments
 (0)