diff options
| -rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java | 4 | ||||
| -rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/yamas/YamasHandler.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java index 830e2201966..51e82cde79e 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java @@ -49,6 +49,10 @@ public class ValuesFetcher { .collect(Collectors.toList()); } + public List<MetricsPacket> fetchAllMetrics() throws JsonRenderingException { + return metricsManager.getMetrics(vespaServices.getVespaServices(), Instant.now()); + } + private ConsumerId getConsumerOrDefault(String consumer) { if (consumer == null) return DEFAULT_PUBLIC_CONSUMER_ID; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/yamas/YamasHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/yamas/YamasHandler.java index cba7fe5c328..4c25796907a 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/yamas/YamasHandler.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/yamas/YamasHandler.java @@ -56,7 +56,7 @@ public class YamasHandler extends HttpHandlerBase { private JsonResponse valuesResponse(String consumer) { try { - List<MetricsPacket> metrics = valuesFetcher.fetch(consumer); + List<MetricsPacket> metrics = consumer == null ? valuesFetcher.fetchAllMetrics() : valuesFetcher.fetch(consumer); metrics.addAll(nodeMetricGatherer.gatherMetrics()); // TODO: Currently only add these metrics in this handler. Eventually should be included in all handlers return new JsonResponse(OK, YamasJsonUtil.toYamasArray(metrics, true).serialize()); } catch (JsonRenderingException e) { |