diff options
author | gjoranv <gv@verizonmedia.com> | 2020-03-24 17:47:18 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-03-24 17:47:18 +0100 |
commit | 9caaf811b36c9f5b4f7f883d630277612f37c42c (patch) | |
tree | 1e9f1ba002860e034e18ae7e19dde03420731287 /node-repository | |
parent | 678383db15485b46d5d5b6aa9af57bd33a4cf740 (diff) |
Use name of the consumer instead of the metric set.
Diffstat (limited to 'node-repository')
2 files changed, 3 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 e0ecbcfbf3c..536db644ae5 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 @@ -59,7 +59,7 @@ public class NodeMetricsFetcher extends AbstractComponent implements NodeMetrics .stream() .findFirst(); if (metricsV2Container.isEmpty()) return Collections.emptyList(); - String url = "http://" + metricsV2Container.get().hostname() + ":" + 4080 + apiPath + "?consumer=vespa-consumer-metrics"; + String url = "http://" + metricsV2Container.get().hostname() + ":" + 4080 + apiPath + "?consumer=Vespa"; 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 3dfebedb0e6..7497f9c5f14 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 @@ -37,7 +37,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=vespa-consumer-metrics", + assertEquals("http://host-1.yahoo.com:4080/metrics/v2/values?consumer=Vespa", 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()); @@ -50,7 +50,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=vespa-consumer-metrics", + assertEquals("http://host-3.yahoo.com:4080/metrics/v2/values?consumer=Vespa", 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()); |