Merge sending logs through otel-collector #147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This sends logs collected by fluentd to otelcol via fluentforward. There are some limitations noted by TODOs that I will file issues to track but they should not affect the common cases. It's mostly around configuring of hec_exporter TLS settings. It still attaches k8s metadata on the fluentd side as it uses various annotations to construct source/sourcetype in some cases. May not be worth trying to fix with move to filelog receiver.
* Remove hec token * remove ingestHost, ingestPort, ingestProtocol * add back extraEnvs for fluentd
- Fix changelog ordering - Don't include fluentd configmap when agent not enabled - Enable http-forwarder for all telemetry types since signalfx exporter sends metadata updates
dmitryax
reviewed
May 21, 2021
helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
Outdated
Show resolved
Hide resolved
helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
Outdated
Show resolved
Hide resolved
| - Removed `logsBackend`, configure `splunk_hec` exporter directly (#123) | ||
| - Removed `splunk.com/index` annotation for logs (#123) | ||
| - Removed `fluentd.config.indexFields` as all fields sent are indexed (#123) | ||
| - Removed `fluentforward` receiver from gateway (#127) |
There was a problem hiding this comment.
Wonder if this was* desired overall since there may be other users than our td-agent? Maybe keep for now with a deprecation warning?
There was a problem hiding this comment.
Seems unlikely. Would rather not encourage its use. I've run into several issues with the receiver. They can always add to their own config.
| container_id ${record.dig("docker","container_id")} | ||
| pod_uid ${record.dig("kubernetes","pod_id")} | ||
| node_name "#{ENV['K8S_NODE_NAME']}" | ||
| cluster_name {{ .Values.clusterName }} |
There was a problem hiding this comment.
why drop node and cluster names?
There was a problem hiding this comment.
It'll get attached by the resource processor in the agent now.
|
🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.