diff options
Diffstat (limited to 'node-repository')
3 files changed, 14 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java index 1c10de8498a..3615b9afa97 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java @@ -90,16 +90,22 @@ public class ApplicationSerializer { Load idealLoad = clusterModel.idealLoad(); Load averageLoad = clusterModel.averageLoad(); Load currentLoad = clusterModel.currentLoad(); + Load peakLoad = clusterModel.peakLoad(); utilizationObject.setDouble("cpu", averageLoad.cpu()); utilizationObject.setDouble("idealCpu", idealLoad.cpu()); utilizationObject.setDouble("currentCpu", currentLoad.cpu()); + utilizationObject.setDouble("peakCpu", peakLoad.cpu()); + utilizationObject.setDouble("memory", averageLoad.memory()); utilizationObject.setDouble("idealMemory", idealLoad.memory()); utilizationObject.setDouble("currentMemory", currentLoad.memory()); + utilizationObject.setDouble("peakMemory", peakLoad.memory()); + utilizationObject.setDouble("disk", averageLoad.disk()); utilizationObject.setDouble("idealDisk", idealLoad.disk()); utilizationObject.setDouble("currentDisk", currentLoad.disk()); + utilizationObject.setDouble("peakDisk", peakLoad.disk()); } private static void scalingEventsToSlime(List<ScalingEvent> scalingEvents, Cursor scalingEventsArray) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json index 40719153b9e..9ae495a7396 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json @@ -73,12 +73,15 @@ "cpu" : 0.0, "idealCpu": 0.1375, "currentCpu": 0.0, + "peakCpu": 0.0, "memory" : 0.0, "idealMemory": 0.65, "currentMemory": 0.0, + "peakMemory": 0.0, "disk" : 0.0, "idealDisk": 0.95, - "currentDisk": 0.0 + "currentDisk": 0.0, + "peakDisk": 0.0 }, "scalingEvents" : [ { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json index 41aa4257c00..5babf5fc843 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json @@ -47,12 +47,15 @@ "cpu" : 0.0, "idealCpu": 0.1394913986537023, "currentCpu": 0.0, + "peakCpu": 0.0, "memory" : 0.0, "idealMemory": 0.325, "currentMemory": 0.0, + "peakMemory": 0.0, "disk" : 0.0, "idealDisk": 0.3, - "currentDisk": 0.0 + "currentDisk": 0.0, + "peakDisk": 0.0 }, "scalingEvents" : [ { |