From 52b38a430dbb42bc68dfd5465165a3fc1bfdb01c Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Thu, 20 Jun 2019 21:04:02 +0200
Subject: Remove network metrics from the default-public consumer.

---
 .../com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java  | 3 +--
 .../model/admin/metricsproxy/MetricsProxyContainerClusterTest.java     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'config-model')

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 9f614841b5f..5bbdca61c5c 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
@@ -24,8 +24,7 @@ public class DefaultPublicConsumer {
                                                                          emptyList(),
                                                                          ImmutableList.of(defaultPublicMetricSet,
                                                                                           defaultVespaMetricSet,
-                                                                                          systemMetricSet,
-                                                                                          networkMetricSet));
+                                                                                          systemMetricSet));
 
     public static MetricsConsumer getDefaultPublicConsumer() {
         return new MetricsConsumer(DEFAULT_PUBLIC_CONSUMER_ID, publicConsumerMetrics);
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 7cca4cb5588..5bb040ce941 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
@@ -97,7 +97,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 + numNetworkMetrics;
+        int numMetricsForPublicDefaultConsumer = defaultPublicMetricSet.getMetrics().size() + numDefaultVespaMetrics + numSystemMetrics;
         assertEquals(numMetricsForPublicDefaultConsumer, config.consumer(1).metric().size());
     }
 
-- 
cgit v1.2.3