Merge remote-tracking branch 'origin/master' into ogronnesby/billing-api-v2

Conflicts:
	controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java

4 files changed, 40 insertions, 20 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ClusterMetrics.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ClusterMetrics.java
index cb29d5854a0..0e11bcdccaf 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ClusterMetrics.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ClusterMetrics.java
@@ -15,7 +15,10 @@ public class ClusterMetrics {
     public static final String DOCUMENT_COUNT = "documentCount";
     public static final String FEED_LATENCY = "feedLatency";
     public static final String QUERY_LATENCY  = "queryLatency";
-    public static final String FEEDING_BLOCKED  = "feedingBlocked";
+    public static final String MEMORY_UTIL = "memoryUtil";
+    public static final String MEMORY_FEED_BLOCK_LIMIT = "memoryFeedBlockLimit";
+    public static final String DISK_UTIL = "diskUtil";
+    public static final String DISK_FEED_BLOCK_LIMIT = "diskFeedBlockLimit";
 
     private final String clusterId;
     private final String clusterType;
@@ -55,8 +58,20 @@ public class ClusterMetrics {
         return Optional.ofNullable(metrics.get(QUERY_LATENCY));
     }
 
-    public Optional<Double> feedingBlocked() {
-        return Optional.ofNullable(metrics.get(FEEDING_BLOCKED));
+    public Optional<Double> memoryUtil() {
+        return Optional.ofNullable(metrics.get(MEMORY_UTIL));
+    }
+
+    public Optional<Double> memoryFeedBlockLimit() {
+        return Optional.ofNullable(metrics.get(MEMORY_FEED_BLOCK_LIMIT));
+    }
+
+    public Optional<Double> diskUtil() {
+        return Optional.ofNullable(metrics.get(DISK_UTIL));
+    }
+
+    public Optional<Double> diskFeedBlockLimit() {
+        return Optional.ofNullable(metrics.get(DISK_FEED_BLOCK_LIMIT));
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java
deleted file mode 100644
index 91c7cd68ea2..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2021 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.archive;
-
-import com.yahoo.config.provision.TenantName;
-import com.yahoo.config.provision.zone.ZoneId;
-
-import java.net.URI;
-import java.util.Optional;
-import java.util.Set;
-
-public interface ArchiveBucketDb {
-
-    Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant);
-
-    Set<ArchiveBucket> buckets(ZoneId zoneId);
-}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java
index 067d05cd14e..2fa68f1f39d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/package-info.java
@@ -5,4 +5,4 @@
 @ExportPackage
 package com.yahoo.vespa.hosted.controller.api.integration.archive;
 
-import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockRoleService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockRoleService.java
new file mode 100644
index 00000000000..f7c51f0bbc2
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/aws/MockRoleService.java
@@ -0,0 +1,21 @@
+// 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.aws;
+
+import com.yahoo.config.provision.TenantName;
+
+import java.util.List;
+
+public class MockRoleService extends NoopRoleService {
+
+    private List<TenantName> maintainedTenants;
+
+    @Override
+    public void maintainRoles(List<TenantName> tenants) {
+        maintainedTenants = List.copyOf(tenants);
+    }
+
+    public List<TenantName> maintainedTenants() {
+        return maintainedTenants;
+    }
+}