Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions charts/fluent-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
- fluent-bit
- fluentd
- operator
version: 3.4.0
version: 3.4.2
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
appVersion: "3.4.0"
icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
Expand All @@ -19,9 +19,9 @@ maintainers:
dependencies:
- name: fluent-bit-crds
repository: "file://charts/fluent-bit-crds"
version: 3.3.0
version: 3.4.2
condition: fluentbit.crdsEnable
- name: fluentd-crds
repository: "file://charts/fluentd-crds"
version: 3.3.0
version: 3.4.2
condition: fluentd.crdsEnable
4 changes: 2 additions & 2 deletions charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ description: A Helm chart delivering fluenbt-bit controller CRDS
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.3.0
version: 3.4.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
appVersion: "3.3.0"
appVersion: "3.4.0"
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ spec:
type: boolean
httpListen:
description: Address to listen
pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
pattern: ^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([A-Fa-f0-9:]+:+)+[A-Fa-f0-9]*)$
type: string
httpPort:
description: Port to listen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2109,6 +2109,7 @@ spec:
type: string
region:
description: The AWS region.
minLength: 1
type: string
roleARN:
description: ARN of an IAM role to assume (for cross account access).
Expand Down Expand Up @@ -3522,6 +3523,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ spec:
type: object
logfmt:
description: Logfmt defines logfmt parser configuration.
properties:
timeFormat:
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
type: string
timeKeep:
description: Time_Keep
type: boolean
timeKey:
description: Time_Key
type: string
type: object
x-kubernetes-validations:
- message: logfmt must not be null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ spec:
type: boolean
httpListen:
description: Address to listen
pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
pattern: ^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([A-Fa-f0-9:]+:+)+[A-Fa-f0-9]*)$
type: string
httpPort:
description: Port to listen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2109,6 +2109,7 @@ spec:
type: string
region:
description: The AWS region.
minLength: 1
type: string
roleARN:
description: ARN of an IAM role to assume (for cross account access).
Expand Down Expand Up @@ -3522,6 +3523,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ spec:
type: object
logfmt:
description: Logfmt defines logfmt parser configuration.
properties:
timeFormat:
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
type: string
timeKeep:
description: Time_Keep
type: boolean
timeKey:
description: Time_Key
type: string
type: object
x-kubernetes-validations:
- message: logfmt must not be null
Expand Down
4 changes: 2 additions & 2 deletions charts/fluent-operator/charts/fluentd-crds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ description: A Helm chart delivering fluentd controller CRDS
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.3.0
version: 3.4.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
appVersion: "3.3.0"
appVersion: "3.4.0"
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ spec:
bufferChunkSize: {{ . | quote }}
{{- end }}
skipLongLines: {{ .Values.fluentbit.input.tail.skipLongLines }}
skipEmptyLines: {{ .Values.fluentbit.input.tail.skipEmptyLines }}
{{- if .Values.fluentbit.input.tail.ignoredOlder }}
ignoredOlder: {{ .Values.fluentbit.input.tail.ignoredOlder }}
{{- end }}
db: /fluent-bit/tail/pos.db
dbSync: Normal
storageType: {{ .Values.fluentbit.input.tail.storageType }}
Expand Down
15 changes: 4 additions & 11 deletions charts/fluent-operator/templates/fluentbit-fluentBit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
{{- end }}
image: {{ template "fluent-operator.image" (tuple .Values.fluentbit.image "") }}
{{- if .Values.fluentbit.imagePullSecrets }}
{{- with .Values.fluentbit.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 4 }}
{{- end }}
Expand Down Expand Up @@ -72,17 +72,10 @@ spec:
volumes:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.fluentbit.livenessProbe }}
{{- if .enabled }}
{{- if .Values.fluentbit.livenessProbe.enabled }}
livenessProbe:
httpGet:
port: 2020
path: /
initialDelaySeconds: {{ .initialDelaySeconds }}
periodSeconds: {{ .periodSeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
successThreshold: {{ .successThreshold }}
failureThreshold: {{ .failureThreshold }}
{{- with omit .Values.fluentbit.livenessProbe "enabled" }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- with .Values.fluentbit.additionalVolumesMounts }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ spec:
traceError: {{ .Values.fluentbit.output.es.traceError | default false }}
generateID: true
timeKey: "@timestamp"
{{- if .Values.fluentbit.output.es.enableTLS }}
{{- if and .Values.fluentbit.output.es.tls .Values.fluentbit.output.es.tls.enable }}
tls:
{{- toYaml .Values.fluentbit.output.es.tls | nindent 6 }}
{{- omit .Values.fluentbit.output.es.tls "enable" | toYaml | nindent 6 }}
{{- end }}
{{- end }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
fluentbit.fluent.io/enabled: "true"
fluentbit.fluent.io/component: logging
spec:
logLevel: "{{ .logLevel }}"
matchRegex: (?:kube|service)\.(.*)
kafka:
brokers: {{ .brokers | quote }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ metadata:
spec:
matchRegex: (?:kube|service)\.(.*)
retry_limit: "{{ .retryLimit }}"
logLevel: "{{ .logLevel }}"
loki:
{{- with .host }}
host: {{ . | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-operator/templates/fluentd-fluentd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
bind: 0.0.0.0
port: {{ .port }}
replicas: {{ .replicas }}
image: {{ template "fluent-operator.image" (tuple .Values.fluentd.image "") }}
image: {{ template "fluent-operator.image" (tuple .image "") }}
{{- with .imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 4 }}
Expand Down
89 changes: 48 additions & 41 deletions charts/fluent-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ operator:
# If set to false, this will disable the creation of ClusterRole, ClusterRoleBinding,
# Deployment, and ServiceAccount resources to avoid conflicts when deploying multiple instances.
enable: true
# nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/user-guide/node-selection/
# nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
nodeSelector: {}
# affinity configuration for Fluent Operator. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
affinity: {}
Expand Down Expand Up @@ -95,6 +95,9 @@ fluentbit:
metricRelabelings: []
livenessProbe:
enabled: true
httpGet:
port: 2020
path: /
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 15
Expand Down Expand Up @@ -228,6 +231,7 @@ fluentbit:
bufferChunkSize: ""
path: "/var/log/containers/*.log"
skipLongLines: true
skipEmptyLines: true
readFromHead: false
# Use storageType as "filesystem" if you want to use filesystem as the buffering mechanism for tail input.
storageType: memory
Expand Down Expand Up @@ -280,9 +284,9 @@ fluentbit:
# httpPassword:
# logstashFormat: true
# replaceDots: false
# enableTLS: false
# writeOperation: upsert
# tls:
# enable: false
# verify: On
# debug: 1
# caFile: "<Absolute path to CA certificate file>"
Expand All @@ -293,6 +297,7 @@ fluentbit:
# vhost: "<Hostname to be used for TLS SNI extension>"
kafka:
enable: false
logLevel: info
brokers: "<kafka broker list like xxx.xxx.xxx.xxx:9092,yyy.yyy.yyy.yyy:9092>"
topics: ks-log
opentelemetry: {}
Expand All @@ -316,52 +321,53 @@ fluentbit:
# See https://docs.fluentbit.io/manual/pipeline/outputs/loki
loki:
# Switch for generation of fluentbit loki ClusterOutput (and loki basic auth http user and pass secrets if required)
enable: false # Bool
enable: false # Bool
retryLimit: "no_limits"
host: 127.0.0.1 # String
port: 3100 # Int
logLevel: "info"
host: 127.0.0.1 # String
port: 3100 # Int
# Either, give http{User,Password},tenantID string values specifying them directly
httpUser: myuser
httpPassword: mypass
tenantID: ""
# Or give {http{User,Password},tenantID} as reference to secrets that you have manually installed into your kubernetes cluster
#httpUser:
# valueFrom:
# secretKeyRef:
# key: value
# name: husersecret
# optional: true
#httpPassword:
# valueFrom:
# secretKeyRef:
# key: value
# name: hpasssecret
# optional: true
#tenantID:
# valueFrom:
# secretKeyRef:
# key: value
# name: tenantsecret
# optional: true
# httpUser:
# valueFrom:
# secretKeyRef:
# key: value
# name: husersecret
# optional: true
# httpPassword:
# valueFrom:
# secretKeyRef:
# key: value
# name: hpasssecret
# optional: true
# tenantID:
# valueFrom:
# secretKeyRef:
# key: value
# name: tenantsecret
# optional: true
#
# To use bearer token auth instead of http basic auth
#bearerToken: ey....
# bearerToken: ey....
# or with existing secret
#bearerToken:
# valueFrom:
# secretKeyRef:
# key: value
# name: bearerTokenSecret
# optional: true
#labels: [] # String list of <name>=<value>
#labelKeys: [] # String list of <key>
#removeKeys: [] # String list of <key>
#labelMapPath: '' # String, path to file, ex /here/it/is
#dropSingleKey: off
#lineFormat: '' # String
#autoKubernetesLabels: on
#tenantIDKey: # String
#tls: {} # *plugins.TLS fluentbit docs
# bearerToken:
# valueFrom:
# secretKeyRef:
# key: value
# name: bearerTokenSecret
# optional: true
# labels: [] # String list of <name>=<value>
# labelKeys: [] # String list of <key>
# removeKeys: [] # String list of <key>
# labelMapPath: '' # String, path to file, ex /here/it/is
# dropSingleKey: off
# lineFormat: '' # String
# autoKubernetesLabels: on
# tenantIDKey: # String
# tls: {} # *plugins.TLS fluentbit docs
stackdriver: {}
# You can configure the stackdriver configuration here

Expand Down Expand Up @@ -425,12 +431,13 @@ fluentbit:
javaMultiline:
# use in filter for parser generic springboot multiline log format
enable: false
#Using namespaceClusterFbCfg, deploy fluent-bit configmap and secret in this namespace.
#If it is not defined, it is in the namespace of the fluent-operator.
# Using namespaceClusterFbCfg, deploy fluent-bit configmap and secret in this namespace.
# If it is not defined, it is in the namespace of the fluent-operator.
namespaceClusterFbCfg: ""

fluentd:
# Installs a sub chart carrying the CRDs for the fluentd controller. The sub chart is enabled by default.
# Valid modes include "collector" and "agent".
crdsEnable: true
enable: false
name: fluentd
Expand Down