diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-06-22 13:54:43 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-06-22 13:55:15 +0200 |
| commit | 9016501a4a9fba90590fa5e645b4f7303a161e26 (patch) | |
| tree | 61efb5367e74f83df4e0b8f9f86efbe5c5737367 /config-model | |
| parent | 52b38a430dbb42bc68dfd5465165a3fc1bfdb01c (diff) | |
Rename the public default consumer and metric set to 'default'
- Keep the class/constant names, as they are only used in a public
context, and not for Oath-internal Vespa with Yamas.
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java index 5bbdca61c5c..fbd1c7455dd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java @@ -9,7 +9,6 @@ import com.google.common.collect.ImmutableList; import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicMetrics.defaultPublicMetricSet; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; -import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet; import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet; import static java.util.Collections.emptyList; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java index 52d5306e63a..3cec9b4c324 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java @@ -22,7 +22,7 @@ public class DefaultPublicMetrics { public static MetricSet defaultPublicMetricSet = createMetricSet(); private static MetricSet createMetricSet() { - return new MetricSet("default-public", + return new MetricSet("public", getAllMetrics(), emptyList()); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index 5bb040ce941..78c1c5931a2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -134,8 +134,8 @@ public class MetricsProxyContainerClusterTest { } @Test - public void default_public_is_a_reserved_consumer_id() { - assertReservedConsumerId("default-public"); + public void public_is_a_reserved_consumer_id() { + assertReservedConsumerId("default"); } private void assertReservedConsumerId(String consumerId) { |