diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-08-15 12:46:18 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2022-08-15 12:46:18 +0200 |
| commit | 6bf0d669bea0594c78363a71c81d7fa6d3ed2184 (patch) | |
| tree | 4a24496d2715aa2b126f56edb179dfbda02680ce /controller-server | |
| parent | 7253b79d4bb07d8cd0e69fc5352175f48f4e725c (diff) | |
Expose peak load
Diffstat (limited to 'controller-server')
3 files changed, 12 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 159bfb08b33..cc58e863bd3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2630,12 +2630,17 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { utilizationObject.setDouble("cpu", utilization.cpu()); utilizationObject.setDouble("idealCpu", utilization.idealCpu()); utilizationObject.setDouble("currentCpu", utilization.currentCpu()); + utilizationObject.setDouble("peakCpu", utilization.peakCpu()); + utilizationObject.setDouble("memory", utilization.memory()); utilizationObject.setDouble("idealMemory", utilization.idealMemory()); utilizationObject.setDouble("currentMemory", utilization.currentMemory()); + utilizationObject.setDouble("peakMemory", utilization.peakMemory()); + utilizationObject.setDouble("disk", utilization.disk()); utilizationObject.setDouble("idealDisk", utilization.idealDisk()); utilizationObject.setDouble("currentDisk", utilization.currentDisk()); + utilizationObject.setDouble("peakDisk", utilization.peakDisk()); } private void scalingEventsToSlime(List<Cluster.ScalingEvent> scalingEvents, Cursor scalingEventsArray) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index 35a12f4b6d4..d7f83979054 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -115,7 +115,9 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer current, Optional.of(new ClusterResources(2, 1, new NodeResources(3, 8, 50, 1, slow, remote))), Optional.empty(), - new Cluster.Utilization(0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9), + new Cluster.Utilization(0.1, 0.2, 0.3, 0.35, + 0.4, 0.5, 0.6, 0.65, + 0.7, 0.8, 0.9, 1.0), List.of(new Cluster.ScalingEvent(new ClusterResources(0, 0, NodeResources.unspecified()), current, Instant.ofEpochMilli(1234), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json index 3eff2ab781a..137ea64eba7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json @@ -58,12 +58,15 @@ "cpu": 0.1, "idealCpu": 0.2, "currentCpu": 0.3, + "peakCpu": 0.35, "memory": 0.4, "idealMemory": 0.5, "currentMemory": 0.6, + "peakMemory": 0.65, "disk": 0.7, "idealDisk": 0.8, - "currentDisk": 0.9 + "currentDisk": 0.9, + "peakDisk": 1.0 }, "scalingEvents": [ { |