Merge pull request #1322 from LKummer/feat-otel-output-logs-body-key-…

…attr Add logs_body_key_attributes option for OpenTelemetry output plugin
fluent · Aug 23, 2024 · 0ffa578 · 0ffa578
2 parents a327d9b + 50637d9
commit 0ffa578
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 2 deletions.
diff --git a/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go b/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go
@@ -36,8 +36,10 @@ type OpenTelemetry struct {
 	// Log the response payload within the Fluent Bit log.
 	LogResponsePayload *bool `json:"logResponsePayload,omitempty"`
 	// This allows you to add custom labels to all metrics exposed through the OpenTelemetry exporter. You may have multiple of these fields.
-	AddLabel     map[string]string `json:"addLabel,omitempty"`
-	*plugins.TLS `json:"tls,omitempty"`
+	AddLabel map[string]string `json:"addLabel,omitempty"`
+	// If true, remaining unmatched keys are added as attributes.
+	LogsBodyKeyAttributes *bool `json:"logsBodyKeyAttributes,omitempty"`
+	*plugins.TLS          `json:"tls,omitempty"`
 	// Include fluentbit networking options for this output-plugin
 	*plugins.Networking `json:"networking,omitempty"`
 }
@@ -91,6 +93,9 @@ func (o *OpenTelemetry) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 	kvs.InsertStringMap(o.AddLabel, func(k, v string) (string, string) {
 		return "add_label", fmt.Sprintf(" %s    %s", k, v)
 	})
+	if o.LogsBodyKeyAttributes != nil {
+		kvs.Insert("logs_body_key_attributes", fmt.Sprint(*o.LogsBodyKeyAttributes))
+	}
 	if o.TLS != nil {
 		tls, err := o.TLS.Params(sl)
 		if err != nil {

diff --git a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -2856,6 +2856,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'

diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -2856,6 +2856,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'

diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -2856,6 +2856,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'

diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -2856,6 +2856,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'

diff --git a/docs/plugins/fluentbit/output/open_telemetry.md b/docs/plugins/fluentbit/output/open_telemetry.md
@@ -15,6 +15,7 @@ The OpenTelemetry plugin allows you to take logs, metrics, and traces from Fluen
 | tracesUri | Specify an optional HTTP URI for the target web server listening for traces, e.g: /v1/traces | string |
 | header | Add a HTTP header key/value pair. Multiple headers can be set. | map[string]string |
 | logResponsePayload | Log the response payload within the Fluent Bit log. | *bool |
+| logsBodyKeyAttributes | Adds unmatched keys as attributes when true. | *bool |
 | addLabel | This allows you to add custom labels to all metrics exposed through the OpenTelemetry exporter. You may have multiple of these fields. | map[string]string |
 | tls |  | *[plugins.TLS](../tls.md) |
 | networking | Include fluentbit networking options for this output-plugin | *plugins.Networking |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -6793,6 +6793,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'
@@ -35349,6 +35352,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -6793,6 +6793,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'
@@ -35349,6 +35352,9 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsBodyKeyAttributes:
+                    description: If true, remaining unmatched keys are added as attributes.
+                    type: boolean
                   logsUri:
                     description: 'Specify an optional HTTP URI for the target web
                       server listening for logs, e.g: /v1/logs'