Expose peak load

2 files changed, 26 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
index b500cd1c133..08f975fbc29 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Cluster.java
@@ -82,35 +82,47 @@ public class Cluster {
 
     public static class Utilization {
 
-        private final double cpu, idealCpu, currentCpu, memory, idealMemory, currentMemory, disk, idealDisk, currentDisk;
+        private final double cpu, idealCpu, currentCpu, peakCpu;
+        private final double memory, idealMemory, currentMemory, peakMemory;
+        private final double disk, idealDisk, currentDisk, peakDisk;
 
-        public Utilization(double cpu, double idealCpu, double currentCpu,
-                           double memory, double idealMemory, double currentMemory,
-                           double disk, double idealDisk, double currentDisk) {
+        public Utilization(double cpu, double idealCpu, double currentCpu, double peakCpu,
+                           double memory, double idealMemory, double currentMemory, double peakMemory,
+                           double disk, double idealDisk, double currentDisk, double peakDisk) {
             this.cpu = cpu;
             this.idealCpu = idealCpu;
             this.currentCpu = currentCpu;
+            this.peakCpu = peakCpu;
+
             this.memory = memory;
             this.idealMemory = idealMemory;
             this.currentMemory = currentMemory;
+            this.peakMemory = peakMemory;
+
             this.disk = disk;
             this.idealDisk = idealDisk;
             this.currentDisk = currentDisk;
+            this.peakDisk = peakDisk;
         }
 
         public double cpu() { return cpu; }
         public double idealCpu() { return idealCpu; }
         public double currentCpu() { return currentCpu; }
+        public double peakCpu() { return peakCpu; }
 
         public double memory() { return memory; }
         public double idealMemory() { return idealMemory; }
         public double currentMemory() { return currentMemory; }
+        public double peakMemory() { return peakMemory; }
 
         public double disk() { return disk; }
         public double idealDisk() { return idealDisk; }
         public double currentDisk() { return currentDisk; }
+        public double peakDisk() { return peakDisk; }
 
-        public static Utilization empty() { return new Utilization(0, 0, 0, 0, 0, 0, 0, 0, 0); }
+        public static Utilization empty() { return new Utilization(0, 0, 0, 0, 0,
+                                                                   0, 0, 0,
+                                                                   0, 0, 0, 0); }
 
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
index 803daf6a8c6..6632ba47b7b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
@@ -21,6 +21,8 @@ public class ClusterUtilizationData {
     public Double idealCpu;
     @JsonProperty("currentCpu")
     public Double currentCpu;
+    @JsonProperty("peakCpu")
+    public Double peakCpu;
 
     @JsonProperty("memory")
     public Double memory;
@@ -28,6 +30,8 @@ public class ClusterUtilizationData {
     public Double idealMemory;
     @JsonProperty("currentMemory")
     public Double currentMemory;
+    @JsonProperty("peakMemory")
+    public Double peakMemory;
 
     @JsonProperty("disk")
     public Double disk;
@@ -35,9 +39,13 @@ public class ClusterUtilizationData {
     public Double idealDisk;
     @JsonProperty("currentDisk")
     public Double currentDisk;
+    @JsonProperty("peakDisk")
+    public Double peakDisk;
 
     public Cluster.Utilization toClusterUtilization() {
-        return new Cluster.Utilization(cpu, idealCpu, currentCpu, memory, idealMemory, currentMemory, disk, idealDisk, currentDisk);
+        return new Cluster.Utilization(cpu, idealCpu, currentCpu, peakCpu,
+                                       memory, idealMemory, currentMemory, peakMemory,
+                                       disk, idealDisk, currentDisk, peakDisk);
     }
 
 }