diff --git a/charts/logging-operator-logging/Chart.yaml b/charts/logging-operator-logging/Chart.yaml index 1e7d830b1..e917efc58 100644 --- a/charts/logging-operator-logging/Chart.yaml +++ b/charts/logging-operator-logging/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Helm chart to configure logging resource for the logging-operator name: logging-operator-logging -version: 2.3.0 +version: 2.4.0 diff --git a/charts/logging-operator/Chart.yaml b/charts/logging-operator/Chart.yaml index 6681781f1..e7a51a2d8 100644 --- a/charts/logging-operator/Chart.yaml +++ b/charts/logging-operator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Helm chart to install Banzai Cloud logging-operator name: logging-operator -version: 2.3.1 +version: 2.4.0 diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md index 53856c409..a74ac9c84 100644 --- a/charts/logging-operator/README.md +++ b/charts/logging-operator/README.md @@ -45,7 +45,7 @@ The following tables lists the configurable parameters of the logging-operator c | Parameter | Description | Default | | --------------------------------------------------- | ------------------------------------------------------ | ------------------------------ | | `image.repository` | Container image repository | `banzaicloud/logging-operator` | -| `image.tag` | Container image tag | `2.3.0` | +| `image.tag` | Container image tag | `2.4.0` | | `image.pullPolicy` | Container pull policy | `IfNotPresent` | | `nameOverride` | Override name of app | `` | | `fullnameOverride` | Override full name of app | `` | diff --git a/charts/logging-operator/templates/logging.banzaicloud.io_clusteroutputs.yaml b/charts/logging-operator/templates/logging.banzaicloud.io_clusteroutputs.yaml index 6dedda95e..257610268 100644 --- a/charts/logging-operator/templates/logging.banzaicloud.io_clusteroutputs.yaml +++ b/charts/logging-operator/templates/logging.banzaicloud.io_clusteroutputs.yaml @@ -2366,12 +2366,17 @@ spec: extra_labels: additionalProperties: type: string - description: Set of labels to include with every Loki stream. + description: Set of extra labels to include with every Loki stream. type: object extract_kubernetes_labels: description: 'Extract kubernetes labels as loki labels (default: false)' type: boolean + labels: + additionalProperties: + type: string + description: Set of labels to include with every Loki stream. + type: object line_format: description: 'Format to use when flattening the record to a log line: json, key_value (default: key_value)' diff --git a/charts/logging-operator/templates/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/templates/logging.banzaicloud.io_loggings.yaml index e99a5c2a8..288293973 100644 --- a/charts/logging-operator/templates/logging.banzaicloud.io_loggings.yaml +++ b/charts/logging-operator/templates/logging.banzaicloud.io_loggings.yaml @@ -47,6 +47,53 @@ spec: additionalProperties: type: string type: object + bufferStorage: + description: BufferStorage is the Service Section Configuration + of fluent-bit + properties: + storage.backlog.mem_limit: + description: If storage.path is set, Fluent Bit will look for + data chunks that were not delivered and are still in the storage + layer, these are called backlog data. This option configure + a hint of maximum value of memory to use when processing these + records. (default:5M) + type: string + storage.checksum: + description: Enable the data integrity check when writing and + reading data from the filesystem. The storage layer uses the + CRC32 algorithm. (default:Off) + type: string + storage.path: + description: Set an optional location in the file system to + store streams and chunks of data. If this parameter is not + set, Input plugins can only use in-memory buffering. + type: string + storage.sync: + description: Configure the synchronization mode used to store + the data into the file system. It can take the values normal + or full. (default:normal) + type: string + type: object + bufferStorageVolume: + properties: + host_path: + description: Represents a host path mapped into a pod. Host + path volumes do not support ownership management or SELinux + relabeling. + properties: + path: + description: 'Path of the directory on the host. If the + path is a symlink, it will follow the link to the real + path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + type: + description: 'Type for HostPath Volume Defaults to "" More + info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' + type: string + required: + - path + type: object + type: object customConfigSecret: type: string filterKubernetes: @@ -160,9 +207,9 @@ spec: tag: type: string required: - - pullPolicy - - repository - - tag + - pullPolicy + - repository + - tag type: object inputTail: description: InputTail defines Fluentbit tail input configuration @@ -278,6 +325,10 @@ spec: Tag_Regex: description: Set a regex to extract fields from the file. type: string + storage.type: + description: Specify the buffering mechanism to use. It can + be memory or filesystem. (default:memory) + type: string type: object metrics: description: Metrics defines the service monitor endpoints @@ -317,7 +368,7 @@ spec: info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' type: string required: - - path + - path type: object type: object resources: @@ -435,8 +486,8 @@ spec: description: Value of a property to set type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -564,8 +615,8 @@ spec: sharedKey: type: string required: - - enabled - - secretName + - enabled + - secretName type: object tolerations: items: @@ -624,9 +675,9 @@ spec: tag: type: string required: - - pullPolicy - - repository - - tag + - pullPolicy + - repository + - tag type: object disablePvc: type: boolean @@ -664,8 +715,8 @@ spec: description: Name is the name of resource being referenced type: string required: - - kind - - name + - kind + - name type: object resources: description: 'Resources represents the minimum resources the @@ -717,8 +768,8 @@ spec: type: string type: array required: - - key - - operator + - key + - operator type: object type: array matchLabels: @@ -755,9 +806,9 @@ spec: tag: type: string required: - - pullPolicy - - repository - - tag + - pullPolicy + - repository + - tag type: object metrics: description: Metrics defines the service monitor endpoints @@ -802,6 +853,15 @@ spec: to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' type: object type: object + scaling: + description: FluentdScaling enables configuring the scaling behaviour + of the fluentd statefulset + properties: + replicas: + type: integer + required: + - replicas + type: object security: description: Security defines Fluentd, Fluentbit deployment security properties @@ -898,8 +958,8 @@ spec: description: Value of a property to set type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -1022,8 +1082,8 @@ spec: sharedKey: type: string required: - - enabled - - secretName + - enabled + - secretName type: object tolerations: items: @@ -1074,9 +1134,9 @@ spec: tag: type: string required: - - pullPolicy - - repository - - tag + - pullPolicy + - repository + - tag type: object type: object loggingRef: @@ -1086,7 +1146,7 @@ spec: type: string type: array required: - - controlNamespace + - controlNamespace type: object status: description: LoggingStatus defines the observed state of Logging @@ -1099,9 +1159,9 @@ spec: type: object version: v1beta1 versions: - - name: v1beta1 - served: true - storage: true + - name: v1beta1 + served: true + storage: true status: acceptedNames: kind: "" diff --git a/charts/logging-operator/templates/logging.banzaicloud.io_outputs.yaml b/charts/logging-operator/templates/logging.banzaicloud.io_outputs.yaml index b990e0a75..0eb520ee5 100644 --- a/charts/logging-operator/templates/logging.banzaicloud.io_outputs.yaml +++ b/charts/logging-operator/templates/logging.banzaicloud.io_outputs.yaml @@ -2362,12 +2362,17 @@ spec: extra_labels: additionalProperties: type: string - description: Set of labels to include with every Loki stream. + description: Set of extra labels to include with every Loki stream. type: object extract_kubernetes_labels: description: 'Extract kubernetes labels as loki labels (default: false)' type: boolean + labels: + additionalProperties: + type: string + description: Set of labels to include with every Loki stream. + type: object line_format: description: 'Format to use when flattening the record to a log line: json, key_value (default: key_value)' diff --git a/charts/logging-operator/values.yaml b/charts/logging-operator/values.yaml index f40757be3..8e1ec9ff3 100644 --- a/charts/logging-operator/values.yaml +++ b/charts/logging-operator/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: banzaicloud/logging-operator - tag: 2.3.0 + tag: 2.4.0 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/charts/nginx-logging-cw-demo/Chart.yaml b/charts/nginx-logging-cw-demo/Chart.yaml index 0795a6677..a8a772700 100644 --- a/charts/nginx-logging-cw-demo/Chart.yaml +++ b/charts/nginx-logging-cw-demo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Demo application for the logging-operator AWS CloudWatch backend name: nginx-logging-cw-demo -version: 2.3.0 +version: 2.4.0 maintainers: - name: Banzai Cloud email: info@banzaicloud.com diff --git a/charts/nginx-logging-demo/Chart.yaml b/charts/nginx-logging-demo/Chart.yaml index c8f648299..c1cc0b35b 100644 --- a/charts/nginx-logging-demo/Chart.yaml +++ b/charts/nginx-logging-demo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Demo application for the logging-operator name: nginx-logging-demo -version: 2.3.0 +version: 2.4.0 maintainers: - name: Banzai Cloud email: info@banzaicloud.com diff --git a/charts/nginx-logging-es-demo/Chart.yaml b/charts/nginx-logging-es-demo/Chart.yaml index 700340526..0b2d29dc3 100644 --- a/charts/nginx-logging-es-demo/Chart.yaml +++ b/charts/nginx-logging-es-demo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Demo application for the logging-operator name: nginx-logging-es-demo -version: 2.3.0 +version: 2.4.0 maintainers: - name: Banzai Cloud email: info@banzaicloud.com diff --git a/charts/nginx-logging-kafka-demo/Chart.yaml b/charts/nginx-logging-kafka-demo/Chart.yaml index 5f48ababc..0c476c16b 100644 --- a/charts/nginx-logging-kafka-demo/Chart.yaml +++ b/charts/nginx-logging-kafka-demo/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Helm chart for Kubernetes name: nginx-logging-kafka-demo -version: 2.3.0 +version: 2.4.0 diff --git a/charts/nginx-logging-loki-demo/Chart.yaml b/charts/nginx-logging-loki-demo/Chart.yaml index acc492409..f628b174b 100644 --- a/charts/nginx-logging-loki-demo/Chart.yaml +++ b/charts/nginx-logging-loki-demo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "2.3.0" +appVersion: "2.4.0" description: A Demo application for the logging-operator name: nginx-logging-loki-demo -version: 2.3.0 +version: 2.4.0 maintainers: - name: Banzai Cloud email: info@banzaicloud.com