Remove one duplicate of monitoring config default values.

- They are still duplicated in DomAdminBuilderBase.
- Align def file value with default in DomAdminBuilderBase.

2 files changed, 10 insertions, 16 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index 283b8815981..1d195b3bc0a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -61,13 +61,10 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
 {
     public static final Logger log = Logger.getLogger(MetricsProxyContainerCluster.class.getName());
 
-    static final String METRICS_PROXY_NAME = "metrics-proxy";
+    private static final String METRICS_PROXY_NAME = "metrics-proxy";
     static final Path METRICS_PROXY_BUNDLE_FILE = absoluteBundlePath((Paths.get(METRICS_PROXY_NAME + JAR_WITH_DEPS.suffix)));
     static final String METRICS_PROXY_BUNDLE_NAME = "com.yahoo.vespa." + METRICS_PROXY_NAME;
 
-    static final String DEFAULT_NAME_IN_MONITORING_SYSTEM = "vespa";
-    static final int DEFAULT_MONITORING_INTERVAL = 1;
-
     static final class AppDimensionNames {
         static final String ZONE = "zone";
         static final String APPLICATION_ID = "applicationId";  // tenant.app.instance
@@ -109,8 +106,8 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
 
     @Override
     public void getConfig(MonitoringConfig.Builder builder) {
-        builder.systemName(getSystemName())
-                .intervalMinutes(getIntervalMinutes());
+        getSystemName().ifPresent(builder::systemName);
+        getIntervalMinutes().ifPresent(builder::intervalMinutes);
     }
 
     @Override
@@ -150,19 +147,16 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
         return Optional.empty();
     }
 
-    private String getSystemName() {
+    private Optional<String> getSystemName() {
         Monitoring monitoring = getMonitoringService();
-        if (monitoring != null && ! monitoring.getClustername().equals(""))
-            return monitoring.getClustername();
-        return DEFAULT_NAME_IN_MONITORING_SYSTEM;
+        return monitoring != null && ! monitoring.getClustername().equals("") ?
+                Optional.of(monitoring.getClustername()) : Optional.empty();
     }
 
-    private int getIntervalMinutes() {
+    private Optional<Integer> getIntervalMinutes() {
         Monitoring monitoring = getMonitoringService();
-        if (monitoring != null && monitoring.getInterval() != null) {
-            return monitoring.getInterval();
-        }
-        return DEFAULT_MONITORING_INTERVAL;
+        return monitoring != null ?
+                Optional.of(monitoring.getInterval()) : Optional.empty();
     }
 
     private void  addMetricsProxyComponent(Class<?> componentClass) {
diff --git a/metrics-proxy/src/main/resources/configdefinitions/monitoring.def b/metrics-proxy/src/main/resources/configdefinitions/monitoring.def
index 6fe24c86394..c7c00aeeaec 100644
--- a/metrics-proxy/src/main/resources/configdefinitions/monitoring.def
+++ b/metrics-proxy/src/main/resources/configdefinitions/monitoring.def
@@ -2,7 +2,7 @@
 package=ai.vespa.metricsproxy.core
 
 # The rate at which metrics are passed to the monitoring system. Currently (Apr 2019) only used by SystemPoller.
-intervalMinutes int default=5
+intervalMinutes int default=1
 
 # The name used for this application in the monitoring system
 systemName string default=vespa