Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6.8 release #3774

Merged
merged 5 commits into from
May 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ public class ClusterNodesStats
[JsonProperty("jvm")]
public ClusterJvm Jvm { get; internal set; }

[JsonProperty("network_types")]
public ClusterNetworkTypes NetworkTypes { get; internal set; }

[JsonProperty("os")]
public ClusterOperatingSystemStats OperatingSystem { get; internal set; }

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

[JsonObject]
public class ClusterNetworkTypes
{
[JsonProperty("http_types")]
public IReadOnlyDictionary<string, int> HttpTypes { get; internal set; }

[JsonProperty("transport_types")]
public IReadOnlyDictionary<string, int> TransportTypes { get; internal set; }
}

[JsonObject]
public class ClusterFileSystem
{
Expand Down Expand Up @@ -143,8 +156,33 @@ public class ClusterOperatingSystemStats
[JsonProperty("available_processors")]
public int AvailableProcessors { get; internal set; }

[JsonProperty("mem")]
public OperatingSystemMemoryInfo Memory { get; internal set; }

[JsonProperty("names")]
public IReadOnlyCollection<ClusterOperatingSystemName> Names { get; internal set; }

[JsonProperty("pretty_names")]
public IReadOnlyCollection<ClusterOperatingSystemPrettyNane> PrettyNames { get; internal set; }
}

[JsonObject]
public class OperatingSystemMemoryInfo
{
[JsonProperty("free_in_bytes")]
public long FreeBytes { get; internal set; }

[JsonProperty("free_percent")]
public int FreePercent { get; internal set; }

[JsonProperty("total_in_bytes")]
public long TotalBytes { get; internal set; }

[JsonProperty("used_in_bytes")]
public long UsedBytes { get; internal set; }

[JsonProperty("used_percent")]
public int UsedPercent { get; internal set; }
}

[JsonObject]
Expand Down
5 changes: 5 additions & 0 deletions src/Nest/Cluster/ClusterStats/ClusterStatsResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ public interface IClusterStatsResponse : INodesResponse
[JsonProperty("cluster_name")]
string ClusterName { get; }

[JsonProperty("cluster_uuid")]
string ClusterUUID { get; }

[JsonProperty("indices")]
ClusterIndicesStats Indices { get; }

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

public string ClusterUUID { get; internal set; }

public ClusterIndicesStats Indices { get; internal set; }

public ClusterNodesStats Nodes { get; internal set; }
Expand Down
13 changes: 13 additions & 0 deletions src/Nest/Cluster/NodesInfo/NodeInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ public class NodeOperatingSystemInfo
[JsonProperty("name")]
public string Name { get; internal set; }

[JsonProperty("pretty_name")]
public string PrettyName { get; internal set; }

[JsonProperty("refresh_interval_in_millis")]
public int RefreshInterval { get; internal set; }

Expand All @@ -91,6 +94,16 @@ public class NodeOperatingSystemInfo
public string Version { get; internal set; }
}

[JsonObject]
public class ClusterOperatingSystemPrettyNane
{
[JsonProperty("pretty_name")]
public string PrettyName { get; internal set; }

[JsonProperty("count")]
public int Count { get; internal set; }
}

[JsonObject]
public class NodeInfoOSCPU
{
Expand Down
9 changes: 9 additions & 0 deletions src/Nest/CommonOptions/Stats/PluginStats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ public class PluginStats
[JsonProperty("description")]
public string Description { get; set; }

[JsonProperty("elasticsearch_version")]
public string ElasticsearchVersion { get; set; }

[JsonProperty("isolated")]
public bool Isolated { get; set; }

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

[JsonProperty("java_version")]
public string JavaVersion { get; set; }

[JsonProperty("has_native_controller")]
public bool? HasNativeController { get; set; }

[JsonProperty("version")]
public string Version { get; set; }
}
Expand Down
3 changes: 3 additions & 0 deletions src/Nest/CommonOptions/Stats/SegmentsStats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ public class SegmentsStats
[JsonProperty("index_writer_memory_in_bytes")]
public long IndexWriterMemoryInBytes { get; set; }

