Add stats to controller/v1 API

4 files changed, 8 insertions, 4 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Load.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Load.java
index a16d05a7310..d3fef13aa77 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Load.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Load.java
@@ -24,4 +24,6 @@ public class Load {
         return "load: cpu "  + cpu  + ", memory " + memory + ", disk " + disk;
     }
 
+    public static Load zero() { return new Load(0, 0, 0); }
+
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java
index 31e5730b6a6..5b5ac21b500 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepoStats.java
@@ -10,7 +10,7 @@ public class NodeRepoStats {
 
     private final Load load;
     private final Load activeLoad;
-    private List<ApplicationStats> applicationStats;
+    private final List<ApplicationStats> applicationStats;
 
     public NodeRepoStats(Load load, Load activeLoad, List<ApplicationStats> applicationStats) {
         this.load = load;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index bbe982bd5fe..7d454b2134f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -79,6 +79,8 @@ public interface NodeRepository {
     void patchApplication(ZoneId zone, ApplicationId application,
                           double currentReadShare, double maxReadShare);
 
+    NodeRepoStats getStats(ZoneId zone);
+
     Map<TenantName, URI> getArchiveUris(ZoneId zone);
 
     void setArchiveUri(ZoneId zone, TenantName tenantName, URI archiveUri);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
index d3a81201c78..a4b3174b442 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
@@ -22,12 +22,12 @@ public class NodeRepoStatsData {
     @JsonProperty("activeLoad")
     public LoadData activeLoad;
 
-    @JsonProperty("applicationStats")
-    public List<ApplicationStatsData> applicationStats;
+    @JsonProperty("applications")
+    public List<ApplicationStatsData> applications;
 
     public NodeRepoStats toNodeRepoStats() {
         return new NodeRepoStats(load.toLoad(), activeLoad.toLoad(),
-                                 applicationStats.stream().map(stats -> stats.toApplicationStats()).collect(Collectors.toList()));
+                                 applications.stream().map(stats -> stats.toApplicationStats()).collect(Collectors.toList()));
     }
 
 }