Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fluentd integration for data jobs #940

Merged
merged 2 commits into from
Aug 17, 2022
Merged

Fluentd integration for data jobs #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00646e8
Integrated fluentd for the data jobs
mivanov1988 Aug 15, 2022
a01d311
Merge branch 'main' into person/miroslavi/data-jobs-fluentd-integration
mivanov1988 Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions ...vice/projects/helm_charts/pipelines-control-service/templates/fluentdconfig_datajobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{{- if .Values.dataJob.fluentd.enabled }}
apiVersion: logs.vdp.vmware.com/v1beta1
kind: FluentdConfig
metadata:
name: {{ include "pipelines-control-service.fullname" . }}-data-jobs-parser
namespace: {{ template "pipelines-control-service.deploymentK8sNamespace" . }}
spec:
fluentconf: |
{{- if .Values.dataJob.fluentd.extra }}
{{ .Values.dataJob.fluentd.extra | indent 4 | trim }}
{{- end }}
{{- if .Values.dataJob.fluentd.filter }}
<filter **>
{{ .Values.dataJob.fluentd.filter | indent 6 | trim }}
</filter>
{{- end }}
{{- if .Values.dataJob.fluentd.match }}
<match **>
{{ .Values.dataJob.fluentd.match | indent 6 | trim }}
</match>
{{- end }}
{{- end }}
15 changes: 15 additions & 0 deletions projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,3 +884,18 @@ dataJob:
# In case of negative number it will be subtracted from the {{end_time}}.
# If left blank, defaults to 0.
endTimeOffsetSeconds: 0
# configuration for the fluentd data collector (https://github.com/vmware/kube-fluentd-operator),
# which is currently used for collecting Data Job logs;
# filter and match refer to the fluentd config directives, see here https://docs.fluentd.org/configuration/config-file;
fluentd:
enabled: false
filter: |-
@type parser
key_name log
reserve_data true
remove_key_name_field true
<parse>
@type json
</parse>
match: |-
@type elastic