Configure 'new-default' consumer in the cluster

.. to allow using different metric sets for e.g. hosted.

3 files changed, 16 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index a9a5f39c791..4dce1b33b1d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -45,7 +45,9 @@ import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static ai.vespa.metrics.set.DefaultMetrics.defaultMetricSet;
 import static ai.vespa.metrics.set.MetricSet.empty;
+import static ai.vespa.metrics.set.SystemMetrics.systemMetricSet;
 import static com.yahoo.vespa.model.admin.metricsproxy.ConsumersConfigGenerator.addMetrics;
 import static com.yahoo.vespa.model.admin.metricsproxy.ConsumersConfigGenerator.generateConsumers;
 import static com.yahoo.vespa.model.admin.metricsproxy.ConsumersConfigGenerator.toConsumerBuilder;
@@ -68,7 +70,10 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
 {
     public static final Logger log = Logger.getLogger(MetricsProxyContainerCluster.class.getName());
 
+    public static final String NEW_DEFAULT_CONSUMER_ID = "new-default";
+
     private static final String METRICS_PROXY_NAME = "metrics-proxy";
+
     static final Path METRICS_PROXY_BUNDLE_FILE = PlatformBundles.absoluteBundlePath(METRICS_PROXY_NAME);
     static final String METRICS_PROXY_BUNDLE_NAME = "com.yahoo.vespa." + METRICS_PROXY_NAME;
 
@@ -153,7 +158,15 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
         builder.consumer.addAll(generateConsumers(amendedVespaConsumer, getUserMetricsConsumers(), getZone().system()));
 
         builder.consumer.add(toConsumerBuilder(MetricsConsumer.defaultConsumer));
-        builder.consumer.add(toConsumerBuilder(MetricsConsumer.newDefaultConsumer));
+        builder.consumer.add(toConsumerBuilder(newDefaultConsumer()));
+    }
+
+    public MetricsConsumer newDefaultConsumer() {
+        if (isHostedVespa()) {
+            // TODO: use different metric set for hosted vespa.
+            return MetricsConsumer.consumer(NEW_DEFAULT_CONSUMER_ID, defaultMetricSet, systemMetricSet);
+        }
+        return MetricsConsumer.consumer(NEW_DEFAULT_CONSUMER_ID, defaultMetricSet, systemMetricSet);
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
index 7bbe8750571..cfe3c01e03a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
@@ -34,9 +34,6 @@ public class MetricsConsumer {
     public static final MetricsConsumer defaultConsumer =
             consumer(ValuesFetcher.defaultMetricsConsumerId.id, defaultMetricSet, systemMetricSet);
 
-    public static final MetricsConsumer newDefaultConsumer =
-            consumer("new-default", defaultMetricSet, systemMetricSet);
-
     // Referenced from com.yahoo.vespa.hosted.provision.autoscale.NodeMetricsFetcher
     public static final MetricsConsumer autoscaling =
             consumer("autoscaling", autoscalingMetricSet);
@@ -69,7 +66,7 @@ public class MetricsConsumer {
         return metricSet.getMetrics();
     }
 
-    private static MetricsConsumer consumer(String id, MetricSet ... metricSets) {
+    public static MetricsConsumer consumer(String id, MetricSet ... metricSets) {
         return new MetricsConsumer(id, new MetricSet(id + "-consumer-metrics", List.of(), Arrays.asList(metricSets)));
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java
index 7a89cd839b8..49019e47bc2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java
@@ -56,7 +56,7 @@ public class MetricsConsumersTest {
         assertEquals(MetricsConsumer.vespa.id(), config.consumer(0).name());
         assertEquals(MetricsConsumer.autoscaling.id(), config.consumer(1).name());
         assertEquals(MetricsConsumer.defaultConsumer.id(), config.consumer(2).name());
-        assertEquals(MetricsConsumer.newDefaultConsumer.id(), config.consumer(3).name());
+        assertEquals(MetricsProxyContainerCluster.NEW_DEFAULT_CONSUMER_ID, config.consumer(3).name());
     }
 
     @Test