Pass more cluster info

3 files changed, 51 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index fc0b8eb9fee..740a70fc6d1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -701,6 +701,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             toSlime(cluster.current(), clusterObject.setObject("current"));
             cluster.target().ifPresent(target -> toSlime(target, clusterObject.setObject("target")));
             cluster.suggested().ifPresent(suggested -> toSlime(suggested, clusterObject.setObject("suggested")));
+            scalingEventsToSlime(cluster.scalingEvents(), clusterObject.setArray("scalingEvents"));
+            clusterObject.setString("autoscalingStatus", cluster.autoscalingStatus());
         }
         return new SlimeJsonResponse(slime);
     }
@@ -1914,6 +1916,15 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             object.setDouble("cost", Math.round(resources.nodes() * resources.nodeResources().cost() * 100.0 / 3.0) / 100.0);
     }
 
+    private void scalingEventsToSlime(List<Cluster.ScalingEvent> scalingEvents, Cursor scalingEventsArray) {
+        for (Cluster.ScalingEvent scalingEvent : scalingEvents) {
+            Cursor scalingEventObject = scalingEventsArray.addObject();
+            toSlime(scalingEvent.from(), scalingEventObject.setObject("from"));
+            toSlime(scalingEvent.to(), scalingEventObject.setObject("to"));
+            scalingEventObject.setLong("at", scalingEvent.at().toEpochMilli());
+        }
+    }
+
     private void toSlime(NodeResources resources, Cursor object) {
         object.setDouble("vcpu", resources.vcpu());
         object.setDouble("memoryGb", resources.memoryGb());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index 8acce352d5a..27b739160fc 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -108,12 +108,17 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
 
     /** Assigns a reserved tenant node to the given deployment, with initial versions. */
     public void provision(ZoneId zone, ApplicationId application, ClusterSpec.Id clusterId) {
+        var current = new ClusterResources(2, 1, new NodeResources(2,  8, 50, 1, slow, remote));
         Cluster cluster = new Cluster(clusterId,
                                       new ClusterResources(2, 1, new NodeResources(1,  4, 20, 1, slow, remote)),
                                       new ClusterResources(2, 1, new NodeResources(4, 16, 90, 1, slow, remote)),
-                                      new ClusterResources(2, 1, new NodeResources(2,  8, 50, 1, slow, remote)),
+                                      current,
                                       Optional.of(new ClusterResources(2, 1, new NodeResources(3, 8, 50, 1, slow, remote))),
-                                      Optional.empty());
+                                      Optional.empty(),
+                                      List.of(new Cluster.ScalingEvent(new ClusterResources(0, 0, NodeResources.unspecified()),
+                                                                       current,
+                                                                       Instant.ofEpochMilli(1234))),
+                                      "the autoscaling status");
         nodeRepository.putApplication(zone,
                                       new com.yahoo.vespa.hosted.controller.api.integration.configserver.Application(application,
                                                                                                                      List.of(cluster)));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
index 65fa2a4bf70..817cee7732a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
@@ -52,7 +52,39 @@
           "storageType": "remote"
         },
         "cost": "(ignore)"
-      }
+      },
+      "scalingEvents": [
+        {
+          "from": {
+            "nodes": 0,
+            "groups": 0,
+            "nodeResources": {
+              "vcpu": 0.0,
+              "memoryGb": 0.0,
+              "diskGb": 0.0,
+              "bandwidthGbps": 0.0,
+              "diskSpeed": "fast",
+              "storageType": "any"
+            },
+            "cost": "(ignore)"
+          },
+          "to": {
+            "nodes": 2,
+            "groups": 1,
+            "nodeResources": {
+              "vcpu": 2.0,
+              "memoryGb": 8.0,
+              "diskGb": 50.0,
+              "bandwidthGbps": 1.0,
+              "diskSpeed": "slow",
+              "storageType": "remote"
+            },
+            "cost": "(ignore)"
+          },
+          "at": 1234
+        }
+      ],
+      "autoscalingStatus": "the autoscaling status"
     }
   }
 }
\ No newline at end of file