diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-03-08 21:01:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 21:01:53 +0100 |
| commit | 4c5dd819b1ce8cca2c18e0e0cf13d02188da7f14 (patch) | |
| tree | 6b69eb47aae1e5389f7b0016abf6a6c308727e3b /config-model | |
| parent | 54b2397b413c7ebb44168ca1288416c2b76faab6 (diff) | |
| parent | c456bebbc5893181bb2f5f3295880a7cad40ec00 (diff) | |
Merge pull request #12491 from vespa-engine/gjoranv/rename-public-metric-set
Rename the default public metric set from 'public' -> 'default'
Diffstat (limited to 'config-model')
2 files changed, 5 insertions, 3 deletions
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 6950eb1fd84..c80cebe3d5b 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 @@ -20,10 +20,12 @@ import static java.util.Collections.singleton; */ public class DefaultPublicMetrics { + public static final String DEFAULT_METRIC_SET_ID = "default"; + public static MetricSet defaultPublicMetricSet = createMetricSet(); private static MetricSet createMetricSet() { - return new MetricSet("public", + return new MetricSet(DEFAULT_METRIC_SET_ID, getAllMetrics(), singleton(defaultVespaMetricSet)); } 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 b441f1e1993..12a10a7e354 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 @@ -197,14 +197,14 @@ public class MetricsConsumersTest { } @Test - public void consumer_with_default_public_metric_set_has_all_public_metrics_plus_all_system_metrics_plus_its_own() { + public void consumer_with_default_metric_set_has_all_its_metrics_plus_all_system_metrics_plus_its_own() { String services = String.join("\n", "<services>", " <admin version='2.0'>", " <adminserver hostalias='node1'/>", " <metrics>", " <consumer id='consumer-with-public-default-set'>", - " <metric-set id='public'/>", + " <metric-set id='default'/>", " <metric id='custom.metric'/>", " </consumer>", " </metrics>", |