Replace metrics strings with the corresponding enum constants.

- Add 'metrics' as provided dep for clustercontroller-core

2 files changed, 21 insertions, 19 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
index 4aac8bfb647..6f0a03bab60 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
+import ai.vespa.metrics.DistributorMetrics;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.vespa.config.content.core.StorDistributormanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
@@ -135,13 +136,13 @@ public class DistributorCluster extends TreeConfigProducer<Distributor> implemen
     @Override
     public void getConfig(MetricsmanagerConfig.Builder builder) {
         ContentCluster.getMetricBuilder("log", builder).
-                addedmetrics("vds.distributor.docsstored").
-                addedmetrics("vds.distributor.bytesstored").
-                addedmetrics("vds.idealstate.delete_bucket.done_ok").
-                addedmetrics("vds.idealstate.merge_bucket.done_ok").
-                addedmetrics("vds.idealstate.split_bucket.done_ok").
-                addedmetrics("vds.idealstate.join_bucket.done_ok").
-                addedmetrics("vds.idealstate.buckets_rechecking");
+                addedmetrics(DistributorMetrics.VDS_DISTRIBUTOR_DOCSSTORED.baseName()).
+                addedmetrics(DistributorMetrics.VDS_DISTRIBUTOR_BYTESSTORED.baseName()).
+                addedmetrics(DistributorMetrics.VDS_IDEALSTATE_DELETE_BUCKET_DONE_OK.baseName()).
+                addedmetrics(DistributorMetrics.VDS_IDEALSTATE_MERGE_BUCKET_DONE_OK.baseName()).
+                addedmetrics(DistributorMetrics.VDS_IDEALSTATE_SPLIT_BUCKET_DONE_OK.baseName()).
+                addedmetrics(DistributorMetrics.VDS_IDEALSTATE_JOIN_BUCKET_DONE_OK.baseName()).
+                addedmetrics(DistributorMetrics.VDS_IDEALSTATE_BUCKETS_RECHECKING.baseName());
     }
 
     @Override
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 2d67a344a17..a1e809098f2 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
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content.storagecluster;
 
+import ai.vespa.metrics.StorageMetrics;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
 import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
@@ -75,24 +76,24 @@ public class StorageCluster extends TreeConfigProducer<StorageNode>
     @Override
     public void getConfig(MetricsmanagerConfig.Builder builder) {
         ContentCluster.getMetricBuilder("fleetcontroller", builder).
-                addedmetrics("vds.datastored.alldisks.docs").
-                addedmetrics("vds.datastored.alldisks.bytes").
-                addedmetrics("vds.datastored.alldisks.buckets").
-                addedmetrics("vds.datastored.bucket_space.buckets_total");
+                addedmetrics(StorageMetrics.VDS_DATASTORED_ALLDISKS_DOCS.baseName()).
+                addedmetrics(StorageMetrics.VDS_DATASTORED_ALLDISKS_BYTES.baseName()).
+                addedmetrics(StorageMetrics.VDS_DATASTORED_ALLDISKS_BUCKETS.baseName()).
+                addedmetrics(StorageMetrics.VDS_DATASTORED_BUCKET_SPACE_BUCKETS_TOTAL.baseName());
 
         ContentCluster.getMetricBuilder("log", builder).
                 addedmetrics("vds.filestor.allthreads.put").
                 addedmetrics("vds.filestor.allthreads.get").
                 addedmetrics("vds.filestor.allthreads.remove").
                 addedmetrics("vds.filestor.allthreads.update").
-                addedmetrics("vds.datastored.alldisks.docs").
-                addedmetrics("vds.datastored.alldisks.bytes").
-                addedmetrics("vds.filestor.queuesize").
-                addedmetrics("vds.filestor.averagequeuewait").
-                addedmetrics("vds.visitor.cv_queuewaittime").
-                addedmetrics("vds.visitor.allthreads.averagequeuewait").
-                addedmetrics("vds.visitor.allthreads.averagevisitorlifetime").
-                addedmetrics("vds.visitor.allthreads.created");
+                addedmetrics(StorageMetrics.VDS_DATASTORED_ALLDISKS_DOCS.baseName()).
+                addedmetrics(StorageMetrics.VDS_DATASTORED_ALLDISKS_BYTES.baseName()).
+                addedmetrics(StorageMetrics.VDS_FILESTOR_QUEUESIZE.baseName()).
+                addedmetrics(StorageMetrics.VDS_FILESTOR_AVERAGEQUEUEWAIT.baseName()).
+                addedmetrics(StorageMetrics.VDS_VISITOR_CV_QUEUEWAITTIME.baseName()).
+                addedmetrics(StorageMetrics.VDS_VISITOR_ALLTHREADS_AVERAGEQUEUEWAIT.baseName()).
+                addedmetrics(StorageMetrics.VDS_VISITOR_ALLTHREADS_AVERAGEVISITORLIFETIME.baseName()).
+                addedmetrics(StorageMetrics.VDS_VISITOR_ALLTHREADS_CREATED.baseName());
     }
 
     public String getClusterName() {