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

Add journald config #290

Merged
merged 62 commits into from
Jan 21, 2022
Merged

Add journald config #290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
b2efe02
added journald config to olly chart
luckyj5 Nov 16, 2021
e00da4e
update values.yaml
luckyj5 Nov 16, 2021
b06d27b
render update
luckyj5 Nov 16, 2021
4f4ebf6
Merge branch 'main' into add-journald-config
luckyj5 Nov 16, 2021
4a6e6f1
render update2
luckyj5 Nov 16, 2021
18e1da9
updated conditional logic in the chart for journald receiver
luckyj5 Nov 16, 2021
1e0fda4
updated if/else condition for journald config
luckyj5 Nov 17, 2021
c5fd2e7
Merge branch 'main' into add-journald-config
luckyj5 Nov 17, 2021
5eb3aec
update render
luckyj5 Nov 17, 2021
36d15ac
added journald config to olly chart
luckyj5 Nov 16, 2021
300e409
render update
luckyj5 Nov 16, 2021
29db45e
merge
luckyj5 Nov 25, 2021
10d6db4
render update
luckyj5 Nov 25, 2021
0d6f56d
update values
luckyj5 Nov 25, 2021
c4f49fd
update based on PR review
luckyj5 Dec 7, 2021
e87e54e
render update
luckyj5 Dec 7, 2021
95d94ab
update based on PR review
luckyj5 Nov 25, 2021
257801f
merge latest changes
luckyj5 Dec 7, 2021
0457640
fix linting errors
luckyj5 Dec 7, 2021
af8630e
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Dec 7, 2021
d69fccf
Update values.yaml
luckyj5 Dec 7, 2021
a40a460
Merge remote-tracking branch 'upstream/main' into add-journald-config
luckyj5 Dec 9, 2021
6ecc917
update render
luckyj5 Dec 9, 2021
5d52dcb
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Dec 13, 2021
3651170
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Dec 13, 2021
bd8bcd8
Merge remote-tracking branch 'upstream/main' into add-journald-config
luckyj5 Dec 13, 2021
52d9a82
update render
luckyj5 Dec 13, 2021
2b7ad93
Squashed commit of the following:
luckyj5 Dec 13, 2021
17c6961
update render
luckyj5 Dec 13, 2021
7b766d0
Merge remote-tracking branch 'upstream/main' into add-journald-config
luckyj5 Dec 13, 2021
750dc2b
update render
luckyj5 Dec 13, 2021
285fd78
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Dec 13, 2021
2506114
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Dec 14, 2021
adc8900
update agent template
luckyj5 Dec 15, 2021
c9cf143
added journald advance config section and changelog
luckyj5 Dec 15, 2021
cd58035
fix typo
luckyj5 Dec 15, 2021
d7e380a
Update helm-charts/splunk-otel-collector/templates/config/_otel-agent…
luckyj5 Dec 16, 2021
bc610c1
Update helm-charts/splunk-otel-collector/values.yaml
luckyj5 Dec 16, 2021
1ffdb1e
update per pr review
luckyj5 Dec 17, 2021
b031204
fix whitespace
luckyj5 Dec 17, 2021
6d09c72
update per review comments
luckyj5 Dec 21, 2021
e1bf0fc
update journal path directory default value
luckyj5 Dec 21, 2021
cbc6e1d
update render
luckyj5 Dec 21, 2021
8fa229a
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Dec 21, 2021
ec70eb6
update closing tags
luckyj5 Dec 23, 2021
f3bf62f
update template
luckyj5 Dec 23, 2021
fe2743a
update render
luckyj5 Dec 23, 2021
a91a15e
added filter to discard not useful fields
luckyj5 Jan 5, 2022
d6f660b
move MESSAGE to log body and priority & unit to attributes
luckyj5 Jan 19, 2022
fb435da
update render
luckyj5 Jan 19, 2022
e17098f
Merge branch 'main' into add-journald-config
luckyj5 Jan 19, 2022
721fe21
update render
luckyj5 Jan 19, 2022
3b7e3c8
update Changelog
luckyj5 Jan 19, 2022
69b2175
update comments
luckyj5 Jan 19, 2022
44cd758
udpate to remove unit-name when its not present
luckyj5 Jan 19, 2022
6fc8e8b
udpate default units value and disable journald by default
luckyj5 Jan 20, 2022
5482e07
Merge branch 'signalfx:main' into add-journald-config
luckyj5 Jan 20, 2022
eeceaf1
Update CHANGELOG.md
luckyj5 Jan 20, 2022
5641b2f
update docs and clean up
luckyj5 Jan 20, 2022
88547b3
update render
luckyj5 Jan 20, 2022
5996f07
update journald sourcetype format to be consistent with other sourcet…
luckyj5 Jan 20, 2022
6026b7b
update schema for units object
luckyj5 Jan 20, 2022
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
7 changes: 6 additions & 1 deletion helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ receivers:
to: $$
{{- end }}
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/journaldreceiver
{{- if .Values.logsCollection.journaldLogs.enabled }}
{{- if (eq (include "splunk-otel-collector.logsEnabled" .) "true") }}
{{- if and (eq .Values.logsEngine "otel") .Values.logsCollection.journaldLogs.enabled }}
{{- if .Values.logsCollection.journaldLogs.units }}
{{- range $_, $unit := .Values.logsCollection.journaldLogs.units }}
{{- printf "journald/%s:" $unit.name | nindent 2 }}
Expand All @@ -258,6 +259,7 @@ receivers:
{{- toYaml $.Values.extraAttributes.custom | nindent 6 }}
{{- end }}
{{- end }}
{{- end }}
{{- else }}
journald:
directory: {{- toYaml .Values.logsCollection.journaldLogs.directory | nindent 6 }}
Expand Down Expand Up @@ -560,6 +562,8 @@ service:
{{- end }}
{{- end }}
{{- end }}

