make charts

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/_generic_logging.yaml

@@ -0,0 +1,118 @@
+{{- define "logging-operator.logging.tpl" -}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Logging
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
+spec:
+  controlNamespace: {{ .Release.Namespace }}
+  fluentbit:
+    image:
+      repository: {{ template "logging-operator.fluentbitImageRepository" . }}
+      tag: {{ template "logging-operator.fluentbitImageTag" . }}
+    {{- if not .Values.disablePvc }}
+    {{- with .Values.fluentbit.bufferStorage }}
+    bufferStorage: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.fluentbit.bufferStorageVolume }}
+    bufferStorageVolume: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- end }}
+    {{- if or .Values.global.psp.enabled .Values.global.seLinux.enabled }}
+    security:
+    {{- end }}
+    {{- if .Values.global.psp.enabled }}
+      podSecurityPolicyCreate: true
+      roleBasedAccessControlCreate: true
+    {{- end }}
+    {{- if .Values.global.seLinux.enabled }}
+      securityContext:
+        seLinuxOptions:
+          type: rke_logreader_t
+    {{- end }}
+    {{- if or .Values.fluentbit.inputTail.Buffer_Chunk_Size .Values.fluentbit.inputTail.Buffer_Max_Size .Values.fluentbit.inputTail.Mem_Buf_Limit .Values.fluentbit.inputTail.Multiline_Flush .Values.fluentbit.inputTail.Skip_Long_Lines }}
+    inputTail:
+      {{- 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 }}
+    {{- 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 -}}
+
+{{- define "logging-operator.util.merge.logging" -}}
+{{/* Top context to expose fields like `.Release` and `.Values` */}}
+{{- $top := first . -}}
+
+{{/* tpl is the template specific to the logging implementation */}}
+{{- $tpl := fromYaml (include (index . 1) $top) | default (dict ) -}}
+
+{{/* Generic is the shared rancher logging setttings from `_generic_logging.yaml` */}}
+{{- $generic := fromYaml (include (index . 2) $top) | default (dict ) -}}
+
+{{/* values are from the values.yaml */}}
+{{- $values := $top.Values.loggingOverlay | default (dict ) -}}
+
+####### {{$generic}}
+
+{{/* the sources are merge right to left meaning tpl is the highest prcedence and values is the lowest */}}
+{{- toYaml (merge $tpl $values $generic) -}}
+{{- end -}}
+
+{{- define "logging-operator.logging" -}}
+{{- include "logging-operator.util.merge.logging" (append . "logging-operator.logging.tpl") -}}
+{{- end -}}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/_helpers.tpl

@@ -154,3 +154,26 @@ Set kubernetes log options if they are configured
 true
 {{- end -}}
 {{- end -}}
+
+{{/*Fluent Bit Image Repository */}}
+{{- define "logging-operator.fluentbitImageRepository" -}}
+{{- if .Values.debug -}}
+{{ template "system_default_registry" . }}{{ .Values.images.fluentbit_debug.repository }}
+{{- else -}}
+{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+{{- end -}}
+{{- end -}}
+
+{{/*Fluent Bit Image Tag */}}
+{{- define "logging-operator.fluentbitImageTag" -}}
+{{- if .Values.debug -}}
+{{ .Values.images.fluentbit_debug.tag }}
+{{- else -}}
+{{ .Values.images.fluentbit.tag }}
+{{- end -}}
+{{- end -}}
+
+{{/*Fluent Bit Image */}}
+{{- define "logging-operator.fluentbitImage" -}}
+{{ template "logging-operator.fluentbitImageRepository" . }}:{{ template "logging-operator.fluentbitImageTag" . }}
+{{- end -}}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/aks/logging.yaml

@@ -1,104 +1,18 @@
-{{- if .Values.additionalLoggingSources.aks.enabled }}
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Logging
+{{- define "logging-operator.logging.aks" -}}
+{{- $logPath := "/var/log/azure/kubelet-status.log" -}}
 metadata:
   name: {{ .Release.Name }}-aks
-  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 }}
+    disableKubernetesFilter: true
+    extraVolumeMounts:
+      - source: {{ $logPath }}
+        destination: {{ $logPath }}
+        readOnly: true
     inputTail:
       Tag: "aks"
