From 36d5296e8475c46b5933060f4389c1a3018b5ac3 Mon Sep 17 00:00:00 2001 From: Jaganathan P Date: Fri, 13 Sep 2024 18:20:44 +0530 Subject: [PATCH 01/17] add kubelet logs under separate feature flag --- .../conf/logs/collector/otelcol/config.yaml | 12 ++++++-- .../sumologic/conf/logs/otelcol/config.yaml | 28 ++++++++++--------- deploy/helm/sumologic/values.yaml | 1 + 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index 75d70093d5..7d51a3311e 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -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}` @@ -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 }} @@ -116,6 +117,11 @@ receivers: - update-ca-certificates.service - user-cloudinit.service - var-lib-etcd2.service + - snap.microk8s.daemon-kubelite.service +{{- end }} +{{- end }} +{{- if or .Values.sumologic.logs.kubelet.enabled }} + - snap.microk8s.daemon-kubelite.service {{- end }} {{- end }} @@ -137,7 +143,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 diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index 5e85eccac8..dae17f8c23 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -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 @@ -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 @@ -141,10 +141,10 @@ processors: match_type: strict record_attributes: - key: _SYSTEMD_UNIT - value: kubelet.service + value: snap.microk8s.daemon-kubelite.servicee {{ end }} -{{ if .Values.sumologic.logs.systemd.enabled }} +{{ if .Values.sumologic.logs.kubelet.enabled }} filter/exclude_kubelet_hostname: logs: exclude: @@ -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: @@ -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: @@ -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: @@ -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: @@ -244,14 +244,14 @@ processors: value: host\..+ {{ end }} -{{ if .Values.sumologic.logs.systemd.enabled }} +{{ if .Values.sumologic.logs.kubelet.enabled }} filter/include_kubelet: logs: include: match_type: strict record_attributes: - key: _SYSTEMD_UNIT - value: kubelet.service + value: snap.microk8s.daemon-kubelite.service {{ end }} {{ if .Values.sumologic.logs.systemd.enabled }} @@ -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 @@ -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}" @@ -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}} @@ -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}} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index a2217aed8d..4ac1e9bc2c 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -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: [] From 4ddc3cb88a17451c024608ebba2e7a0716fb6b84 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:17:12 +0530 Subject: [PATCH 02/17] Update README.md --- deploy/helm/sumologic/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index a0553cc343..ea78ead915 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -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}"` | From 5886d2aa3b98e939556c56ab08e42908d6ede73c Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:44:06 +0530 Subject: [PATCH 03/17] Update config.yaml --- deploy/helm/sumologic/conf/logs/otelcol/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index dae17f8c23..89ea89e36a 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -141,7 +141,7 @@ processors: match_type: strict record_attributes: - key: _SYSTEMD_UNIT - value: snap.microk8s.daemon-kubelite.servicee + value: kubelet.service {{ end }} {{ if .Values.sumologic.logs.kubelet.enabled }} @@ -251,7 +251,7 @@ processors: match_type: strict record_attributes: - key: _SYSTEMD_UNIT - value: snap.microk8s.daemon-kubelite.service + value: kubelet.service {{ end }} {{ if .Values.sumologic.logs.systemd.enabled }} From 3073b288f11bd330ac8d3207bdf5a65ba655010a Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:44:44 +0530 Subject: [PATCH 04/17] Update config.yaml --- deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index 7d51a3311e..05dc93dbd2 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -92,7 +92,6 @@ receivers: - flanneld.service - format-etcd2-volume.service - kube-node-taint-and-uncordon.service - - kubelet.service - ldconfig.service - locksmithd.service - logrotate.service @@ -117,11 +116,10 @@ receivers: - update-ca-certificates.service - user-cloudinit.service - var-lib-etcd2.service - - snap.microk8s.daemon-kubelite.service {{- end }} {{- end }} {{- if or .Values.sumologic.logs.kubelet.enabled }} - - snap.microk8s.daemon-kubelite.service + - kubelet.service {{- end }} {{- end }} From 7ef85161019f92757919fa3195ba3c2b63809541 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:32:30 +0530 Subject: [PATCH 05/17] Create 3845.added.txt --- .changelog/3845.added.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/3845.added.txt diff --git a/.changelog/3845.added.txt b/.changelog/3845.added.txt new file mode 100644 index 0000000000..fd0715cc41 --- /dev/null +++ b/.changelog/3845.added.txt @@ -0,0 +1 @@ +feat(otelcolLogs): Split kubelet from systemd logs with a separate feature flag From e28f70ef1d361866abe679fed8108e7f52d061dd Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:36:50 +0530 Subject: [PATCH 06/17] Update basic.input.yaml --- tests/helm/testdata/goldenfile/logs_otc/basic.input.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.input.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.input.yaml index fe681be1c8..fad8656317 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.input.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.input.yaml @@ -3,3 +3,7 @@ sumologic: collector: otelcol: enabled: true + kubelet: + enabled: true + systemd: + enabled: true From 26e1c8cad708cfe6008605c415249abb88dfa86f Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:38:08 +0530 Subject: [PATCH 07/17] Update debug.input.yaml --- tests/helm/testdata/goldenfile/logs_otc/debug.input.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.input.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.input.yaml index 5070306b55..a3327db1bf 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/debug.input.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/debug.input.yaml @@ -3,6 +3,10 @@ sumologic: collector: otelcol: enabled: true + kubelet: + enabled: true + systemd: + enabled: true debug: logs: collector: From f89a8ba86e1f040848045bac18c6ccaa9751fe53 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:38:52 +0530 Subject: [PATCH 08/17] Update options.input.yaml --- tests/helm/testdata/goldenfile/logs_otc/options.input.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.input.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.input.yaml index e0bd430d37..4d321d7c56 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.input.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.input.yaml @@ -7,6 +7,8 @@ sumologic: enabled: false systemd: enabled: true + kubelet: + enabled: false container: enabled: false From 54228b9c15fff43dcfb78021ca056ba161b528f4 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:39:18 +0530 Subject: [PATCH 09/17] Update options.output.yaml --- tests/helm/testdata/goldenfile/logs_otc/options.output.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index db3b44342c..93e1d52053 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -81,7 +81,6 @@ data: - flanneld.service - format-etcd2-volume.service - kube-node-taint-and-uncordon.service - - kubelet.service - ldconfig.service - locksmithd.service - logrotate.service From e8c182493803cfe8b53ee32c084d1d0d9a2a4289 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:00:07 +0530 Subject: [PATCH 10/17] Update debug.output.yaml --- tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml index 2dafaea9ca..94121a8d4c 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml @@ -198,7 +198,6 @@ data: - flanneld.service - format-etcd2-volume.service - kube-node-taint-and-uncordon.service - - kubelet.service - ldconfig.service - locksmithd.service - logrotate.service @@ -223,6 +222,7 @@ data: - update-ca-certificates.service - user-cloudinit.service - var-lib-etcd2.service + - kubelet.service service: extensions: - health_check From 182ce08767f148683ab7dbeb28129531e05a1570 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:00:49 +0530 Subject: [PATCH 11/17] Update basic.output.yaml --- tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index c2083da504..14a3f9046d 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -188,7 +188,6 @@ data: - flanneld.service - format-etcd2-volume.service - kube-node-taint-and-uncordon.service - - kubelet.service - ldconfig.service - locksmithd.service - logrotate.service @@ -213,6 +212,7 @@ data: - update-ca-certificates.service - user-cloudinit.service - var-lib-etcd2.service + - kubelet.service service: extensions: - health_check From dd7c8f0d96f0d4e8c3374c200a25a74c1df801be Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:05:46 +0530 Subject: [PATCH 12/17] Update logs_test.go --- tests/helm/logs_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/helm/logs_test.go b/tests/helm/logs_test.go index 4fb3401728..2b0ea6bd89 100644 --- a/tests/helm/logs_test.go +++ b/tests/helm/logs_test.go @@ -57,7 +57,7 @@ metadata: require.Equal(t, expected, otelConfig) } -func TestMetadataOtelConfigSystemdDisabled(t *testing.T) { +func TestMetadataOtelConfigSystemdAndKubeletDisabled(t *testing.T) { t.Parallel() templatePath := "templates/logs/otelcol/configmap.yaml" valuesYaml := ` @@ -65,6 +65,8 @@ sumologic: logs: systemd: enabled: false + kubelet: + enabled: false ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) From 3b989e8406aa3ccd2dfe549840de9859af89eda9 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:22:09 +0530 Subject: [PATCH 13/17] Update logs_test.go --- tests/helm/logs_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/helm/logs_test.go b/tests/helm/logs_test.go index 2b0ea6bd89..1114992705 100644 --- a/tests/helm/logs_test.go +++ b/tests/helm/logs_test.go @@ -336,6 +336,8 @@ sumologic: logs: systemd: enabled: false + kubelet: + enabled: false ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) @@ -432,6 +434,8 @@ sumologic: systemd: units: - test + kubelet: + enabled: false ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) From d0593424a6a248ee6de7f777b5d321d626aa25d9 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:27:09 +0530 Subject: [PATCH 14/17] Update multiple_multiline.input.yaml --- .../goldenfile/logs_otc_daemonset/multiple_multiline.input.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.input.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.input.yaml index 69803013d4..99e6aec2b5 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.input.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.input.yaml @@ -1,5 +1,7 @@ sumologic: logs: + kubelet: + enabled: true multiline: enabled: true first_line_regex: "^\\[?\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}" From 9582e7b43fafca682a47c6de0def59e9f242baf9 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:05:40 +0530 Subject: [PATCH 15/17] Update README.md --- deploy/helm/sumologic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index ea78ead915..cffe9db973 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -57,7 +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.kubelet.enabled` | Enable collecting systemd logs from Kubernets 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}"` | From e3411aa6be2d51137b4ec91481bf850a7373a34d Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:09:24 +0530 Subject: [PATCH 16/17] Update README.md --- deploy/helm/sumologic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index cffe9db973..498e8d60fa 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -57,7 +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 systemd logs from Kubernets nodes. | `true` | +| `sumologic.logs.kubelet.enabled` | Enable collecting kubelet logs from Kubernets 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}"` | From 44e1203f77bb84a637078fa2c812a3dd46b74dfe Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Wed, 18 Sep 2024 20:50:54 +0530 Subject: [PATCH 17/17] Update multiple_multiline.output.yaml --- .../logs_otc_daemonset/multiple_multiline.output.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index 6a8e98b4bb..6dfb28e249 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -221,7 +221,6 @@ data: - flanneld.service - format-etcd2-volume.service - kube-node-taint-and-uncordon.service - - kubelet.service - ldconfig.service - locksmithd.service - logrotate.service @@ -246,6 +245,7 @@ data: - update-ca-certificates.service - user-cloudinit.service - var-lib-etcd2.service + - kubelet.service service: extensions: - health_check