Merge branch 'master' into bratseth/remove-dead-code

4 files changed, 20 insertions, 1 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 16ef46353d9..1ac682558d5 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
@@ -155,7 +155,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
     public void getConfig(LogdConfig.Builder builder) {
         builder.
             logserver(new LogdConfig.Logserver.Builder().
-                    use(!isHostedVespa).
+                    use(logServerContainerCluster.isPresent() || !isHostedVespa).
                     host(logserver.getHostName()).
                     port(logserver.getRelativePort(1)));
     }
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 297c4a6e9b9..35b69ab655f 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
@@ -21,6 +21,7 @@ import org.w3c.dom.Element;
 import java.util.*;
 
 import static com.yahoo.vespa.model.admin.monitoring.builder.PredefinedMetricSets.predefinedMetricSets;
+import static java.util.logging.Level.WARNING;
 
 /**
  * A base class for admin model builders, to support common functionality across versions.
@@ -68,6 +69,9 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
                 .buildMetrics(XML.getChild(adminElement, "metrics"));
         Map<String, MetricsConsumer> legacyMetricsConsumers = DomMetricBuilderHelper
                 .buildMetricsConsumers(XML.getChild(adminElement, "metric-consumers"));
+        if (! legacyMetricsConsumers.isEmpty()) {
+            parent.deployLogger().log(WARNING, "Element 'metric-consumers' is deprecated and will be removed in Vespa 7. Use 'metrics' instead!");
+        }
         FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent);
 
         Admin admin = new Admin(parent, monitoring, metrics, legacyMetricsConsumers, multitenant, fileDistributionConfigProducer);
diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy
index 8d2d65b5551..4ed8311d7ae 100755
--- a/config-model/src/main/perl/vespa-deploy
+++ b/config-model/src/main/perl/vespa-deploy
@@ -240,6 +240,14 @@ sub usage {
     print "Usage: vespa-deploy [-h] [-v] [-f] [-t] [-p] [-V] [<command>] [args]\n";
     print "Supported commands: 'upload', 'prepare', 'activate', 'fetch' and 'help'\n";
     print "Supported options: '-h' (help), '-v' (verbose), '-f' (force/ignore validation errors), '-t' (timeout in seconds), '-p' (config server http port)\n";
+    print "    '-h' (help)\n";
+    print "    '-v' (verbose)\n";
+    print "    '-n' (dry-run)\n";
+    print "    '-f' (force/ignore validation errors)\n";
+    print "    '-t <timeout>' (timeout in seconds)\n";
+    print "    '-c <server>' (config server hostname)\n";
+    print "    '-p <port>' (config server http port)\n\n";
+    
     print "Try 'vespa-deploy help <command>' to get more help\n";
   }
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 121863f454f..dd28d45ef4d 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1,6 +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.config.model.provision;
 
+import com.yahoo.cloud.config.log.LogdConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.deploy.DeployProperties;
@@ -1771,6 +1772,12 @@ public class ModelProvisioningTest {
         model.getConfig(builder, configId);
         ApplicationMetadataConfig cfg = new ApplicationMetadataConfig(builder);
         assertEquals(1, cfg.generation());
+
+        LogdConfig.Builder logdConfigBuilder = new LogdConfig.Builder();
+        model.getConfig(logdConfigBuilder, configId);
+        LogdConfig logdConfig = new LogdConfig(logdConfigBuilder);
+        // Logd should use logserver (forward logs to it)
+        assertTrue(logdConfig.logserver().use());
     }
 
 }