Skip to content

Commit

Permalink
fix: disable the metadata pipeline for OTC log collector by default
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikołaj Świątek committed Feb 3, 2022
1 parent c701769 commit 33c3dc8
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 13 deletions.
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
[#2075]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2075
[#2017]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2017
[#2077]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2077
[#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
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

0 comments on commit 33c3dc8

Please sign in to comment.