-      Path: "/var/log/azure/kubelet-status.log"
-      {{- 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 }}
-    {{- 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 }}
-    {{- if (include "requireFilterKubernetes" .) }}
-    filterKubernetes:
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log }}
-      Merge_Log: "{{ .Values.fluentbit.filterKubernetes.Merge_Log }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Key }}
-      Merge_Log_Key: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Key }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}
-      Merge_Log_Trim: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Parser }}
-      Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
-      {{- end }}
-    {{- 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 }}
+      Path: {{ $logPath }}
+{{- end -}}
+{{- if .Values.additionalLoggingSources.aks.enabled }}
+{{- include "logging-operator.logging" (list . "logging-operator.logging.aks") -}}
 {{- end }}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/eks/logging.yaml

@@ -1,105 +1,19 @@
-{{- if .Values.additionalLoggingSources.eks.enabled }}
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Logging
+{{- define "logging-operator.logging.eks" -}}
+{{- $logPath := "/var/log/messages" -}}
 metadata:
   name: {{ .Release.Name }}-eks
-  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 }}
+    disableKubernetesFilter: true
+    extraVolumeMounts:
+      - source: {{ $logPath }}
+        destination: {{ $logPath }}
+        readOnly: true
     inputTail:
       Tag: "eks"
-      Path: "/var/log/messages"
+      Path: {{ $logPath }}
       Parser: "syslog"
-      {{- 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 }}
-    {{- 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 }}
-    {{- if (include "requireFilterKubernetes" .) }}
-    filterKubernetes:
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log }}
-      Merge_Log: "{{ .Values.fluentbit.filterKubernetes.Merge_Log }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Key }}
-      Merge_Log_Key: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Key }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}
-      Merge_Log_Trim: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Parser }}
-      Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
-      {{- end }}
-    {{- 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 -}}
+{{- if .Values.additionalLoggingSources.eks.enabled }}
+{{- include "logging-operator.logging" (list . "logging-operator.logging.eks") -}}
 {{- end }}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/gke/logging.yaml

@@ -1,104 +1,18 @@
-{{- if .Values.additionalLoggingSources.gke.enabled }}
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Logging
+{{- define "logging-operator.logging.gke" -}}
+{{- $logPath := "/var/log/kube-proxy.log" -}}
 metadata:
   name: {{ .Release.Name }}-gke
-  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 }}
+    disableKubernetesFilter: true
+    extraVolumeMounts:
+      - source: {{ $logPath }}
+        destination: {{ $logPath }}
+        readOnly: true
     inputTail:
       Tag: "gke"
-      Path: "/var/log/kube-proxy.log"
-      {{- 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 }}
-    {{- 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 }}
-    {{- if (include "requireFilterKubernetes" .) }}
-    filterKubernetes:
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log }}
-      Merge_Log: "{{ .Values.fluentbit.filterKubernetes.Merge_Log }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Key }}
-      Merge_Log_Key: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Key }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}
-      Merge_Log_Trim: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Parser }}
-      Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
-      {{- end }}
-    {{- 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 }}
+      Path: {{ $logPath }}
+{{- end -}}
+{{- if .Values.additionalLoggingSources.gke.enabled }}
+{{- include "logging-operator.logging" (list . "logging-operator.logging.gke") -}}
 {{- end }}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/k3s/daemonset.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: fluentbit
-          image: "{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}:{{ .Values.images.fluentbit.tag }}"
+          image: "{{ template "logging-operator.fluentbitImage" . }}"
           {{- if .Values.global.seLinux.enabled }}
           securityContext:
             seLinuxOptions:

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/k3s/logging-k3s-openrc.yaml

@@ -1,109 +1,19 @@
-{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "openrc")}}
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Logging
+{{- define "logging-operator.logging.k3s-openrc" -}}
+{{- $logPath := "/var/log/k3s.log" -}}
 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 }}
+    disableKubernetesFilter: true
+    extraVolumeMounts:
+      - source: {{ $logPath }}
+        destination: {{ $logPath }}
+        readOnly: true
     inputTail:
       Tag: "k3s"
-      Path: "/var/log/k3s.log"
+      Path: {{ $logPath }}
       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 }}
