Merge pull request #9610 from vespa-engine/revert-9602-revert-9501-gjoranv/switch-to-new-metricsproxy

Reapply "Switch to new metrics proxy."

7 files changed, 37 insertions, 30 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 44627ade4ec..44c10b0738b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -208,8 +208,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         if (slobroks.isEmpty()) // TODO: Move to caller
             slobroks.addAll(createDefaultSlobrokSetup(deployState.getDeployLogger()));
 
-        if (deployState.getProperties().enableMetricsProxyContainer())
-            addMetricsProxyCluster(hosts, deployState);
+        addMetricsProxyCluster(hosts, deployState);
 
         for (HostResource host : hosts) {
             if (!host.getHost().runsConfigServer()) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java
index dc72fb8a42b..074ff610e9a 100644
--- a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java
@@ -116,7 +116,7 @@ public class SystemModelTestCase {
 
         // all three host aliases are for the same host, so the number of services should be 3 + 8
         // (3 simpleservices and logd, configproxy, config sentinel, admin server config server, slobrok, logserver and metricsproxy)
-        assertEquals(9, host1.getServices().size());
+        assertEquals(10, host1.getServices().size());
 
         assertNotNull(host1.getService("simpleservice"));
         assertNotNull(host1.getService("simpleservice2"));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index b7ceb0923b7..a490b7afd4c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -29,6 +29,7 @@ import org.junit.Test;
 
 import java.util.Set;
 
+import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -101,12 +102,12 @@ public class AdminTestCase {
         SentinelConfig.Builder b = new SentinelConfig.Builder();
         vespaModel.getConfig(b, localhostConfigId);
         SentinelConfig sentinelConfig = new SentinelConfig(b);
-        assertThat(sentinelConfig.service().size(), is(4));
+        assertThat(sentinelConfig.service().size(), is(5));
         assertThat(sentinelConfig.service(0).name(), is("logserver"));
         assertThat(sentinelConfig.service(1).name(), is("slobrok"));
         assertThat(sentinelConfig.service(2).name(), is("slobrok2"));
-        //assertThat(sentinelConfig.service(3).name(), is(METRICS_PROXY_CONTAINER.serviceName));
-        assertThat(sentinelConfig.service(3).name(), is("logd"));
+        assertThat(sentinelConfig.service(3).name(), is(METRICS_PROXY_CONTAINER.serviceName));
+        assertThat(sentinelConfig.service(4).name(), is("logd"));
     }
 
     /**
@@ -137,11 +138,11 @@ public class AdminTestCase {
         SentinelConfig.Builder b = new SentinelConfig.Builder();
         vespaModel.getConfig(b, localhostConfigId);
         SentinelConfig sentinelConfig = new SentinelConfig(b);
-        assertThat(sentinelConfig.service().size(), is(3));
+        assertThat(sentinelConfig.service().size(), is(4));
         assertThat(sentinelConfig.service(0).name(), is("logserver"));
         assertThat(sentinelConfig.service(1).name(), is("slobrok"));
-        //assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName));
-        assertThat(sentinelConfig.service(2).name(), is("logd"));
+        assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName));
+        assertThat(sentinelConfig.service(3).name(), is("logd"));
         assertThat(sentinelConfig.service(0).affinity().cpuSocket(), is(-1));
         assertTrue(sentinelConfig.service(0).preShutdownCommand().isEmpty());
 
@@ -292,11 +293,11 @@ public class AdminTestCase {
         TestRoot root = new TestDriver().buildModel(state);
         String localhost = HostName.getLocalhost();
         SentinelConfig sentinelConfig = root.getConfig(SentinelConfig.class, "hosts/" + localhost);
-        assertThat(sentinelConfig.service().size(), is(3));
+        assertThat(sentinelConfig.service().size(), is(4));
         assertThat(sentinelConfig.service(0).name(), is("logserver"));
         assertThat(sentinelConfig.service(1).name(), is("slobrok"));
-        //assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName));
-        assertThat(sentinelConfig.service(2).name(), is("logd"));
+        assertThat(sentinelConfig.service(2).name(), is(METRICS_PROXY_CONTAINER.serviceName));
+        assertThat(sentinelConfig.service(3).name(), is("logd"));
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index fc10e941091..77f31993a7f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -75,10 +75,13 @@ public class DedicatedAdminV4Test {
         VespaModel model = createModel(hosts, services);
         assertEquals(3, model.getHosts().size());
 
-        assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd");
-        assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd");
-        // Note: A container is always added on logserver host
-        assertHostContainsServices(model, "hosts/myhost2", "logserver", "logd", LOGSERVER_CONTAINER.serviceName);
+        assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd",
+                                   METRICS_PROXY_CONTAINER.serviceName);
+        assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd",
+                                   METRICS_PROXY_CONTAINER.serviceName);
+        // Note: A logserver container is always added on logserver host
+        assertHostContainsServices(model, "hosts/myhost2", "logserver", "logd",
+                                   METRICS_PROXY_CONTAINER.serviceName, LOGSERVER_CONTAINER.serviceName);
 
         Monitoring monitoring = model.getAdmin().getMonitoring();
         assertEquals("vespa.routing", monitoring.getClustername());
@@ -131,13 +134,13 @@ public class DedicatedAdminV4Test {
 
         // 4 slobroks, 2 per cluster where possible
         assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver",
-                                   QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
         assertHostContainsServices(model, "hosts/myhost1", "slobrok", "logd",
-                                   QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
         assertHostContainsServices(model, "hosts/myhost2", "slobrok", "logd",
-                                   QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
         assertHostContainsServices(model, "hosts/myhost3", "slobrok", "logd",
-                                   QRSERVER.serviceName);
+                                   METRICS_PROXY_CONTAINER.serviceName, QRSERVER.serviceName);
     }
 
     @Test
@@ -155,10 +158,13 @@ public class DedicatedAdminV4Test {
         VespaModel model = createModel(hosts, services);
         assertEquals(3, model.getHosts().size());
 
-        assertHostContainsServices(model, "hosts/myhost0", "logd", "logforwarder", "slobrok");
-        assertHostContainsServices(model, "hosts/myhost1", "logd", "logforwarder", "slobrok");
-        // Note: A container is always added on logserver host
-        assertHostContainsServices(model, "hosts/myhost2", "logd", "logforwarder", "logserver", LOGSERVER_CONTAINER.serviceName);
+        assertHostContainsServices(model, "hosts/myhost0", "logd", "logforwarder", "slobrok",
+                                   METRICS_PROXY_CONTAINER.serviceName);
+        assertHostContainsServices(model, "hosts/myhost1", "logd", "logforwarder", "slobrok",
+                                   METRICS_PROXY_CONTAINER.serviceName);
+        // Note: A logserver container is always added on logserver host
+        assertHostContainsServices(model, "hosts/myhost2", "logd", "logforwarder", "logserver",
+                                   METRICS_PROXY_CONTAINER.serviceName, LOGSERVER_CONTAINER.serviceName);
 
         Set<String> configIds = model.getConfigIds();
         // 1 logforwarder on each host
@@ -203,8 +209,9 @@ public class DedicatedAdminV4Test {
                 .zone(new Zone(SystemName.cd, Environment.dev, RegionName.defaultName()))
                 .properties(new TestProperties().setHostedVespa(true)));
         assertEquals(1, model.getHosts().size());
-        // Should create a container on the same node as logserver
-        assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver", LOGSERVER_CONTAINER.serviceName);
+        // Should create a logserver container on the same node as logserver
+        assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver",
+                                   METRICS_PROXY_CONTAINER.serviceName , LOGSERVER_CONTAINER.serviceName);
     }
 
     private Set<String> serviceNames(VespaModel model, String hostname) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
index 01f868d2ad7..3fbfbf33fb3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
@@ -58,10 +58,10 @@ public class ConfigValueChangeValidatorTest {
                 createVespaModel(createQrStartConfigSegment(true, 2096)),
                 createVespaModel(createQrStartConfigSegment(false, 2096))
         );
-        assertEquals(2, changes.size());
+        assertEquals(3, changes.size());
         assertComponentsEquals(changes, "default/container.0", 0);
         assertComponentsEquals(changes, "admin/cluster-controllers/0", 1);
-        //assertComponentsEquals(changes, "admin/metrics/0", 2);
+        assertComponentsEquals(changes, "admin/metrics/metricsproxy.0", 2);
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index 6a5e3bcb9d6..e7a1cbd6d8b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -241,7 +241,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         String [] expectedServices = {
                 "logd", "configproxy", "config-sentinel", "configserver", "logserver",
                 "slobrok", "storagenode", "distributor","searchnode","transactionlogserver",
-                CLUSTERCONTROLLER_CONTAINER.serviceName
+                CLUSTERCONTROLLER_CONTAINER.serviceName, METRICS_PROXY_CONTAINER.serviceName
         };
         assertServices(h, expectedServices);
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index 5f6cec00b0c..a5284ac8720 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -265,7 +265,7 @@ public class VespaModelTestCase {
         assertThat(hosts.size(), is(1));
         //logd, config proxy, sentinel, config server, slobrok, log server
         HostInfo host = hosts.iterator().next();
-        assertThat(host.getServices().size(), is(6));
+        assertThat(host.getServices().size(), is(7));
         new LogdConfig((LogdConfig.Builder) model.getConfig(new LogdConfig.Builder(), "admin/model"));
 
     }