diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-12-13 10:10:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-13 10:10:15 +0100 |
| commit | 000fa3620f53736b7729dfd3fbdc468d00bbf355 (patch) | |
| tree | 7c6551052c1329b69b04e579d7ac7e7a3cc7bc72 /node-repository | |
| parent | 929a36912fcd7c37055828afd1ef0c479acdd8d0 (diff) | |
| parent | 9275b61b54d29f63a941fc6768e5f622c2063f2f (diff) | |
Merge pull request #25220 from vespa-engine/bratseth/utilization-cleanup
Remove average and current utilization: Not used
Diffstat (limited to 'node-repository')
3 files changed, 0 insertions, 20 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 0603eb97cca..b6103bb23fa 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 @@ -96,23 +96,15 @@ public class ApplicationSerializer { private static void clusterUtilizationToSlime(ClusterModel clusterModel, Cursor utilizationObject) { 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()); } 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 0d640f7e3b2..02aef6fa9c4 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 @@ -70,17 +70,11 @@ } }, "utilization" : { - "cpu" : 0.0, "idealCpu": 0.40750000000000003, - "currentCpu": 0.0, "peakCpu": 0.0, - "memory" : 0.0, "idealMemory": 0.8, - "currentMemory": 0.0, "peakMemory": 0.0, - "disk" : 0.0, "idealDisk": 0.95, - "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 80da118f620..341fa5f6031 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 @@ -44,17 +44,11 @@ } }, "utilization" : { - "cpu" : 0.0, "idealCpu": 0.42670157068062825, - "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, "peakDisk": 0.0 }, "scalingEvents" : [ |