-    {{- if (include "requireFilterKubernetes" .) }}
-    filterKubernetes:
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log }}
-      Merge_Log: "{{ .Values.fluentbit.filterKubernetes.Merge_Log }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Key }}
-      Merge_Log_Key: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Key }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}
-      Merge_Log_Trim: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Parser }}
-      Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
-      {{- end }}
-    {{- 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 -}}
+{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "openrc")}}
+{{- include "logging-operator.logging" (list . "logging-operator.logging.k3s-openrc") -}}
 {{- end }}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/kube-audit/logging.yaml

@@ -1,113 +1,24 @@
-{{- if .Values.additionalLoggingSources.kubeAudit.enabled }}
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Logging
+{{- define "logging-operator.logging.kube-audit" -}}
 metadata:
   name: {{ .Release.Name }}-kube-audit
-  namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "logging-operator.labels" . | indent 4 }}
 spec:
-  controlNamespace: {{ .Release.Namespace }}
   {{- if .Values.additionalLoggingSources.kubeAudit.loggingRef }}
   loggingRef: {{ .Values.additionalLoggingSources.kubeAudit.loggingRef }}
   {{- end }}
   fluentbit:
     disableKubernetesFilter: true
-    image:
-      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
-      tag: {{ .Values.images.fluentbit.tag }}
+    extraVolumeMounts:
+      - source: {{ template "kubeAuditPathPrefix" . }}
+        destination: "/kube-audit-logs"
+        readOnly: true
     inputTail:
       Tag: {{ .Values.additionalLoggingSources.kubeAudit.fluentbit.logTag }}
       Path: /kube-audit-logs/{{ template "kubeAuditFilename" . }}
       Parser: json
-      {{- 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: {{ template "kubeAuditPathPrefix" . }}
-      destination: "/kube-audit-logs"
-      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.additionalLoggingSources.kubeAudit.fluentbit.tolerations)) }}
-    tolerations: 
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    nodeSelector:
-      {{- include "controlplaneSelector" . | nindent 6 }}
-    {{- with .Values.fluentbit.resources }}
-    resources: {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- if (include "requireFilterKubernetes" .) }}
-    filterKubernetes:
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log }}
-      Merge_Log: "{{ .Values.fluentbit.filterKubernetes.Merge_Log }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Key }}
-      Merge_Log_Key: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Key }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}
-      Merge_Log_Trim: "{{ .Values.fluentbit.filterKubernetes.Merge_Log_Trim }}"
-      {{- end }}
-      {{- if .Values.fluentbit.filterKubernetes.Merge_Parser }}
-      Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
-      {{- end }}
-    {{- 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) }}
+    {{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations) (.Values.additionalLoggingSources.kubeAudit.fluentbit.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 -}}
+{{- if .Values.additionalLoggingSources.kubeAudit.enabled }}
+{{- include "logging-operator.logging" (list . "logging-operator.logging.kube-audit") -}}
 {{- end }}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/rke/daemonset.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: fluentbit
-          image: "{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}:{{ .Values.images.fluentbit.tag }}"
+          image: "{{ template "logging-operator.fluentbitImage" . }}"
           volumeMounts:
             - mountPath: /var/lib/rancher/rke/log/
               name: indir

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/rke2/daemonset.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: fluentbit
-          image: "{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}:{{ .Values.images.fluentbit.tag }}"
+          image: "{{ template "logging-operator.fluentbitImage" . }}"
           {{- if .Values.global.seLinux.enabled }}
           securityContext:
             seLinuxOptions:

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/templates/loggings/root/logging.yaml

