aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-20 16:12:29 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-08-17 17:04:17 +0200
commitead8d2122f052436f5d38771df5db68483e10989 (patch)
tree887fb93a02da41592779899ef5d7043a355441a1 /config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy
parent4b4dfeb835e43b852858cb128e512219270d7f93 (diff)
Use BindingPattern to represent all types of binding in config model
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java6
1 files changed, 4 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 4dc9811a024..04a009762ce 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
@@ -37,6 +37,7 @@ import com.yahoo.vespa.model.admin.monitoring.MetricSet;
import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
import com.yahoo.vespa.model.admin.monitoring.Monitoring;
import com.yahoo.vespa.model.container.ContainerCluster;
+import com.yahoo.vespa.model.container.component.BindingPattern;
import com.yahoo.vespa.model.container.component.Handler;
import com.yahoo.vespa.model.container.xml.PlatformBundles;
@@ -129,8 +130,9 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
static Handler<AbstractConfigProducer<?>> createMetricsHandler(Class<? extends ThreadedHttpRequestHandler> clazz, String bindingPath) {
Handler<AbstractConfigProducer<?>> metricsHandler = new Handler<>(
new ComponentModel(clazz.getName(), null, METRICS_PROXY_BUNDLE_NAME, null));
- metricsHandler.addServerBindings("http://*" + bindingPath,
- "http://*" + bindingPath + "/*");
+ metricsHandler.addServerBindings(
+ BindingPattern.createModelGeneratedFromHttpPath(bindingPath),
+ BindingPattern.createModelGeneratedFromHttpPath(bindingPath + "/*"));
return metricsHandler;
}