diff options
| author | Amund Bergland Kvalsvik <akvalsvik@verizonmedia.com> | 2020-06-26 15:02:38 +0200 |
|---|---|---|
| committer | Amund Bergland Kvalsvik <akvalsvik@verizonmedia.com> | 2020-06-26 15:02:38 +0200 |
| commit | ce432af28ff6f8f35a25b673665a72f5a48c6266 (patch) | |
| tree | 2dcf098a9e34bbaf8684c55cfd5d0b1faf6e09a8 | |
| parent | e682fa35d0c6e9874c1bedb4a6bbdb8900c99948 (diff) | |
Added configs
3 files changed, 7 insertions, 2 deletions
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 55ce199eddf..75e6468d3a0 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,9 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat @Override public void getConfig(MetricsProxyApiConfig.Builder builder) { builder.metricsPort(MetricsProxyContainer.BASEPORT) - .metricsApiPath(ApplicationMetricsHandler.METRICS_VALUES_PATH); + .metricsApiPath(ApplicationMetricsHandler.METRICS_VALUES_PATH) + .prometheusPort(MetricsProxyContainer.BASEPORT) + .prometheusApiPath(ApplicationMetricsHandler.PROMETHEUS_VALUES_PATH); } @Override diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusHandler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusHandler.java index c8782e3a9f1..5010e6a3a8d 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusHandler.java @@ -34,7 +34,7 @@ public class PrometheusHandler extends HttpHandlerBase{ protected PrometheusHandler(Executor executor, MetricsProxyApiConfig config) { super(executor); - prometheusProxyUri = "http://localhost:" + config.metricsPort() + config.metricsApiPath(); + prometheusProxyUri = "http://localhost:" + config.prometheusPort() + config.prometheusApiPath(); } @Override diff --git a/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def b/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def index 3e5b973e3f3..b41d79149ef 100644 --- a/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def +++ b/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def @@ -4,3 +4,6 @@ namespace=container.handler.metrics metricsPort int metricsApiPath string + +prometheusPort int +prometheusApiPath string |