Skip to content

Commit

Permalink
update fluent-operator to v3.1.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Gentleelephant <[email protected]>
  • Loading branch information
@Gentleelephant
Gentleelephant committed Aug 14, 2024
1 parent 19e6a22 commit ce6c76b
Show file tree
Hide file tree
Showing 23 changed files with 3,506 additions and 679 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.0.0
appVersion: 3.0.0
version: 3.1.0
appVersion: 3.1.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.0.0
version: 3.1.0
condition: fluentbit.crdsEnable
- name: fluentd-crds
repository: "file://charts/fluentd-crds"
version: 3.0.0
version: 3.1.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.0.0
appVersion: "3.0.0"
version: 3.1.0
appVersion: "3.1.0"
sources:
- https://github.com/fluent/fluent-operator
maintainers:
Expand Down
32 changes: 31 additions & 1 deletion 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 @@ -200,6 +200,13 @@ spec:
when capacity is reached. In order to enable this option, you should set the number to a time interval.
For example, set this value to 60 or 60s and cache entries which have been created more than 60s will be evicted.
type: string
kubeMetaNamespaceCacheTTL:
description: |-
Configurable TTL for K8s cached namespace metadata.
By default, it is set to 900 which means a 15min TTL for namespace cache entries.
Setting this to 0 will mean entries are evicted at random once the cache is full.
format: int32
type: integer
kubeMetaPreloadCacheDir:
description: |-
If set, Kubernetes meta-data can be cached/pre-loaded from files in JSON format in this directory,
Expand All @@ -210,6 +217,11 @@ spec:
When the source records comes from Tail input plugin,
this option allows to specify what's the prefix used in Tail configuration.
type: string
kubeTokenCommand:
description: |-
Command to get Kubernetes authorization token.
By default, it will be NULL and we will use token file to get token.
type: string
kubeTokenFile:
description: Token file
type: string
Expand Down Expand Up @@ -254,6 +266,19 @@ spec:
the data contained in the log key. Recommended use is
for developers or testing only.
type: string
namespaceAnnotations:
description: Include Kubernetes namespace resource annotations
in the extra metadata.
type: boolean
namespaceLabels:
description: Include Kubernetes namespace resource labels
in the extra metadata.
type: boolean
namespaceMetadataOnly:
description: |-
Include Kubernetes namespace metadata only and no pod metadata.
If this is set, the values of Labels and Annotations are ignored.
type: boolean
regexParser:
description: |-
Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.
Expand Down Expand Up @@ -326,10 +351,15 @@ spec:
description: The key to select.
type: string
name:
default: ""
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
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 ConfigMap or its key
Expand Down
13 changes: 13 additions & 0 deletions ...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -123,11 +125,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -167,11 +171,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -216,11 +222,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -260,11 +268,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -327,6 +337,9 @@ spec:
Note: Enabling this will not automatically configure kubernetes
to use fluentbit''s healthcheck endpoint'
type: boolean
hotReload:
description: If true enable reloading via HTTP
type: boolean
httpListen:
description: Address to listen
pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
Expand Down
60 changes: 59 additions & 1 deletion 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 @@ -234,10 +234,15 @@ spec:
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
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
Expand Down Expand Up @@ -423,6 +428,13 @@ spec:
and 204 are supported(default 201).
format: int32
type: integer
tag:
description: opentelemetry uses the tag value for incoming metrics.
type: string
tagFromURI:
description: If true, tag will be created from uri. e.g. v1_metrics
from /v1/metrics
type: boolean
tagKey:
description: Specify the key name to overwrite a tag. If set,
the tag will be overwritten by a value of the key.
Expand Down Expand Up @@ -814,6 +826,52 @@ spec:
uses the breakline character (LF or 0x10).
type: string
type: object
udp:
description: UDP defines the UDP input plugin configuration
properties:
bufferSize:
description: |-
BufferSize Specify the maximum buffer size in KB to receive a JSON message.
If not set, the default size will be the value of Chunk_Size.
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
chunkSize:
description: |-
By default the buffer to store the incoming JSON messages, do not allocate the maximum memory allowed,
instead it allocate memory when is required.
The rounds of allocations are set by Chunk_Size in KB. If not set, Chunk_Size is equal to 32 (32KB).
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
type: string
format:
description: |-
Format Specify the expected payload format. It support the options json and none.
When using json, it expects JSON maps, when is set to none,
it will split every record using the defined Separator (option below).
type: string
listen:
description: 'Listen Listener network interface, default: 0.0.0.0'
type: string
port:
description: 'Port Specify the UDP port where listening for connections,
default: 5170'
format: int32
maximum: 65535
minimum: 1
type: integer
separator:
description: Separator When the expected Format is set to none,
Fluent Bit needs a separator string to split the records. By
default it uses the breakline character (LF or 0x10).
type: string
sourceAddressKey:
description: SourceAddressKey Specify the key where the source
address will be injected.
type: string
threaded:
description: Threaded mechanism allows input plugin to run in
a separate thread which helps to desaturate the main pipeline.
type: string
type: object
type: object
type: object
served: true
Expand Down
Loading

0 comments on commit ce6c76b

Please sign in to comment.