diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-01-24 13:00:46 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2020-01-28 20:11:18 +0100 |
| commit | 9e7313708c0aac16bda48cced4c4d011a19e3f51 (patch) | |
| tree | f8c5bb6daf0ea46f1524baa05670b0f2b7dcc900 | |
| parent | b0e37961e675e13b292136cc342c42bad020ceff (diff) | |
Add MetricsV2Handler to access control whitelist.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 4 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java | 4 |
2 files changed, 6 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 f007a508b6c..1bf9c91384b 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 @@ -53,6 +53,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat ContainerMbusConfig.Producer, MetricsProxyApiConfig.Producer { + public static final String METRICS_V2_HANDLER_CLASS = MetricsV2Handler.class.getName(); + private final Set<FileReference> applicationBundles = new LinkedHashSet<>(); private final ConfigProducerGroup<Servlet> servletGroup; @@ -108,7 +110,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat public void addMetricsV2Handler() { Handler<AbstractConfigProducer<?>> handler = new Handler<>( - new ComponentModel(MetricsV2Handler.class.getName(), null, null, null)); + new ComponentModel(METRICS_V2_HANDLER_CLASS, null, null, null)); handler.addServerBindings("http://*" + MetricsV2Handler.V2_PATH, "http://*" + MetricsV2Handler.V2_PATH + "/*"); addComponent(handler); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java index d3ba2718d71..6b1a94e16ae 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java @@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.config.application.api.DeployLogger; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.FileStatusHandlerComponent; import com.yahoo.vespa.model.container.component.Handler; @@ -34,7 +35,8 @@ public final class AccessControl { ContainerCluster.APPLICATION_STATUS_HANDLER_CLASS, ContainerCluster.BINDINGS_OVERVIEW_HANDLER_CLASS, ContainerCluster.STATE_HANDLER_CLASS, - ContainerCluster.LOG_HANDLER_CLASS + ContainerCluster.LOG_HANDLER_CLASS, + ApplicationContainerCluster.METRICS_V2_HANDLER_CLASS ); public static final class Builder { |