[Logging] Upgrade to upstream 3.12.0 (#1331)

* remove rancher logging 3.10

* logging 1.12.0

* make charts

charts/rancher-logging/rancher-logging-crd/100.0.0+up3.12.0/Chart.yaml

@@ -7,4 +7,4 @@ apiVersion: v1
 description: Installs the CRDs for rancher-logging.
 name: rancher-logging-crd
 type: application
-version: 100.0.0+up3.10.0
+version: 100.0.0+up3.12.0

charts/rancher-logging/rancher-logging-crd/100.0.0+up3.12.0/templates/logging.banzaicloud.io_clusterflows.yaml

@@ -18,6 +18,743 @@ spec:
     singular: clusterflow
   scope: Namespaced
   versions:
+  - additionalPrinterColumns:
+    - description: Is the flow active?
+      jsonPath: .status.active
+      name: Active
+      type: boolean
+    - description: Number of problems
+      jsonPath: .status.problemsCount
+      name: Problems
+      type: integer
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              filters:
+                items:
+                  properties:
+                    concat:
+                      properties:
+                        continuous_line_regexp:
+                          type: string
+                        flush_interval:
+                          type: integer
+                        keep_partial_key:
+                          type: boolean
+                        keep_partial_metadata:
+                          type: string
+                        key:
+                          type: string
+                        multiline_end_regexp:
+                          type: string
+                        multiline_start_regexp:
+                          type: string
+                        n_lines:
+                          type: integer
+                        partial_key:
+                          type: string
+                        partial_value:
+                          type: string
+                        separator:
+                          type: string
+                        stream_identity_key:
+                          type: string
+                        timeout_label:
+                          type: string
+                        use_first_timestamp:
+                          type: boolean
+                        use_partial_metadata:
+                          type: string
+                      type: object
+                    dedot:
+                      properties:
+                        de_dot_nested:
+                          type: boolean
+                        de_dot_separator:
+                          type: string
+                      type: object
+                    detectExceptions:
+                      properties:
+                        languages:
+                          items:
+                            type: string
+                          type: array
+                        max_bytes:
+                          type: integer
+                        max_lines:
+                          type: integer
+                        message:
+                          type: string
+                        multiline_flush_interval:
+                          type: string
+                        remove_tag_prefix:
+                          type: string
+                        stream:
+                          type: string
+                      type: object
+                    enhanceK8s:
+                      properties:
+                        api_groups:
+                          items:
+                            type: string
+                          type: array
+                        bearer_token_file:
+                          type: string
+                        ca_file:
+                          properties:
+                            mountFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                          type: object
+                        cache_refresh:
+                          type: integer
+                        cache_refresh_variation:
+                          type: integer
+                        cache_size:
+                          type: integer
+                        cache_ttl:
+                          type: integer
+                        client_cert:
+                          properties:
+                            mountFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                          type: object
+                        client_key:
+                          properties:
+                            mountFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                          type: object
+                        core_api_versions:
+                          items:
+                            type: string
+                          type: array
+                        data_type:
+                          type: string
+                        in_namespace_path:
+                          items:
+                            type: string
+                          type: array
+                        in_pod_path:
+                          items:
+                            type: string
+                          type: array
+                        kubernetes_url:
+                          type: string
+                        secret_dir:
+                          type: string
+                        ssl_partial_chain:
+                          type: boolean
+                        verify_ssl:
+                          type: boolean
+                      type: object
+                    geoip:
+                      properties:
+                        backend_library:
+                          type: string
+                        geoip_2_database:
+                          type: string
+                        geoip_database:
+                          type: string
+                        geoip_lookup_keys:
+                          type: string
+                        records:
+                          items:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type: array
+                        skip_adding_null_record:
+                          type: boolean
+                      type: object
+                    grep:
+                      properties:
+                        and:
+                          items:
+                            properties:
+                              exclude:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                              regexp:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                            type: object
+                          type: array
+                        exclude:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              pattern:
+                                type: string
+                            required:
+                            - key
+                            - pattern
+                            type: object
+                          type: array
+                        or:
+                          items:
+                            properties:
+                              exclude:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                              regexp:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                            type: object
+                          type: array
+                        regexp:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              pattern:
+                                type: string
+                            required:
+                            - key
+                            - pattern
+                            type: object
+                          type: array
+                      type: object
+                    parser:
+                      properties:
+                        emit_invalid_record_to_error:
+                          type: boolean
+                        hash_value_field:
+                          type: string
+                        inject_key_prefix:
+                          type: string
+                        key_name:
+                          type: string
+                        parse:
+                          properties:
+                            delimiter:
+                              type: string
+                            delimiter_pattern:
+                              type: string
+                            estimate_current_event:
+                              type: boolean
+                            expression:
+                              type: string
+                            format:
+                              type: string
+                            format_firstline:
+                              type: string
+                            keep_time_key:
+                              type: boolean
+                            label_delimiter:
+                              type: string
+                            local_time:
+                              type: boolean
+                            multiline:
+                              items:
+                                type: string
+                              type: array
+                            null_empty_string:
+                              type: boolean
+                            null_value_pattern:
+                              type: string
+                            patterns:
+                              items:
+                                properties:
+                                  estimate_current_event:
+                                    type: boolean
+                                  expression:
+                                    type: string
+                                  format:
+                                    type: string
+                                  keep_time_key:
+                                    type: boolean
+                                  local_time:
+                                    type: boolean
+                                  null_empty_string:
+                                    type: boolean
+                                  null_value_pattern:
+                                    type: string
+                                  time_format:
+                                    type: string
+                                  time_key:
+                                    type: string
+                                  time_type:
+                                    type: string
+                                  timezone:
+                                    type: string
+                                  type:
+                                    type: string
+                                  types:
+                                    type: string
+                                  utc:
+                                    type: boolean
+                                type: object
+                              type: array
+                            time_format:
+                              type: string
+                            time_key:
+                              type: string
+                            time_type:
+                              type: string
+                            timezone:
+                              type: string
+                            type:
+                              type: string
+                            types:
+                              type: string
+                            utc:
+                              type: boolean
+                          type: object
+                        parsers:
+                          items:
+                            properties:
+                              delimiter:
+                                type: string
+                              delimiter_pattern:
+                                type: string
+                              estimate_current_event:
+                                type: boolean
+                              expression:
+                                type: string
+                              format:
+                                type: string
+                              format_firstline:
+                                type: string
+                              keep_time_key:
+                                type: boolean
+                              label_delimiter:
+                                type: string
+                              local_time:
+                                type: boolean
+                              multiline:
+                                items:
+                                  type: string
+                                type: array
+                              null_empty_string:
+                                type: boolean
+                              null_value_pattern:
+                                type: string
+                              patterns:
+                                items:
+                                  properties:
+                                    estimate_current_event:
+                                      type: boolean
+                                    expression:
+                                      type: string
+                                    format:
+                                      type: string
+                                    keep_time_key:
+                                      type: boolean
+                                    local_time:
+                                      type: boolean
+                                    null_empty_string:
+                                      type: boolean
+                                    null_value_pattern:
+                                      type: string
+                                    time_format:
+                                      type: string
+                                    time_key:
+                                      type: string
+                                    time_type:
+                                      type: string
+                                    timezone:
+                                      type: string
+                                    type:
+                                      type: string
+                                    types:
+                                      type: string
+                                    utc:
+                                      type: boolean
+                                  type: object
+                                type: array
+                              time_format:
+                                type: string
+                              time_key:
+                                type: string
+                              time_type:
+                                type: string
+                              timezone:
+                                type: string
+                              type:
+                                type: string
+                              types:
+                                type: string
+                              utc:
+                                type: boolean
+                            type: object
+                          type: array
+                        remove_key_name_field:
+                          type: boolean
+                        replace_invalid_sequence:
+                          type: boolean
+                        reserve_data:
+                          type: boolean
+                        reserve_time:
+                          type: boolean
+                      type: object
+                    prometheus:
+                      properties:
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        metrics:
+                          items:
+                            properties:
+                              buckets:
+                                type: string
+                              desc:
+                                type: string
+                              key:
+                                type: string
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              name:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - desc
+                            - name
+                            - type
+                            type: object
+                          type: array
+                      type: object
+                    record_modifier:
+                      properties:
+                        char_encoding:
+                          type: string
+                        prepare_value:
+                          type: string
+                        records:
+                          items:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type: array
+                        remove_keys:
+                          type: string
+                        replaces:
+                          items:
+                            properties:
+                              expression:
+                                type: string
+                              key:
+                                type: string
+                              replace:
+                                type: string
+                            required:
+                            - expression
+                            - key
+                            - replace
+                            type: object
+                          type: array
+                        whitelist_keys:
+                          type: string
+                      type: object
+                    record_transformer:
+                      properties:
+                        auto_typecast:
+                          type: boolean
+                        enable_ruby:
+                          type: boolean
+                        keep_keys:
+                          type: string
+                        records:
+                          items:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type: array
+                        remove_keys:
+                          type: string
+                        renew_record:
+                          type: boolean
+                        renew_time_key:
+                          type: string
+                      type: object
+                    stdout:
+                      properties:
+                        output_type:
+                          type: string
+                      type: object
+                    sumologic:
+                      properties:
+                        collector_key_name:
+                          type: string
+                        collector_value:
+                          type: string
+                        exclude_container_regex:
+                          type: string
+                        exclude_facility_regex:
+                          type: string
+                        exclude_host_regex:
+                          type: string
+                        exclude_namespace_regex:
+                          type: string
+                        exclude_pod_regex:
+                          type: string
+                        exclude_priority_regex:
+                          type: string
+                        exclude_unit_regex:
+                          type: string
+                        log_format:
+                          type: string
+                        source_category:
+                          type: string
+                        source_category_key_name:
+                          type: string
+                        source_category_prefix:
+                          type: string
+                        source_category_replace_dash:
+                          type: string
+                        source_host:
+                          type: string
+                        source_host_key_name:
+                          type: string
+                        source_name:
+                          type: string
+                        source_name_key_name:
+                          type: string
+                        tracing_annotation_prefix:
+                          type: string
+                        tracing_container_name:
+                          type: string
+                        tracing_format:
+                          type: boolean
+                        tracing_host:
+                          type: string
+                        tracing_label_prefix:
+                          type: string
+                        tracing_namespace:
+                          type: string
+                        tracing_pod:
+                          type: string
+                        tracing_pod_id:
+                          type: string
+                      type: object
+                    tag_normaliser:
+                      properties:
+                        format:
+                          type: string
+                      type: object
+                    throttle:
+                      properties:
+                        group_bucket_limit:
+                          type: integer
+                        group_bucket_period_s:
+                          type: integer
+                        group_drop_logs:
+                          type: boolean
+                        group_key:
+                          type: string
+                        group_reset_rate_s:
+                          type: integer
+                        group_warning_delay_s:
+                          type: integer
+                      type: object
+                  type: object
+                type: array
+              globalOutputRefs:
+                items:
+                  type: string
+                type: array
+              loggingRef:
+                type: string
+              match:
+                items:
+                  properties:
+                    exclude:
+                      properties:
+                        container_names:
+                          items:
+                            type: string
+                          type: array
+                        hosts:
+                          items:
+                            type: string
+                          type: array
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        namespaces:
+                          items:
+                            type: string
+                          type: array
+                      type: object
+                    select:
+                      properties:
+                        container_names:
+                          items:
+                            type: string
+                          type: array
+                        hosts:
+                          items:
+                            type: string
+                          type: array
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        namespaces:
+                          items:
+                            type: string
+                          type: array
+                      type: object
+                  type: object
+                type: array
+              outputRefs:
+                items:
+                  type: string
+                type: array
+              selectors:
+                additionalProperties:
+                  type: string
+                type: object
+            type: object
+          status:
+            properties:
+              active:
+                type: boolean
+              problems:
+                items:
+                  type: string
+                type: array
+              problemsCount:
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
   - additionalPrinterColumns:
     - description: Is the flow active?
       jsonPath: .status.active

charts/rancher-logging/rancher-logging-crd/100.0.0+up3.12.0/templates/logging.banzaicloud.io_flows.yaml

@@ -18,6 +18,739 @@ spec:
     singular: flow
   scope: Namespaced
   versions:
+  - additionalPrinterColumns:
+    - description: Is the flow active?
+      jsonPath: .status.active
+      name: Active
+      type: boolean
+    - description: Number of problems
+      jsonPath: .status.problemsCount
+      name: Problems
+      type: integer
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              filters:
+                items:
+                  properties:
+                    concat:
+                      properties:
+                        continuous_line_regexp:
+                          type: string
+                        flush_interval:
+                          type: integer
+                        keep_partial_key:
+                          type: boolean
+                        keep_partial_metadata:
+                          type: string
+                        key:
+                          type: string
+                        multiline_end_regexp:
+                          type: string
+                        multiline_start_regexp:
+                          type: string
+                        n_lines:
+                          type: integer
+                        partial_key:
+                          type: string
+                        partial_value:
+                          type: string
+                        separator:
+                          type: string
+                        stream_identity_key:
+                          type: string
+                        timeout_label:
+                          type: string
+                        use_first_timestamp:
+                          type: boolean
+                        use_partial_metadata:
+                          type: string
+                      type: object
+                    dedot:
+                      properties:
+                        de_dot_nested:
+                          type: boolean
+                        de_dot_separator:
+                          type: string
+                      type: object
+                    detectExceptions:
+                      properties:
+                        languages:
+                          items:
+                            type: string
+                          type: array
+                        max_bytes:
+                          type: integer
+                        max_lines:
+                          type: integer
+                        message:
+                          type: string
+                        multiline_flush_interval:
+                          type: string
+                        remove_tag_prefix:
+                          type: string
+                        stream:
+                          type: string
+                      type: object
+                    enhanceK8s:
+                      properties:
+                        api_groups:
+                          items:
+                            type: string
+                          type: array
+                        bearer_token_file:
+                          type: string
+                        ca_file:
+                          properties:
+                            mountFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                          type: object
+                        cache_refresh:
+                          type: integer
+                        cache_refresh_variation:
+                          type: integer
+                        cache_size:
+                          type: integer
+                        cache_ttl:
+                          type: integer
+                        client_cert:
+                          properties:
+                            mountFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                          type: object
+                        client_key:
+                          properties:
+                            mountFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                              type: object
+                          type: object
+                        core_api_versions:
+                          items:
+                            type: string
+                          type: array
+                        data_type:
+                          type: string
+                        in_namespace_path:
+                          items:
+                            type: string
+                          type: array
+                        in_pod_path:
+                          items:
+                            type: string
+                          type: array
+                        kubernetes_url:
+                          type: string
+                        secret_dir:
+                          type: string
+                        ssl_partial_chain:
+                          type: boolean
+                        verify_ssl:
+                          type: boolean
+                      type: object
+                    geoip:
+                      properties:
+                        backend_library:
+                          type: string
+                        geoip_2_database:
+                          type: string
+                        geoip_database:
+                          type: string
+                        geoip_lookup_keys:
+                          type: string
+                        records:
+                          items:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type: array
+                        skip_adding_null_record:
+                          type: boolean
+                      type: object
+                    grep:
+                      properties:
+                        and:
+                          items:
+                            properties:
+                              exclude:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                              regexp:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                            type: object
+                          type: array
+                        exclude:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              pattern:
+                                type: string
+                            required:
+                            - key
+                            - pattern
+                            type: object
+                          type: array
+                        or:
+                          items:
+                            properties:
+                              exclude:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                              regexp:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    pattern:
+                                      type: string
+                                  required:
+                                  - key
+                                  - pattern
+                                  type: object
+                                type: array
+                            type: object
+                          type: array
+                        regexp:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              pattern:
+                                type: string
+                            required:
+                            - key
+                            - pattern
+                            type: object
+                          type: array
+                      type: object
+                    parser:
+                      properties:
+                        emit_invalid_record_to_error:
+                          type: boolean
+                        hash_value_field:
+                          type: string
+                        inject_key_prefix:
+                          type: string
+                        key_name:
+                          type: string
+                        parse:
+                          properties:
+                            delimiter:
+                              type: string
+                            delimiter_pattern:
+                              type: string
+                            estimate_current_event:
+                              type: boolean
+                            expression:
+                              type: string
+                            format:
+                              type: string
+                            format_firstline:
+                              type: string
+                            keep_time_key:
+                              type: boolean
+                            label_delimiter:
+                              type: string
+                            local_time:
+                              type: boolean
+                            multiline:
+                              items:
+                                type: string
+                              type: array
+                            null_empty_string:
+                              type: boolean
+                            null_value_pattern:
+                              type: string
+                            patterns:
+                              items:
+                                properties:
+                                  estimate_current_event:
+                                    type: boolean
+                                  expression:
+                                    type: string
+                                  format:
+                                    type: string
+                                  keep_time_key:
+                                    type: boolean
+                                  local_time:
+                                    type: boolean
+                                  null_empty_string:
+                                    type: boolean
+                                  null_value_pattern:
+                                    type: string
+                                  time_format:
+                                    type: string
+                                  time_key:
+                                    type: string
+                                  time_type:
+                                    type: string
+                                  timezone:
+                                    type: string
+                                  type:
+                                    type: string
+                                  types:
+                                    type: string
+                                  utc:
+                                    type: boolean
+                                type: object
+                              type: array
+                            time_format:
+                              type: string
+                            time_key:
+                              type: string
+                            time_type:
+                              type: string
+                            timezone:
+                              type: string
+                            type:
+                              type: string
+                            types:
+                              type: string
+                            utc:
+                              type: boolean
+                          type: object
+                        parsers:
+                          items:
+                            properties:
+                              delimiter:
+                                type: string
+                              delimiter_pattern:
+                                type: string
+                              estimate_current_event:
+                                type: boolean
+                              expression:
+                                type: string
+                              format:
+                                type: string
+                              format_firstline:
+                                type: string
+                              keep_time_key:
+                                type: boolean
+                              label_delimiter:
+                                type: string
+                              local_time:
+                                type: boolean
+                              multiline:
+                                items:
+                                  type: string
+                                type: array
+                              null_empty_string:
+                                type: boolean
+                              null_value_pattern:
+                                type: string
+                              patterns:
+                                items:
+                                  properties:
+                                    estimate_current_event:
+                                      type: boolean
+                                    expression:
+                                      type: string
+                                    format:
+                                      type: string
+                                    keep_time_key:
+                                      type: boolean
+                                    local_time:
+                                      type: boolean
+                                    null_empty_string:
+                                      type: boolean
+                                    null_value_pattern:
+                                      type: string
+                                    time_format:
+                                      type: string
+                                    time_key:
+                                      type: string
+                                    time_type:
+                                      type: string
+                                    timezone:
+                                      type: string
+                                    type:
+                                      type: string
+                                    types:
+                                      type: string
+                                    utc:
+                                      type: boolean
+                                  type: object
+                                type: array
+                              time_format:
+                                type: string
+                              time_key:
+                                type: string
+                              time_type:
+                                type: string
+                              timezone:
+                                type: string
+                              type:
+                                type: string
+                              types:
+                                type: string
+                              utc:
+                                type: boolean
+                            type: object
+                          type: array
+                        remove_key_name_field:
+                          type: boolean
+                        replace_invalid_sequence:
+                          type: boolean
+                        reserve_data:
+                          type: boolean
+                        reserve_time:
+                          type: boolean
+                      type: object
+                    prometheus:
+                      properties:
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        metrics:
+                          items:
+                            properties:
+                              buckets:
+                                type: string
+                              desc:
+                                type: string
+                              key:
+                                type: string
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              name:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - desc
+                            - name
+                            - type
+                            type: object
+                          type: array
+                      type: object
+                    record_modifier:
+                      properties:
+                        char_encoding:
+                          type: string
+                        prepare_value:
+                          type: string
+                        records:
+                          items:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type: array
+                        remove_keys:
+                          type: string
+                        replaces:
+                          items:
+                            properties:
+                              expression:
+                                type: string
+                              key:
+                                type: string
+                              replace:
+                                type: string
+                            required:
+                            - expression
+                            - key
+                            - replace
+                            type: object
+                          type: array
+                        whitelist_keys:
+                          type: string
+                      type: object
+                    record_transformer:
+                      properties:
+                        auto_typecast:
+                          type: boolean
+                        enable_ruby:
+                          type: boolean
+                        keep_keys:
+                          type: string
+                        records:
+                          items:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type: array
+                        remove_keys:
+                          type: string
+                        renew_record:
+                          type: boolean
+                        renew_time_key:
+                          type: string
+                      type: object
+                    stdout:
+                      properties:
+                        output_type:
+                          type: string
+                      type: object
+                    sumologic:
+                      properties:
+                        collector_key_name:
+                          type: string
+                        collector_value:
+                          type: string
+                        exclude_container_regex:
+                          type: string
+                        exclude_facility_regex:
+                          type: string
+                        exclude_host_regex:
+                          type: string
+                        exclude_namespace_regex:
+                          type: string
+                        exclude_pod_regex:
+                          type: string
+                        exclude_priority_regex:
+                          type: string
+                        exclude_unit_regex:
+                          type: string
+                        log_format:
+                          type: string
+                        source_category:
+                          type: string
+                        source_category_key_name:
+                          type: string
+                        source_category_prefix:
+                          type: string
+                        source_category_replace_dash:
+                          type: string
+                        source_host:
+                          type: string
+                        source_host_key_name:
+                          type: string
+                        source_name:
+                          type: string
+                        source_name_key_name:
+                          type: string
+                        tracing_annotation_prefix:
+                          type: string
+                        tracing_container_name:
+                          type: string
+                        tracing_format:
+                          type: boolean
+                        tracing_host:
+                          type: string
+                        tracing_label_prefix:
+                          type: string
+                        tracing_namespace:
+                          type: string
+                        tracing_pod:
+                          type: string
+                        tracing_pod_id:
+                          type: string
+                      type: object
+                    tag_normaliser:
+                      properties:
+                        format:
+                          type: string
+                      type: object
+                    throttle:
+                      properties:
+                        group_bucket_limit:
+                          type: integer
+                        group_bucket_period_s:
+                          type: integer
+                        group_drop_logs:
+                          type: boolean
+                        group_key:
+                          type: string
+                        group_reset_rate_s:
+                          type: integer
+                        group_warning_delay_s:
+                          type: integer
+                      type: object
+                  type: object
+                type: array
+              globalOutputRefs:
+                items:
+                  type: string
+                type: array
+              localOutputRefs:
+                items:
+                  type: string
+                type: array
+              loggingRef:
+                type: string
+              match:
+                items:
+                  properties:
+                    exclude:
+                      properties:
+                        container_names:
+                          items:
+                            type: string
+                          type: array
+                        hosts:
+                          items:
+                            type: string
+                          type: array
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                      type: object
+                    select:
+                      properties:
+                        container_names:
+                          items:
+                            type: string
+                          type: array
+                        hosts:
+                          items:
+                            type: string
+                          type: array
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                      type: object
+                  type: object
+                type: array
+              outputRefs:
+                items:
+                  type: string
+                type: array
+              selectors:
+                additionalProperties:
+                  type: string
+                type: object
+            type: object
+          status:
+            properties:
+              active:
+                type: boolean
+              problems:
+                items:
+                  type: string
+                type: array
+              problemsCount:
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
   - additionalPrinterColumns:
     - description: Is the flow active?
       jsonPath: .status.active

charts/rancher-logging/rancher-logging/100.0.0+up3.12.0/Chart.yaml

@@ -7,7 +7,7 @@ annotations:
   catalog.cattle.io/release-name: rancher-logging
   catalog.cattle.io/ui-component: logging
 apiVersion: v1
-appVersion: 3.10.0
+appVersion: 3.12.0
 description: Collects and filter logs using highly configurable CRDs. Powered by Banzai
   Cloud Logging Operator.
 icon: https://charts.rancher.io/assets/logos/logging.svg
@@ -16,4 +16,4 @@ keywords:
 - monitoring
 - security
 name: rancher-logging
-version: 100.0.0+up3.10.0
+version: 100.0.0+up3.12.0

charts/rancher-logging/rancher-logging/100.0.0+up3.12.0/README.md

@@ -113,11 +113,11 @@ The following tables lists the configurable parameters of the logging-operator-l
 | `tls.sharedKey`                                     | Shared key between nodes (fluentd-fluentbit)           | [autogenerated]                |
 | `fluentbit.enabled`                                 | Install fluent-bit                                     | true                           |
 | `fluentbit.namespace`                               | Specified fluentbit installation namespace             | same as operator namespace     |
-| `fluentbit.image.tag`                               | Fluentbit container image tag                          | `1.7.4`                        |
+| `fluentbit.image.tag`                               | Fluentbit container image tag                          | `1.7.9`                        |
 | `fluentbit.image.repository`                        | Fluentbit container image repository                   | `fluent/fluent-bit`            |
 | `fluentbit.image.pullPolicy`                        | Fluentbit container pull policy                        | `IfNotPresent`                 |
 | `fluentd.enabled`                                   | Install fluentd                                        | true                           |
-| `fluentd.image.tag`                                 | Fluentd container image tag                            | `v1.11.5-alpine-21`             |
+| `fluentd.image.tag`                                 | Fluentd container image tag                            | `v1.12.4-alpine-1`             |
 | `fluentd.image.repository`                          | Fluentd container image repository                     | `ghcr.io/banzaicloud/fluentd`  |
 | `fluentd.image.pullPolicy`                          | Fluentd container pull policy                          | `IfNotPresent`                 |
 | `fluentd.volumeModImage.tag`                        | Fluentd volumeModImage container image tag             | `latest`                       |

charts/rancher-logging/rancher-logging/100.0.0+up3.12.0/templates/clusterrole.yaml

@@ -82,6 +82,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - coordination.k8s.io
   resources:

charts/rancher-logging/rancher-logging/100.0.0+up3.12.0/templates/loggings/k3s/logging-k3s-openrc.yaml

@@ -0,0 +1,94 @@
+{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "openrc")}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Logging
+metadata:
+  name: {{ .Release.Name }}-k3s
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
+spec:
+  controlNamespace: {{ .Release.Namespace }}
+  fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
+    inputTail:
+      Tag: "k3s"
+      Path: "/var/log/k3s.log"
+      Path_Key: filename
+      {{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
+      Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
+      {{- end }}
+      {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
+      Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
+      {{- end }}
+      {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
+      Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
+      {{- end }}
+      {{- if .Values.fluentbit.inputTail.Multiline_Flush }}
+      Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString | quote }}
+      {{- end }}
+      {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
+      Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString | quote }}
+      {{- end }}
+    extraVolumeMounts:
+      - source: "/var/log/"
+        destination: "/var/log"
+        readOnly: true
+    {{- if not .Values.disablePvc }}
+    {{- with .Values.fluentbit.bufferStorage }}
+    bufferStorage: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.fluentbit.bufferStorageVolume }}
+    bufferStorageVolume: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- end }}
+    {{- if .Values.global.psp.enabled }}
+    security:
+      podSecurityPolicyCreate: true
+      roleBasedAccessControlCreate: true
+    {{- end }}
+    {{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations)) }}
+    tolerations: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.nodeSelector }}
+    nodeSelector: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.fluentbit.resources }}
+    resources: {{- toYaml . | nindent 6 }}
+    {{- end }}
+  fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
+    {{- if not .Values.disablePvc }}
+    {{- with .Values.fluentd.bufferStorageVolume }}
+    bufferStorageVolume: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- end }}
+    disablePvc: {{ .Values.disablePvc }}
+    {{- if .Values.fluentd.replicas }}
+    scaling:
+      replicas: {{ .Values.fluentd.replicas }}
+    {{- end }}
+    {{- if .Values.global.psp.enabled }}
+    security:
+      podSecurityPolicyCreate: true
+      roleBasedAccessControlCreate: true
+    {{- end }}
+    {{- with (default .Values.tolerations .Values.fluentd.tolerations) }}
+    tolerations: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with (default .Values.nodeSelector .Values.fluentd.nodeSelector) }}
+    nodeSelector: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.fluentd.resources }}
+    resources: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.fluentd.livenessProbe }}
+    livenessProbe: {{- toYaml . | nindent 6 }}
+    {{- end }}
+{{- end }}

