aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-03-10 12:55:45 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-03-10 12:55:45 +0100
commite78006c080383814e37aa6339c75137980d62815 (patch)
treea0b47d22087eadb3e28381d77020307409fa7838
parentddd5141d112d44f881da17e83d26ac18ad35c3c1 (diff)
memory.util -> mem.util
-rw-r--r--metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java8
3 files changed, 6 insertions, 6 deletions
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
index be57b24d92f..57185d55131 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
@@ -9,9 +9,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
/**
- * @author Unknowm
*/
public class MetricsFetcherTest {
+
private static int port = 9; //port number is not used in this test
@Test
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java
index 9c85ca870d5..1f8f0b2eefa 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java
@@ -17,7 +17,7 @@ public enum Resource {
},
memory {
- String metricName() { return "memory.util"; }
+ String metricName() { return "mem.util"; }
double idealAverageLoad() { return 0.7; }
double valueFrom(NodeResources resources) { return resources.memoryGb(); }
},
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java
index 4376bfd38b0..f48a87d0b93 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java
@@ -41,7 +41,7 @@ public class NodeMetricsFetcherTest {
httpClient.requestsReceived.get(0));
assertEquals(5, values.size());
assertEquals("metric value cpu.util: 16.2 at 1234 for host-1.yahoo.com", values.get(0).toString());
- assertEquals("metric value memory.util: 23.1 at 1234 for host-1.yahoo.com", values.get(1).toString());
+ assertEquals("metric value mem.util: 23.1 at 1234 for host-1.yahoo.com", values.get(1).toString());
assertEquals("metric value disk.util: 82.0 at 1234 for host-1.yahoo.com", values.get(2).toString());
assertEquals("metric value cpu.util: 20.0 at 1200 for host-2.yahoo.com", values.get(3).toString());
assertEquals("metric value disk.util: 40.0 at 1200 for host-2.yahoo.com", values.get(4).toString());
@@ -54,7 +54,7 @@ public class NodeMetricsFetcherTest {
httpClient.requestsReceived.get(1));
assertEquals(3, values.size());
assertEquals("metric value cpu.util: 10.0 at 1300 for host-3.yahoo.com", values.get(0).toString());
- assertEquals("metric value memory.util: 15.0 at 1300 for host-3.yahoo.com", values.get(1).toString());
+ assertEquals("metric value mem.util: 15.0 at 1300 for host-3.yahoo.com", values.get(1).toString());
assertEquals("metric value disk.util: 20.0 at 1300 for host-3.yahoo.com", values.get(2).toString());
}
}
@@ -87,7 +87,7 @@ public class NodeMetricsFetcherTest {
" {\n" +
" \"values\": {\n" +
" \"cpu.util\": 16.2,\n" +
- " \"memory.util\": 23.1,\n" +
+ " \"mem.util\": 23.1,\n" +
" \"disk.util\": 82\n" +
" },\n" +
" \"dimensions\": {\n" +
@@ -131,7 +131,7 @@ public class NodeMetricsFetcherTest {
" {\n" +
" \"values\": {\n" +
" \"cpu.util\": 10,\n" +
- " \"memory.util\": 15,\n" +
+ " \"mem.util\": 15,\n" +
" \"disk.util\": 20\n" +
" },\n" +
" \"dimensions\": {\n" +