diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-06-29 14:03:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 14:03:15 +0200 |
| commit | f094091789d5d7414f95cbea60e1fd883fac3057 (patch) | |
| tree | 2514bf95f7f4d20353156f0ec6dd6bc801cf8bd0 /config-model | |
| parent | 57c876f95fe2103e700320bcec27ca6beede2807 (diff) | |
| parent | ac21189ef5ff8561153a4f1b6dc8d8b2dc870fda (diff) | |
Merge pull request #13664 from vespa-engine/expose-prometheus
Trying to add prometheus handler automatically
Diffstat (limited to 'config-model')
2 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index 20f2bfe6636..86b6ab8a25c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -117,7 +117,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC addHttpHandler(PrometheusHandler.class, PrometheusHandler.V1_PATH); addHttpHandler(YamasHandler.class, YamasHandler.V1_PATH); - addHttpHandler(ApplicationMetricsHandler.class, ApplicationMetricsHandler.V1_PATH); + addHttpHandler(ApplicationMetricsHandler.class, ApplicationMetricsHandler.METRICS_V1_PATH); addMetricsProxyComponent(ApplicationMetricsRetriever.class); addTelegrafComponents(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index c8908495c0a..71d16303573 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -214,7 +214,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat @Override public void getConfig(MetricsProxyApiConfig.Builder builder) { builder.metricsPort(MetricsProxyContainer.BASEPORT) - .metricsApiPath(ApplicationMetricsHandler.VALUES_PATH); + .metricsApiPath(ApplicationMetricsHandler.METRICS_VALUES_PATH) + .prometheusApiPath(ApplicationMetricsHandler.PROMETHEUS_VALUES_PATH); } @Override |