charts/rancher-logging/rancher-logging/100.0.0+up3.12.0/templates/validate-install-crd.yaml

@@ -1,10 +1,10 @@
 #{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}}
 # {{- $found := dict -}}
-# {{- set $found "logging.banzaicloud.io/v1beta1/ClusterFlow" false -}}
-# {{- set $found "logging.banzaicloud.io/v1beta1/ClusterOutput" false -}}
-# {{- set $found "logging.banzaicloud.io/v1beta1/Flow" false -}}
-# {{- set $found "logging.banzaicloud.io/v1beta1/Logging" false -}}
-# {{- set $found "logging.banzaicloud.io/v1beta1/Output" false -}}
+# {{- set $found "logging.banzaicloud.io/v1alpha1/ClusterFlow" false -}}
+# {{- set $found "logging.banzaicloud.io/v1alpha1/ClusterOutput" false -}}
+# {{- set $found "logging.banzaicloud.io/v1alpha1/Flow" false -}}
+# {{- set $found "logging.banzaicloud.io/v1alpha1/Logging" false -}}
+# {{- set $found "logging.banzaicloud.io/v1alpha1/Output" false -}}
 # {{- range .Capabilities.APIVersions -}}
 # {{- if hasKey $found (toString .) -}}
 # 	{{- set $found (toString .) true -}}

