Remove flavor and canonicalFlavor dimensions.

- They have not been used for some time.

3 files changed, 2 insertions, 15 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
index 3bc38cad1d1..2a698233713 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
@@ -19,10 +19,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.CANONICAL_FLAVOR;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.CLUSTER_ID;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.CLUSTER_TYPE;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer.NodeDimensionNames.FLAVOR;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.METRICS_PROXY_BUNDLE_NAME;
 
 /**
@@ -37,8 +35,6 @@ public class MetricsProxyContainer extends Container implements
 {
 
     static final class NodeDimensionNames {
-        static final String FLAVOR = "flavor";
-        static final String CANONICAL_FLAVOR = "canonicalFlavor";
         static final String CLUSTER_TYPE = "clustertype";
         static final String CLUSTER_ID = "clusterid";
     }
@@ -118,11 +114,6 @@ public class MetricsProxyContainer extends Container implements
     public void getConfig(NodeDimensionsConfig.Builder builder) {
         Map<String, String> dimensions = new LinkedHashMap<>();
         if (isHostedVespa) {
-            getHostResource().getFlavor().ifPresent(flavor -> {
-                dimensions.put(FLAVOR, flavor.name());
-                dimensions.put(CANONICAL_FLAVOR, flavor.canonicalName());
-            });
-
             getHostResource().primaryClusterMembership().map(ClusterMembership::cluster).ifPresent(cluster -> {
                 dimensions.put(CLUSTER_TYPE, cluster.type().name());
                 dimensions.put(CLUSTER_ID, cluster.id().value());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index d2bf4b601a6..a700368d1f5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -11,7 +11,6 @@ import org.junit.Test;
 import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CLUSTER_CONFIG_ID;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CONTAINER_CONFIG_ID;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.MY_FLAVOR;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getHostedModel;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig;
@@ -108,8 +107,6 @@ public class MetricsProxyContainerTest {
 
         assertEquals("content", config.dimensions(NodeDimensionNames.CLUSTER_TYPE));
         assertEquals("my-content", config.dimensions(NodeDimensionNames.CLUSTER_ID));
-        assertEquals(MY_FLAVOR, config.dimensions(NodeDimensionNames.FLAVOR));
-        assertEquals(MY_FLAVOR, config.dimensions(NodeDimensionNames.CANONICAL_FLAVOR));
     }
 
 
@@ -162,7 +159,7 @@ public class MetricsProxyContainerTest {
                            "    </admin>",
                            "    <content version='1.0' id='my-content'>",
                            "        <documents />",
-                           "        <nodes count='1' flavor='" + MY_FLAVOR + "' />",
+                           "        <nodes count='1' />",
                            "    </content>",
                            "</services>"
         );
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
index 13589c763e2..940b6e666e4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
@@ -27,7 +27,6 @@ class MetricsProxyModelTester {
     static final String MY_TENANT = "mytenant";
     static final String MY_APPLICATION = "myapp";
     static final String MY_INSTANCE = "myinstance";
-    static final String MY_FLAVOR = "myflavor";
 
     static final String CLUSTER_CONFIG_ID = "admin/metrics";
 
@@ -47,7 +46,7 @@ class MetricsProxyModelTester {
         var numberOfHosts = 2;
         var tester = new VespaModelTester();
         tester.enableMetricsProxyContainer(true);
-        tester.addHosts(flavorFromString(MY_FLAVOR), numberOfHosts);
+        tester.addHosts(numberOfHosts);
         tester.setHosted(true);
         tester.setApplicationId(MY_TENANT, MY_APPLICATION, MY_INSTANCE);
         return tester.createModel(servicesXml, true);