diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml index 8fcd82dd..0969fee6 100644 --- a/charts/fluent-operator/Chart.yaml +++ b/charts/fluent-operator/Chart.yaml @@ -6,8 +6,8 @@ keywords: - fluent-bit - fluentd - operator -version: 2.8.0 -appVersion: 2.8.0 +version: 2.9.0 +appVersion: 2.9.0 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg home: https://www.fluentd.org/ sources: @@ -18,9 +18,9 @@ maintainers: dependencies: - name: fluent-bit-crds repository: "file://charts/fluent-bit-crds" - version: 2.8.0 + version: 2.9.0 condition: fluentbit.crdsEnable - name: fluentd-crds repository: "file://charts/fluentd-crds" - version: 2.8.0 + version: 2.9.0 condition: fluentd.crdsEnable diff --git a/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml b/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml index dccd4b66..3d7ad42f 100644 --- a/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml +++ b/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml @@ -5,8 +5,8 @@ keywords: - logging - fluent-bit - operator -version: 2.8.0 -appVersion: "2.8.0" +version: 2.9.0 +appVersion: "2.9.0" sources: - https://github.com/fluent/fluent-operator maintainers: 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 index d32f7cc5..dfe34fb1 100644 --- 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 @@ -348,7 +348,32 @@ spec: properties: apikey: description: Your Datadog API key. - type: string + 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: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + 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 compress: description: Compress the payload in GZIP format. Datadog supports and recommends setting this to gzip. @@ -650,6 +675,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 traceError: description: When enabled print the elasticsearch API calls to stdout when elasticsearch returns an error @@ -819,6 +848,10 @@ spec: description: A key string known by the remote Fluentd used for authorization. type: string + tag: + description: Overwrite the tag as we transmit. This allows the + receiving pipeline start fresh, or to attribute source. + type: string timeAsInteger: description: Set timestamps in integer format, it enable compatibility mode for Fluentd v0.12 series. diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml index c7513656..77ed6a94 100644 --- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml +++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml @@ -4673,6 +4673,11 @@ spec: type: string description: Annotations to add to the Fluentbit service account type: object + terminationGracePeriodSeconds: + description: Optional duration in seconds the pod needs to terminate + gracefully. Value must be non-negative integer. + format: int64 + type: integer tolerations: description: Tolerations items: 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 index 3949e9bc..f9b8d9ab 100644 --- 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 @@ -348,7 +348,32 @@ spec: properties: apikey: description: Your Datadog API key. - type: string + 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: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + 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 compress: description: Compress the payload in GZIP format. Datadog supports and recommends setting this to gzip. @@ -650,6 +675,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 traceError: description: When enabled print the elasticsearch API calls to stdout when elasticsearch returns an error @@ -819,6 +848,10 @@ spec: description: A key string known by the remote Fluentd used for authorization. type: string + tag: + description: Overwrite the tag as we transmit. This allows the + receiving pipeline start fresh, or to attribute source. + type: string timeAsInteger: description: Set timestamps in integer format, it enable compatibility mode for Fluentd v0.12 series. diff --git a/charts/fluent-operator/charts/fluentd-crds/Chart.yaml b/charts/fluent-operator/charts/fluentd-crds/Chart.yaml index cc76b7a1..be15a1dc 100644 --- a/charts/fluent-operator/charts/fluentd-crds/Chart.yaml +++ b/charts/fluent-operator/charts/fluentd-crds/Chart.yaml @@ -5,8 +5,8 @@ keywords: - logging - fluentd - operator -version: 2.8.0 -appVersion: "2.8.0" +version: 2.9.0 +appVersion: "2.9.0" sources: - https://github.com/fluent/fluent-operator maintainers: diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml index cc69e61f..2098a414 100644 --- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml +++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml @@ -596,6 +596,70 @@ spec: x-kubernetes-map-type: atomic type: object type: object + cloudAuth: + description: Authenticate towards Elastic Cloud using cloudAuth. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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: Authenticate towards Elastic Cloud using CloudId. + If set, cloudAuth must be set as well and host, port, + user and password are ignored. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 host: description: 'The hostname of your Elasticsearch node (default: localhost).' @@ -701,6 +765,212 @@ spec: type: object type: object type: object + elasticsearchDataStream: + description: out_es datastreams plugin + properties: + caFile: + description: Optional, Absolute path to CA certificate file + type: string + clientCert: + description: Optional, Absolute path to client Certificate + file + type: string + clientKey: + description: Optional, Absolute path to client private Key + file + type: string + clientKeyPassword: + description: Optional, password for ClientKey file + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + cloudAuth: + description: Authenticate towards Elastic Cloud using cloudAuth. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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: Authenticate towards Elastic Cloud using CloudId. + If set, cloudAuth must be set as well and host, port, + user and password are ignored. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + dataStreamName: + description: You can specify Elasticsearch data stream name + by this parameter. This parameter is mandatory for elasticsearch_data_stream + type: string + host: + description: 'The hostname of your Elasticsearch node (default: + localhost).' + type: string + hosts: + description: Hosts defines a list of hosts if you want to + connect to more than one Elasticsearch nodes + type: string + password: + description: Optional, The login credentials to connect + to Elasticsearch + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + path: + description: 'Path defines the REST API endpoint of Elasticsearch + to post write requests (default: nil).' + type: string + port: + description: 'The port number of your Elasticsearch node + (default: 9200).' + format: int32 + maximum: 65535 + minimum: 1 + type: integer + scheme: + description: 'Specify https if your Elasticsearch endpoint + supports SSL (default: http).' + type: string + sslVerify: + description: Optional, Force certificate validation + type: boolean + user: + description: Optional, The login credentials to connect + to Elasticsearch + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + required: + - dataStreamName + type: object format: description: format section properties: diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml index bacfb15f..dde16f77 100644 --- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml +++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml @@ -596,6 +596,70 @@ spec: x-kubernetes-map-type: atomic type: object type: object + cloudAuth: + description: Authenticate towards Elastic Cloud using cloudAuth. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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: Authenticate towards Elastic Cloud using CloudId. + If set, cloudAuth must be set as well and host, port, + user and password are ignored. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 host: description: 'The hostname of your Elasticsearch node (default: localhost).' @@ -701,6 +765,212 @@ spec: type: object type: object type: object + elasticsearchDataStream: + description: out_es datastreams plugin + properties: + caFile: + description: Optional, Absolute path to CA certificate file + type: string + clientCert: + description: Optional, Absolute path to client Certificate + file + type: string + clientKey: + description: Optional, Absolute path to client private Key + file + type: string + clientKeyPassword: + description: Optional, password for ClientKey file + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + cloudAuth: + description: Authenticate towards Elastic Cloud using cloudAuth. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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: Authenticate towards Elastic Cloud using CloudId. + If set, cloudAuth must be set as well and host, port, + user and password are ignored. + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + dataStreamName: + description: You can specify Elasticsearch data stream name + by this parameter. This parameter is mandatory for elasticsearch_data_stream + type: string + host: + description: 'The hostname of your Elasticsearch node (default: + localhost).' + type: string + hosts: + description: Hosts defines a list of hosts if you want to + connect to more than one Elasticsearch nodes + type: string + password: + description: Optional, The login credentials to connect + to Elasticsearch + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + path: + description: 'Path defines the REST API endpoint of Elasticsearch + to post write requests (default: nil).' + type: string + port: + description: 'The port number of your Elasticsearch node + (default: 9200).' + format: int32 + maximum: 65535 + minimum: 1 + type: integer + scheme: + description: 'Specify https if your Elasticsearch endpoint + supports SSL (default: http).' + type: string + sslVerify: + description: Optional, Force certificate validation + type: boolean + user: + description: Optional, The login credentials to connect + to Elasticsearch + 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: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, + kind, uid?' + 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 + required: + - dataStreamName + type: object format: description: format section properties: diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index 4f68a6c1..bb22ba82 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -24,7 +24,7 @@ operator: memory: 64Mi container: repository: "kubesphere/fluent-operator" - tag: "v2.8.0" + tag: "v2.9.0" # nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: {} # Node tolerations applied to Fluent Operator. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ @@ -74,8 +74,8 @@ fluentbit: enable: true serviceMonitor: false image: - repository: "kubesphere/fluent-bit" - tag: "v2.2.2" + repository: "ghcr.io/fluent/fluent-operator/fluent-bit" + tag: "v3.0.7" # fluentbit resources. If you do want to specify resources, adjust them as necessary # You can adjust it based on the log volume. resources: @@ -371,8 +371,8 @@ fluentd: mode: "collector" port: 24224 image: - repository: "kubesphere/fluentd" - tag: "v1.15.3" + repository: "ghcr.io/fluent/fluent-operator/fluentd" + tag: "v1.17.0" # Numbers of the Fluentd instance # Applicable when the mode is "collector", and will be ignored when the mode is "agent" replicas: 1