summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-09-18 14:07:32 +0200
committerJon Bratseth <bratseth@gmail.com>2020-09-18 14:07:32 +0200
commit00704b6e5506a1b422ba8b1c89897f0c867523f4 (patch)
tree124fc8fa5245bc9a948854ca84b10e5c4233d73a
parent9a4a8a442f3b75a869e21adac4ae17f729e09688 (diff)
Use 'autoscaling' metrics consumer
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcher.java3
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcher.java
index 83fc421be74..1361faba66c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcher.java
@@ -62,7 +62,8 @@ public class NodeMetricsFetcher extends AbstractComponent implements NodeMetrics
.stream()
.findFirst();
if (metricsV2Container.isEmpty()) return Collections.emptyList();
- String url = "http://" + metricsV2Container.get().hostname() + ":" + 4080 + apiPath + "?consumer=default";
+ // Consumer 'autoscaling' defined in com.yahoo.vespa.model.admin.monitoring.MetricConsumer
+ String url = "http://" + metricsV2Container.get().hostname() + ":" + 4080 + apiPath + "?consumer=autoscaling";
String response = httpClient.get(url);
return new MetricsResponse(response).metrics();
}
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 6bf52218302..d418d818ef3 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.cannedResponse = cannedResponseForApplication1;
List<NodeMetrics.MetricValue> values = new ArrayList<>(fetcher.fetchMetrics(application1));
- assertEquals("http://host-1.yahoo.com:4080/metrics/v2/values?consumer=default",
+ assertEquals("http://host-1.yahoo.com:4080/metrics/v2/values?consumer=autoscaling",
httpClient.requestsReceived.get(0));
assertEquals(5, values.size());
assertEquals("metric value cpu.util: 16.2 at 1970-01-01T00:20:34Z for host-1.yahoo.com", values.get(0).toString());
@@ -54,7 +54,7 @@ public class NodeMetricsFetcherTest {
{
httpClient.cannedResponse = cannedResponseForApplication2;
List<NodeMetrics.MetricValue> values = new ArrayList<>(fetcher.fetchMetrics(application2));
- assertEquals("http://host-3.yahoo.com:4080/metrics/v2/values?consumer=default",
+ assertEquals("http://host-3.yahoo.com:4080/metrics/v2/values?consumer=autoscaling",
httpClient.requestsReceived.get(1));
assertEquals(3, values.size());
assertEquals("metric value cpu.util: 10.0 at 1970-01-01T00:21:40Z for host-3.yahoo.com", values.get(0).toString());