{{- if (eq (include "splunk-otel-collector.logsEnabled" .) "true") }}
{{- if and (eq .Values.logsEngine "otel") .Values.logsCollection.journaldLogs.enabled }}
logs/journald:
dmitryax marked this conversation as resolved.
Show resolved Hide resolved
receivers:
Expand All @@ -584,4 +588,5 @@ service:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
32 changes: 1 addition & 31 deletions rendered/manifests/agent-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,39 +152,9 @@ data:
endpoint: 0.0.0.0:14250
thrift_http:
endpoint: 0.0.0.0:14268
journald/containerd:
journald:
luckyj5 marked this conversation as resolved.
Show resolved Hide resolved
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- containerd
journald/docker:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- docker
journald/kubelet:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- kubelet
kubeletstats:
auth_type: serviceAccount
collection_interval: 10s
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 9e973656784660a50847a7785212d23acc81d8838062da9875b85238a7ca3528
checksum/config: 30edcde59e9ca392a04630e41bc491ed9317e597cf8b1c3aa36ea98b92f09cd9
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
32 changes: 1 addition & 31 deletions rendered/manifests/logs-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,39 +132,9 @@ data:
receivers:
fluentforward:
endpoint: 0.0.0.0:8006
journald/containerd:
journald:
luckyj5 marked this conversation as resolved.
Show resolved Hide resolved
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- containerd
journald/docker:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- docker
journald/kubelet:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- kubelet
otlp:
protocols:
grpc:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 66f25f07b4a0a1cbceed7b811c68d7a55a38e1591c7076744c263f320a7d686a
checksum/config: 69cb918c344b7fd787c77333133cc73371243be9050cd4691ea788298685ca11
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
33 changes: 0 additions & 33 deletions rendered/manifests/metrics-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,39 +138,6 @@ data:
network: null
paging: null
processes: null
journald/containerd:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- containerd
journald/docker:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- docker
journald/kubelet:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- kubelet
kubeletstats:
auth_type: serviceAccount
collection_interval: 10s
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: dd2ce993db2c423f428354de2f81ae995d1a1b06b010b013fcad01918c11f2e7
checksum/config: e7d1ec302095a1cfdf06114064eb7e01edcf9dce8b2bf6028ae922ba1ac653a6
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
33 changes: 0 additions & 33 deletions rendered/manifests/traces-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,39 +136,6 @@ data:
endpoint: 0.0.0.0:14250
thrift_http:
endpoint: 0.0.0.0:14268
journald/containerd:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- containerd
journald/docker:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- docker
journald/kubelet:
directory: /run/log/journal
priority: info
resource:
com.splunk.index: null
com.splunk.source: /run/log/journal
com.splunk.sourcetype: EXPR("kube:"+$$._SYSTEMD_UNIT)
host.name: EXPR(env("K8S_NODE_NAME"))
k8s.cluster.name: CHANGEME
units:
- kubelet
otlp:
protocols:
grpc:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: f82825fad6f9e32fca6186bfd67ab267b81b504cef8b4573343c3972359c034e
checksum/config: fb37eb794d74f55669e7e8804627a61e5e6090f26c4f78457e3a606cde8f6b81
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down