diff options
| author | Gjøran Voldengen <gjoranv@gmail.com> | 2023-10-26 09:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 09:56:10 +0200 |
| commit | 444b2217bc11103d01a1262c9baa84ee3a4eb4ef (patch) | |
| tree | 368be16eb0fabef5548797937e23299b1435dd70 | |
| parent | 8079a8769915d740474493a8c23623adfecdfdc9 (diff) | |
| parent | 4a155971e820fae2c4d7254745449be8248392d3 (diff) | |
Merge pull request #29100 from vespa-engine/olaa/default9-consumer
Add vespa9default metric set
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java | 4 |
1 files changed, 2 insertions, 2 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 9fab6a2b17b..348b84367d5 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 @@ -48,6 +48,7 @@ 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 ai.vespa.metrics.set.Vespa9DefaultMetricSet.vespa9defaultMetricSet; 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; @@ -169,8 +170,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC 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, vespa9defaultMetricSet, systemMetricSet); } return MetricsConsumer.consumer(NEW_DEFAULT_CONSUMER_ID, defaultMetricSet, systemMetricSet); } |