diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-06-23 13:51:30 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-06-23 13:51:30 +0200 |
| commit | a0c597400346ca232a40c5154be5f25d544d09b0 (patch) | |
| tree | 84d72dfbb272072c40885e773bb2670ccc722128 | |
| parent | 79831782255e2b362c9d650ec5c7c8398b2a4eff (diff) | |
Use max value for resource utilization
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java | 4 | ||||
| -rw-r--r-- | configserver/src/test/resources/metrics/clustercontroller_metrics.json | 4 |
2 files changed, 4 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 77e2f923d4a..5659360d56b 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 @@ -142,11 +142,11 @@ public class ClusterDeploymentMetricsRetriever { .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount)); break; case VESPA_CONTAINER_CLUSTERCONTROLLER: - optionalDouble(values.field("cluster-controller.resource_usage.max_memory_utilization.last")).ifPresent(memoryUtil -> + optionalDouble(values.field("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.last").asDouble(), + .addDiskUsage(values.field("cluster-controller.resource_usage.max_disk_utilization.max").asDouble(), values.field("cluster-controller.resource_usage.disk_limit.last").asDouble())); optionalDouble(values.field("reindexing.progress.last")).ifPresent(progress -> { if (progress < 0 || progress >= 1) return; diff --git a/configserver/src/test/resources/metrics/clustercontroller_metrics.json b/configserver/src/test/resources/metrics/clustercontroller_metrics.json index 65468749940..c60000b34de 100644 --- a/configserver/src/test/resources/metrics/clustercontroller_metrics.json +++ b/configserver/src/test/resources/metrics/clustercontroller_metrics.json @@ -8,8 +8,8 @@ "values": { "cluster-controller.resource_usage.disk_limit.last": 0.75, "cluster-controller.resource_usage.nodes_above_limit.last": 0, - "cluster-controller.resource_usage.max_memory_utilization.last": 0.8907474348626, - "cluster-controller.resource_usage.max_disk_utilization.last": 0.8351705494609, + "cluster-controller.resource_usage.max_memory_utilization.max": 0.8907474348626, + "cluster-controller.resource_usage.max_disk_utilization.max": 0.8351705494609, "cluster-controller.cluster-state-change.count": 2, "cluster-controller.resource_usage.memory_limit.last": 0.8 }, |