Revert "Handle user metrics when generating metrics config for container cluster"

2 files changed, 20 insertions, 56 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 66eb1ec1f0f..7bb6e3dabd4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -29,7 +29,6 @@ import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerComponent;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerConfigurer;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainer;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerClusterVerifier;
-import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 import com.yahoo.vespa.model.builder.xml.dom.NodesSpecification;
 import com.yahoo.vespa.model.container.Container;
@@ -727,17 +726,7 @@ public class ContentCluster extends AbstractConfigProducer implements
                         removedtags("thread").
                         tags("disk"));
 
-        Metrics userMetrics = getRoot().getAdmin().getUserMetrics();
-        Map<String, MetricsConsumer> consumers = userMetrics.getConsumers();
-        if (consumers != null) {
-            for (Map.Entry<String, MetricsConsumer> e : consumers.entrySet()) {
-                MetricsmanagerConfig.Consumer.Builder b = getMetricBuilder(e.getKey(), builder);
-                for (Metric m : e.getValue().getMetrics().values()) {
-                    b.addedmetrics(m.name);
-                }
-            }
-        }
-        consumers = getRoot().getAdmin().getLegacyUserMetricsConsumers();
+        Map<String, MetricsConsumer> consumers = getRoot().getAdmin().getLegacyUserMetricsConsumers();
         if (consumers != null) {
            for (Map.Entry<String, MetricsConsumer> e : consumers.entrySet()) {
                 MetricsmanagerConfig.Consumer.Builder b = getMetricBuilder(e.getKey(), builder);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index f3f7841e885..53456c627a4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -658,43 +658,7 @@ public class ContentClusterTest extends ContentBaseTest {
     }
 
     @Test
-    public void testConfiguredLegacyUserMetrics() throws Exception {
-        testConfiguredMetrics("  <metric-consumers>" +
-                "    <consumer name=\"foobar\">" +
-                "      <metric name=\"storage.foo.bar\"/>" +
-                "    </consumer>" +
-                "    <consumer name=\"log\">" +
-                "      <metric name=\"extralogmetric\"/>" +
-                "      <metric name=\"extralogmetric3\"/>" +
-                "    </consumer>" +
-                "    <consumer name=\"fleetcontroller\">" +
-                "      <metric name=\"extraextra\"/>" +
-                "    </consumer>" +
-                "  </metric-consumers>",
-                "");
-    }
-
-    @Test
-    public void testConfiguredUserMetrics() throws Exception {
-        testConfiguredMetrics("  <metrics>" +
-                "    <consumer id=\"foobar\">" +
-                "      <metric id=\"storage.foo.bar\"/>" +
-                "    </consumer>" +
-                "    <consumer id=\"log\">" +
-                "      <metric id=\"extralogmetric\"/>" +
-                "      <metric id=\"extralogmetric3\"/>" +
-                "    </consumer>" +
-                "    <consumer id=\"fleetcontroller\">" +
-                "      <metric id=\"extraextra\"/>" +
-                "    </consumer>" +
-                "  </metrics>",
-                ", feed.operations.rate, " +
-                        "content.proton.resource_usage.feeding_blocked.last, " +
-                        "cpu.util, cpu.sys.util, disk.limit, disk.used, disk.util, mem.limit, mem.used, mem.util, " +
-                        "cpu.busy.pct, mem.used.pct, mem.active.kb, mem.total.kb, used.kb");
-    }
-
-    private void testConfiguredMetrics(String userMetricsConfig, String defaultUserMetrics) throws Exception {
+    public void testConfiguredMetrics() throws Exception {
         String xml = "" +
             "<services>" +
             "<content version=\"1.0\" id=\"storage\">\n" +
@@ -710,7 +674,18 @@ public class ContentClusterTest extends ContentBaseTest {
             "<admin version=\"2.0\">" +
             "  <logserver hostalias=\"node0\"/>" +
             "  <adminserver hostalias=\"node0\"/>" +
-                userMetricsConfig +
+            "  <metric-consumers>" +
+            "    <consumer name=\"foobar\">" +
+            "      <metric name=\"storage.foo.bar\"/>" +
+            "    </consumer>" +
+            "    <consumer name=\"log\">" +
+            "      <metric name=\"extralogmetric\"/>" +
+            "      <metric name=\"extralogmetric3\"/>" +
+            "    </consumer>" +
+            "    <consumer name=\"fleetcontroller\">" +
+            "      <metric name=\"extraextra\"/>" +
+            "    </consumer>" +
+            "  </metric-consumers>" +
             "</admin>" +
             "</services>";
 
@@ -723,10 +698,10 @@ public class ContentClusterTest extends ContentBaseTest {
             model.getConfig(builder, "storage/storage/0");
             MetricsmanagerConfig config = new MetricsmanagerConfig(builder);
 
-            assertEquals("[storage.foo.bar" + defaultUserMetrics + "]", getConsumer("foobar", config).addedmetrics().toString());
+            assertEquals("[storage.foo.bar]", getConsumer("foobar", config).addedmetrics().toString());
             String expected =
                     "[extralogmetric\n" +
-                    "extralogmetric3" + defaultUserMetrics.replaceAll(", ", "\n") + "\n" +
+                    "extralogmetric3\n" +
                     "vds.filestor.alldisks.allthreads.put.sum\n" +
                     "vds.filestor.alldisks.allthreads.get.sum\n" +
                     "vds.filestor.alldisks.allthreads.remove.sum\n" +
@@ -743,7 +718,7 @@ public class ContentClusterTest extends ContentBaseTest {
             assertEquals(expected, actual);
             assertEquals("[logdefault]", getConsumer("log", config).tags().toString());
             expected =
-                    "[extraextra" + defaultUserMetrics.replaceAll(", ", "\n") + "\n" +
+                    "[extraextra\n" +
                     "vds.datastored.alldisks.docs\n" +
                     "vds.datastored.alldisks.bytes\n" +
                     "vds.datastored.alldisks.buckets]";
@@ -756,10 +731,10 @@ public class ContentClusterTest extends ContentBaseTest {
             model.getConfig(builder, "storage/distributor/0");
             MetricsmanagerConfig config = new MetricsmanagerConfig(builder);
 
-            assertEquals("[storage.foo.bar" + defaultUserMetrics + "]", getConsumer("foobar", config).addedmetrics().toString());
-            assertEquals("[extralogmetric, extralogmetric3" + defaultUserMetrics + ", vds.distributor.docsstored, vds.distributor.bytesstored, vds.idealstate.delete_bucket.done_ok, vds.idealstate.merge_bucket.done_ok, vds.idealstate.split_bucket.done_ok, vds.idealstate.join_bucket.done_ok, vds.idealstate.buckets_rechecking]", getConsumer("log", config).addedmetrics().toString());
+            assertEquals("[storage.foo.bar]", getConsumer("foobar", config).addedmetrics().toString());
+            assertEquals("[extralogmetric, extralogmetric3, vds.distributor.docsstored, vds.distributor.bytesstored, vds.idealstate.delete_bucket.done_ok, vds.idealstate.merge_bucket.done_ok, vds.idealstate.split_bucket.done_ok, vds.idealstate.join_bucket.done_ok, vds.idealstate.buckets_rechecking]", getConsumer("log", config).addedmetrics().toString());
             assertEquals("[logdefault]", getConsumer("log", config).tags().toString());
-            assertEquals("[extraextra" + defaultUserMetrics + "]", getConsumer("fleetcontroller", config).addedmetrics().toString());
+            assertEquals("[extraextra]", getConsumer("fleetcontroller", config).addedmetrics().toString());
         }
     }