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

feat(otelcolLogs): Split kubelet from systemd logs with a separate feature flag #3845

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

feat(otelcolLogs): Split kubelet from systemd logs with a separate feature flag #3845

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
36d5296
add kubelet logs under separate feature flag
jagan2221 Sep 13, 2024
4ddc3cb
Update README.md
jagan2221 Sep 13, 2024
5886d2a
Update config.yaml
jagan2221 Sep 16, 2024
3073b28
Update config.yaml
jagan2221 Sep 16, 2024
7ef8516
Create 3845.added.txt
jagan2221 Sep 16, 2024
e28f70e
Update basic.input.yaml
jagan2221 Sep 16, 2024
26e1c8c
Update debug.input.yaml
jagan2221 Sep 16, 2024
f89a8ba
Update options.input.yaml
jagan2221 Sep 16, 2024
54228b9
Update options.output.yaml
jagan2221 Sep 16, 2024
e8c1824
Update debug.output.yaml
jagan2221 Sep 16, 2024
182ce08
Update basic.output.yaml
jagan2221 Sep 16, 2024
dd7c8f0
Update logs_test.go
jagan2221 Sep 16, 2024
3b989e8
Update logs_test.go
jagan2221 Sep 16, 2024
d059342
Update multiple_multiline.input.yaml
jagan2221 Sep 16, 2024
9582e7b
Update README.md
jagan2221 Sep 18, 2024
e3411aa
Update README.md
jagan2221 Sep 18, 2024
44e1203
Update multiple_multiline.output.yaml
jagan2221 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/helm/sumologic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `sumologic.logs.multiline.additional` | List of additional conditions and expressions to match first line of multiline logs. See [Multiline](https://help.sumologic.com/docs/send-data/kubernetes/collecting-logs/#conditional-multiline-log-parsing) for more information. | `[]` |
| `sumologic.logs.systemd.enabled` | Enable collecting systemd logs from Kubernets nodes. | `true` |
| `sumologic.logs.systemd.units` | List of systemd units to collect logs from. | See [values.yaml] |
| `sumologic.logs.kubelet.enabled` | Enable collecting kubelet logs from Kubernetes nodes. | `true` |
| `sumologic.logs.container.keep_time_attribute` | When set to `true`, preserves the `time` attribute, which is a string representation of the `timestamp` attribute. | `false` |
| `sumologic.logs.container.sourceHost` | Set the \_sourceHost metadata field in Sumo Logic. | `""` |
| `sumologic.logs.container.sourceName` | Set the \_sourceName metadata field in Sumo Logic. | `"%{namespace}.%{pod}.%{container}"` |
Expand Down
12 changes: 8 additions & 4 deletions deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ processors:
send_batch_size: 1000
timeout: 1s

{{- if .Values.sumologic.logs.systemd.enabled }}
{{- if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
## copy _SYSTEMD_UNIT, SYSLOG_FACILITY, _HOSTNAME and PRIORITY from body to attributes
## so they can be used by metadata processors same way like for fluentd
## build fluent.tag attribute as `host.{_SYSTEMD_UNIT}`
Expand Down Expand Up @@ -59,12 +59,13 @@ receivers:
{{ tpl (.Files.Get "conf/logs/collector/common/filelog_receiver.yaml") . | nindent 2 }}
{{- end }}

{{- if .Values.sumologic.logs.systemd.enabled }}
{{- if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
journald:
directory: /var/log/journal
## This is not a full equivalent of fluent-bit filtering as fluent-bit filters by `_SYSTEMD_UNIT`
## Here is filtering by `UNIT`
units:
{{- if .Values.sumologic.logs.systemd.enabled }}
{{- if .Values.sumologic.logs.systemd.units }}
{{ toYaml .Values.sumologic.logs.systemd.units | nindent 6 }}
{{- else }}
Expand All @@ -91,7 +92,6 @@ receivers:
- flanneld.service
- format-etcd2-volume.service
- kube-node-taint-and-uncordon.service
- kubelet.service
- ldconfig.service
- locksmithd.service
- logrotate.service
Expand All @@ -118,6 +118,10 @@ receivers:
- var-lib-etcd2.service
{{- end }}
{{- end }}
{{- if or .Values.sumologic.logs.kubelet.enabled }}
- kubelet.service
{{- end }}
{{- end }}

service:
extensions:
Expand All @@ -137,7 +141,7 @@ service:
receivers:
- filelog/containers
{{- end }}
{{- if .Values.sumologic.logs.systemd.enabled }}
{{- if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
logs/systemd:
exporters:
- otlphttp
Expand Down
24 changes: 13 additions & 11 deletions deploy/helm/sumologic/conf/logs/otelcol/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ exporters:

{{- end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
sumologic/systemd:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
log_format: json
Expand Down Expand Up @@ -109,7 +109,7 @@ extensions:
pprof: {}

processors:
{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
attributes/extract_systemd_source_fields:
actions:
- action: extract
Expand Down Expand Up @@ -144,7 +144,7 @@ processors:
value: kubelet.service
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
filter/exclude_kubelet_hostname:
logs:
exclude:
Expand All @@ -154,7 +154,7 @@ processors:
value: {{ .Values.sumologic.logs.kubelet.excludeHostRegex | default "$^" | quote }}
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
filter/exclude_kubelet_priority:
logs:
exclude:
Expand All @@ -164,7 +164,7 @@ processors:
value: {{ .Values.sumologic.logs.kubelet.excludePriorityRegex | default "$^" | quote }}
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
filter/exclude_kubelet_syslog:
logs:
exclude:
Expand All @@ -174,7 +174,7 @@ processors:
value: {{ .Values.sumologic.logs.kubelet.excludeFacilityRegex | default "$^" | quote }}
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
filter/exclude_kubelet_unit:
logs:
exclude:
Expand Down Expand Up @@ -234,7 +234,7 @@ processors:
value: .+
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
filter/include_fluent_tag_host:
logs:
include:
Expand All @@ -244,7 +244,7 @@ processors:
value: host\..+
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
filter/include_kubelet:
logs:
include:
Expand Down Expand Up @@ -274,7 +274,7 @@ processors:
- _collector
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if or .Values.sumologic.logs.systemd.enabled .Values.sumologic.logs.kubelet.enabled }}
groupbyattrs/systemd:
keys:
- _sourceName
Expand Down Expand Up @@ -436,7 +436,7 @@ processors:
source_name: {{ .Values.sumologic.logs.container.sourceName | quote }}
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
source/kubelet:
collector: {{ .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}
source_host: "%{_sourceHost}"
Expand Down Expand Up @@ -558,7 +558,7 @@ service:
- otlp
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
{{ if .Values.sumologic.logs.kubelet.enabled }}
logs/otlp/kubelet:
exporters:
{{ include "logs.otelcol.exporters" (dict "Values" .Values "Type" "systemd") | nindent 8}}
Expand Down Expand Up @@ -589,7 +589,9 @@ service:
{{- end }}
receivers:
- otlp
{{- end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
logs/otlp/systemd:
exporters:
{{ include "logs.otelcol.exporters" (dict "Values" .Values "Type" "systemd") | nindent 8}}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ sumologic:
excludeUnitRegex: ""

kubelet:
enabled: true
otelcol:
## Extra processors for kubelet logs. See https://help.sumologic.com/docs/send-data/kubernetes/collecting-logs/ for details.
extraProcessors: []
Expand Down
Loading