Add links to doc in log and excpetion messages

2 files changed, 8 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 6092d5dfba2..05449083817 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -1078,12 +1078,14 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                     String jvmArgs = nodesElement.getAttribute(VespaDomBuilder.JVMARGS_ATTRIB_NAME);
                     throw new IllegalArgumentException("You have specified both jvm-options='" + jvmOptions + "'" +
                                                                " and deprecated jvmargs='" + jvmArgs +
-                                                               "'. Merge jvmargs into 'options' in 'jvm' element.");
+                                                               "'. Merge jvmargs into 'options' in 'jvm' element." +
+                                                               " See https://docs.vespa.ai/en/reference/services-container.html#jvm");
                 }
             } else {
                 jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVMARGS_ATTRIB_NAME);
                 if (incompatibleGCOptions(jvmOptions)) {
-                    deployLogger.logApplicationPackage(WARNING, "You need to move your GC-related options from deprecated 'jvmargs' to 'gc-options' in 'jvm' element");
+                    deployLogger.logApplicationPackage(WARNING, "You need to move your GC-related options from deprecated 'jvmargs' to 'gc-options' in 'jvm' element." +
+                            " See https://docs.vespa.ai/en/reference/services-container.html#jvm");
                     cluster.setJvmGCOptions(ContainerCluster.G1GC);
                 }
             }
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 77e3aa516dc..0866e1174ee 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
@@ -1488,7 +1488,10 @@ public class ModelProvisioningTest {
             fail("Expected exception");
         }
         catch (IllegalArgumentException e) {
-            assertEquals("You have specified both jvm-options='xyz' and deprecated jvmargs='abc'. Merge jvmargs into 'options' in 'jvm' element.", e.getMessage());
+            assertEquals("You have specified both jvm-options='xyz' and deprecated jvmargs='abc'. " +
+                                 "Merge jvmargs into 'options' in 'jvm' element. " +
+                                 "See https://docs.vespa.ai/en/reference/services-container.html#jvm",
+                         e.getMessage());
         }
     }