From 29d73a1d0be3ad371077b44eac891fe0edc75b69 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Thu, 27 Jan 2022 14:08:55 +0000 Subject: Expose proton resource usage metrics with new names. --- .../yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'config-model') 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 578fba978d3..05f2ebee446 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 @@ -475,11 +475,17 @@ public class VespaMetricSet { // resource usage metrics.add(new Metric("content.proton.resource_usage.disk.average")); - metrics.add(new Metric("content.proton.resource_usage.disk_utilization.average")); + metrics.add(new Metric("content.proton.resource_usage.disk_usage.total.max")); + metrics.add(new Metric("content.proton.resource_usage.disk_usage.total_utilization.max")); + metrics.add(new Metric("content.proton.resource_usage.disk_usage.transient.max")); metrics.add(new Metric("content.proton.resource_usage.memory.average")); - metrics.add(new Metric("content.proton.resource_usage.memory_utilization.average")); - metrics.add(new Metric("content.proton.resource_usage.transient_memory.average")); - metrics.add(new Metric("content.proton.resource_usage.transient_disk.average")); + metrics.add(new Metric("content.proton.resource_usage.memory_usage.total.max")); + metrics.add(new Metric("content.proton.resource_usage.memory_usage.total_utilization.max")); + metrics.add(new Metric("content.proton.resource_usage.memory_usage.transient.max")); + metrics.add(new Metric("content.proton.resource_usage.disk_utilization.average")); // TODO: Remove in Vespa 8 + metrics.add(new Metric("content.proton.resource_usage.memory_utilization.average")); // TODO: Remove in Vespa 8 + metrics.add(new Metric("content.proton.resource_usage.transient_memory.average")); // TODO: Remove in Vespa 8 + metrics.add(new Metric("content.proton.resource_usage.transient_disk.average")); // TODO: Remove in Vespa 8 metrics.add(new Metric("content.proton.resource_usage.memory_mappings.max")); metrics.add(new Metric("content.proton.resource_usage.open_file_descriptors.max")); metrics.add(new Metric("content.proton.resource_usage.feeding_blocked.max")); -- cgit v1.2.3