From c62212953bc52c8db724ce2b264d352cf57d0766 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 14 Jan 2021 22:10:18 +0100 Subject: Switch from mem.total.util to mem.util in autoscaling mem.total.util included disk cache which makes it unsuitable as a regulation target. --- .../com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java | 2 +- .../vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'node-repository/src') diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java index 7c5b839edf3..963ab85c5a0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java @@ -91,7 +91,7 @@ public class MetricsResponse { double convertValue(double metricValue) { return (float)metricValue / 100; } // % to ratio }, memory { // a node resource - public String metricResponseName() { return "mem_total.util"; } + public String metricResponseName() { return "mem.util"; } double convertValue(double metricValue) { return (float)metricValue / 100; } // % to ratio }, disk { // a node resource diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java index 0a62e5b6a68..cc0450ec2ea 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java @@ -114,7 +114,7 @@ public class MetricsV2MetricsFetcherTest { " {\n" + " \"values\": {\n" + " \"cpu.util\": 16.2,\n" + - " \"mem_total.util\": 23.1,\n" + + " \"mem.util\": 23.1,\n" + " \"disk.util\": 82\n" + " },\n" + " \"dimensions\": {\n" + @@ -157,7 +157,7 @@ public class MetricsV2MetricsFetcherTest { " {\n" + " \"values\": {\n" + " \"cpu.util\": 10,\n" + - " \"mem_total.util\": 15,\n" + + " \"mem.util\": 15,\n" + " \"disk.util\": 20,\n" + " \"application_generation\": 3\n" + " },\n" + -- cgit v1.2.3