From 0550c3ce944cf9e965139f2892400987d8a76e14 Mon Sep 17 00:00:00 2001 From: Matthias Mertens Date: Mon, 1 Aug 2016 13:52:21 +0200 Subject: [PATCH 1/3] Add Percent metric in OperatingSystemStats --- src/Nest/Cluster/NodesStats/NodeStats.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Nest/Cluster/NodesStats/NodeStats.cs b/src/Nest/Cluster/NodesStats/NodeStats.cs index 24a1be4c6a2..5dc081250c0 100644 --- a/src/Nest/Cluster/NodesStats/NodeStats.cs +++ b/src/Nest/Cluster/NodesStats/NodeStats.cs @@ -87,6 +87,8 @@ public class OperatingSystemStats public long Timestamp { get; internal set; } [JsonProperty("load_average")] public float LoadAverage { get; internal set; } + [JsonProperty("percent")] + public float Percent { get; internal set; } [JsonProperty("mem")] public ExtendedMemoryStats Memory { get; internal set; } From d2c96231d3f4a2e29b64e7ed3c5c6ef4f3292954 Mon Sep 17 00:00:00 2001 From: Matthias Mertens Date: Mon, 1 Aug 2016 14:56:12 +0200 Subject: [PATCH 2/3] Percent is an int, not a float --- src/Nest/Cluster/NodesStats/NodeStats.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nest/Cluster/NodesStats/NodeStats.cs b/src/Nest/Cluster/NodesStats/NodeStats.cs index 5dc081250c0..b617a0618ec 100644 --- a/src/Nest/Cluster/NodesStats/NodeStats.cs +++ b/src/Nest/Cluster/NodesStats/NodeStats.cs @@ -88,7 +88,7 @@ public class OperatingSystemStats [JsonProperty("load_average")] public float LoadAverage { get; internal set; } [JsonProperty("percent")] - public float Percent { get; internal set; } + public int Percent { get; internal set; } [JsonProperty("mem")] public ExtendedMemoryStats Memory { get; internal set; } From 87a40a4c088d5a9aeda75f2dcbe1bb2c9613f176 Mon Sep 17 00:00:00 2001 From: Matthias Mertens Date: Mon, 1 Aug 2016 17:40:02 +0200 Subject: [PATCH 3/3] Add cpu_percent to NodeStats/OS Add CPU percent to OS node stats and add an assertion --- src/Nest/Cluster/NodesStats/NodeStats.cs | 4 ++-- src/Tests/Cluster/NodesStats/NodesStatsApiTests.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Nest/Cluster/NodesStats/NodeStats.cs b/src/Nest/Cluster/NodesStats/NodeStats.cs index b617a0618ec..016fa5c2684 100644 --- a/src/Nest/Cluster/NodesStats/NodeStats.cs +++ b/src/Nest/Cluster/NodesStats/NodeStats.cs @@ -87,8 +87,8 @@ public class OperatingSystemStats public long Timestamp { get; internal set; } [JsonProperty("load_average")] public float LoadAverage { get; internal set; } - [JsonProperty("percent")] - public int Percent { get; internal set; } + [JsonProperty("cpu_percent")] + public int CpuPercent { get; internal set; } [JsonProperty("mem")] public ExtendedMemoryStats Memory { get; internal set; } diff --git a/src/Tests/Cluster/NodesStats/NodesStatsApiTests.cs b/src/Tests/Cluster/NodesStats/NodesStatsApiTests.cs index d2b653be844..bfd27937505 100644 --- a/src/Tests/Cluster/NodesStats/NodesStatsApiTests.cs +++ b/src/Tests/Cluster/NodesStats/NodesStatsApiTests.cs @@ -99,6 +99,7 @@ protected void Assert(OperatingSystemStats os) os.Timestamp.Should().BeGreaterThan(0); os.LoadAverage.Should().NotBe(0); + os.CpuPercent.Should().NotBe(0); os.Memory.Should().NotBeNull(); os.Memory.TotalInBytes.Should().BeGreaterThan(0);