@@ -1,13 +1,8 @@
-{{- $containers := printf "%s/containers/" (default "/var/lib/docker" .Values.global.dockerRootDirectory) }}
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Logging
+{{- define "logging-operator.logging.root" -}}
+{{- $containerLogPath := printf "%s/containers/" (default "/var/lib/docker" .Values.global.dockerRootDirectory) }}
 metadata:
   name: {{ .Release.Name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-{{ include "logging-operator.labels" . | indent 4 }}
 spec:
-  controlNamespace: {{ .Release.Namespace }}
   {{- if (include "windowsEnabled" .) }}
   nodeAgents:
     - name: win-agent
@@ -18,8 +13,8 @@ spec:
             template:
               spec:
                 containers:
-                - image: "{{ template "system_default_registry" . }}{{ .Values.images.nodeagent_fluentbit.repository }}:{{ .Values.images.nodeagent_fluentbit.tag }}"
-                  name: fluent-bit
+                  - image: {{ template "system_default_registry" . }}{{ .Values.images.nodeagent_fluentbit.repository }}:{{ .Values.images.nodeagent_fluentbit.tag }}
+                    name: fluent-bit
         tls:
           enabled: {{ .Values.nodeAgents.tls.enabled | default false }}
     {{- if .Values.additionalLoggingSources.rke.enabled }}
@@ -46,78 +41,28 @@ spec:
           Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString | quote }}
           {{- end }}
         extraVolumeMounts:
-        - source: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log"
-          destination: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log"
-          readOnly: true
+          - source: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log"
+            destination: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log"
+            readOnly: true
         daemonSet:
           spec:
             template:
               spec:
                 containers:
-                - image: "{{ template "system_default_registry" . }}{{ .Values.images.nodeagent_fluentbit.repository }}:{{ .Values.images.nodeagent_fluentbit.tag }}"
-                  name: fluent-bit
+                  - image: "{{ template "system_default_registry" . }}{{ .Values.images.nodeagent_fluentbit.repository }}:{{ .Values.images.nodeagent_fluentbit.tag }}"
+                    name: fluent-bit
         tls:
           enabled: {{ .Values.nodeAgents.tls.enabled | default false }}
     {{- end }}
   {{- end }}
   fluentbit:
-    image:
-      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
-      tag: {{ .Values.images.fluentbit.tag }}
-    {{- if or .Values.fluentbit.inputTail.Buffer_Chunk_Size .Values.fluentbit.inputTail.Buffer_Max_Size .Values.fluentbit.inputTail.Mem_Buf_Limit .Values.fluentbit.inputTail.Multiline_Flush .Values.fluentbit.inputTail.Skip_Long_Lines }}
-    inputTail:
-      {{- 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 }}
-    {{- end }}
-    {{- if not .Values.disablePvc }}
-    {{- with .Values.fluentbit.bufferStorage }}
-    bufferStorage: {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with .Values.fluentbit.bufferStorageVolume }}
-    bufferStorageVolume: {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- end }}
-    {{- if or .Values.global.psp.enabled .Values.global.seLinux.enabled }}
-    security:
-    {{- end }}
-    {{- if .Values.global.psp.enabled }}
-      podSecurityPolicyCreate: true
-      roleBasedAccessControlCreate: true
-    {{- end }}
-    {{- if .Values.global.seLinux.enabled }}
-      securityContext:
-        seLinuxOptions:
-          type: rke_logreader_t
-    {{- end }}
     {{- if .Values.global.dockerRootDirectory }}
-    mountPath: {{ $containers }}
+    mountPath: {{ $containerLogPath }}
     extraVolumeMounts:
-      - source: {{ $containers }}
-        destination: {{ $containers }}
+      - source: {{ $containerLogPath }}
+        destination: {{ $containerLogPath }}
         readOnly: 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 }}
     {{- if (include "requireFilterKubernetes" .) }}
     filterKubernetes:
       {{- if .Values.fluentbit.filterKubernetes.Merge_Log }}
@@ -133,37 +78,5 @@ spec:
       Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
       {{- end }}
     {{- 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 -}}
+{{- include "logging-operator.logging" (list . "logging-operator.logging.root") -}}

charts/rancher-logging/rancher-logging/100.0.1+up3.15.0/values.yaml

@@ -104,10 +104,61 @@ monitoring:
     metricRelabelings: []
     relabelings: []
 
+###################################
+# Rancher Logging Operator Values #
+###################################
+
+# Enable debug to use fluent-bit images that allow exec
+debug: false
+
+# Disable persistent volumes for buffers
 disablePvc: true
 
+# If your additional logging sources collect logs from systemd configure the systemd log path here
 systemdLogPath: "/run/log/journal"
 