charts/rancher-logging/rancher-logging/100.0.0+up3.12.0/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: rancher/mirrored-banzaicloud-logging-operator
-  tag: 3.10.0
+  tag: 3.12.0
   pullPolicy: IfNotPresent
 
 extraArgs:
@@ -147,13 +147,13 @@ images:
     tag: v0.4.0
   fluentbit:
     repository: rancher/mirrored-fluent-fluent-bit
-    tag: 1.7.4
+    tag: 1.7.9
   fluentbit_debug:
     repository: rancher/mirrored-fluent-fluent-bit
-    tag: 1.7.4-debug
+    tag: 1.7.9-debug
   fluentd:
     repository: rancher/mirrored-banzaicloud-fluentd
-    tag: v1.11.5-alpine-21
+    tag: v1.12.4-alpine-1
   nodeagent_fluentbit:
     os: "windows"
     repository: rancher/fluent-bit

index.yaml

@@ -2368,11 +2368,11 @@ entries:
       catalog.cattle.io/release-name: rancher-logging
       catalog.cattle.io/ui-component: logging
     apiVersion: v1
-    appVersion: 3.10.0
-    created: "2021-06-23T08:47:16.925322-07:00"
+    appVersion: 3.12.0
+    created: "2021-07-02T20:42:32.086072907Z"
     description: Collects and filter logs using highly configurable CRDs. Powered
       by Banzai Cloud Logging Operator.
