Add cluster utilization to node repo client and application/v4

3 files changed, 58 insertions, 0 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 98b7ffd1d47..2f77fa6cfc4 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
@@ -19,6 +19,7 @@ public class Cluster {
     private final ClusterResources current;
     private final Optional<ClusterResources> target;
     private final Optional<ClusterResources> suggested;
+    private final Utilization utilization;
     private final List<ScalingEvent> scalingEvents;
     private final String autoscalingStatus;
 
@@ -28,6 +29,7 @@ public class Cluster {
                    ClusterResources current,
                    Optional<ClusterResources> target,
                    Optional<ClusterResources> suggested,
+                   Utilization utilization,
                    List<ScalingEvent> scalingEvents,
                    String autoscalingStatus) {
         this.id = id;
@@ -36,6 +38,7 @@ public class Cluster {
         this.current = current;
         this.target = target;
         this.suggested = suggested;
+        this.utilization = utilization;
         this.scalingEvents = scalingEvents;
         this.autoscalingStatus = autoscalingStatus;
     }
@@ -46,6 +49,7 @@ public class Cluster {
     public ClusterResources current() { return current; }
     public Optional<ClusterResources> target() { return target; }
     public Optional<ClusterResources> suggested() { return suggested; }
+    public Utilization utilization() { return utilization; }
     public List<ScalingEvent> scalingEvents() { return scalingEvents; }
     public String autoscalingStatus() { return autoscalingStatus; }
 
@@ -54,6 +58,24 @@ public class Cluster {
         return "cluster '" + id + "'";
     }
 
+    public static class Utilization {
+
+        private final double cpu, memory, disk;
+
+        public Utilization(double cpu, double memory, double disk) {
+            this.cpu = cpu;
+            this.memory = memory;
+            this.disk = disk;
+        }
+
+        public double cpu() { return cpu; }
+        public double memory() { return memory; }
+        public double disk() { return disk; }
+
+        public static Utilization empty() { return new Utilization(0, 0, 0); }
+
+    }
+
     public static class ScalingEvent {
 
         private final ClusterResources from, to;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
index 99a72fbc827..688b2764c87 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
@@ -28,6 +28,8 @@ public class ClusterData {
     public ClusterResourcesData suggested;
     @JsonProperty("target")
     public ClusterResourcesData target;
+    @JsonProperty("utilization")
+    public ClusterUtilizationData utilization;
     @JsonProperty("scalingEvents")
     public List<ScalingEventData> scalingEvents;
     @JsonProperty("autoscalingStatus")
@@ -40,6 +42,7 @@ public class ClusterData {
                            current.toClusterResources(),
                            target == null ? Optional.empty() : Optional.of(target.toClusterResources()),
                            suggested == null ? Optional.empty() : Optional.of(suggested.toClusterResources()),
+                           utilization == null ? Cluster.Utilization.empty() : utilization.toClusterUtilization(),
                            scalingEvents == null ? List.of()
                                                  : scalingEvents.stream().map(data -> data.toScalingEvent()).collect(Collectors.toList()),
                            autoscalingStatus);
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
new file mode 100644
index 00000000000..a7de7664572
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterUtilizationData.java
@@ -0,0 +1,33 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.api.integration.noderepository;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+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
+ *
+ * @author bratseth
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ClusterUtilizationData {
+
+    @JsonProperty("cpu")
+    public Double cpu;
+
+    @JsonProperty("memory")
+    public Double memory;
+
+    @JsonProperty("disk")
+    public Double disk;
+
+    public Cluster.Utilization toClusterUtilization() {
+        return new Cluster.Utilization(cpu, memory, disk);
+    }
+
+}