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

fix: disable the metadata pipeline for OTC log collector by default #2084

Merged
merged 1 commit into from
Feb 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- fix: disable the metadata pipeline for OTC log collector by default [#2084][#2084]
- fix: fix scheduler metrics remote write and relabel regex [#2058][#2058]

[#2036]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2036
Expand All @@ -32,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#2017]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2017
[#2077]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2077
[#2083]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2083
[#2084]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2084
[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.4.1...main

## [v2.4.1][v2_4_1]
Expand Down
29 changes: 16 additions & 13 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4076,19 +4076,20 @@ metadata:
- batch
exporters:
- sumologic/systemd
logs/otlp/containers:
receivers:
- otlp
processors:
- memory_limiter
- attributes/containers
- groupbyattrs/containers
- k8s_tagger
- source/containers
- resource/containers_copy_node_to_host
- batch
exporters:
- sumologic/containers
## Uncomment this only if you're enabling the Otelcol Log Collector via otellogs.enabled
# logs/otlp/containers:
# receivers:
# - otlp
# processors:
# - memory_limiter
# - attributes/containers
# - groupbyattrs/containers
# - k8s_tagger
# - source/containers
# - resource/containers_copy_node_to_host
# - batch
# exporters:
# - sumologic/containers
statefulset:
nodeSelector: {}
tolerations: []
Expand Down Expand Up @@ -4159,6 +4160,8 @@ metadata:
## which is consistent with CRI, but may possibly cause issues on older K8s versions.
## This is an alpha feature, and may change in the near future.
otellogs:
## In order to enable this feature, a configuration block under metadata.logs.config.service.pipelines.logs/otlp/containers
## needs to be uncommented
enabled: false

## Configure image for Opentelemetry Collector
Expand Down
13 changes: 0 additions & 13 deletions tests/helm/metadata_logs_otc/static/basic.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,19 +270,6 @@ data:
- batch
receivers:
- fluentforward
logs/otlp/containers:
exporters:
- sumologic/containers
processors:
- memory_limiter
- attributes/containers
- groupbyattrs/containers
- k8s_tagger
- source/containers
- resource/containers_copy_node_to_host
- batch
receivers:
- otlp
telemetry:
logs:
level: info
13 changes: 0 additions & 13 deletions tests/helm/metadata_logs_otc/static/templates.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,19 +270,6 @@ data:
- batch
receivers:
- fluentforward
logs/otlp/containers:
exporters:
- sumologic/containers
processors:
- memory_limiter
- attributes/containers
- groupbyattrs/containers
- k8s_tagger
- source/containers
- resource/containers_copy_node_to_host
- batch
receivers:
- otlp
telemetry:
logs:
level: info
20 changes: 20 additions & 0 deletions tests/integration/values/values_helm_otelcol_logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,26 @@ fluentd:
events:
enabled: false

metadata:
logs:
config:
service:
pipelines:
logs/otlp/containers:
receivers:
- otlp
processors:
- memory_limiter
- attributes/containers
- groupbyattrs/containers
- k8s_tagger
- source/containers
- resource/containers_copy_node_to_host
- batch
exporters:
- sumologic/containers


otellogs:
enabled: true
config:
Expand Down