diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-09-16 10:35:01 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-09-16 10:35:01 +0200 |
| commit | 769dbcec6a68dbf08ac4d7d79be0631b29a03830 (patch) | |
| tree | 2bd9cfb0dfbf2fa0356c12b7c3860042bda89c94 /config-model | |
| parent | 7d1562dc0330d6b357eec282d1f019ef4636458c (diff) | |
Do not add the default-vespa metrics twice to the public metrics.
Diffstat (limited to 'config-model')
2 files changed, 1 insertions, 2 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 9c75b80c2f4..e8e6a987ebe 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 @@ -22,7 +22,6 @@ public class DefaultPublicConsumer { private static final MetricSet publicConsumerMetrics = new MetricSet("public-consumer-metrics", emptyList(), ImmutableList.of(defaultPublicMetricSet, - defaultVespaMetricSet, systemMetricSet)); public static MetricsConsumer getDefaultPublicConsumer() { 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 6e3ff564025..34530b598df 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 @@ -117,7 +117,7 @@ public class MetricsProxyContainerClusterTest { assertEquals(2, config.consumer().size()); assertEquals(config.consumer(1).name(), DEFAULT_PUBLIC_CONSUMER_ID); - int numMetricsForPublicDefaultConsumer = defaultPublicMetricSet.getMetrics().size() + numDefaultVespaMetrics + numSystemMetrics; + int numMetricsForPublicDefaultConsumer = defaultPublicMetricSet.getMetrics().size() + numSystemMetrics; assertEquals(numMetricsForPublicDefaultConsumer, config.consumer(1).metric().size()); } |