diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-03-13 21:31:18 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-03-13 23:47:47 +0100 |
| commit | 500468178783cd7c5a2c61b0911349fe07840e43 (patch) | |
| tree | 58be62dac9944a6e4a6a7f3326dfc31f04c3bf95 /config-model | |
| parent | cd9235879bf6c5df5c679afe6982d1649af8f2d1 (diff) | |
Add metrics/v2 bindings to set of reserved bindings.
Diffstat (limited to 'config-model')
2 files changed, 8 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java index 45a044a2aa8..4214b6d77a5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java @@ -16,12 +16,16 @@ import org.w3c.dom.Element; import java.util.Set; import static java.util.logging.Level.INFO; +import static com.yahoo.vespa.model.container.ApplicationContainerCluster.METRICS_V2_HANDLER_BINDING_1; +import static com.yahoo.vespa.model.container.ApplicationContainerCluster.METRICS_V2_HANDLER_BINDING_2; + /** * @author gjoranv */ public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Handler> { - private static final Set<String> reservedBindings = Set.of(); + private static final Set<String> reservedBindings = Set.of(METRICS_V2_HANDLER_BINDING_1, + METRICS_V2_HANDLER_BINDING_2); private final ApplicationContainerCluster cluster; 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 3632cb08da5..f9bb7e1e425 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 @@ -54,6 +54,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat MetricsProxyApiConfig.Producer { public static final String METRICS_V2_HANDLER_CLASS = MetricsV2Handler.class.getName(); + public static final String METRICS_V2_HANDLER_BINDING_1 = "http://*" + MetricsV2Handler.V2_PATH; + public static final String METRICS_V2_HANDLER_BINDING_2 = METRICS_V2_HANDLER_BINDING_1 + "/*"; private final Set<FileReference> applicationBundles = new LinkedHashSet<>(); @@ -111,8 +113,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat public void addMetricsV2Handler() { Handler<AbstractConfigProducer<?>> handler = new Handler<>( new ComponentModel(METRICS_V2_HANDLER_CLASS, null, null, null)); - handler.addServerBindings("http://*" + MetricsV2Handler.V2_PATH, - "http://*" + MetricsV2Handler.V2_PATH + "/*"); + handler.addServerBindings(METRICS_V2_HANDLER_BINDING_1, METRICS_V2_HANDLER_BINDING_2); addComponent(handler); } |