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.

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

Presets for only logsCollection and hostMetrics #294

Merged
merged 13 commits into from
Aug 3, 2022
Prev Previous commit
Next Next commit
allow config to override
TylerHelmuth committed Jul 28, 2022
commit f376822f675a708ff7fd5948af9c660ea207ee4a
Original file line number Diff line number Diff line change
@@ -5,3 +5,10 @@ presets:
enabled: true
includeCollectorLogs: true

config:
service:
pipelines:
logs:
receivers:
- otlp
- filelog
Original file line number Diff line number Diff line change
@@ -3,3 +3,12 @@ mode: daemonset
presets:
hostMetrics:
enabled: true

config:
service:
pipelines:
metrics:
receivers:
- otlp
- prometheus
- hostmetrics
Original file line number Diff line number Diff line change
@@ -35,8 +35,6 @@ data:
- health_check
- memory_ballast
pipelines:
logs: null
metrics: null
traces:
exporters:
- logging
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b36c37e42f95124302c89ca97f04783e0ed7f45fe1ce6b534245afed0c5ffce8
checksum/config: 92fea31a6087fa1c15b5da7631c2f968f2bedf086c3845c413aae2e069d0f479

labels:
app.kubernetes.io/name: opentelemetry-collector
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/templates/_config.tpl
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@ Build config file for daemonset OpenTelemetry Collector
{{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) }}
{{- $config := include "opentelemetry-collector.baseConfig" $data | fromYaml }}
{{- $config := include "opentelemetry-collector.ballastConfig" $data | fromYaml | mustMergeOverwrite $config }}
{{- $config := include "opentelemetry-collector.daemonset.logsCollectionConfig" $data | fromYaml | mustMergeOverwrite $config }}
{{- $config := include "opentelemetry-collector.daemonset.hostMetricsConfig" $data | fromYaml | mustMergeOverwrite $config }}
{{- $config := mustMergeOverwrite (include "opentelemetry-collector.daemonset.logsCollectionConfig" $data | fromYaml) $config }}
{{- $config := mustMergeOverwrite (include "opentelemetry-collector.daemonset.hostMetricsConfig" $data | fromYaml) $config }}
{{- $config | toYaml }}
{{- end }}