aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-01-27 16:16:31 +0100
committerGitHub <noreply@github.com>2022-01-27 16:16:31 +0100
commitc35f3ad52fdb3e0a2dd45011e5fa790bbd95df64 (patch)
tree7817ff6dbaa793961c975324e524a2e633f3af04
parent532cdfbc16dc9a5718f97167ae27344e22ff78ce (diff)
parent29d73a1d0be3ad371077b44eac891fe0edc75b69 (diff)
Merge pull request #20957 from vespa-engine/geirst/expose-aligned-resource-usage-metrics
Expose proton resource usage metrics with new names.
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java14
1 files changed, 10 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 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"));