summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-12-12 16:27:14 +0100
committerJon Bratseth <bratseth@gmail.com>2022-12-12 16:27:14 +0100
commit9275b61b54d29f63a941fc6768e5f622c2063f2f (patch)
treea81eef015143dc4af71234518816c0ed7050925a /node-repository
parent9758ab6fdbdcb01c39b42df19355a3c2222d4aaf (diff)
Remove average and current utilization: Not used
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java8
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json6
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json6
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" : [