diff options
author | Harald Musum <musum@yahooinc.com> | 2023-06-22 07:59:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-22 07:59:02 +0200 |
commit | 8773f8f9934e2d99182ac717774f4fe2fa4d5c9e (patch) | |
tree | f7f184df1e09bbad350f026bb3e2e8905b269662 /config-model | |
parent | cd9332c9d57eb9e0dab825ec939785e1951b933a (diff) |
Revert "Replace metrics strings with the corresponding enum constants."
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java | 15 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java | 25 |
2 files changed, 19 insertions, 21 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 6f0a03bab60..4aac8bfb647 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,7 +1,6 @@ // 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; @@ -136,13 +135,13 @@ public class DistributorCluster extends TreeConfigProducer<Distributor> implemen @Override public void getConfig(MetricsmanagerConfig.Builder builder) { ContentCluster.getMetricBuilder("log", builder). - 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()); + 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"); } @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 a1e809098f2..2d67a344a17 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,7 +1,6 @@ // 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; @@ -76,24 +75,24 @@ public class StorageCluster extends TreeConfigProducer<StorageNode> @Override public void getConfig(MetricsmanagerConfig.Builder builder) { ContentCluster.getMetricBuilder("fleetcontroller", builder). - 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()); + addedmetrics("vds.datastored.alldisks.docs"). + addedmetrics("vds.datastored.alldisks.bytes"). + addedmetrics("vds.datastored.alldisks.buckets"). + addedmetrics("vds.datastored.bucket_space.buckets_total"); 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(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()); + 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"); } public String getClusterName() { |