unconditional -> include-admin

4 files changed, 5 insertions, 5 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 269a638ce4e..c3345b49c2c 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
@@ -65,9 +65,9 @@ public class Admin extends AbstractConfigProducer<Admin> implements Serializable
 
     private ApplicationType applicationType = ApplicationType.DEFAULT;
 
-    public void setLogForwarderConfig(LogForwarder.Config cfg, boolean unconditional) {
+    public void setLogForwarderConfig(LogForwarder.Config cfg, boolean includeAdmin) {
         this.logForwarderConfig = cfg;
-        this.logForwarderUnconditional = unconditional;
+        this.logForwarderUnconditional = includeAdmin;
     }
 
     /**
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 c4ec80c1b8a..963d2dde7fc 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
@@ -114,7 +114,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
 
     void addLogForwarders(ModelElement logForwardingElement, Admin admin) {
         if (logForwardingElement == null) return;
-        boolean alsoForAdminCluster = logForwardingElement.booleanAttribute("unconditional");
+        boolean alsoForAdminCluster = logForwardingElement.booleanAttribute("include-admin");
         for (ModelElement e : logForwardingElement.children("splunk")) {
             LogForwarder.Config cfg = LogForwarder.cfg()
 		    .withSplunkHome(e.stringAttribute("splunk-home"))
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc
index e584bb1c6a7..a75b51a567a 100644
--- a/config-model/src/main/resources/schema/admin.rnc
+++ b/config-model/src/main/resources/schema/admin.rnc
@@ -105,7 +105,7 @@ ClusterControllers = element cluster-controllers {
 }
 
 LogForwarding = element logforwarding {
-    attribute unconditional { xsd:boolean }? &
+    attribute include-admin { xsd:boolean }? &
     element splunk {
         attribute splunk-home { xsd:string }? &
         attribute deployment-server { xsd:string } &
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 1df4631a860..ecb63740fca 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
@@ -914,7 +914,7 @@ public class ModelProvisioningTest {
                         "    <logservers>" +
                         "      <nodes count='1' dedicated='true'/>" +
                         "    </logservers>" +
-                        "    <logforwarding unconditional='true'>" +
+                        "    <logforwarding include-admin='true'>" +
                         "      <splunk deployment-server='bardeplserv:123' client-name='barclinam' phone-home-interval='987' />" +
                         "    </logforwarding>" +
                         "  </admin>" +