Include cloud in metrics dimensions

Quota limits will not be the same for different cloud providers

2 files changed, 7 insertions, 5 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
index bd69ea41b05..9691b45de7d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
@@ -45,10 +45,12 @@ public class ArchiveAccessMaintainer extends ControllerMaintainer {
 
     @Override
     protected double maintain() {
-        // Count buckets - so we can alert if we get close to the account limit of 1000
-        zoneRegistry.zonesIncludingSystem().all().ids().forEach(zoneId ->
-                metric.set(bucketCountMetricName, archiveBucketDb.buckets(zoneId).size(),
-                        metric.createContext(Map.of("zone", zoneId.value()))));
+        // Count buckets - so we can alert if we get close to the AWS account limit of 1000
+        zoneRegistry.zonesIncludingSystem().all().zones().forEach(z ->
+                metric.set(bucketCountMetricName, archiveBucketDb.buckets(z.getVirtualId()).size(),
+                        metric.createContext(Map.of(
+                                "zone", z.getVirtualId().value(),
+                                "cloud", z.getCloudName().value()))));
 
         zoneRegistry.zonesIncludingSystem().controllerUpgraded().zones().forEach(z -> {
                     ZoneId zoneId = z.getVirtualId();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
index 5571f957e83..b97743f4d44 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
@@ -50,7 +50,7 @@ public class ArchiveAccessMaintainerTest {
         var expected = Map.of("archive.bucketCount",
                               tester.controller().zoneRegistry().zonesIncludingSystem().all().ids().stream()
                                     .collect(Collectors.toMap(
-                                            zone -> Map.of("zone", zone.value()),
+                                            zone -> Map.of("zone", zone.value(), "cloud", "default"),
                                             zone -> zone.equals(testZone) ? 1d : 0d)));
 
         assertEquals(expected, metric.metrics());