diff --git a/charts/axosyslog-collector/Chart.yaml b/charts/axosyslog-collector/Chart.yaml index 90fc179..5cfa543 100644 --- a/charts/axosyslog-collector/Chart.yaml +++ b/charts/axosyslog-collector/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: axosyslog-collector description: AxoSyslog Kubernetes log collector type: application -version: 0.4.0 +version: 0.5.0 appVersion: "4.3.1" diff --git a/charts/axosyslog-collector/templates/config.yaml b/charts/axosyslog-collector/templates/config.yaml index 730b9bc..6f045b4 100644 --- a/charts/axosyslog-collector/templates/config.yaml +++ b/charts/axosyslog-collector/templates/config.yaml @@ -31,6 +31,24 @@ data: ); }; {{- end }} +{{- if .Values.config.parsers.opentelemetry.enabled }} + parser { + opentelemetry(); + }; +{{- end }} +{{- range .Values.config.destinations.file }} + destination { + file( + {{ .path | quote }} + {{- if .template }} + template({{ .template | quote }}) + {{- end }} + {{- if .extraOptionsRaw }} + {{ .extraOptionsRaw }} + {{- end }} + ); + }; +{{- end }} {{- range .Values.config.destinations.network }} destination { network( @@ -39,6 +57,9 @@ data: transport({{ .transport }}) {{- if .template }} template({{ .template | quote }}) + {{- end }} + {{- if .extraOptionsRaw }} + {{ .extraOptionsRaw }} {{- end }} ); }; @@ -78,6 +99,9 @@ data: peer-verify(no) {{- end }} ) + {{- end }} + {{- if .extraOptionsRaw }} + {{ .extraOptionsRaw }} {{- end }} ); }; @@ -86,6 +110,9 @@ data: destination { opentelemetry( url({{ tpl .url $ | quote }}) + {{- if .extraOptionsRaw }} + {{ .extraOptionsRaw }} + {{- end }} ); }; {{- end }} diff --git a/charts/axosyslog-collector/values.yaml b/charts/axosyslog-collector/values.yaml index e238cdf..d3f3917 100644 --- a/charts/axosyslog-collector/values.yaml +++ b/charts/axosyslog-collector/values.yaml @@ -48,13 +48,22 @@ config: opentelemetry: [] # E.g.: # - port: 4317 + parsers: + opentelemetry: + enabled: false destinations: + file: [] +# E.g.: +# - path: "/dev/stdout" +# template: "$(format-json .*)" +# extraOptionsRaw: "create-dirs(yes)" network: [] # E.g.: # - transport: tcp # address: localhost # port: 12345 # template: "$(format-json .*)" +# extraOptionsRaw: "time-reopen(10)" opensearch: [] # E.g.: # - address: 10.104.232.94 @@ -68,9 +77,11 @@ config: # Key: "/path/to/Key.pem" # peerVerify: false # template: "$(format-json .*)" +# extraOptionsRaw: "time-reopen(10)" opentelemetry: [] # E.g.: # - url: "10.104.232.95:4317" +# extraOptionsRaw: "time-reopen(10)" rbac: create: true