-    digest: 255b25e71c44e7d810e4eb3ffd0353518f4e7a5928a1985ee49c174cb7d0d203
+    digest: b170ab1d07ac379dfabb741e2aeb8529e291b621c2de3b6b53a7728e1d1770b5
     icon: https://charts.rancher.io/assets/logos/logging.svg
     keywords:
     - logging
@@ -2380,8 +2380,8 @@ entries:
     - security
     name: rancher-logging
     urls:
-    - assets/rancher-logging/rancher-logging-100.0.0+up3.10.0.tgz
-    version: 100.0.0+up3.10.0
+    - assets/rancher-logging/rancher-logging-100.0.0+up3.12.0.tgz
+    version: 100.0.0+up3.12.0
   - annotations:
       catalog.cattle.io/auto-install: rancher-logging-crd=match
       catalog.cattle.io/certified: rancher
@@ -2507,14 +2507,14 @@ entries:
       catalog.cattle.io/namespace: cattle-logging-system
       catalog.cattle.io/release-name: rancher-logging-crd
     apiVersion: v1
-    created: "2021-06-23T08:47:16.934865-07:00"
+    created: "2021-07-02T20:42:32.097190339Z"
     description: Installs the CRDs for rancher-logging.
-    digest: 24a2952c785a9372e87c04e82d2145601c530d49e7d8dc250a6c53026abb1edb
+    digest: 8543212393b921630119d9f0bbaedd046c713e81c18d125c0f9a0b54083b3281
     name: rancher-logging-crd
     type: application
     urls:
