Expose current load in controller

2 files changed, 18 insertions, 8 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 07de259be2f..b3317c7f268 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
@@ -77,29 +77,35 @@ public class Cluster {
 
     public static class Utilization {
 
-        private final double cpu, idealCpu, memory, idealMemory, disk, idealDisk;
+        private final double cpu, idealCpu, currentCpu, memory, idealMemory, currentMemory, disk, idealDisk, currentDisk;
 
-        public Utilization(double cpu, double idealCpu,
-                           double memory, double idealMemory,
-                           double disk, double idealDisk) {
+        public Utilization(double cpu, double idealCpu, double currentCpu,
+                           double memory, double idealMemory, double currentMemory,
+                           double disk, double idealDisk, double currentDisk) {
             this.cpu = cpu;
             this.idealCpu = idealCpu;
+            this.currentCpu = currentCpu;
             this.memory = memory;
             this.idealMemory = idealMemory;
+            this.currentMemory = currentMemory;
             this.disk = disk;
             this.idealDisk = idealDisk;
+            this.currentDisk = currentDisk;
         }
 
         public double cpu() { return cpu; }
         public double idealCpu() { return idealCpu; }
+        public double currentCpu() { return currentCpu; }
 
         public double memory() { return memory; }
         public double idealMemory() { return idealMemory; }
+        public double currentMemory() { return currentMemory; }
 
         public double disk() { return disk; }
         public double idealDisk() { return idealDisk; }
+        public double currentDisk() { return currentDisk; }
 
-        public static Utilization empty() { return new Utilization(0, 0, 0, 0, 0, 0); }
+        public static Utilization empty() { return new Utilization(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 0465a1037e8..47cb80a98e2 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
@@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Cluster;
 
-import java.time.Instant;
-
 /**
  * Utilization ratios
  *
@@ -21,19 +19,25 @@ public class ClusterUtilizationData {
     public Double cpu;
     @JsonProperty("idealCpu")
     public Double idealCpu;
+    @JsonProperty("currentCpu")
+    public Double currentCpu;
 
     @JsonProperty("memory")
     public Double memory;
     @JsonProperty("idealMemory")
     public Double idealMemory;
+    @JsonProperty("currentMemory")
+    public Double currentMemory;
 
     @JsonProperty("disk")
     public Double disk;
     @JsonProperty("idealDisk")
     public Double idealDisk;
+    @JsonProperty("currentDisk")
+    public Double currentDisk;
 
     public Cluster.Utilization toClusterUtilization() {
-        return new Cluster.Utilization(cpu, idealCpu, memory, idealMemory, disk, idealDisk);
+        return new Cluster.Utilization(cpu, idealCpu, currentCpu, memory, idealMemory, currentMemory, disk, idealDisk, currentDisk);
     }
 
 }