2 files changed, 11 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
index e303e878550..b35918b3460 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
@@ -28,6 +28,7 @@ import java.io.Writer;
 public class DerivedConfiguration {
 
     private final Schema schema;
+    private final boolean isStreaming;
     private Summaries summaries;
     private Juniperrc juniperrc;
     private AttributeFields attributeFields;
@@ -67,6 +68,7 @@ public class DerivedConfiguration {
      *               schema is later modified.
      */
     public DerivedConfiguration(Schema schema, DeployState deployState, boolean isStreaming) {
+        this.isStreaming = isStreaming;
         try {
             Validator.ensureNotNull("Schema", schema);
             this.schema = schema;
@@ -150,6 +152,10 @@ public class DerivedConfiguration {
         }
     }
 
+    public boolean isStreaming() {
+        return isStreaming;
+    }
+
     public Summaries getSummaries() {
         return summaries;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index c0aec7ba0b4..f19af8b62ca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -113,8 +113,11 @@ public abstract class SearchCluster extends TreeConfigProducer<AnyConfigProducer
     @Override
     public void getConfig(DocumentdbInfoConfig.Builder builder) {
         for (DocumentDatabase db : documentDbs) {
-            DocumentdbInfoConfig.Documentdb.Builder docDb = new DocumentdbInfoConfig.Documentdb.Builder();
-            docDb.name(db.getName());
+            var docDb = new DocumentdbInfoConfig.Documentdb.Builder()
+                    .name(db.getName())
+                    .mode(db.getDerivedConfiguration().isStreaming()
+                            ? DocumentdbInfoConfig.Documentdb.Mode.Enum.STREAMING
+                            : DocumentdbInfoConfig.Documentdb.Mode.Enum.INDEX);
             builder.documentdb(docDb);
         }
     }