[JsonProperty("max_unsafe_auto_id_timestamp")]
public string MaximumUnsafeAutoIdTimestamp { get; set; }

[JsonProperty("memory")]
public string Memory { get; set; }

Expand Down
10 changes: 10 additions & 0 deletions src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ public interface IMultiGetHit<out TDocument> where TDocument : class
string Type { get; }

long Version { get; }

long PrimaryTerm { get; }

long SequenceNumber { get; }
}

[JsonObject]
Expand Down Expand Up @@ -58,5 +62,11 @@ public class MultiGetHit<TDocument> : IMultiGetHit<TDocument>

[JsonProperty("_version")]
public long Version { get; internal set; }

[JsonProperty("_primary_term")]
public long PrimaryTerm { get; internal set; }

[JsonProperty("_seq_no")]
public long SequenceNumber { get; internal set; }
}
}
8 changes: 8 additions & 0 deletions src/Nest/Document/Single/Get/GetResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ public interface IGetResponse<out TDocument> : IResponse where TDocument : class

[JsonProperty("_version")]
long Version { get; }

[JsonProperty("_primary_term")]
long? PrimaryTerm { get; }

[JsonProperty("_seq_no")]
long? SequenceNumber { get; }
}

[JsonObject(MemberSerialization.OptIn)]
Expand All @@ -47,5 +53,7 @@ public class GetResponse<TDocument> : ResponseBase, IGetResponse<TDocument> wher
public TDocument Source { get; internal set; }
public string Type { get; internal set; }
public long Version { get; internal set; }
public long? PrimaryTerm { get; internal set; }
public long? SequenceNumber { get; internal set; }
}
}
27 changes: 27 additions & 0 deletions src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Diagnostics;
using Newtonsoft.Json;

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

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

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

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

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

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

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

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

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

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

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

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

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

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


[Obsolete("Removed in Elasticsearch 6.6")]
double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
bool? IGeoShapeProperty.IgnoreZValue { get; set; }
GeoOrientation? IGeoShapeProperty.Orientation { get; set; }

[Obsolete("Removed in Elasticsearch 6.6")]
bool? IGeoShapeProperty.PointsOnly { get; set; }

[Obsolete("Removed in Elasticsearch 6.6")]
Distance IGeoShapeProperty.Precision { get; set; }
GeoStrategy? IGeoShapeProperty.Strategy { get; set; }

[Obsolete("Removed in Elasticsearch 6.6")]
GeoTree? IGeoShapeProperty.Tree { get; set; }

[Obsolete("Removed in Elasticsearch 6.6")]
int? IGeoShapeProperty.TreeLevels { get; set; }

bool? IGeoShapeProperty.Coerce { get; set; }

/// <inheritdoc cref="IGeoShapeProperty.Tree" />

[Obsolete("Removed in Elasticsearch 6.6")]
public GeoShapePropertyDescriptor<T> Tree(GeoTree? tree) => Assign(tree, (a, v) => a.Tree = v);

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

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

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

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

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

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

/// <inheritdoc cref="IGeoShapeProperty.IgnoreMalformed" />
Expand Down
15 changes: 15 additions & 0 deletions src/Nest/XPack/Info/XPackInfo/XPackInfoResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,33 @@ public class MinimalLicenseInformation

public class XPackFeatures
{
[JsonProperty("ccr")]
public XPackFeature Ccr { get; internal set; }

[JsonProperty("graph")]
public XPackFeature Graph { get; internal set; }

[JsonProperty("ilm")]
public XPackFeature Ilm { get; internal set; }

[JsonProperty("logstash")]
public XPackFeature Logstash { get; internal set; }

[JsonProperty("ml")]
public XPackFeature MachineLearning { get; internal set; }

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

[JsonProperty("rollup")]
public XPackFeature Rollup { get; internal set; }

[JsonProperty("security")]
public XPackFeature Security { get; internal set; }

[JsonProperty("sql")]
public XPackFeature Sql { get; internal set; }

[JsonProperty("watcher")]
public XPackFeature Watcher { get; internal set; }
}
Expand Down
Loading