Merge pull request #11783 from vespa-engine/hakonhall/add-vdsdatastoredbucketspacebucketstotal-as-a-fleetcontroller-consumer-for-storage-cluster-to-expose-metric-in-host-info

Add vds.datastored.bucket_space.buckets_total as a fleetcontroller consumer for storage cluster to expose metric in host info.

2 files changed, 6 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
index cd99f46646b..091e82a9c76 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
@@ -80,7 +80,8 @@ public class StorageCluster extends AbstractConfigProducer<StorageNode>
         ContentCluster.getMetricBuilder("fleetcontroller", builder).
                 addedmetrics("vds.datastored.alldisks.docs").
                 addedmetrics("vds.datastored.alldisks.bytes").
-                addedmetrics("vds.datastored.alldisks.buckets");
+                addedmetrics("vds.datastored.alldisks.buckets").
+                addedmetrics("vds.datastored.bucket_space.buckets_total");
 
         ContentCluster.getMetricBuilder("log", builder).
                 addedmetrics("vds.filestor.alldisks.allthreads.put.sum").
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index d6579ba88d4..305bcc1d7d5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -659,10 +659,11 @@ public class ContentClusterTest extends ContentBaseTest {
         assertEquals(6, config.consumer().size());
 
         assertEquals("fleetcontroller", config.consumer(4).name());
-        assertEquals(3, config.consumer(4).addedmetrics().size());
+        assertEquals(4, config.consumer(4).addedmetrics().size());
         assertEquals("vds.datastored.alldisks.docs", config.consumer(4).addedmetrics(0));
         assertEquals("vds.datastored.alldisks.bytes", config.consumer(4).addedmetrics(1));
         assertEquals("vds.datastored.alldisks.buckets", config.consumer(4).addedmetrics(2));
+        assertEquals("vds.datastored.bucket_space.buckets_total", config.consumer(4).addedmetrics(3));
     }
 
     public MetricsmanagerConfig.Consumer getConsumer(String consumer, MetricsmanagerConfig config) {
@@ -723,7 +724,8 @@ public class ContentClusterTest extends ContentBaseTest {
             expected =
                     "[vds.datastored.alldisks.docs\n" +
                     "vds.datastored.alldisks.bytes\n" +
-                    "vds.datastored.alldisks.buckets]";
+                    "vds.datastored.alldisks.buckets\n" +
+                    "vds.datastored.bucket_space.buckets_total]";
             actual = getConsumer("fleetcontroller", config).addedmetrics().toString().replaceAll(", ", "\n");
             assertEquals(expected, actual);
         }