andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1322 from dbason/strip-underscores 

Add option to strip underscores for fluentbit journald config
pull/1302/head
Nick Gerace 2021-07-01 17:20:58 -04:00 committed by GitHub
parent de94acb762 6bd13bb959
commit 3f282c30e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/rancher-logging/rancher-logging-100.0.0+up3.10.0.tgz
View File

Binary file not shown.

3
charts/rancher-logging/rancher-logging/100.0.0+up3.10.0/templates/loggings/k3s/configmap.yaml
View File

@ -19,6 +19,9 @@ data:
Tag k3s
Path {{ .Values.systemdLogPath | default "/var/log/journal" }}
Systemd_Filter _SYSTEMD_UNIT=k3s.service
{{- if .Values.additionalLoggingSources.k3s.stripUnderscores }}
Strip_Underscores On
{{- end }}
[OUTPUT]
Name forward

3
charts/rancher-logging/rancher-logging/100.0.0+up3.10.0/templates/loggings/rke2/configmap.yaml
View File

@ -20,6 +20,9 @@ data:
Path {{ .Values.systemdLogPath | default "/var/log/journal" }}
Systemd_Filter _SYSTEMD_UNIT=rke2-server.service
Systemd_Filter _SYSTEMD_UNIT=rke2-agent.service
{{- if .Values.additionalLoggingSources.rke2.stripUnderscores }}
Strip_Underscores On
{{- end }}
[OUTPUT]
Name forward

2
charts/rancher-logging/rancher-logging/100.0.0+up3.10.0/values.yaml
View File

@ -116,9 +116,11 @@ additionalLoggingSources:
mem_buffer_limit: "5MB"
rke2:
enabled: false
stripUnderscores: false
k3s:
enabled: false
container_engine: "systemd"
stripUnderscores: false
aks:
enabled: false
eks:

3
packages/rancher-logging/generated-changes/overlay/templates/loggings/k3s/configmap.yaml
View File

@ -19,6 +19,9 @@ data:
Tag k3s
Path {{ .Values.systemdLogPath | default "/var/log/journal" }}
Systemd_Filter _SYSTEMD_UNIT=k3s.service
{{- if .Values.additionalLoggingSources.k3s.stripUnderscores }}
Strip_Underscores On
{{- end }}
[OUTPUT]
Name forward

3
packages/rancher-logging/generated-changes/overlay/templates/loggings/rke2/configmap.yaml
View File

@ -20,6 +20,9 @@ data:
Path {{ .Values.systemdLogPath | default "/var/log/journal" }}
Systemd_Filter _SYSTEMD_UNIT=rke2-server.service
Systemd_Filter _SYSTEMD_UNIT=rke2-agent.service
{{- if .Values.additionalLoggingSources.rke2.stripUnderscores }}
Strip_Underscores On
{{- end }}
[OUTPUT]
Name forward

4
packages/rancher-logging/generated-changes/patch/values.yaml.patch
View File

@ -36,7 +36,7 @@
rbac:
enabled: true
psp:
@@ -95,3 +103,107 @@
@@ -95,3 +103,109 @@
additionalLabels: {}
metricRelabelings: []
relabelings: []
@ -53,9 +53,11 @@
+ mem_buffer_limit: "5MB"
+ rke2:
+ enabled: false
+ stripUnderscores: false
+ k3s:
+ enabled: false
+ container_engine: "systemd"
+ stripUnderscores: false
+ aks:
+ enabled: false
+ eks: