diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-09-18 14:53:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 14:53:29 +0200 |
| commit | 42adcf6286491f57d6fa4ea087c760d6a8f84d26 (patch) | |
| tree | 8de34b1fd94b0493ba8a6ddc96c4bdcfa345c8dd /node-repository | |
| parent | bf3ca4359b94aff539fc79b80b4caac66225a028 (diff) | |
| parent | 00704b6e5506a1b422ba8b1c89897f0c867523f4 (diff) | |
Merge pull request #14447 from vespa-engine/bratseth/autoscaling-metric-set
Bratseth/autoscaling metric set
Diffstat (limited to 'node-repository')
2 files changed, 4 insertions, 4 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 acdd419c0de..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(); } @@ -114,7 +115,6 @@ public class NodeMetricsFetcher extends AbstractComponent implements NodeMetrics } } - } } 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()); |