diff options
3 files changed, 77 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index cf199ef95a8..850b25472d2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -2,7 +2,9 @@ package com.yahoo.vespa.model.admin.monitoring; import com.yahoo.metrics.ContainerMetrics; +import com.yahoo.metrics.DistributorMetrics; import com.yahoo.metrics.SearchNodeMetrics; +import com.yahoo.metrics.StorageMetrics; import com.yahoo.metrics.Suffix; import java.util.Collections; @@ -541,8 +543,8 @@ public class VespaMetricSet { // TODO: For the purpose of this file and likely elsewhere, all but the last aggregate specifier, // TODO: such as 'average' and 'sum' in the metric names below are just confusing and can be mentally // TODO: disregarded when considering metric names. Consider cleaning up for Vespa 9. - addMetric(metrics, "vds.datastored.alldisks.buckets.average"); - addMetric(metrics, "vds.datastored.alldisks.docs.average"); + addMetric(metrics, StorageMetrics.VDS_DATASTORED_ALLDISKS_BUCKETS.average()); + addMetric(metrics, StorageMetrics.VDS_DATASTORED_ALLDISKS_DOCS.average()); addMetric(metrics, "vds.datastored.alldisks.bytes.average"); addMetric(metrics, "vds.visitor.allthreads.averagevisitorlifetime", List.of("max", "sum", "count")); addMetric(metrics, "vds.visitor.allthreads.averagequeuewait", List.of("max", "sum", "count")); @@ -604,8 +606,8 @@ public class VespaMetricSet { } private static Set<Metric> getDistributorMetrics() { Set<Metric> metrics = new LinkedHashSet<>(); - addMetric(metrics, "vds.idealstate.buckets_rechecking.average"); - addMetric(metrics, "vds.idealstate.idealstate_diff.average"); + addMetric(metrics, DistributorMetrics.VDS_IDEALSTATE_BUCKETS_RECHECKING.average()); + addMetric(metrics, DistributorMetrics.VDS_IDEALSTATE_IDEALSTATE_DIFF.average()); addMetric(metrics, "vds.idealstate.buckets_toofewcopies.average"); addMetric(metrics, "vds.idealstate.buckets_toomanycopies.average"); addMetric(metrics, "vds.idealstate.buckets.average"); diff --git a/container-core/src/main/java/com/yahoo/metrics/DistributorMetrics.java b/container-core/src/main/java/com/yahoo/metrics/DistributorMetrics.java new file mode 100644 index 00000000000..a2e8395f34c --- /dev/null +++ b/container-core/src/main/java/com/yahoo/metrics/DistributorMetrics.java @@ -0,0 +1,36 @@ +package com.yahoo.metrics; + +import java.util.List; + +/** + * @author yngveaasheim + */ +public enum DistributorMetrics implements VespaMetrics { + + VDS_IDEALSTATE_BUCKETS_RECHECKING("vds.idealstate.buckets_rechecking", Unit.BUCKET, "The number of buckets that we are rechecking for ideal state operations"), + VDS_IDEALSTATE_IDEALSTATE_DIFF("vds.idealstate.idealstate_diff", Unit.BUCKET, "A number representing the current difference from the ideal state. This is a number that decreases steadily as the system is getting closer to the ideal state"); + + + private final String name; + private final Unit unit; + private final String description; + + DistributorMetrics(String name, Unit unit, String description) { + this.name = name; + this.unit = unit; + this.description = description; + } + + public String baseName() { + return name; + } + + public Unit unit() { + return unit; + } + + public String description() { + return description; + } + +} diff --git a/container-core/src/main/java/com/yahoo/metrics/StorageMetrics.java b/container-core/src/main/java/com/yahoo/metrics/StorageMetrics.java new file mode 100644 index 00000000000..12d4085ff4c --- /dev/null +++ b/container-core/src/main/java/com/yahoo/metrics/StorageMetrics.java @@ -0,0 +1,35 @@ +package com.yahoo.metrics; + +import java.util.List; + +/** + * @author yngveaasheim + */ +public enum StorageMetrics implements VespaMetrics { + + VDS_DATASTORED_ALLDISKS_BUCKETS("vds.datastored.alldisks.buckets", Unit.BUCKET, "Number of buckets managed"), + VDS_DATASTORED_ALLDISKS_DOCS("vds.datastored.alldisks.docs", Unit.DOCUMENT, "Number of documents stored"); + + private final String name; + private final Unit unit; + private final String description; + + StorageMetrics(String name, Unit unit, String description) { + this.name = name; + this.unit = unit; + this.description = description; + } + + public String baseName() { + return name; + } + + public Unit unit() { + return unit; + } + + public String description() { + return description; + } + +} |