Partial cleanup of metric-defaults config.

4 files changed, 2 insertions, 39 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 2ab55f40eb5..9ee13d2146e 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -117,7 +117,6 @@ public final class ContainerCluster
         PageTemplatesConfig.Producer,
         SemanticRulesConfig.Producer,
         DocprocConfig.Producer,
-        MetricDefaultsConfig.Producer,
         ClusterInfoConfig.Producer,
         ServletPathsConfig.Producer,
         RoutingProviderConfig.Producer,
@@ -176,7 +175,6 @@ public final class ContainerCluster
     private final boolean isHostedVespa;
 
     private Map<String, String> concreteDocumentTypes = new LinkedHashMap<>();
-    private MetricDefaultsConfig.Factory.Enum defaultMetricConsumerFactory;
 
     private ApplicationMetaData applicationMetaData = null;
 
@@ -718,11 +716,6 @@ public final class ContainerCluster
     }
 
     @Override
-    public void getConfig(MetricDefaultsConfig.Builder builder) {
-        if (defaultMetricConsumerFactory != null) builder.factory(defaultMetricConsumerFactory);
-    }
-
-    @Override
     public void getConfig(ClusterInfoConfig.Builder builder) {
         builder.clusterId(name);
         builder.nodeCount(containers.size());
@@ -759,11 +752,6 @@ public final class ContainerCluster
         return builders;
     }
 
-    public void setDefaultMetricConsumerFactory(MetricDefaultsConfig.Factory.Enum defaultMetricConsumerFactory) {
-        Objects.requireNonNull(defaultMetricConsumerFactory, "defaultMetricConsumerFactory");
-        this.defaultMetricConsumerFactory = defaultMetricConsumerFactory;
-    }
-
     public boolean isHostedVespa() {
         return isHostedVespa;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index f18c3a13689..b258822c34e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -174,7 +174,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         addDefaultHandlers(cluster);
         addStatusHandlers(cluster, context);
-        setDefaultMetricConsumerFactory(cluster);
 
         addHttp(deployState, spec, cluster);
 
@@ -255,10 +254,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         addConfiguredComponents(deployState, cluster, spec, "component");
     }
 
-    private void setDefaultMetricConsumerFactory(ContainerCluster cluster) {
-        cluster.setDefaultMetricConsumerFactory(MetricDefaultsConfig.Factory.Enum.STATE_MONITOR);
-    }
-
     private void addDefaultHandlers(ContainerCluster cluster) {
         addDefaultHandlersExceptStatus(cluster);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 27c05e08886..9ea984737c7 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -40,21 +40,6 @@ import static org.junit.Assert.assertTrue;
 public class ContainerClusterTest {
 
     @Test
-    public void requireThatDefaultMetricConsumerFactoryCanBeConfigured() {
-        ContainerCluster cluster = newContainerCluster();
-        cluster.setDefaultMetricConsumerFactory(MetricDefaultsConfig.Factory.Enum.YAMAS_SCOREBOARD);
-        assertEquals(MetricDefaultsConfig.Factory.Enum.YAMAS_SCOREBOARD,
-                getMetricDefaultsConfig(cluster).factory());
-    }
-
-    @Test
-    public void requireThatDefaultMetricConsumerFactoryMatchesConfigDefault() {
-        ContainerCluster cluster = newContainerCluster();
-        assertEquals(new MetricDefaultsConfig(new MetricDefaultsConfig.Builder()).factory(),
-                getMetricDefaultsConfig(cluster).factory());
-    }
-
-    @Test
     public void requireThatClusterInfoIsPopulated() {
         ContainerCluster cluster = newContainerCluster();
         ClusterInfoConfig config = getClusterInfoConfig(cluster);
@@ -301,12 +286,6 @@ public class ContainerClusterTest {
         return cluster;
     }
 
-    private static MetricDefaultsConfig getMetricDefaultsConfig(ContainerCluster cluster) {
-        MetricDefaultsConfig.Builder builder = new MetricDefaultsConfig.Builder();
-        cluster.getConfig(builder);
-        return new MetricDefaultsConfig(builder);
-    }
-
     private static ClusterInfoConfig getClusterInfoConfig(ContainerCluster cluster) {
         ClusterInfoConfig.Builder builder = new ClusterInfoConfig.Builder();
         cluster.getConfig(builder);
diff --git a/container-disc/src/main/resources/configdefinitions/metric-defaults.def b/container-disc/src/main/resources/configdefinitions/metric-defaults.def
index 013c2a8c77e..1084ef5906f 100644
--- a/container-disc/src/main/resources/configdefinitions/metric-defaults.def
+++ b/container-disc/src/main/resources/configdefinitions/metric-defaults.def
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# TODO VESPA 7: Remove this def file
 namespace=container.jdisc.config
 
-factory enum { STATE_MONITOR, YAMAS_SCOREBOARD } default = STATE_MONITOR
+factory enum { STATE_MONITOR } default = STATE_MONITOR