Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into remove-config-cloud…
Browse files Browse the repository at this point in the history
…-detector
  • Loading branch information
matej-g committed Oct 26, 2023
2 parents 72d0362 + 7b45600 commit bd5157b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion otel-integration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

## OpenTelemtry-Integration

### v0.0.24 / 2023-10-26
### v0.0.25 / 2023-10-26
* [CHORE] Remove unnecessary cloud resource detector configuration.

### v0.0.24 / 2023-10-26
* [FIX] service::pipelines::logs: references exporter "k8sattributes" which is not configured

### v0.0.23 / 2023-10-26
* [FEATURE] Add k8sattributes and resourcedetecion processor for logs and traces in agent.

Expand Down
4 changes: 2 additions & 2 deletions otel-integration/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,11 @@ opentelemetry-agent:
exporters:
- coralogix
processors:
- batch
receivers:
- k8sattributes
- resourcedetection/env
- resourcedetection/region
- batch
receivers:
- otlp
tolerations:
- operator: Exists
Expand Down

0 comments on commit bd5157b

Please sign in to comment.