Merge pull request #2920 from yahoo/bratseth/minimize-yamas

Bratseth/minimize yamas

25 files changed, 110 insertions, 131 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
index 8b051028f23..6c665affd1e 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
@@ -11,7 +11,7 @@ import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.*;
 import com.yahoo.vespa.model.*;
 import com.yahoo.vespa.model.admin.Admin;
-import com.yahoo.vespa.model.admin.monitoring.MonitoringSystem;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.utils.FreezableMap;
 
 import java.io.*;
@@ -435,15 +435,15 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce
     }
 
     // TODO: Make producers depend on AdminModel instead
-    /** Returns a monitoring service (yamas if that is configured, null otherwise) */
-    protected MonitoringSystem getMonitoringService() {
+    /** Returns a monitoring service if configured, null otherwise */
+    protected Monitoring getMonitoringService() {
         AbstractConfigProducerRoot root = getRoot();
         Admin admin = (root == null? null : root.getAdmin());
         if (admin == null) {
             return null;
         }
-        if (admin.getYamas() != null) {
-            return admin.getYamas();
+        if (admin.getMonitoring() != null) {
+            return admin.getMonitoring();
         }
         return null;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Service.java b/config-model/src/main/java/com/yahoo/vespa/model/Service.java
index 7c879c946ed..620e44bc11a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Service.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Service.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.api.ServiceInfo;
 import java.util.HashMap;
 import java.util.Optional;
 
-
 /**
  * Representation of a process which runs a service
  *
@@ -20,7 +19,7 @@ public interface Service extends ConfigProducer {
      * configuration.
      * TODO: Should change this to Optional of String
      */
-    public String getStartupCommand();
+    String getStartupCommand();
 
     /**
      * Services that wish that a command should be run before shutdown
@@ -28,32 +27,32 @@ public interface Service extends ConfigProducer {
      * by the config sentinel before sending SIGTERM to the service.
      * The command is executed without a timeout.
      */
-    public Optional<String> getPreShutdownCommand();
+    Optional<String> getPreShutdownCommand();
 
     /**
      * Tells if this service should be autostarted by
      * config-sentinel. Returned value will be used to configure the
      * config-sentinel.
      */
-    public boolean getAutostartFlag();
+    boolean getAutostartFlag();
 
     /**
      * Tells if this service should be autorestarted by
      * config-sentinel. Returned value will be used to configure the
      * config-sentinel.
      */
-    public boolean getAutorestartFlag();
+    boolean getAutorestartFlag();
 
     /**
      * Returns the type of service. E.g. the class-name without the
      * package prefix.
      */
-    public String getServiceType();
+    String getServiceType();
 
    /**
      * Returns the name that identifies this service for the config-sentinel.
      */
-    public String getServiceName();
+    String getServiceName();
 
     /**
      * Returns the desired base port for this service, or '0' if this
@@ -61,7 +60,7 @@ public interface Service extends ConfigProducer {
      *
      * @return The desired base port for this service.
      */
-    public int getWantedPort();
+    int getWantedPort();
 
     /**
      * Returns true if the desired base port (returned by
@@ -70,37 +69,37 @@ public interface Service extends ConfigProducer {
      *
      * @return true if this Service requires the wanted base port.
      */
-    public boolean requiresWantedPort();
+    boolean requiresWantedPort();
 
     /**
      * Returns the number of ports needed by this service.
      */
-    public int getPortCount();
+    int getPortCount();
 
     /**
      * Returns a PortsMeta object, giving access to more information
      * about the different ports of this service.
      */
-    public PortsMeta getPortsMeta();
+    PortsMeta getPortsMeta();
 
     /**
      * @return the physical host on which this service runs.
      */
-    public Host getHost();
+    Host getHost();
 
     /**
      * Get meta information about service.
      * @return an instance of {@link com.yahoo.config.model.api.ServiceInfo}
      */
-    public ServiceInfo getServiceInfo();
+    ServiceInfo getServiceInfo();
 
     /**
      * @return The hostname on which this service runs.
      */
-    public String getHostName();
+    String getHostName();
 
     /** Optional JVM execution args for this service */
-    public String getJvmArgs();
+    String getJvmArgs();
 
     /**
      * Computes and returns the i'th port for this service, based on
@@ -110,7 +109,7 @@ public interface Service extends ConfigProducer {
      * @return the i'th port relative to the base port.
      * @throws IllegalStateException if i is out of range.
      */
-    public int getRelativePort(int i);
+    int getRelativePort(int i);
 
     /**
      * Gets a service property value mapped to the given key
@@ -120,23 +119,21 @@ public interface Service extends ConfigProducer {
      * @param defStr default String value returned if no value for key found
      * @return the associated String value for the given key, or
      */
-    public String getServicePropertyString(String key, String defStr);
+    String getServicePropertyString(String key, String defStr);
 
-    /**
-     * @return the service health port, to report status to yamas
-     */
-    public int getHealthPort();
+    int getHealthPort();
 
     /**
      *
      * @return HashMap of default dimensions for metrics.
      */
-    public HashMap<String,String> getDefaultMetricDimensions();
+    HashMap<String,String> getDefaultMetricDimensions();
 
     /**
      * Return the Affinity of this service if it has.
      *
      * @return The {@link com.yahoo.vespa.model.Affinity} for this service.
      */
-    public Optional<Affinity> getAffinity();
+    Optional<Affinity> getAffinity();
+
 }
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 c8d6e1dcc99..83ad5f715dd 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
@@ -11,7 +11,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.model.*;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
-import com.yahoo.vespa.model.admin.monitoring.Yamas;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
@@ -36,7 +36,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private final Yamas yamas;
+    private final Monitoring monitoring;
     private final Metrics metrics;
     private final Map<String, MetricsConsumer> legacyMetricsConsumers;
     private final List<Configserver> configservers = new ArrayList<>();
@@ -56,12 +56,12 @@ public class Admin extends AbstractConfigProducer implements Serializable {
     private final boolean multitenant;
 
     public Admin(AbstractConfigProducer parent,
-                 Yamas yamas,
+                 Monitoring monitoring,
                  Metrics metrics,
                  Map<String, MetricsConsumer> legacyMetricsConsumers,
                  boolean multitenant) {
         super(parent, "admin");
-        this.yamas = yamas;
+        this.monitoring = monitoring;
         this.metrics = metrics;
         this.legacyMetricsConsumers = legacyMetricsConsumers;
         this.multitenant = multitenant;
@@ -71,9 +71,9 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         return defaultConfigserver;
     }
 
-    /** Returns the configured yamas end point. Is null if yamas is not configured */
-    public Yamas getYamas() {
-        return yamas;
+    /** Returns the configured monitoring endpoint, or null if not configured */
+    public Monitoring getMonitoring() {
+        return monitoring;
     }
 
     public Metrics getUserMetrics() { return metrics; }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AbstractMonitoringSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java
index a47f6154c87..e53f92822b5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/AbstractMonitoringSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMonitoring.java
@@ -4,19 +4,16 @@ package com.yahoo.vespa.model.admin.monitoring;
 import java.util.Objects;
 
 /**
- *
- * Represents an abstract monitoring service
+ * Monitoring service properties
  *
  * @author hmusum
- * @since 5.1.20
- *
-*/
-class AbstractMonitoringSystem implements MonitoringSystem {
+ */
+public class DefaultMonitoring implements Monitoring {
 
     private final Integer interval;
     private final String clustername;
 
-    public AbstractMonitoringSystem(String clustername, Integer interval) {
+    public DefaultMonitoring(String clustername, Integer interval) {
         Objects.requireNonNull(clustername);
         Objects.requireNonNull(interval);
         this.clustername = clustername;
@@ -39,3 +36,5 @@ class AbstractMonitoringSystem implements MonitoringSystem {
     }
 
 }
+
+
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MonitoringSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/Monitoring.java
index 6e3967ae63e..bba08cccd68 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MonitoringSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/Monitoring.java
@@ -2,23 +2,25 @@
 package com.yahoo.vespa.model.admin.monitoring;
 
 /**
- * Interface for different monitoring services
+ * Interface for monitoring services
  *
  * @author hmusum
  */
-public interface MonitoringSystem {
+public interface Monitoring {
+
     /**
      * @return Snapshot interval in minutes
      */
-    public Integer getInterval();
+    Integer getInterval();
 
     /**
      * @return Snapshot interval in seconds.
      */
-    public Integer getIntervalSeconds();
+    Integer getIntervalSeconds();
 
     /**
      * @return the monitoring cluster name
      */
-    public String getClustername();
+    String getClustername();
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/Yamas.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/Yamas.java
deleted file mode 100644
index ab67d2efe10..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/Yamas.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.admin.monitoring;
-
-import java.io.Serializable;
-
-/**
- * Properties for yamas monitoring service
- *
- * @author hmusum
- * @since 5.1.20
- */
-public class Yamas extends AbstractMonitoringSystem implements Serializable {
-
-    public Yamas(String clustername, Integer interval) {
-        super(clustername, interval);
-    }
-
-}
-
-
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 f69a1c605b5..908481aad63 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
@@ -10,7 +10,8 @@ import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.HostSystem;
 import com.yahoo.vespa.model.admin.*;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
-import com.yahoo.vespa.model.admin.monitoring.Yamas;
+import com.yahoo.vespa.model.admin.monitoring.DefaultMonitoring;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
 import com.yahoo.vespa.model.admin.monitoring.builder.xml.MetricsBuilder;
 import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
@@ -62,14 +63,14 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
 
     @Override
     protected Admin doBuild(AbstractConfigProducer parent, Element adminElement) {
-        Yamas yamas = getYamas(XML.getChild(adminElement, "yamas"));
+        Monitoring monitoring = getMonitoring(getChildWithFallback(adminElement, "monitoring", "yamas"));
 
         Metrics metrics = new MetricsBuilder(applicationType, predefinedMetricSets)
                 .buildMetrics(XML.getChild(adminElement, "metrics"));
         Map<String, MetricsConsumer> legacyMetricsConsumers = DomMetricBuilderHelper
                 .buildMetricsConsumers(XML.getChild(adminElement, "metric-consumers"));
 
-        Admin admin = new Admin(parent, yamas, metrics, legacyMetricsConsumers, multitenant);
+        Admin admin = new Admin(parent, monitoring, metrics, legacyMetricsConsumers, multitenant);
 
         doBuildAdmin(admin, adminElement);
 
@@ -79,21 +80,22 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
         admin.setFileDistribution(new FileDistributionConfigProducer.Builder(fileDistributionOptions).build(parent, fileRegistry));
         return admin;
     }
+    
+    private Element getChildWithFallback(Element parent, String childName, String alternativeChildName) {
+        Element child = XML.getChild(parent, childName);
+        if (child != null) return child;
+        return XML.getChild(parent, alternativeChildName);
+    }
 
     protected abstract void doBuildAdmin(Admin admin, Element adminE);
 
-    private Yamas getYamas(Element yamasE) {
-        Yamas yamas;
-        if (yamasE == null) {
-            yamas = new Yamas(DEFAULT_CLUSTER_NAME, DEFAULT_INTERVAL);
-        } else {
-            Integer minutes = getMonitoringInterval(yamasE);
-            if (minutes == null) {
-                minutes = DEFAULT_INTERVAL;
-            }
-            yamas = new Yamas(yamasE.getAttribute("systemname"), minutes);
-        }
-        return yamas;
+    private Monitoring getMonitoring(Element monitoringElement) {
+        if (monitoringElement == null) return new DefaultMonitoring(DEFAULT_CLUSTER_NAME, DEFAULT_INTERVAL);
+
+        Integer minutes = getMonitoringInterval(monitoringElement);
+        if (minutes == null)
+            minutes = DEFAULT_INTERVAL;
+        return new DefaultMonitoring(monitoringElement.getAttribute("systemname"), minutes);
     }
 
     private Integer getMonitoringInterval(Element monitoringE) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java
index 4718d496c36..4c1fdd3f92c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomMetricBuilderHelper.java
@@ -16,12 +16,11 @@ import java.util.Set;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID;
 
 /**
- * Helper class for parsing yamasmetric config.
+ * Helper class for parsing metric config.
  *
  * TODO: Remove when 'metric-consumers' under 'admin' is disallowed
  *
- * @author trygve
- * @since 5.1
+ * @author Trygve Berdal
  */
 public class DomMetricBuilderHelper {
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index bf332d6f244..8af6f94d903 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -55,7 +55,7 @@ import com.yahoo.search.query.profile.config.QueryProfilesConfig;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
 import com.yahoo.vespa.model.PortsMeta;
 import com.yahoo.vespa.model.Service;
-import com.yahoo.vespa.model.admin.monitoring.MonitoringSystem;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.clients.ContainerDocumentApi;
 import com.yahoo.vespa.model.container.component.AccessLogComponent;
 import com.yahoo.vespa.model.container.component.Component;
@@ -626,9 +626,9 @@ public final class ContainerCluster
 
     @Override
     public void getConfig(HealthMonitorConfig.Builder builder) {
-        MonitoringSystem monitoringSystem = getMonitoringService();
-        if (monitoringSystem != null) {
-            builder.snapshot_interval(monitoringSystem.getIntervalSeconds());
+        Monitoring monitoring = getMonitoringService();
+        if (monitoring != null) {
+            builder.snapshot_interval(monitoring.getIntervalSeconds());
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/StatisticsComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/StatisticsComponent.java
index 5d77780a1e6..b35d2319666 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/StatisticsComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/StatisticsComponent.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.component;
 
-import com.yahoo.vespa.model.admin.monitoring.MonitoringSystem;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.container.StatisticsConfig;
 
 /**
@@ -15,11 +15,11 @@ public class StatisticsComponent extends SimpleComponent implements StatisticsCo
     
     @Override
     public void getConfig(StatisticsConfig.Builder builder) {
-        MonitoringSystem monitoringSystem = getMonitoringService();
-        if (monitoringSystem != null) {
+        Monitoring monitoring = getMonitoringService();
+        if (monitoring != null) {
             builder.
-                collectionintervalsec(monitoringSystem.getIntervalSeconds().doubleValue()).
-                loggingintervalsec(monitoringSystem.getIntervalSeconds().doubleValue());
+                collectionintervalsec(monitoring.getIntervalSeconds().doubleValue()).
+                loggingintervalsec(monitoring.getIntervalSeconds().doubleValue());
         }
         builder.values(new StatisticsConfig.Values.Builder().
                 name("query_latency").
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 218ff472b2a..dbdbb8c58aa 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
@@ -23,7 +23,7 @@ import com.yahoo.vespa.model.Service;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.admin.monitoring.Metric;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
-import com.yahoo.vespa.model.admin.monitoring.MonitoringSystem;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerCluster;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerComponent;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerConfigurer;
@@ -48,7 +48,6 @@ import org.w3c.dom.Element;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * A content cluster.
@@ -650,10 +649,10 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
 
     @Override
     public void getConfig(MetricsmanagerConfig.Builder builder) {
-        MonitoringSystem monitoringSystem = getMonitoringService();
-        if (monitoringSystem != null) {
+        Monitoring monitoring = getMonitoringService();
+        if (monitoring != null) {
             builder.snapshot(new MetricsmanagerConfig.Snapshot.Builder().
-                    periods(monitoringSystem.getIntervalSeconds()).periods(300));
+                    periods(monitoring.getIntervalSeconds()).periods(300));
         }
         builder.consumer(
                 new MetricsmanagerConfig.Consumer.Builder().
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 7a3ded592bd..74e508849e9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -15,7 +15,7 @@ import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.config.storage.StorDevicesConfig;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.admin.monitoring.MonitoringSystem;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder;
 import com.yahoo.vespa.model.content.ContentNode;
@@ -294,7 +294,7 @@ public class SearchNode extends AbstractService implements
 
     @Override
     public void getConfig(MetricsmanagerConfig.Builder builder) {
-        MonitoringSystem point = getMonitoringService();
+        Monitoring point = getMonitoringService();
         if (point != null) {
             builder.snapshot(new MetricsmanagerConfig.Snapshot.Builder().
                     periods(point.getIntervalSeconds()).periods(300));
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc
index e2f15fc51e4..f475a05b979 100644
--- a/config-model/src/main/resources/schema/admin.rnc
+++ b/config-model/src/main/resources/schema/admin.rnc
@@ -11,7 +11,7 @@ AdminV2 =
    (ConfigServer | ConfigServers)? &
    FileDistribution? &
    AdminSlobroks? &
-   AdminYamas? &
+   (LegacyAdminMonitoring | AdminMonitoring)? &
    (LegacyMetricConsumers | Metrics)? &
    ClusterControllers?
  }
@@ -29,7 +29,7 @@ AdminV4 =
     element minSlobroksPerCluster { xsd:positiveInteger }? &
     AdminV4Slobroks? &
     AdminV4LogServers? &
-    AdminYamas? &
+    (LegacyAdminMonitoring | AdminMonitoring)? &
     (LegacyMetricConsumers | Metrics)?
   }
 
@@ -51,14 +51,14 @@ AdminSlobroks =
       }+
    }
 
-AdminYmon =
-   element ymon {
-      attribute endpoint { xsd:anyURI { minLength = "1" } }?,
-      attribute clustername { xsd:NCName }?,
-      attribute interval { xsd:int }?
+AdminMonitoring =
+   element monitoring {
+      attribute interval { xsd:int }?,
+      attribute systemname { xsd:string }?
    }
 
-AdminYamas =
+# TODO: Alternative name for the 'monitoring' tag. Remove on Vespa 7
+LegacyAdminMonitoring =
    element yamas {
       attribute interval { xsd:int }?,
       attribute systemname { xsd:string }?
@@ -90,6 +90,7 @@ Metrics = element metrics {
     }+
 }
 
+# TODO: Remove on Vespa 7
 LegacyMetricConsumers = element metric-consumers {
     element consumer {
         attribute name { xsd:string { pattern = "[a-zA-Z][_a-zA-Z0-9]*" } }&
diff --git a/config-model/src/test/cfg/admin/metricconfig/services.xml b/config-model/src/test/cfg/admin/metricconfig/services.xml
index 1e4c9e6e549..a2a03ca0b08 100644
--- a/config-model/src/test/cfg/admin/metricconfig/services.xml
+++ b/config-model/src/test/cfg/admin/metricconfig/services.xml
@@ -4,7 +4,7 @@
     <admin version="2.0">
         <adminserver hostalias="node1"/>
         <logserver hostalias="node1"/>
-        <yamas interval="60"/>
+        <monitoring interval="60"/>
         <metric-consumers>
             <consumer name="fooConsumer">
                 <metric name="some.foo.metric" output-name="someFooMetric"/>
diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml
index ffcef775844..116b7f6e4c5 100644
--- a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml
+++ b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml
@@ -4,7 +4,7 @@
     <admin version="2.0">
         <adminserver hostalias="node1"/>
         <logserver hostalias="node1"/>
-        <yamas systemname="news_staging" interval="60"/>
+        <monitoring systemname="news_staging" interval="60"/>
     </admin>
 
     <container version="1.0">
diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml b/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml
index 2a8c30844dd..7e899ee0578 100644
--- a/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml
+++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/services.xml
@@ -5,7 +5,7 @@
   <admin version="2.0">
     <adminserver hostalias="node0"/>
     <logserver hostalias="node0"/>
-    <yamas interval="60"/>
+    <monitoring interval="60"/>
   </admin>
 
   <content version="1.0">
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 f2197e3b2b8..c196318bde2 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
@@ -11,7 +11,7 @@ import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.monitoring.Metric;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
-import com.yahoo.vespa.model.admin.monitoring.Yamas;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
@@ -69,9 +69,9 @@ public class DedicatedAdminV4Test {
         assertHostContainsServices(model, "hosts/myhost2",
                                    "logserver", "logd", "filedistributorservice");
 
-        Yamas yamas = model.getAdmin().getYamas();
-        assertEquals("vespa.routing", yamas.getClustername());
-        assertEquals(60L, (long) yamas.getIntervalSeconds());
+        Monitoring monitoring = model.getAdmin().getMonitoring();
+        assertEquals("vespa.routing", monitoring.getClustername());
+        assertEquals(60L, (long) monitoring.getIntervalSeconds());
 
         MetricsConsumer consumer = model.getAdmin().getLegacyUserMetricsConsumers().get(VESPA_CONSUMER_ID);
         assertNotNull(consumer);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
index 491c6365106..8bd62789d52 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
@@ -9,7 +9,7 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.admin.*;
-import com.yahoo.vespa.model.admin.monitoring.Yamas;
+import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Element;
@@ -152,7 +152,7 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
     @Test
     public void basicYamasNoXml() {
         Admin admin = buildAdmin(servicesNoYamas());
-        Yamas y = admin.getYamas();
+        Monitoring y = admin.getMonitoring();
         assertThat(y.getClustername(), is("vespa"));
         assertThat(y.getInterval(), is(1));
     }
@@ -166,7 +166,7 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
     @Test
     public void basicYamasXml() {
         Admin admin = buildAdmin(servicesYamas());
-        Yamas y = admin.getYamas();
+        Monitoring y = admin.getMonitoring();
         assertThat(y.getClustername(), is("foo"));
         assertThat(y.getInterval(), is(1));
     }
@@ -174,7 +174,7 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
     @Test
     public void yamasWithIntervalOverride() {
         Admin admin = buildAdmin(servicesYamasIntervalOverride());
-        Yamas y = admin.getYamas();
+        Monitoring y = admin.getMonitoring();
         assertThat(y.getClustername(), is("foo"));
         assertThat(y.getInterval(), is(5));
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/YamasConfigSnoopTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/MonitoringConfigSnoopTest.java
index b7bac3e4387..6e0ab655128 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/YamasConfigSnoopTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/MonitoringConfigSnoopTest.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertThat;
 /**
  * @author havardpe
  **/
-public class YamasConfigSnoopTest {
+public class MonitoringConfigSnoopTest {
 
     private TestRoot root;
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
index 75cfca075b0..3a2633ed7b7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
@@ -11,7 +11,7 @@ import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.admin.Admin;
-import com.yahoo.vespa.model.admin.monitoring.Yamas;
+import com.yahoo.vespa.model.admin.monitoring.DefaultMonitoring;
 import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import org.w3c.dom.Document;
@@ -57,7 +57,7 @@ public class ContentClusterUtils {
 
     public static ContentCluster createCluster(String clusterXml, MockRoot root) throws Exception {
         Document doc = XML.getDocument(clusterXml);
-        Admin admin = new Admin(root, new Yamas("vespa", 60), new Metrics(), Collections.emptyMap(), false);
+        Admin admin = new Admin(root, new DefaultMonitoring("vespa", 60), new Metrics(), Collections.emptyMap(), false);
         ConfigModelContext context = ConfigModelContext.create(null, root.getDeployState(), null, root, null);
         
         return new ContentCluster.Builder(admin).build(Collections.emptyList(), context, doc.getDocumentElement());
diff --git a/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml b/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml
index 05717669408..3ff6758880b 100644
--- a/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml
+++ b/config-model/src/test/schema-test-files/services-hosted-infrastructure.xml
@@ -5,7 +5,7 @@
   <admin version="4.0">
     <slobroks><nodes count="3" flavor="small"/></slobroks>
     <logservers><nodes count="1" dedicated="true"/></logservers>
-    <yamas systemname="vespa.routing" interval="60" />
+    <monitoring systemname="vespa.routing" interval="60" />
     <metric-consumers>
       <consumer name="yamas">
         <metric name="upstreams_generated" />
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java
index 2cccee1e066..6a3a4c72bef 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/DimensionMetrics.java
@@ -26,9 +26,9 @@ public class DimensionMetrics {
 
     Map<String, Object> getMetrics() {
         final Map<String, Object> routing = new HashMap<>();
-        final Map<String, Object> routingYamas = new HashMap<>();
-        routing.put("yamas", routingYamas);
-        routingYamas.put("namespaces", Collections.singletonList("Vespa"));
+        final Map<String, Object> routingMonitoring = new HashMap<>();
+        routing.put("yamas", routingMonitoring);
+        routingMonitoring.put("namespaces", Collections.singletonList("Vespa"));
 
         Map<String, Object> report = new HashMap<>();
         report.put("application", application);
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
index 31edf49e80e..3ff39819776 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 
 /**
  * Export metrics to both /state/v1/metrics and makes them available programmatically.
- * Each metric belongs to a yamas application
+ * Each metric belongs to a monitoring application
  *
  * @author freva
  */
@@ -108,7 +108,7 @@ public class MetricReceiverWrapper {
         return applicationMetrics.get(application).metricsByDimensions();
     }
 
-    // Application is yamas application, not Vespa application
+    // "Application" is the monitoring application, not Vespa application
     private static class ApplicationMetrics {
         private final Map<Dimensions, Map<String, MetricValue>> metricsByDimensions = new LinkedHashMap<>();
 
diff --git a/metrics/src/vespa/metrics/metricset.h b/metrics/src/vespa/metrics/metricset.h
index 519ea71d67f..5851cdea43c 100644
--- a/metrics/src/vespa/metrics/metricset.h
+++ b/metrics/src/vespa/metrics/metricset.h
@@ -22,7 +22,7 @@ class MetricSet : public Metric
     bool _registrationAltered; // Set to true if metrics have been
                                // registered/unregistered since last time
                                // it was reset
-    std::string _dimensionKey; // If this metric is part of a dimension (yamas-speak),
+    std::string _dimensionKey; // If this metric is part of a monitoring dimension,
                                // the key of the dimension should be set here.
                                // If so, the name of the metric is used as dimension value.
 
diff --git a/searchcore/src/vespa/searchcore/config/fdispatchrc.def b/searchcore/src/vespa/searchcore/config/fdispatchrc.def
index cce62263125..e00e35c43a0 100644
--- a/searchcore/src/vespa/searchcore/config/fdispatchrc.def
+++ b/searchcore/src/vespa/searchcore/config/fdispatchrc.def
@@ -33,7 +33,7 @@ defaultslowquerylimitfactor     double       default=2.0 restart
 ## If 0, fdispatch will not offer RPC service.
 frtport                         int         default=0 restart
 
-## Port to use for yamas health reporting
+## Port for health reporting
 healthport int default=0 restart
 
 ## The maximum time between successful reads on a socket before timeout.