+global:
+  cattle:
+    systemDefaultRegistry: ""
+    # Uncomment the below two lines to either enable or disable Windows logging. If this chart is
+    # installed via the Rancher UI, it will set this value to "true" if the cluster is a Windows
+    # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
+    # set the value below to "false".
+    # windows:
+    #   enabled: true
+
+  # Change the "dockerRootDirectory" if the default Docker directory has changed.
+  dockerRootDirectory: ""
+
+  # This psp setting differs from the upstream "rbac.psp" by only enabling psp settings for the
+  # overlay files, which include the Logging CRs created, whereas the upstream "rbac.psp" affects the
+  # logging operator.
+  psp:
+    enabled: true
+
+  rkeWindowsPathPrefix: "c:\\"
+
+  seLinux:
+    enabled: false
+
+images:
+  config_reloader:
+    repository: rancher/mirrored-jimmidyson-configmap-reload
+    tag: v0.4.0
+  fluentbit:
+    repository: rancher/mirrored-fluent-fluent-bit
+    tag: 1.8.8
+  nodeagent_fluentbit:
+    os: "windows"
+    repository: rancher/fluent-bit
+    tag: 1.7.4
+  fluentbit_debug:
+    repository: rancher/mirrored-fluent-fluent-bit
+    tag: 1.8.8-debug
+  fluentd:
+    repository: rancher/mirrored-banzaicloud-fluentd
+    tag: v1.13.3-alpine-11
+
 additionalLoggingSources:
   rke:
     enabled: false
@@ -141,29 +192,13 @@ additionalLoggingSources:
         value: "true"
         effect: NoExecute
 
-images:
-  config_reloader:
-    repository: rancher/mirrored-jimmidyson-configmap-reload
-    tag: v0.4.0
-  fluentbit:
-    repository: rancher/mirrored-fluent-fluent-bit
-    tag: 1.8.8
-  fluentbit_debug:
-    repository: rancher/mirrored-fluent-fluent-bit
-    tag: 1.8.8-debug
-  fluentd:
-    repository: rancher/mirrored-banzaicloud-fluentd
-    tag: v1.13.3-alpine-11
-  nodeagent_fluentbit:
-    os: "windows"
-    repository: rancher/fluent-bit
-    tag: 1.7.4
-
-# These settings apply to every Logging CR, including vendor Logging CRs enabled in "additionalLoggingSources".
-# Changing these affects every Logging CR installed.
+# configures node agent options for windows node agents
 nodeAgents:
   tls:
     enabled: false
+
+# These settings apply to every Logging CR, including vendor Logging CRs enabled in "additionalLoggingSources".
+# Changing these affects every Logging CR installed.
 fluentd:
   bufferStorageVolume: {}
   livenessProbe:
@@ -195,22 +230,15 @@ fluentbit:
     Merge_Log_Trim: ""
     Merge_Parser: ""
 
-global:
-  cattle:
-    systemDefaultRegistry: ""
-    # Uncomment the below two lines to either enable or disable Windows logging. If this chart is
-    # installed via the Rancher UI, it will set this value to "true" if the cluster is a Windows
-    # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters,
-    # set the value below to "false".
-    # windows:
-    #   enabled: true
-  # Change the "dockerRootDirectory" if the default Docker directory has changed.
-  dockerRootDirectory: ""
-  # This psp setting differs from the upstream "rbac.psp" by only enabling psp settings for the
-  # overlay files, which include the Logging CRs created, whereas the upstream "rbac.psp" affects the
-  # logging operator.
-  psp:
-    enabled: true
-  rkeWindowsPathPrefix: "c:\\"
-  seLinux:
-    enabled: false
+# DO NOT SET THIS UNLESS YOU KNOW WHAT YOU ARE DOING.
+# Setting fields on this object can break rancher logging or cause unexpected behavior. It is intended to be used if you
+# need to configure functionality not exposed by rancher logging. It is highly recommended you check the `app-readme.md`
+# for the functionality you need before modifying this object.
+
+# this object will be merged with every logging CR created by this chart. Any fields that collide with fields from the
+# settings above will be overridden. Any fields that collide with fields set in the files in `templates/loggings` will
+# be ignored.
+loggingOverlay: {}
+# spec:
+#   fluentbit: {}
+#   fluentd: {}