Skip to content

Commit adae492

Browse files
reegnzreegnz
authored
update fluent-operator to v3.2.0 (#553)
* update fluent-operator to v3.2.0 Signed-off-by: Zoltán Reegn <[email protected]> * fix linter errors Signed-off-by: Zoltán Reegn <[email protected]> --------- Signed-off-by: Zoltán Reegn <[email protected]>
1 parent da71989 commit adae492

15 files changed

+560
-47
lines changed

‎charts/fluent-operator/Chart.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ keywords:
66
- fluent-bit
77
- fluentd
88
- operator
9-
version: 3.1.0
10-
appVersion: 3.1.0
9+
version: 3.2.0
10+
appVersion: 3.2.0
1111
icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
1212
home: https://www.fluentd.org/
1313
sources:
@@ -18,9 +18,9 @@ maintainers:
1818
dependencies:
1919
- name: fluent-bit-crds
2020
repository: "file://charts/fluent-bit-crds"
21-
version: 3.1.0
21+
version: 3.2.0
2222
condition: fluentbit.crdsEnable
2323
- name: fluentd-crds
2424
repository: "file://charts/fluentd-crds"
25-
version: 3.1.0
25+
version: 3.2.0
2626
condition: fluentd.crdsEnable

‎charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ keywords:
55
- logging
66
- fluent-bit
77
- operator
8-
version: 3.1.0
9-
appVersion: "3.1.0"
8+
version: 3.2.0
9+
appVersion: "3.2.0"
1010
sources:
1111
- https://github.com/fluent/fluent-operator
1212
maintainers:

‎charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml

+142
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,94 @@ spec:
314314
This could mitigate the Kube API heavy traffic issue for large cluster.
315315
type: boolean
316316
type: object
317+
logToMetrics:
318+
description: LogToMetrics defines a Log to Metrics Filter configuration.
319+
properties:
320+
addLabel:
321+
description: Add a custom label NAME and set the value to
322+
the value of KEY
323+
items:
324+
type: string
325+
type: array
326+
alias:
327+
description: Alias for the plugin
328+
type: string
329+
bucket:
330+
description: Defines a bucket for histogram
331+
items:
332+
type: string
333+
type: array
334+
discardLogs:
335+
description: |-
336+
Flag that defines if logs should be discarded after processing. This applies
337+
for all logs, no matter if they have emitted metrics or not.
338+
type: boolean
339+
emitterMemBufLimit:
340+
description: set a buffer limit to restrict memory usage
341+
of metrics emitter
342+
type: string
343+
emitterName:
344+
description: Name of the emitter (advanced users)
345+
type: string
346+
exclude:
347+
description: |-
348+
Optional filter for records in which the content of KEY does not matches the regular expression.
349+
Value Format: FIELD REGEX
350+
items:
351+
type: string
352+
type: array
353+
kubernetesMode:
354+
description: |-
355+
If enabled, it will automatically put pod_id, pod_name, namespace_name, docker_id and container_name
356+
into the metric as labels. This option is intended to be used in combination with the kubernetes filter plugin.
357+
type: boolean
358+
labelField:
359+
description: Includes a record field as label dimension
360+
in the metric.
361+
items:
362+
type: string
363+
type: array
364+
metricDescription:
365+
description: Sets a help text for the metric.
366+
type: string
367+
metricMode:
368+
description: Defines the mode for the metric. Valid values
369+
are [counter, gauge or histogram]
370+
type: string
371+
metricName:
372+
description: Sets the name of the metric.
373+
type: string
374+
metricNamespace:
375+
description: Namespace of the metric
376+
type: string
377+
metricSubsystem:
378+
description: Sets a sub-system for the metric.
379+
type: string
380+
regex:
381+
description: |-
382+
Optional filter for records in which the content of KEY matches the regular expression.
383+
Value Format: FIELD REGEX
384+
items:
385+
type: string
386+
type: array
387+
retryLimit:
388+
description: 'RetryLimit describes how many times fluent-bit
389+
should retry to send data to a specific output. If set
390+
to false fluent-bit will try indefinetly. If set to any
391+
integer N>0 it will try at most N+1 times. Leading zeros
392+
are not allowed (values such as 007, 0150, 01 do not work).
393+
If this property is not defined fluent-bit will use the
394+
default value: 1.'
395+
pattern: ^(((f|F)alse)|(no_limits)|(no_retries)|([1-9]+[0-9]*))$
396+
type: string
397+
tag:
398+
description: Defines the tag for the generated metrics record
399+
type: string
400+
valueField:
401+
description: Specify the record field that holds a numerical
402+
value
403+
type: string
404+
type: object
317405
lua:
318406
description: Lua defines Lua Filter configuration.
319407
properties:
@@ -376,6 +464,13 @@ spec:
376464
If you desire timestamp precision enabling this option will pass the timestamp as
377465
a Lua table with keys sec for seconds since epoch and nsec for nanoseconds.
378466
type: boolean
467+
typeArrayKey:
468+
description: |-
469+
If these keys are matched, the fields are handled as array. If more than
470+
one key, delimit by space. It is useful the array can be empty.
471+
items:
472+
type: string
473+
type: array
379474
typeIntKey:
380475
description: |-
381476
If these keys are matched, the fields are converted to integer.
@@ -784,6 +879,53 @@ spec:
784879
format: int64
785880
type: integer
786881
type: object
882+
wasm:
883+
description: Wasm defines a Wasm configuration.
884+
properties:
885+
accessiblePaths:
886+
description: Specify the whitelist of paths to be able to
887+
access paths from WASM programs.
888+
items:
889+
type: string
890+
type: array
891+
alias:
892+
description: Alias for the plugin
893+
type: string
894+
eventFormat:
895+
description: 'Define event format to interact with Wasm
896+
programs: msgpack or json. Default: json'
897+
type: string
898+
functionName:
899+
description: Wasm function name that will be triggered to
900+
do filtering. It's assumed that the function is built
901+
inside the Wasm program specified above.
902+
type: string
903+
retryLimit:
904+
description: 'RetryLimit describes how many times fluent-bit
905+
should retry to send data to a specific output. If set
906+
to false fluent-bit will try indefinetly. If set to any
907+
integer N>0 it will try at most N+1 times. Leading zeros
908+
are not allowed (values such as 007, 0150, 01 do not work).
909+
If this property is not defined fluent-bit will use the
910+
default value: 1.'
911+
pattern: ^(((f|F)alse)|(no_limits)|(no_retries)|([1-9]+[0-9]*))$
912+
type: string
913+
wasmHeapSize:
914+
description: Size of the heap size of Wasm execution. Review
915+
unit sizes for allowed values.
916+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
917+
type: string
918+
wasmPath:
919+
description: Path to the built Wasm program that will be
920+
used. This can be a relative path against the main configuration
921+
file.
922+
type: string
923+
wasmStackSize:
924+
description: Size of the stack size of Wasm execution. Review
925+
unit sizes for allowed values.
926+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
927+
type: string
928+
type: object
787929
type: object
788930
type: array
789931
logLevel:

‎charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml

+42
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,48 @@ spec:
9595
plugin.
9696
type: string
9797
type: object
98+
execWasi:
99+
description: ExecWasi defines the exec wasi input plugin configuration
100+
properties:
101+
accessiblePaths:
102+
description: Specify the whitelist of paths to be able to access
103+
paths from WASM programs.
104+
items:
105+
type: string
106+
type: array
107+
bufSize:
108+
description: Size of the buffer (check unit sizes for allowed
109+
values)
110+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
111+
type: string
112+
intervalNSec:
113+
description: Polling interval (nanoseconds).
114+
format: int64
115+
type: integer
116+
intervalSec:
117+
description: Polling interval (seconds).
118+
format: int32
119+
type: integer
120+
parser:
121+
description: Specify the name of a parser to interpret the entry
122+
as a structured message.
123+
type: string
124+
threaded:
125+
description: 'Indicates whether to run this input in its own thread.
126+
Default: false.'
127+
type: boolean
128+
wasiPath:
129+
description: The place of a WASM program file.
130+
type: string
131+
wasmHeapSize:
132+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
133+
type: string
134+
wasmStackSize:
135+
description: Size of the stack size of Wasm execution. Review
136+
unit sizes for allowed values.
137+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
138+
type: string
139+
type: object
98140
fluentBitMetrics:
99141
description: FluentBitMetrics defines Fluent Bit Metrics Input configuration.
100142
properties:

‎charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml

+78
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,41 @@ spec:
529529
description: Enable AWS Sigv4 Authentication for Amazon ElasticSearch
530530
Service.
531531
type: string
532+
awsAuthSecret:
533+
description: AWSAuthSecret Enable AWS Sigv4 Authentication for
534+
Amazon ElasticSearch Service.
535+
properties:
536+
valueFrom:
537+
description: ValueSource defines how to find a value's key.
538+
properties:
539+
secretKeyRef:
540+
description: Selects a key of a secret in the pod's namespace
541+
properties:
542+
key:
543+
description: The key of the secret to select from. Must
544+
be a valid secret key.
545+
type: string
546+
name:
547+
default: ""
548+
description: |-
549+
Name of the referent.
550+
This field is effectively required, but due to backwards compatibility is
551+
allowed to be empty. Instances of this type with an empty value here are
552+
almost certainly wrong.
553+
TODO: Add other useful fields. apiVersion, kind, uid?
554+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
555+
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
556+
type: string
557+
optional:
558+
description: Specify whether the Secret or its key
559+
must be defined
560+
type: boolean
561+
required:
562+
- key
563+
type: object
564+
x-kubernetes-map-type: atomic
565+
type: object
566+
type: object
532567
awsExternalID:
533568
description: External ID for the AWS IAM Role specified with aws_role_arn.
534569
type: string
@@ -556,6 +591,42 @@ spec:
556591
description: Specify the credentials to use to connect to Elastic's
557592
Elasticsearch Service running on Elastic Cloud.
558593
type: string
594+
cloudAuthSecret:
595+
description: CloudAuthSecret Specify the credentials to use to
596+
connect to Elastic's Elasticsearch Service running on Elastic
597+
Cloud.
598+
properties:
599+
valueFrom:
600+
description: ValueSource defines how to find a value's key.
601+
properties:
602+
secretKeyRef:
603+
description: Selects a key of a secret in the pod's namespace
604+
properties:
605+
key:
606+
description: The key of the secret to select from. Must
607+
be a valid secret key.
608+
type: string
609+
name:
610+
default: ""
611+
description: |-
612+
Name of the referent.
613+
This field is effectively required, but due to backwards compatibility is
614+
allowed to be empty. Instances of this type with an empty value here are
615+
almost certainly wrong.
616+
TODO: Add other useful fields. apiVersion, kind, uid?
617+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
618+
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
619+
type: string
620+
optional:
621+
description: Specify whether the Secret or its key
622+
must be defined
623+
type: boolean
624+
required:
625+
- key
626+
type: object
627+
x-kubernetes-map-type: atomic
628+
type: object
629+
type: object
559630
cloudID:
560631
description: If you are using Elastic's Elasticsearch Service
561632
you can specify the cloud_id of the cluster running.
@@ -2856,6 +2927,9 @@ spec:
28562927
logResponsePayload:
28572928
description: Log the response payload within the Fluent Bit log.
28582929
type: boolean
2930+
logsBodyKeyAttributes:
2931+
description: If true, remaining unmatched keys are added as attributes.
2932+
type: boolean
28592933
logsUri:
28602934
description: 'Specify an optional HTTP URI for the target web
28612935
server listening for logs, e.g: /v1/logs'
@@ -4156,6 +4230,10 @@ spec:
41564230
description: Hostname to be used for TLS SNI extension
41574231
type: string
41584232
type: object
4233+
totalLimitSize:
4234+
description: Limit the maximum number of Chunks in the filesystem
4235+
for the current output logical destination.
4236+
type: string
41594237
type: object
41604238
tcp:
41614239
description: TCP defines TCP Output configuration.

0 commit comments

Comments
 (0)