From 002550228a9039b2525b3a52f75c40e5d20d2643 Mon Sep 17 00:00:00 2001
From: Peng Zhou <peng.zhou@progress.com>
Date: Wed, 5 Nov 2025 00:19:15 -0800
Subject: [PATCH 1/4] MLE-25068: Support extra config for fluent-bit

---
 pkg/k8sutil/configmap.go | 144 +++++++++++++++++++++++++--------------
 1 file changed, 92 insertions(+), 52 deletions(-)

diff --git a/pkg/k8sutil/configmap.go b/pkg/k8sutil/configmap.go
index 532d8a8..e131a53 100644
--- a/pkg/k8sutil/configmap.go
+++ b/pkg/k8sutil/configmap.go
@@ -168,21 +168,23 @@ func (oc *OperatorContext) getFluentBitData() map[string]string {
 
 pipeline:
   inputs:`
-
 	// Add INPUT sections based on enabled log types
-	if oc.MarklogicGroup.Spec.LogCollection.Files.ErrorLogs {
-		fluentBitData["fluent-bit.yaml"] += `
-    - name: tail
+	if strings.TrimSpace(oc.MarklogicGroup.Spec.LogCollection.Inputs) != "" {
+		fluentBitData["fluent-bit.yaml"] += "\n" + normalizeYAMLIndentation(oc.MarklogicGroup.Spec.LogCollection.Inputs, 4, 6)
+	} else {
+		if oc.MarklogicGroup.Spec.LogCollection.Files.ErrorLogs {
+			fluentBitData["fluent-bit.yaml"] += `
+	- name: tail
       path: /var/opt/MarkLogic/Logs/*ErrorLog.txt
       read_from_head: true
       tag: kube.marklogic.logs.error
       path_key: path
       parser: error_parser
       mem_buf_limit: 4MB`
-	}
+		}
 
-	if oc.MarklogicGroup.Spec.LogCollection.Files.AccessLogs {
-		fluentBitData["fluent-bit.yaml"] += `
+		if oc.MarklogicGroup.Spec.LogCollection.Files.AccessLogs {
+			fluentBitData["fluent-bit.yaml"] += `
     - name: tail
       path: /var/opt/MarkLogic/Logs/*AccessLog.txt
       read_from_head: true
@@ -190,10 +192,10 @@ pipeline:
       path_key: path
       parser: access_parser
       mem_buf_limit: 4MB`
-	}
+		}
 
-	if oc.MarklogicGroup.Spec.LogCollection.Files.RequestLogs {
-		fluentBitData["fluent-bit.yaml"] += `
+		if oc.MarklogicGroup.Spec.LogCollection.Files.RequestLogs {
+			fluentBitData["fluent-bit.yaml"] += `
     - name: tail
       path: /var/opt/MarkLogic/Logs/*RequestLog.txt
       read_from_head: true
@@ -201,32 +203,37 @@ pipeline:
       path_key: path
       parser: json_parser
       mem_buf_limit: 4MB`
-	}
+		}
 
-	if oc.MarklogicGroup.Spec.LogCollection.Files.CrashLogs {
-		fluentBitData["fluent-bit.yaml"] += `
+		if oc.MarklogicGroup.Spec.LogCollection.Files.CrashLogs {
+			fluentBitData["fluent-bit.yaml"] += `
     - name: tail
       path: /var/opt/MarkLogic/Logs/CrashLog.txt
       read_from_head: true
       tag: kube.marklogic.logs.crash
       path_key: path
       mem_buf_limit: 4MB`
-	}
+		}
 
-	if oc.MarklogicGroup.Spec.LogCollection.Files.AuditLogs {
-		fluentBitData["fluent-bit.yaml"] += `
+		if oc.MarklogicGroup.Spec.LogCollection.Files.AuditLogs {
+			fluentBitData["fluent-bit.yaml"] += `
     - name: tail
       path: /var/opt/MarkLogic/Logs/AuditLog.txt
       read_from_head: true
       tag: kube.marklogic.logs.audit
       path_key: path
       mem_buf_limit: 4MB`
+		}
 	}
 
 	// Add FILTER sections
 	fluentBitData["fluent-bit.yaml"] += `
 
-  filters:
+  filters:`
+	if strings.TrimSpace(oc.MarklogicGroup.Spec.LogCollection.Filters) != "" {
+		fluentBitData["fluent-bit.yaml"] += "\n" + normalizeYAMLIndentation(oc.MarklogicGroup.Spec.LogCollection.Filters, 4, 6)
+	} else {
+		fluentBitData["fluent-bit.yaml"] += `
     - name: modify
       match: "*"
       add: pod ${POD_NAME}
@@ -246,43 +253,16 @@ pipeline:
     - name: modify
       match: kube.marklogic.logs.crash
       add: tag kube.marklogic.logs.crash
+	`
+	}
 
-  outputs:`
+	// Add OUTPUT sections
+	fluentBitData["fluent-bit.yaml"] += `
 
+  outputs:`
 	// Handle user-defined outputs from LogCollection.Outputs
-	if oc.MarklogicGroup.Spec.LogCollection.Outputs != "" {
-		// Process user-defined outputs, adjusting indentation to match pipeline level
-		outputs := oc.MarklogicGroup.Spec.LogCollection.Outputs
-		// Split into lines and process indentation
-		lines := strings.Split(outputs, "\n")
-		processedLines := make([]string, 0, len(lines))
-		for _, line := range lines {
-			if strings.TrimSpace(line) == "" {
-				continue // Skip empty lines
-			}
-			// Count leading spaces in original line
-			leadingSpaces := len(line) - len(strings.TrimLeft(line, " "))
-			content := strings.TrimLeft(line, " ")
-			if content != "" {
-				// For YAML list items starting with "-", use 4 spaces base indentation
-				// For properties under list items, use 6 spaces base indentation
-				var newIndent int
-				const yamlListItemIndent = 4
-				const yamlPropertyIndent = 6
-				if strings.HasPrefix(content, "- ") {
-					newIndent = yamlListItemIndent // List items at pipeline outputs level
-				} else {
-					newIndent = yamlPropertyIndent // Properties under list items
-				}
-				// Add any additional relative indentation beyond the first level
-				const baseIndentOffset = 2
-				if leadingSpaces > baseIndentOffset {
-					newIndent += leadingSpaces - baseIndentOffset
-				}
-				processedLines = append(processedLines, strings.Repeat(" ", newIndent)+content)
-			}
-		}
-		fluentBitData["fluent-bit.yaml"] += "\n" + strings.Join(processedLines, "\n")
+	if strings.TrimSpace(oc.MarklogicGroup.Spec.LogCollection.Outputs) != "" {
+		fluentBitData["fluent-bit.yaml"] += "\n" + normalizeYAMLIndentation(oc.MarklogicGroup.Spec.LogCollection.Outputs, 4, 6)
 	} else {
 		// Default stdout output if none specified
 		fluentBitData["fluent-bit.yaml"] += `
@@ -292,7 +272,11 @@ pipeline:
 	}
 
 	// Parsers in YAML format
-	fluentBitData["parsers.yaml"] = `parsers:
+	fluentBitData["parsers.yaml"] = `parsers:`
+	if strings.TrimSpace(oc.MarklogicGroup.Spec.LogCollection.Parsers) != "" {
+		fluentBitData["parsers.yaml"] += "\n" + normalizeYAMLIndentation(oc.MarklogicGroup.Spec.LogCollection.Parsers, 2, 4)
+	} else {
+		fluentBitData["parsers.yaml"] += `
   - name: error_parser
     format: regex
     regex: ^(?<time>(.+?)(?=[a-zA-Z]))(?<log_level>(.+?)(?=:))(.+?)(?=[a-zA-Z])(?<log>.*)
@@ -309,6 +293,62 @@ pipeline:
     format: json
     time_key: time
     time_format: "%Y-%m-%dT%H:%M:%S%z"`
+	}
 
 	return fluentBitData
 }
+
+// normalizeYAMLIndentation processes user-provided YAML content and adjusts indentation
+// to match the target YAML structure. This is useful when embedding user YAML into templates.
+//
+// Parameters:
+//   - yamlContent: The raw YAML content string to process
+//   - listItemIndent: Number of spaces for YAML list items (lines starting with "- ")
+//   - propertyIndent: Number of spaces for properties under list items
+//
+// Returns: A string with normalized indentation, ready to embed in a larger YAML structure
+//
+// Example:
+//
+//	input := "- name: loki\n  host: loki.svc\n  port: 3100"
+//	output := normalizeYAMLIndentation(input, 4, 6)
+func normalizeYAMLIndentation(yamlContent string, listItemIndent, propertyIndent int) string {
+	if yamlContent == "" {
+		return ""
+	}
+
+	lines := strings.Split(yamlContent, "\n")
+	processedLines := make([]string, 0, len(lines))
+
+	for _, line := range lines {
+		if strings.TrimSpace(line) == "" {
+			continue // Skip empty lines
+		}
+
+		// Count leading spaces in original line
+		leadingSpaces := len(line) - len(strings.TrimLeft(line, " "))
+		content := strings.TrimLeft(line, " ")
+
+		if content != "" {
+			// Determine base indentation level
+			var newIndent int
+			if strings.HasPrefix(content, "- ") {
+				// YAML list items (e.g., "- name: loki")
+				newIndent = listItemIndent
+			} else {
+				// Properties under list items (e.g., "host: loki.svc")
+				newIndent = propertyIndent
+			}
+
+			// Preserve relative indentation for nested structures
+			const baseIndentOffset = 2
+			if leadingSpaces > baseIndentOffset {
+				newIndent += leadingSpaces - baseIndentOffset
+			}
+
+			processedLines = append(processedLines, strings.Repeat(" ", newIndent)+content)
+		}
+	}
+
+	return strings.Join(processedLines, "\n")
+}

From 5ba195e209882153d1d69e1b9ec220640e1ad960 Mon Sep 17 00:00:00 2001
From: Peng Zhou <peng.zhou@progress.com>
Date: Wed, 5 Nov 2025 07:56:31 -0800
Subject: [PATCH 2/4] MLE-25068: Support Extra Configuration for Log Collection

---
 api/v1/common_types.go                        |  8 +++--
 .../templates/marklogiccluster-crd.yaml       | 30 ++++++++-----------
 .../templates/marklogicgroup-crd.yaml         | 15 ++++------
 ...klogic.progress.com_marklogicclusters.yaml | 30 ++++++++-----------
 ...arklogic.progress.com_marklogicgroups.yaml | 15 ++++------
 5 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/api/v1/common_types.go b/api/v1/common_types.go
index 3321dce..adf8b89 100644
--- a/api/v1/common_types.go
+++ b/api/v1/common_types.go
@@ -67,9 +67,11 @@ type LogCollection struct {
 	// +kubebuilder:default:={"requests":{"cpu":"100m","memory":"200Mi"},"limits":{"cpu":"200m","memory":"500Mi"}}
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 	// +kubebuilder:default:={errorLogs: true, accessLogs: true, requestLogs: true, crashLogs: true, auditLogs: true}
-	Files LogFilesConfig `json:"files,omitempty"`
-	// +kubebuilder:default:="[OUTPUT]\n  name loki\n  match *\n  host loki.default.svc.cluster.local\n  port 3100\n  labels job=fluent-bit\n  http_user admin\n  http_passwd admin"
-	Outputs string `json:"outputs,omitempty"`
+	Files   LogFilesConfig `json:"files,omitempty"`
+	Outputs string         `json:"outputs,omitempty"`
+	Filters string         `json:"filters,omitempty"`
+	Inputs  string         `json:"inputs,omitempty"`
+	Parsers string         `json:"parsers,omitempty"`
 }
 
 type LogFilesConfig struct {
diff --git a/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml b/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml
index 4a71d0e..0718272 100644
--- a/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml
+++ b/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml
@@ -4735,6 +4735,8 @@ spec:
                       requestLogs:
                         type: boolean
                     type: object
+                  filters:
+                    type: string
                   image:
                     default: fluent/fluent-bit:4.1.1
                     type: string
@@ -4756,16 +4758,11 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  inputs:
+                    type: string
                   outputs:
-                    default: |-
-                      [OUTPUT]
-                        name loki
-                        match *
-                        host loki.default.svc.cluster.local
-                        port 3100
-                        labels job=fluent-bit
-                        http_user admin
-                        http_passwd admin
+                    type: string
+                  parsers:
                     type: string
                   resources:
                     default:
@@ -8284,6 +8281,8 @@ spec:
                             requestLogs:
                               type: boolean
                           type: object
+                        filters:
+                          type: string
                         image:
                           default: fluent/fluent-bit:4.1.1
                           type: string
@@ -8305,16 +8304,11 @@ spec:
                             type: object
                             x-kubernetes-map-type: atomic
                           type: array
+                        inputs:
+                          type: string
                         outputs:
-                          default: |-
-                            [OUTPUT]
-                              name loki
-                              match *
-                              host loki.default.svc.cluster.local
-                              port 3100
-                              labels job=fluent-bit
-                              http_user admin
-                              http_passwd admin
+                          type: string
+                        parsers:
                           type: string
                         resources:
                           default:
diff --git a/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml b/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml
index 4eb6f1f..7ffdfde 100644
--- a/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml
+++ b/charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml
@@ -3487,6 +3487,8 @@ spec:
                       requestLogs:
                         type: boolean
                     type: object
+                  filters:
+                    type: string
                   image:
                     default: fluent/fluent-bit:4.1.1
                     type: string
@@ -3508,16 +3510,11 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  inputs:
+                    type: string
                   outputs:
-                    default: |-
-                      [OUTPUT]
-                        name loki
-                        match *
-                        host loki.default.svc.cluster.local
-                        port 3100
-                        labels job=fluent-bit
-                        http_user admin
-                        http_passwd admin
+                    type: string
+                  parsers:
                     type: string
                   resources:
                     default:
diff --git a/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml b/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml
index 97da7ac..25d96b2 100644
--- a/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml
+++ b/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml
@@ -4744,6 +4744,8 @@ spec:
                       requestLogs:
                         type: boolean
                     type: object
+                  filters:
+                    type: string
                   image:
                     default: fluent/fluent-bit:4.1.1
                     type: string
@@ -4765,16 +4767,11 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  inputs:
+                    type: string
                   outputs:
-                    default: |-
-                      [OUTPUT]
-                        name loki
-                        match *
-                        host loki.default.svc.cluster.local
-                        port 3100
-                        labels job=fluent-bit
-                        http_user admin
-                        http_passwd admin
+                    type: string
+                  parsers:
                     type: string
                   resources:
                     default:
@@ -8306,6 +8303,8 @@ spec:
                             requestLogs:
                               type: boolean
                           type: object
+                        filters:
+                          type: string
                         image:
                           default: fluent/fluent-bit:4.1.1
                           type: string
@@ -8327,16 +8326,11 @@ spec:
                             type: object
                             x-kubernetes-map-type: atomic
                           type: array
+                        inputs:
+                          type: string
                         outputs:
-                          default: |-
-                            [OUTPUT]
-                              name loki
-                              match *
-                              host loki.default.svc.cluster.local
-                              port 3100
-                              labels job=fluent-bit
-                              http_user admin
-                              http_passwd admin
+                          type: string
+                        parsers:
                           type: string
                         resources:
                           default:
diff --git a/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml b/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml
index eb55ac0..9b1df84 100644
--- a/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml
+++ b/config/crd/bases/marklogic.progress.com_marklogicgroups.yaml
@@ -3494,6 +3494,8 @@ spec:
                       requestLogs:
                         type: boolean
                     type: object
+                  filters:
+                    type: string
                   image:
                     default: fluent/fluent-bit:4.1.1
                     type: string
@@ -3515,16 +3517,11 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  inputs:
+                    type: string
                   outputs:
-                    default: |-
-                      [OUTPUT]
-                        name loki
-                        match *
-                        host loki.default.svc.cluster.local
-                        port 3100
-                        labels job=fluent-bit
-                        http_user admin
-                        http_passwd admin
+                    type: string
+                  parsers:
                     type: string
                   resources:
                     default:

From 2ce41bccafb7712309e4230dc418df75d7578dd9 Mon Sep 17 00:00:00 2001
From: Peng Zhou <peng.zhou@progress.com>
Date: Thu, 6 Nov 2025 22:36:50 -0800
Subject: [PATCH 3/4] Fix handling indentation for log collection

---
 pkg/k8sutil/configmap.go | 122 ++++++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 47 deletions(-)

diff --git a/pkg/k8sutil/configmap.go b/pkg/k8sutil/configmap.go
index e131a53..79fd3b0 100644
--- a/pkg/k8sutil/configmap.go
+++ b/pkg/k8sutil/configmap.go
@@ -174,7 +174,7 @@ pipeline:
 	} else {
 		if oc.MarklogicGroup.Spec.LogCollection.Files.ErrorLogs {
 			fluentBitData["fluent-bit.yaml"] += `
-	- name: tail
+    - name: tail
       path: /var/opt/MarkLogic/Logs/*ErrorLog.txt
       read_from_head: true
       tag: kube.marklogic.logs.error
@@ -234,26 +234,32 @@ pipeline:
 		fluentBitData["fluent-bit.yaml"] += "\n" + normalizeYAMLIndentation(oc.MarklogicGroup.Spec.LogCollection.Filters, 4, 6)
 	} else {
 		fluentBitData["fluent-bit.yaml"] += `
-    - name: modify
-      match: "*"
-      add: pod ${POD_NAME}
-      add: namespace ${NAMESPACE}
-    - name: modify
-      match: kube.marklogic.logs.error
-      add: tag kube.marklogic.logs.error
-    - name: modify
-      match: kube.marklogic.logs.access
-      add: tag kube.marklogic.logs.access
-    - name: modify
-      match: kube.marklogic.logs.request
-      add: tag kube.marklogic.logs.request
-    - name: modify
-      match: kube.marklogic.logs.audit
-      add: tag kube.marklogic.logs.audit
-    - name: modify
-      match: kube.marklogic.logs.crash
-      add: tag kube.marklogic.logs.crash
-	`
+	    - name: modify
+	      match: "*"
+	      add:
+	        - pod ${POD_NAME}
+	        - namespace ${NAMESPACE}
+	    - name: modify
+	      match: kube.marklogic.logs.error
+	      add:
+	        - tag kube.marklogic.logs.error
+	    - name: modify
+	      match: kube.marklogic.logs.access
+	      add:
+	        - tag kube.marklogic.logs.access
+	    - name: modify
+	      match: kube.marklogic.logs.request
+	      add:
+	        - tag kube.marklogic.logs.request
+	    - name: modify
+	      match: kube.marklogic.logs.audit
+	      add:
+	        - tag kube.marklogic.logs.audit
+	    - name: modify
+	      match: kube.marklogic.logs.crash
+	      add:
+	        - tag kube.marklogic.logs.crash
+		`
 	}
 
 	// Add OUTPUT sections
@@ -313,42 +319,64 @@ pipeline:
 //	input := "- name: loki\n  host: loki.svc\n  port: 3100"
 //	output := normalizeYAMLIndentation(input, 4, 6)
 func normalizeYAMLIndentation(yamlContent string, listItemIndent, propertyIndent int) string {
+	// Purpose: Re-indent user supplied YAML fragments representing top-level lists of items
+	// (filters, outputs, inputs, parsers) while supporting nested lists under a property key.
+	// Rules:
+	//   Top-level list items: listItemIndent spaces (e.g. 4)
+	//   Properties under a list item: propertyIndent spaces (e.g. 6)
+	//   Nested list items under a property that ends with ':' (e.g. add:, set:, rename:): propertyIndent + 2
+	//   We ignore original indentation entirely for consistency.
 	if yamlContent == "" {
 		return ""
 	}
 
 	lines := strings.Split(yamlContent, "\n")
-	processedLines := make([]string, 0, len(lines))
+	processed := make([]string, 0, len(lines))
+	var lastNonEmpty string
+	inNestedList := false
+
+	for _, raw := range lines {
+		// Replace any tab with 4 spaces to avoid invalid YAML tokens
+		raw = strings.ReplaceAll(raw, "\t", "    ")
+		trimmed := strings.TrimSpace(raw)
+		if trimmed == "" { // skip blank lines
+			continue
+		}
 
-	for _, line := range lines {
-		if strings.TrimSpace(line) == "" {
-			continue // Skip empty lines
+		indent := 0
+		isListItem := strings.HasPrefix(trimmed, "- ")
+
+		// Detect transition into nested list context: previous line is a property ending with ':'
+		// and current line is a list item
+		if isListItem && strings.HasSuffix(lastNonEmpty, ":") && !strings.HasPrefix(lastNonEmpty, "- ") {
+			inNestedList = true
 		}
 
-		// Count leading spaces in original line
-		leadingSpaces := len(line) - len(strings.TrimLeft(line, " "))
-		content := strings.TrimLeft(line, " ")
-
-		if content != "" {
-			// Determine base indentation level
-			var newIndent int
-			if strings.HasPrefix(content, "- ") {
-				// YAML list items (e.g., "- name: loki")
-				newIndent = listItemIndent
-			} else {
-				// Properties under list items (e.g., "host: loki.svc")
-				newIndent = propertyIndent
-			}
+		// Exit nested list context when we encounter a property line (not a list item)
+		// unless it's the parent property that started the list
+		if !isListItem && !strings.HasSuffix(trimmed, ":") {
+			inNestedList = false
+		}
 
-			// Preserve relative indentation for nested structures
-			const baseIndentOffset = 2
-			if leadingSpaces > baseIndentOffset {
-				newIndent += leadingSpaces - baseIndentOffset
-			}
+		// Also exit nested list when we hit a top-level list item (starts with '- name:')
+		if isListItem && strings.HasPrefix(trimmed, "- name:") {
+			inNestedList = false
+		}
 
-			processedLines = append(processedLines, strings.Repeat(" ", newIndent)+content)
+		switch {
+		case isListItem && inNestedList:
+			// nested list item (e.g. under add:, set:, rename:)
+			indent = propertyIndent + 2
+		case isListItem:
+			// top-level list item
+			indent = listItemIndent
+		default:
+			// property line (key: value or key:)
+			indent = propertyIndent
 		}
-	}
 
-	return strings.Join(processedLines, "\n")
+		processed = append(processed, strings.Repeat(" ", indent)+trimmed)
+		lastNonEmpty = trimmed
+	}
+	return strings.Join(processed, "\n")
 }

From f63a977a169ade513625bdbf93948e7c257efb2c Mon Sep 17 00:00:00 2001
From: Peng Zhou <peng.zhou@progress.com>
Date: Thu, 6 Nov 2025 23:22:47 -0800
Subject: [PATCH 4/4] MLE-25101: Fix AdditionalVolumeMount does not mount to
 Fluent-bit Correctly

---
 pkg/k8sutil/statefulset.go | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkg/k8sutil/statefulset.go b/pkg/k8sutil/statefulset.go
index b06bd02..e6bdf45 100644
--- a/pkg/k8sutil/statefulset.go
+++ b/pkg/k8sutil/statefulset.go
@@ -350,7 +350,7 @@ func generateContainerDef(name string, containerParams containerParameters) []co
 			Command:         []string{"/fluent-bit/bin/fluent-bit"},
 			Args:            []string{"--config=/fluent-bit/etc/fluent-bit.yaml"},
 			Env:             getFluentBitEnvironmentVariables(),
-			VolumeMounts:    getFluentBitVolumeMount(),
+			VolumeMounts:    getFluentBitVolumeMount(containerParams),
 		}
 		if containerParams.LogCollection.Resources != nil {
 			fulentBitContainerDef.Resources = *containerParams.LogCollection.Resources
@@ -704,14 +704,25 @@ func getVolumeMount(containerParams containerParameters) []corev1.VolumeMount {
 	return VolumeMounts
 }
 
-func getFluentBitVolumeMount() []corev1.VolumeMount {
+func getFluentBitVolumeMount(containerParams containerParameters) []corev1.VolumeMount {
 	var VolumeMountsFluentBit []corev1.VolumeMount
+	markLogicLogsPath := "/var/opt/MarkLogic/Logs"
+	logsMount := corev1.VolumeMount{
+		Name:      "datadir",
+		MountPath: markLogicLogsPath,
+	}
+
+	if containerParams.AdditionalVolumeMounts != nil {
+		for _, mount := range *containerParams.AdditionalVolumeMounts {
+			if mount.MountPath == markLogicLogsPath {
+				logsMount = mount
+				break
+			}
+		}
+	}
 
 	VolumeMountsFluentBit = append(VolumeMountsFluentBit,
-		corev1.VolumeMount{
-			Name:      "datadir",
-			MountPath: "/var/opt/MarkLogic/Logs",
-		},
+		logsMount,
 		corev1.VolumeMount{
 			Name:      "fluent-bit",
 			MountPath: "/fluent-bit/etc/",