diff options
author | gjoranv <gv@verizonmedia.com> | 2020-06-30 13:03:44 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-06-30 13:08:57 +0200 |
commit | 96af74696fc75b262ffe1ad3326db10b8ba6dae5 (patch) | |
tree | b53e1fc8df14447152d5e7cfed157eb37b6b6cca /metrics-proxy | |
parent | 2eb570673a17c0c1805743006386f4df8fb0caae (diff) |
Add bindings for prometheus handler in application containers.
+ Simplify by using common path for json and prometheus in the
internal applicationmetrics api.
Diffstat (limited to 'metrics-proxy')
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java index 6b1376452fa..c910ac26833 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java @@ -40,9 +40,7 @@ public class ApplicationMetricsHandler extends HttpHandlerBase { public static final String METRICS_V1_PATH = "/applicationmetrics/v1"; public static final String METRICS_VALUES_PATH = METRICS_V1_PATH + "/values"; - - public static final String PROMETHEUS_V1_PATH = "/applicationprometheus/v1"; - public static final String PROMETHEUS_VALUES_PATH = PROMETHEUS_V1_PATH + "/values"; + public static final String PROMETHEUS_VALUES_PATH = METRICS_V1_PATH + "/prometheus"; private final ApplicationMetricsRetriever metricsRetriever; private final MetricsConsumers metricsConsumers; @@ -60,8 +58,6 @@ public class ApplicationMetricsHandler extends HttpHandlerBase { public Optional<HttpResponse> doHandle(URI requestUri, Path apiPath, String consumer) { if (apiPath.matches(METRICS_V1_PATH)) return Optional.of(resourceListResponse(requestUri, List.of(METRICS_VALUES_PATH))); if (apiPath.matches(METRICS_VALUES_PATH)) return Optional.of(applicationMetricsResponse(consumer)); - - if (apiPath.matches(PROMETHEUS_V1_PATH)) return Optional.of(resourceListResponse(requestUri, List.of(PROMETHEUS_VALUES_PATH))); if (apiPath.matches(PROMETHEUS_VALUES_PATH)) return Optional.of(applicationPrometheusResponse(consumer)); return Optional.empty(); |