From f05dc94ed7c693024b2d879de860c9c3edbca876 Mon Sep 17 00:00:00 2001 From: Russ Cam Date: Fri, 21 Feb 2020 20:15:46 +1100 Subject: [PATCH] Add ingest info to Cluster Stats response (#4407) Relates: #4341, elastic/elasticsearch#48485 --- .../Cluster/ClusterStats/ClusterNodesStats.cs | 30 +++++++++++++++++++ .../ClusterStats/ClusterStatsApiTests.cs | 3 ++ 2 files changed, 33 insertions(+) diff --git a/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs b/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs index 35904cd5440..1d600ab69d7 100644 --- a/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs +++ b/src/Nest/Cluster/ClusterStats/ClusterNodesStats.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Runtime.Serialization; +using Elasticsearch.Net; namespace Nest { @@ -35,6 +36,9 @@ public class ClusterNodesStats [DataMember(Name = "versions")] public IReadOnlyCollection Versions { get; internal set; } + + [DataMember(Name = "ingest")] + public ClusterIngestStats Ingest { get; internal set; } } public class NodePackagingType @@ -222,4 +226,30 @@ public class ClusterNodeCount [DataMember(Name = "voting_only")] public int VotingOnly { get; internal set; } } + + [DataContract] + public class ClusterIngestStats + { + [DataMember(Name = "number_of_pipelines")] + public int NumberOfPipelines { get; internal set; } + + [DataMember(Name = "processor_stats")] + public IReadOnlyDictionary ProcessorStats { get; internal set; } + } + + [DataContract] + public class ClusterProcessorStats + { + [DataMember(Name ="count")] + public long Count { get; set; } + + [DataMember(Name ="current")] + public long Current { get; set; } + + [DataMember(Name ="failed")] + public long Failed { get; set; } + + [DataMember(Name ="time_in_millis")] + public long TimeInMilliseconds { get; set; } + } } diff --git a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs index 2f67c368151..2a0c3f4b82f 100644 --- a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs +++ b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs @@ -93,6 +93,9 @@ protected void Assert(ClusterNodesStats nodes) nodes.Process.OpenFileDescriptors.Min.Should().NotBe(0); nodes.Versions.Should().NotBeEmpty(); + + if (Cluster.ClusterConfiguration.Version >= "7.6.0") + nodes.Ingest.Should().NotBeNull(); } protected void Assert(ClusterIndicesStats indices)