diff options
author | gjoranv <gv@verizonmedia.com> | 2019-03-22 10:23:38 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-03-22 11:25:16 +0100 |
commit | 58afd0dc6a98ef26994fb526b7499a0e71defe28 (patch) | |
tree | 7c1a15c5020c21c1acd2a7f63f9304ea9597d8d6 /config-model | |
parent | af270d49303f907a39a4aa405ae58d49dfdbbdd4 (diff) |
Enable new metrics-proxy-container only in CD.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index bda9b37b0a1..a36d0943b92 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -10,6 +10,7 @@ import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.model.AbstractService; import com.yahoo.vespa.model.ConfigProxy; @@ -194,7 +195,11 @@ public class Admin extends AbstractConfigProducer implements Serializable { public void addPerHostServices(List<HostResource> hosts, DeployState deployState) { if (slobroks.isEmpty()) // TODO: Move to caller slobroks.addAll(createDefaultSlobrokSetup(deployState.getDeployLogger())); - addMetricsProxyCluster(hosts, deployState); + + // TODO: enable for all zones + if (deployState.zone().system() == SystemName.cd) + addMetricsProxyCluster(hosts, deployState); + for (HostResource host : hosts) { if (!host.getHost().runsConfigServer()) { addCommonServices(host, deployState); |