diff options
| author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-01-23 11:54:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-23 11:54:31 +0100 |
| commit | 489f677409e1cbc37362309b182478b089f4bab8 (patch) | |
| tree | 0b80346a0c75596e412594c5f03f797d0d08a80c /configserver | |
| parent | 34f52f2af9bda38b0b1dcf909acf3a44b8bbe6d7 (diff) | |
Use enums for cluster-controller metrics
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java index c1bc1027690..98f01bada3f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.config.server.metrics; import ai.vespa.util.http.hc5.VespaHttpClientBuilder; import com.yahoo.concurrent.DaemonThreadFactory; +import com.yahoo.metrics.ContainerMetrics; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; @@ -145,12 +146,12 @@ public class ClusterDeploymentMetricsRetriever { .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount)); break; case VESPA_CONTAINER_CLUSTERCONTROLLER: - optionalDouble(values.field("cluster-controller.resource_usage.max_memory_utilization.max")).ifPresent(memoryUtil -> + optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil -> aggregator.get() .addMemoryUsage(memoryUtil, - values.field("cluster-controller.resource_usage.memory_limit.last").asDouble()) - .addDiskUsage(values.field("cluster-controller.resource_usage.max_disk_utilization.max").asDouble(), - values.field("cluster-controller.resource_usage.disk_limit.last").asDouble())); + values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble()) + .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(), + values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble())); break; } } |