Skip to content

Commit

Permalink
update fluent-operator to v3.2.0 (#553)
Browse files Browse the repository at this point in the history 
* 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]>
  • Loading branch information
@reegnz
reegnz authored Sep 24, 2024
1 parent da71989 commit adae492
Show file tree
Hide file tree
Showing 15 changed files with 560 additions and 47 deletions.
8 changes: 4 additions & 4 deletions charts/fluent-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ keywords:
- fluent-bit
- fluentd
- operator
version: 3.1.0
appVersion: 3.1.0
version: 3.2.0
appVersion: 3.2.0
icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
home: https://www.fluentd.org/
sources:
Expand All @@ -18,9 +18,9 @@ maintainers:
dependencies:
- name: fluent-bit-crds
repository: "file://charts/fluent-bit-crds"
version: 3.1.0
version: 3.2.0
condition: fluentbit.crdsEnable
- name: fluentd-crds
repository: "file://charts/fluentd-crds"
version: 3.1.0
version: 3.2.0
condition: fluentd.crdsEnable
4 changes: 2 additions & 2 deletions charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ keywords:
- logging
- fluent-bit
- operator
version: 3.1.0
appVersion: "3.1.0"
version: 3.2.0
appVersion: "3.2.0"
sources:
- https://github.com/fluent/fluent-operator
maintainers:
Expand Down
142 changes: 142 additions & 0 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,94 @@ spec:
This could mitigate the Kube API heavy traffic issue for large cluster.
type: boolean
type: object
logToMetrics:
description: LogToMetrics defines a Log to Metrics Filter configuration.
properties:
addLabel:
description: Add a custom label NAME and set the value to
the value of KEY
items:
type: string
type: array
alias:
description: Alias for the plugin
type: string
bucket:
description: Defines a bucket for histogram
items:
type: string
type: array
discardLogs:
description: |-
Flag that defines if logs should be discarded after processing. This applies
for all logs, no matter if they have emitted metrics or not.
type: boolean
emitterMemBufLimit:
description: set a buffer limit to restrict memory usage
of metrics emitter
type: string
emitterName:
description: Name of the emitter (advanced users)
type: string
exclude:
description: |-
Optional filter for records in which the content of KEY does not matches the regular expression.
Value Format: FIELD REGEX
items:
type: string
type: array
kubernetesMode:
description: |-
If enabled, it will automatically put pod_id, pod_name, namespace_name, docker_id and container_name
into the metric as labels. This option is intended to be used in combination with the kubernetes filter plugin.
type: boolean
labelField:
description: Includes a record field as label dimension
in the metric.
items:
type: string
type: array
metricDescription:
description: Sets a help text for the metric.
type: string
metricMode:
description: Defines the mode for the metric. Valid values
are [counter, gauge or histogram]
type: string
metricName:
description: Sets the name of the metric.
type: string
metricNamespace:
description: Namespace of the metric
type: string
metricSubsystem:
description: Sets a sub-system for the metric.
type: string
regex:
description: |-
Optional filter for records in which the content of KEY matches the regular expression.
Value Format: FIELD REGEX
items:
type: string
type: array
retryLimit:
description: 'RetryLimit describes how many times fluent-bit
should retry to send data to a specific output. If set
to false fluent-bit will try indefinetly. If set to any
integer N>0 it will try at most N+1 times. Leading zeros
are not allowed (values such as 007, 0150, 01 do not work).
If this property is not defined fluent-bit will use the
default value: 1.'
pattern: ^(((f|F)alse)|(no_limits)|(no_retries)|([1-9]+[0-9]*))$
type: string
tag:
description: Defines the tag for the generated metrics record
type: string
valueField:
description: Specify the record field that holds a numerical
value
type: string
type: object
lua:
description: Lua defines Lua Filter configuration.
properties:
Expand Down Expand Up @@ -376,6 +464,13 @@ spec:
If you desire timestamp precision enabling this option will pass the timestamp as
a Lua table with keys sec for seconds since epoch and nsec for nanoseconds.
type: boolean
typeArrayKey:
description: |-
If these keys are matched, the fields are handled as array. If more than
one key, delimit by space. It is useful the array can be empty.
items:
type: string
type: array
typeIntKey:
description: |-
If these keys are matched, the fields are converted to integer.
Expand Down Expand Up @@ -784,6 +879,53 @@ spec:
format: int64
type: integer
type: object
wasm:
description: Wasm defines a Wasm configuration.
properties:
accessiblePaths:
description: Specify the whitelist of paths to be able to
access paths from WASM programs.
items:
type: string
type: array
alias:
description: Alias for the plugin
type: string
eventFormat:
description: 'Define event format to interact with Wasm
programs: msgpack or json. Default: json'
type: string
functionName:
description: Wasm function name that will be triggered to
do filtering. It's assumed that the function is built
inside the Wasm program specified above.
type: string
retryLimit:
description: 'RetryLimit describes how many times fluent-bit
should retry to send data to a specific output. If set
to false fluent-bit will try indefinetly. If set to any
integer N>0 it will try at most N+1 times. Leading zeros
are not allowed (values such as 007, 0150, 01 do not work).
If this property is not defined fluent-bit will use the
default value: 1.'
pattern: ^(((f|F)alse)|(no_limits)|(no_retries)|([1-9]+[0-9]*))$
type: string
wasmHeapSize:
description: Size of the heap size of Wasm execution. Review
unit sizes for allowed values.
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
wasmPath:
description: Path to the built Wasm program that will be
used. This can be a relative path against the main configuration
file.
type: string
wasmStackSize:
description: Size of the stack size of Wasm execution. Review
unit sizes for allowed values.
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
type: object
type: object
type: array
logLevel:
Expand Down
42 changes: 42 additions & 0 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,48 @@ spec:
plugin.
type: string
type: object
execWasi:
description: ExecWasi defines the exec wasi input plugin configuration
properties:
accessiblePaths:
description: Specify the whitelist of paths to be able to access
paths from WASM programs.
items:
type: string
type: array
bufSize:
description: Size of the buffer (check unit sizes for allowed
values)
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
intervalNSec:
description: Polling interval (nanoseconds).
format: int64
type: integer
intervalSec:
description: Polling interval (seconds).
format: int32
type: integer
parser:
description: Specify the name of a parser to interpret the entry
as a structured message.
type: string
threaded:
description: 'Indicates whether to run this input in its own thread.
Default: false.'
type: boolean
wasiPath:
description: The place of a WASM program file.
type: string
wasmHeapSize:
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
wasmStackSize:
description: Size of the stack size of Wasm execution. Review
unit sizes for allowed values.
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
type: object
fluentBitMetrics:
description: FluentBitMetrics defines Fluent Bit Metrics Input configuration.
properties:
Expand Down
78 changes: 78 additions & 0 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,41 @@ spec:
description: Enable AWS Sigv4 Authentication for Amazon ElasticSearch
Service.
type: string
awsAuthSecret:
description: AWSAuthSecret Enable AWS Sigv4 Authentication for
Amazon ElasticSearch Service.
properties:
valueFrom:
description: ValueSource defines how to find a value's key.
properties:
secretKeyRef:
description: Selects a key of a secret in the pod's namespace
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
TODO: Add other useful fields. apiVersion, kind, uid?
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
type: string
optional:
description: Specify whether the Secret or its key
must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
type: object
awsExternalID:
description: External ID for the AWS IAM Role specified with aws_role_arn.
type: string
Expand Down Expand Up @@ -556,6 +591,42 @@ spec:
description: Specify the credentials to use to connect to Elastic's
Elasticsearch Service running on Elastic Cloud.
type: string
cloudAuthSecret:
description: CloudAuthSecret Specify the credentials to use to
connect to Elastic's Elasticsearch Service running on Elastic
Cloud.
properties:
valueFrom:
description: ValueSource defines how to find a value's key.
properties:
secretKeyRef:
description: Selects a key of a secret in the pod's namespace
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
TODO: Add other useful fields. apiVersion, kind, uid?
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
type: string
optional:
description: Specify whether the Secret or its key
must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
type: object
cloudID:
description: If you are using Elastic's Elasticsearch Service
you can specify the cloud_id of the cluster running.
Expand Down Expand Up @@ -2856,6 +2927,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'
Expand Down Expand Up @@ -4156,6 +4230,10 @@ spec:
description: Hostname to be used for TLS SNI extension
type: string
type: object
totalLimitSize:
description: Limit the maximum number of Chunks in the filesystem
for the current output logical destination.
type: string
type: object
tcp:
description: TCP defines TCP Output configuration.
Expand Down
Loading

0 comments on commit adae492

Please sign in to comment.