-    - assets/rancher-logging/rancher-logging-crd-100.0.0+up3.10.0.tgz
-    version: 100.0.0+up3.10.0
+    - assets/rancher-logging/rancher-logging-crd-100.0.0+up3.12.0.tgz
+    version: 100.0.0+up3.12.0
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

packages/rancher-logging/generated-changes/patch/Chart.yaml.patch

@@ -2,12 +2,12 @@
 +++ charts/Chart.yaml
 @@ -1,5 +1,18 @@
  apiVersion: v1
- appVersion: 3.10.0
+ appVersion: 3.12.0
 -description: A Helm chart to install Banzai Cloud logging-operator
 -name: logging-operator
 +description: Collects and filter logs using highly configurable CRDs. Powered by Banzai Cloud Logging Operator.
 +name: rancher-logging
- version: 3.10.0
+ version: 3.12.0
 +icon: https://charts.rancher.io/assets/logos/logging.svg
 +keywords:
 +  - logging

packages/rancher-logging/generated-changes/patch/values.yaml.patch

@@ -6,7 +6,7 @@
  image:
 -  repository: ghcr.io/banzaicloud/logging-operator
 +  repository: rancher/mirrored-banzaicloud-logging-operator
-   tag: 3.10.0
+   tag: 3.12.0
    pullPolicy: IfNotPresent
  
 @@ -38,9 +38,14 @@
@@ -84,13 +84,13 @@
 +    tag: v0.4.0
 +  fluentbit:
 +    repository: rancher/mirrored-fluent-fluent-bit
-+    tag: 1.7.4
++    tag: 1.7.9
 +  fluentbit_debug:
 +    repository: rancher/mirrored-fluent-fluent-bit
-+    tag: 1.7.4-debug
++    tag: 1.7.9-debug
 +  fluentd:
 +    repository: rancher/mirrored-banzaicloud-fluentd
-+    tag: v1.11.5-alpine-21
++    tag: v1.12.4-alpine-1
 +  nodeagent_fluentbit:
 +    os: "windows"
 +    repository: rancher/fluent-bit

packages/rancher-logging/package.yaml

@@ -1,4 +1,4 @@
-url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.10.0.tgz
+url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.12.0.tgz
 version: 100.0.0
 additionalCharts:
   - workingDir: charts-crd