Merge pull request #11697 from vespa-engine/revert-11685-gjoranv/disallow-systemname-for-hosted

Revert "Disallow the admin/monitoring element for hosted Vespa."

3 files changed, 4 insertions, 59 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index 859a1c2eaea..9de777a96ef 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -69,7 +69,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
 
     @Override
     protected Admin doBuild(DeployState deployState, AbstractConfigProducer parent, Element adminElement) {
-        Monitoring monitoring = getMonitoring(XML.getChild(adminElement,"monitoring"), deployState.isHosted());
+        Monitoring monitoring = getMonitoring(XML.getChild(adminElement,"monitoring"));
         Metrics metrics = new MetricsBuilder(applicationType, predefinedMetricSets)
                 .buildMetrics(XML.getChild(adminElement, "metrics"));
         FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent);
@@ -88,9 +88,8 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
 
     protected abstract void doBuildAdmin(DeployState deployState, Admin admin, Element adminE);
 
-    private Monitoring getMonitoring(Element monitoringElement, boolean isHosted) {
+    private Monitoring getMonitoring(Element monitoringElement) {
         if (monitoringElement == null) return new DefaultMonitoring(DEFAULT_CLUSTER_NAME, DEFAULT_INTERVAL);
-        if (isHosted) throw new IllegalArgumentException("The 'monitoring' element cannot be used on hosted Vespa.");
 
         Integer minutes = getMonitoringInterval(monitoringElement);
         if (minutes == null)
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 12cc7727153..6164b311da0 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
@@ -58,6 +58,7 @@ import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -313,8 +314,7 @@ public class MetricsProxyContainerClusterTest {
     }
 
     private static String servicesWithAdminOnly() {
-        return String.join("\n",
-                           "<services>",
+        return String.join("\n", "<services>",
                            "    <admin version='4.0'>",
                            "        <adminserver hostalias='node1'/>",
                            "    </admin>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MonitoringElementTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MonitoringElementTest.java
deleted file mode 100644
index c218b34afc5..00000000000
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MonitoringElementTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.yahoo.vespa.model.admin.metricsproxy;
-
-import ai.vespa.metricsproxy.core.MonitoringConfig;
-import com.yahoo.vespa.model.VespaModel;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CLUSTER_CONFIG_ID;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.hosted;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted;
-import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author gjoranv
- */
-public class MonitoringElementTest {
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void monitoring_element_is_disallowed_for_hosted_vespa() {
-        String services = servicesWithMonitoringElement();
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("The 'monitoring' element cannot be used");
-        getModel(services, hosted);
-    }
-
-    @Test
-    public void monitoring_element_is_allowed_for_self_hosted_vespa() {
-        String services = servicesWithMonitoringElement();
-        VespaModel model = getModel(services, self_hosted);
-
-        var builder = new MonitoringConfig.Builder();
-        model.getConfig(builder, CLUSTER_CONFIG_ID);
-        MonitoringConfig config = builder.build();
-
-        assertEquals(5, config.intervalMinutes());
-        assertEquals("my-system", config.systemName());
-    }
-
-    private String servicesWithMonitoringElement() {
-        return String.join("\n",
-                           "<services>",
-                           "    <admin version='4.0'>",
-                           "        <monitoring interval='300' systemname='my-system' />",
-                           "    </admin>",
-                           "</services>"
-        );
-    }
-
-}