Skip to content

MLE-25068: Support more configuration for log collection #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: release/1.1.0
Choose a base branch
from
+196 −133
Open

MLE-25068: Support more configuration for log collection #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0025502
MLE-25068: Support extra config for fluent-bit
Nov 5, 2025
5ba195e
MLE-25068: Support Extra Configuration for Log Collection
Nov 5, 2025
2ce41bc
Fix handling indentation for log collection
Nov 7, 2025
f63a977
MLE-25101: Fix AdditionalVolumeMount does not mount to Fluent-bit Cor…
Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions api/v1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
30 changes: 12 additions & 18 deletions charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4735,6 +4735,8 @@ spec:
requestLogs:
type: boolean
type: object
filters:
type: string
image:
default: fluent/fluent-bit:4.1.1
type: string
Expand All @@ -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:
Expand Down Expand Up @@ -8284,6 +8281,8 @@ spec:
requestLogs:
type: boolean
type: object
filters:
type: string
image:
default: fluent/fluent-bit:4.1.1
type: string
Expand All @@ -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:
Expand Down
15 changes: 6 additions & 9 deletions charts/marklogic-operator-kubernetes/templates/marklogicgroup-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3487,6 +3487,8 @@ spec:
requestLogs:
type: boolean
type: object
filters:
type: string
image:
default: fluent/fluent-bit:4.1.1
type: string
Expand All @@ -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:
Expand Down
30 changes: 12 additions & 18 deletions config/crd/bases/marklogic.progress.com_marklogicclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4744,6 +4744,8 @@ spec:
requestLogs:
type: boolean
type: object
filters:
type: string
image:
default: fluent/fluent-bit:4.1.1
type: string
Expand All @@ -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:
Expand Down Expand Up @@ -8306,6 +8303,8 @@ spec:
requestLogs:
type: boolean
type: object
filters:
type: string
image:
default: fluent/fluent-bit:4.1.1
type: string
Expand All @@ -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:
Expand Down
15 changes: 6 additions & 9 deletions config/crd/bases/marklogic.progress.com_marklogicgroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3494,6 +3494,8 @@ spec:
requestLogs:
type: boolean
type: object
filters:
type: string
image:
default: fluent/fluent-bit:4.1.1
type: string
Expand All @@ -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:
Expand Down
Loading