diff --git a/charts/axosyslog-collector/Chart.yaml b/charts/axosyslog-collector/Chart.yaml index fedb04d..90fc179 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.3.0 -appVersion: "4.2.0" +version: 0.4.0 +appVersion: "4.3.1" diff --git a/charts/axosyslog-collector/templates/config.yaml b/charts/axosyslog-collector/templates/config.yaml index bc58d52..84c3f11 100644 --- a/charts/axosyslog-collector/templates/config.yaml +++ b/charts/axosyslog-collector/templates/config.yaml @@ -22,6 +22,15 @@ data: {{- if .Values.config.sources.kubernetes.enabled }} source { kubernetes(); }; {{- end }} +{{- range .Values.config.sources.opentelemetry }} + source { + opentelemetry( + {{- if .port }} + port({{ .port }}) + {{- end }} + ); + }; +{{- end }} {{- range .Values.config.destinations.network }} destination { network( @@ -72,6 +81,13 @@ data: {{- end }} ); }; +{{- end }} +{{- range .Values.config.destinations.opentelemetry }} + destination { + opentelemetry( + url({{ tpl .url $ | quote }}) + ); + }; {{- end }} }; {{- end }} diff --git a/charts/axosyslog-collector/templates/service.yaml b/charts/axosyslog-collector/templates/service.yaml new file mode 100644 index 0000000..434e9cc --- /dev/null +++ b/charts/axosyslog-collector/templates/service.yaml @@ -0,0 +1,19 @@ +{{- if .Values.service.create }} +--- +apiVersion: v1 +kind: Service +metadata: + name: "{{ template "axosyslog-collector.fullname" . }}" +spec: + selector: + app: "{{ template "axosyslog-collector.fullname" . }}" + release: {{ .Release.Name | quote }} + ports: +{{ if .Values.service.extraPorts }} +{{ toYaml ( .Values.service.extraPorts ) | nindent 4 }} +{{ end }} +{{ range .Values.config.sources.opentelemetry }} + - protocol: TCP + port: {{ .port | default 4317 }} +{{ end }} +{{- end }} diff --git a/charts/axosyslog-collector/values.yaml b/charts/axosyslog-collector/values.yaml index 33c07fa..5711876 100644 --- a/charts/axosyslog-collector/values.yaml +++ b/charts/axosyslog-collector/values.yaml @@ -29,6 +29,9 @@ config: sources: kubernetes: enabled: true + opentelemetry: [] +# E.g.: +# - port: 4317 destinations: network: [] # E.g.: @@ -49,6 +52,9 @@ config: # Key: "/path/to/Key.pem" # peerVerify: false # template: "$(format-json .*)" + opentelemetry: [] +# E.g.: +# - url: "10.104.232.95:4317" rbac: create: true @@ -60,6 +66,10 @@ openShift: create: true annotations: {} +service: + create: false + extraPorts: [] + serviceAccount: create: true annotations: {}