diff options
author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-01-19 16:03:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-19 16:03:23 +0100 |
commit | 8b3aecc4e3129f7a3cb8bab0dc4eb9f4c6701578 (patch) | |
tree | 12f27d3bd05f623b212af46f386195de880c94b9 | |
parent | fa5d8f4c7af6246e840beee50ed103c1d80aae05 (diff) | |
parent | 53eedc306f161c287f61c54dc30a99caaf1c3008 (diff) |
Merge pull request #25638 from vespa-engine/kkraune/simplify-metric-set
Add metric only once, with suffix
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 274 |
1 files changed, 70 insertions, 204 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 66073b1d7d1..d8232987524 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 @@ -243,18 +243,10 @@ public class VespaMetricSet { metrics.add(new Metric("cluster-controller.stopping.count.last")); metrics.add(new Metric("cluster-controller.up.count.last")); metrics.add(new Metric("cluster-controller.cluster-state-change.count")); - metrics.add(new Metric("cluster-controller.busy-tick-time-ms.last")); - metrics.add(new Metric("cluster-controller.busy-tick-time-ms.max")); - metrics.add(new Metric("cluster-controller.busy-tick-time-ms.sum")); - metrics.add(new Metric("cluster-controller.busy-tick-time-ms.count")); - metrics.add(new Metric("cluster-controller.idle-tick-time-ms.last")); - metrics.add(new Metric("cluster-controller.idle-tick-time-ms.max")); - metrics.add(new Metric("cluster-controller.idle-tick-time-ms.sum")); - metrics.add(new Metric("cluster-controller.idle-tick-time-ms.count")); - - metrics.add(new Metric("cluster-controller.work-ms.last")); - metrics.add(new Metric("cluster-controller.work-ms.sum")); - metrics.add(new Metric("cluster-controller.work-ms.count")); + addMetric(metrics, "cluster-controller.busy-tick-time-ms", List.of("last", "max", "sum", "count")); + addMetric(metrics, "cluster-controller.idle-tick-time-ms", List.of("last", "max", "sum", "count")); + + addMetric(metrics, "cluster-controller.work-ms", List.of("last", "sum", "count")); metrics.add(new Metric("cluster-controller.is-master.last")); metrics.add(new Metric("cluster-controller.remote-task-queue.size.last")); @@ -262,12 +254,9 @@ public class VespaMetricSet { // DO NOT RELY ON THIS METRIC YET. metrics.add(new Metric("cluster-controller.node-event.count")); - metrics.add(new Metric("cluster-controller.resource_usage.nodes_above_limit.last")); - metrics.add(new Metric("cluster-controller.resource_usage.nodes_above_limit.max")); - metrics.add(new Metric("cluster-controller.resource_usage.max_memory_utilization.last")); - metrics.add(new Metric("cluster-controller.resource_usage.max_memory_utilization.max")); - metrics.add(new Metric("cluster-controller.resource_usage.max_disk_utilization.last")); - metrics.add(new Metric("cluster-controller.resource_usage.max_disk_utilization.max")); + addMetric(metrics, "cluster-controller.resource_usage.nodes_above_limit", List.of("last", "max")); + addMetric(metrics, "cluster-controller.resource_usage.max_memory_utilization", List.of("last", "max")); + addMetric(metrics, "cluster-controller.resource_usage.max_disk_utilization", List.of("last", "max")); metrics.add(new Metric("cluster-controller.resource_usage.disk_limit.last")); metrics.add(new Metric("cluster-controller.resource_usage.memory_limit.last")); @@ -356,32 +345,16 @@ public class VespaMetricSet { metrics.add(new Metric("content.proton.documentdb.heart_beat_age.last")); metrics.add(new Metric("content.proton.transport.query.count.rate")); metrics.add(new Metric("content.proton.docsum.docs.rate")); - metrics.add(new Metric("content.proton.docsum.latency.max")); - metrics.add(new Metric("content.proton.docsum.latency.sum")); - metrics.add(new Metric("content.proton.docsum.latency.count")); - metrics.add(new Metric("content.proton.transport.query.latency.max")); - metrics.add(new Metric("content.proton.transport.query.latency.sum")); - metrics.add(new Metric("content.proton.transport.query.latency.count")); + addMetric(metrics, "content.proton.docsum.latency", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.transport.query.latency", List.of("max", "sum", "count")); // Search protocol - metrics.add(new Metric("content.proton.search_protocol.query.latency.max")); - metrics.add(new Metric("content.proton.search_protocol.query.latency.sum")); - metrics.add(new Metric("content.proton.search_protocol.query.latency.count")); - metrics.add(new Metric("content.proton.search_protocol.query.request_size.max")); - metrics.add(new Metric("content.proton.search_protocol.query.request_size.sum")); - metrics.add(new Metric("content.proton.search_protocol.query.request_size.count")); - metrics.add(new Metric("content.proton.search_protocol.query.reply_size.max")); - metrics.add(new Metric("content.proton.search_protocol.query.reply_size.sum")); - metrics.add(new Metric("content.proton.search_protocol.query.reply_size.count")); - metrics.add(new Metric("content.proton.search_protocol.docsum.latency.max")); - metrics.add(new Metric("content.proton.search_protocol.docsum.latency.sum")); - metrics.add(new Metric("content.proton.search_protocol.docsum.latency.count")); - metrics.add(new Metric("content.proton.search_protocol.docsum.request_size.max")); - metrics.add(new Metric("content.proton.search_protocol.docsum.request_size.sum")); - metrics.add(new Metric("content.proton.search_protocol.docsum.request_size.count")); - metrics.add(new Metric("content.proton.search_protocol.docsum.reply_size.max")); - metrics.add(new Metric("content.proton.search_protocol.docsum.reply_size.sum")); - metrics.add(new Metric("content.proton.search_protocol.docsum.reply_size.count")); + addMetric(metrics, "content.proton.search_protocol.query.latency", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.search_protocol.query.request_size", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.search_protocol.query.reply_size", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.search_protocol.docsum.latency", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.search_protocol.docsum.request_size", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.search_protocol.docsum.reply_size", List.of("max", "sum", "count")); metrics.add(new Metric("content.proton.search_protocol.docsum.requested_documents.count")); // Executors shared between all document dbs @@ -449,21 +422,11 @@ public class VespaMetricSet { metrics.add(new Metric("content.proton.documentdb.attribute.resource_usage.feeding_blocked.max")); // CPU util - metrics.add(new Metric("content.proton.resource_usage.cpu_util.setup.max")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.setup.sum")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.setup.count")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.read.max")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.read.sum")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.read.count")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.write.max")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.write.sum")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.write.count")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.compact.max")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.compact.sum")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.compact.count")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.other.max")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.other.sum")); - metrics.add(new Metric("content.proton.resource_usage.cpu_util.other.count")); + addMetric(metrics, "content.proton.resource_usage.cpu_util.setup", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.resource_usage.cpu_util.read", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.resource_usage.cpu_util.write", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.resource_usage.cpu_util.compact", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.resource_usage.cpu_util.other", List.of("max", "sum", "count")); // transaction log metrics.add(new Metric("content.proton.transactionlog.entries.average")); @@ -522,44 +485,22 @@ public class VespaMetricSet { // matching metrics.add(new Metric("content.proton.documentdb.matching.queries.rate")); metrics.add(new Metric("content.proton.documentdb.matching.soft_doomed_queries.rate")); - metrics.add(new Metric("content.proton.documentdb.matching.query_latency.max")); - metrics.add(new Metric("content.proton.documentdb.matching.query_latency.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.query_latency.count")); - metrics.add(new Metric("content.proton.documentdb.matching.query_setup_time.max")); - metrics.add(new Metric("content.proton.documentdb.matching.query_setup_time.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.query_setup_time.count")); - metrics.add(new Metric("content.proton.documentdb.matching.docs_matched.rate")); - metrics.add(new Metric("content.proton.documentdb.matching.docs_matched.count")); + addMetric(metrics, "content.proton.documentdb.matching.query_latency", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.query_setup_time", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.docs_matched", List.of("rate", "count")); metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.queries.rate")); metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.soft_doomed_queries.rate")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.soft_doom_factor.min")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.soft_doom_factor.max")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.soft_doom_factor.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.soft_doom_factor.count")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_latency.max")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_latency.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_latency.count")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_setup_time.max")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_setup_time.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.query_setup_time.count")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.grouping_time.max")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.grouping_time.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.grouping_time.count")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.rerank_time.max")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.rerank_time.sum")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.rerank_time.count")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.docs_matched.rate")); - metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.docs_matched.count")); + addMetric(metrics, "content.proton.documentdb.matching.rank_profile.soft_doom_factor", List.of("min", "max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.rank_profile.query_latency", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.rank_profile.query_setup_time", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.rank_profile.grouping_time", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.rank_profile.rerank_time", List.of("max", "sum", "count")); + addMetric(metrics, "content.proton.documentdb.matching.rank_profile.docs_matched", List.of("rate", "count")); metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.limited_queries.rate")); // feeding - metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.max")); - metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.sum")); - metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.count")); - metrics.add(new Metric("content.proton.documentdb.feeding.commit.operations.rate")); - metrics.add(new Metric("content.proton.documentdb.feeding.commit.latency.max")); - metrics.add(new Metric("content.proton.documentdb.feeding.commit.latency.sum")); - metrics.add(new Metric("content.proton.documentdb.feeding.commit.latency.count")); + addMetric(metrics, "content.proton.documentdb.feeding.commit.operations", List.of("max", "sum", "count", "rate")); + addMetric(metrics, "content.proton.documentdb.feeding.commit.latency", List.of("max", "sum", "count")); return metrics; } @@ -573,61 +514,27 @@ public class VespaMetricSet { metrics.add(new Metric("vds.datastored.alldisks.buckets.average")); metrics.add(new Metric("vds.datastored.alldisks.docs.average")); metrics.add(new Metric("vds.datastored.alldisks.bytes.average")); - metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.max")); - metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum")); - metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.count")); - metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.max")); - metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.sum")); - metrics.add(new Metric("vds.visitor.allthreads.averagequeuewait.count")); - metrics.add(new Metric("vds.visitor.allthreads.queuesize.max")); - metrics.add(new Metric("vds.visitor.allthreads.queuesize.sum")); - metrics.add(new Metric("vds.visitor.allthreads.queuesize.count")); + addMetric(metrics, "vds.visitor.allthreads.averagevisitorlifetime", List.of("max", "sum", "count")); + addMetric(metrics, "vds.visitor.allthreads.averagequeuewait", List.of("max", "sum", "count")); + addMetric(metrics, "vds.visitor.allthreads.queuesize", List.of("max", "sum", "count")); metrics.add(new Metric("vds.visitor.allthreads.completed.rate")); metrics.add(new Metric("vds.visitor.allthreads.created.rate")); metrics.add(new Metric("vds.visitor.allthreads.failed.rate")); - metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.max")); - metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.sum")); - metrics.add(new Metric("vds.visitor.allthreads.averagemessagesendtime.count")); - metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.max")); - metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.sum")); - metrics.add(new Metric("vds.visitor.allthreads.averageprocessingtime.count")); - - metrics.add(new Metric("vds.filestor.queuesize.max")); - metrics.add(new Metric("vds.filestor.queuesize.sum")); - metrics.add(new Metric("vds.filestor.queuesize.count")); - metrics.add(new Metric("vds.filestor.averagequeuewait.max")); - metrics.add(new Metric("vds.filestor.averagequeuewait.sum")); - metrics.add(new Metric("vds.filestor.averagequeuewait.count")); - metrics.add(new Metric("vds.filestor.active_operations.size.max")); - metrics.add(new Metric("vds.filestor.active_operations.size.sum")); - metrics.add(new Metric("vds.filestor.active_operations.size.count")); - metrics.add(new Metric("vds.filestor.active_operations.latency.max")); - metrics.add(new Metric("vds.filestor.active_operations.latency.sum")); - metrics.add(new Metric("vds.filestor.active_operations.latency.count")); - metrics.add(new Metric("vds.filestor.throttle_window_size.max")); - metrics.add(new Metric("vds.filestor.throttle_window_size.sum")); - metrics.add(new Metric("vds.filestor.throttle_window_size.count")); - metrics.add(new Metric("vds.filestor.throttle_waiting_threads.max")); - metrics.add(new Metric("vds.filestor.throttle_waiting_threads.sum")); - metrics.add(new Metric("vds.filestor.throttle_waiting_threads.count")); - metrics.add(new Metric("vds.filestor.throttle_active_tokens.max")); - metrics.add(new Metric("vds.filestor.throttle_active_tokens.sum")); - metrics.add(new Metric("vds.filestor.throttle_active_tokens.count")); - metrics.add(new Metric("vds.filestor.allthreads.mergemetadatareadlatency.max")); - metrics.add(new Metric("vds.filestor.allthreads.mergemetadatareadlatency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.mergemetadatareadlatency.count")); - metrics.add(new Metric("vds.filestor.allthreads.mergedatareadlatency.max")); - metrics.add(new Metric("vds.filestor.allthreads.mergedatareadlatency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.mergedatareadlatency.count")); - metrics.add(new Metric("vds.filestor.allthreads.mergedatawritelatency.max")); - metrics.add(new Metric("vds.filestor.allthreads.mergedatawritelatency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.mergedatawritelatency.count")); - metrics.add(new Metric("vds.filestor.allthreads.put_latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.put_latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.put_latency.count")); - metrics.add(new Metric("vds.filestor.allthreads.remove_latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.remove_latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.remove_latency.count")); + addMetric(metrics, "vds.visitor.allthreads.averagemessagesendtime", List.of("max", "sum", "count")); + addMetric(metrics, "vds.visitor.allthreads.averageprocessingtime", List.of("max", "sum", "count")); + + addMetric(metrics, "vds.filestor.queuesize", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.averagequeuewait", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.active_operations.size", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.active_operations.latency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.throttle_window_size", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.throttle_waiting_threads", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.throttle_active_tokens", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.mergemetadatareadlatency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.mergedatareadlatency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.mergedatawritelatency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.put_latency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.remove_latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allstripes.throttled_rpc_direct_dispatches.rate")); metrics.add(new Metric("vds.filestor.allstripes.throttled_persistence_thread_polls.rate")); metrics.add(new Metric("vds.filestor.allstripes.timeouts_waiting_for_throttle_token.rate")); @@ -635,57 +542,33 @@ public class VespaMetricSet { metrics.add(new Metric("vds.filestor.allthreads.put.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.put.failed.rate")); metrics.add(new Metric("vds.filestor.allthreads.put.test_and_set_failed.rate")); - metrics.add(new Metric("vds.filestor.allthreads.put.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.put.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.put.latency.count")); - metrics.add(new Metric("vds.filestor.allthreads.put.request_size.max")); - metrics.add(new Metric("vds.filestor.allthreads.put.request_size.sum")); - metrics.add(new Metric("vds.filestor.allthreads.put.request_size.count")); + addMetric(metrics, "vds.filestor.allthreads.put.latency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.put.request_size", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.remove.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.remove.failed.rate")); metrics.add(new Metric("vds.filestor.allthreads.remove.test_and_set_failed.rate")); - metrics.add(new Metric("vds.filestor.allthreads.remove.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.remove.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.remove.latency.count")); - metrics.add(new Metric("vds.filestor.allthreads.remove.request_size.max")); - metrics.add(new Metric("vds.filestor.allthreads.remove.request_size.sum")); - metrics.add(new Metric("vds.filestor.allthreads.remove.request_size.count")); + addMetric(metrics, "vds.filestor.allthreads.remove.latency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.remove.request_size", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.get.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.get.failed.rate")); - metrics.add(new Metric("vds.filestor.allthreads.get.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.get.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.get.latency.count")); - metrics.add(new Metric("vds.filestor.allthreads.get.request_size.max")); - metrics.add(new Metric("vds.filestor.allthreads.get.request_size.sum")); - metrics.add(new Metric("vds.filestor.allthreads.get.request_size.count")); + addMetric(metrics, "vds.filestor.allthreads.get.latency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.get.request_size", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.update.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.update.failed.rate")); metrics.add(new Metric("vds.filestor.allthreads.update.test_and_set_failed.rate")); - metrics.add(new Metric("vds.filestor.allthreads.update.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.update.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.update.latency.count")); - metrics.add(new Metric("vds.filestor.allthreads.update.request_size.max")); - metrics.add(new Metric("vds.filestor.allthreads.update.request_size.sum")); - metrics.add(new Metric("vds.filestor.allthreads.update.request_size.count")); - metrics.add(new Metric("vds.filestor.allthreads.createiterator.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.createiterator.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.createiterator.latency.count")); + addMetric(metrics, "vds.filestor.allthreads.update.latency", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.update.request_size", List.of("max", "sum", "count")); + addMetric(metrics, "vds.filestor.allthreads.createiterator.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.createiterator.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.visit.count.rate")); - metrics.add(new Metric("vds.filestor.allthreads.visit.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.visit.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.visit.latency.count")); + addMetric(metrics, "vds.filestor.allthreads.visit.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.remove_location.count.rate")); - metrics.add(new Metric("vds.filestor.allthreads.remove_location.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.remove_location.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.remove_location.latency.count")); + addMetric(metrics, "vds.filestor.allthreads.remove_location.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.splitbuckets.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.joinbuckets.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.count.rate")); metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.failed.rate")); - metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.latency.max")); - metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.latency.sum")); - metrics.add(new Metric("vds.filestor.allthreads.deletebuckets.latency.count")); + addMetric(metrics, "vds.filestor.allthreads.deletebuckets.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.filestor.allthreads.setbucketstates.count.rate")); return metrics; } @@ -722,12 +605,9 @@ public class VespaMetricSet { metrics.add(new Metric("vds.idealstate.garbage_collection.done_ok.rate")); metrics.add(new Metric("vds.idealstate.garbage_collection.done_failed.rate")); metrics.add(new Metric("vds.idealstate.garbage_collection.pending.average")); - metrics.add(new Metric("vds.idealstate.garbage_collection.documents_removed.count")); - metrics.add(new Metric("vds.idealstate.garbage_collection.documents_removed.rate")); + addMetric(metrics, "vds.idealstate.garbage_collection.documents_removed", List.of("count", "rate")); - metrics.add(new Metric("vds.distributor.puts.latency.max")); - metrics.add(new Metric("vds.distributor.puts.latency.sum")); - metrics.add(new Metric("vds.distributor.puts.latency.count")); + addMetric(metrics, "vds.distributor.puts.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.distributor.puts.ok.rate")); metrics.add(new Metric("vds.distributor.puts.failures.total.rate")); metrics.add(new Metric("vds.distributor.puts.failures.notfound.rate")); @@ -741,17 +621,13 @@ public class VespaMetricSet { metrics.add(new Metric("vds.distributor.puts.failures.timeout.rate")); metrics.add(new Metric("vds.distributor.puts.failures.busy.rate")); metrics.add(new Metric("vds.distributor.puts.failures.inconsistent_bucket.rate")); - metrics.add(new Metric("vds.distributor.removes.latency.max")); - metrics.add(new Metric("vds.distributor.removes.latency.sum")); - metrics.add(new Metric("vds.distributor.removes.latency.count")); + addMetric(metrics, "vds.distributor.removes.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.distributor.removes.ok.rate")); metrics.add(new Metric("vds.distributor.removes.failures.total.rate")); metrics.add(new Metric("vds.distributor.removes.failures.notfound.rate")); metrics.add(new Metric("vds.distributor.removes.failures.test_and_set_failed.rate")); metrics.add(new Metric("vds.distributor.removes.failures.concurrent_mutations.rate")); - metrics.add(new Metric("vds.distributor.updates.latency.max")); - metrics.add(new Metric("vds.distributor.updates.latency.sum")); - metrics.add(new Metric("vds.distributor.updates.latency.count")); + addMetric(metrics, "vds.distributor.updates.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.distributor.updates.ok.rate")); metrics.add(new Metric("vds.distributor.updates.failures.total.rate")); metrics.add(new Metric("vds.distributor.updates.failures.notfound.rate")); @@ -760,15 +636,11 @@ public class VespaMetricSet { metrics.add(new Metric("vds.distributor.updates.diverging_timestamp_updates.rate")); metrics.add(new Metric("vds.distributor.removelocations.ok.rate")); metrics.add(new Metric("vds.distributor.removelocations.failures.total.rate")); - metrics.add(new Metric("vds.distributor.gets.latency.max")); - metrics.add(new Metric("vds.distributor.gets.latency.sum")); - metrics.add(new Metric("vds.distributor.gets.latency.count")); + addMetric(metrics, "vds.distributor.gets.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.distributor.gets.ok.rate")); metrics.add(new Metric("vds.distributor.gets.failures.total.rate")); metrics.add(new Metric("vds.distributor.gets.failures.notfound.rate")); - metrics.add(new Metric("vds.distributor.visitor.latency.max")); - metrics.add(new Metric("vds.distributor.visitor.latency.sum")); - metrics.add(new Metric("vds.distributor.visitor.latency.count")); + addMetric(metrics, "vds.distributor.visitor.latency", List.of("max", "sum", "count")); metrics.add(new Metric("vds.distributor.visitor.ok.rate")); metrics.add(new Metric("vds.distributor.visitor.failures.total.rate")); metrics.add(new Metric("vds.distributor.visitor.failures.notready.rate")); @@ -786,15 +658,9 @@ public class VespaMetricSet { metrics.add(new Metric("vds.bouncer.clock_skew_aborts.count")); - metrics.add(new Metric("vds.mergethrottler.averagequeuewaitingtime.max")); - metrics.add(new Metric("vds.mergethrottler.averagequeuewaitingtime.sum")); - metrics.add(new Metric("vds.mergethrottler.averagequeuewaitingtime.count")); - metrics.add(new Metric("vds.mergethrottler.queuesize.max")); - metrics.add(new Metric("vds.mergethrottler.queuesize.sum")); - metrics.add(new Metric("vds.mergethrottler.queuesize.count")); - metrics.add(new Metric("vds.mergethrottler.active_window_size.max")); - metrics.add(new Metric("vds.mergethrottler.active_window_size.sum")); - metrics.add(new Metric("vds.mergethrottler.active_window_size.count")); + addMetric(metrics, "vds.mergethrottler.averagequeuewaitingtime", List.of("max", "sum", "count")); + addMetric(metrics, "vds.mergethrottler.queuesize", List.of("max", "sum", "count")); + addMetric(metrics, "vds.mergethrottler.active_window_size", List.of("max", "sum", "count")); metrics.add(new Metric("vds.mergethrottler.bounced_due_to_back_pressure.rate")); metrics.add(new Metric("vds.mergethrottler.locallyexecutedmerges.ok.rate")); metrics.add(new Metric("vds.mergethrottler.mergechains.ok.rate")); |