-
Notifications
You must be signed in to change notification settings - Fork 183
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
Add more attributes extracted for traces #438
Merged
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f84e6fa
Add more attributes extracted for traces
pmaciolek 0dcce19
Keep single OT pipeline
pmaciolek aa6ef34
Generate otelcol conf from values
601acd2
Generate otelcol conf from values
2dcaf0b
Use collector from sumologic docker repo
4e0e610
Bump otelcolcontib to newest version (0.2.6.1)
9f4a324
Generate otelcol config from values.yaml
75ec112
Move config to otelcol.config
80ae39c
Merge remote-tracking branch 'origin/master' into otelcol-ext-config
ddc3e1d
Fix image after rebase
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,8 +42,8 @@ otelcolDeployment: | |
# Memory Ballast size should be max 1/3 to 1/2 of memory. | ||
memBallastSizeMib: "683" | ||
image: | ||
name: "omnition/opentelemetry-collector-contrib" | ||
tag: "0.0.5" | ||
name: "sumologic/opentelemetry-collector" | ||
tag: "0.0.0" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @pmaciolek could you update? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's really good point - please use the tagged otelcol release. |
||
pullPolicy: IfNotPresent | ||
|
||
sumologic: | ||
|
@@ -508,3 +508,76 @@ falco: | |
# enabled: true | ||
falco: | ||
jsonOutput: true | ||
|
||
otelcol: | ||
processors: | ||
k8s_tagger: | ||
enabled: true | ||
passthrough: false | ||
extract: | ||
metadata: | ||
# extract the following well-known metadata fields | ||
- containerId | ||
- containerName | ||
- containerImage | ||
- cluster | ||
- daemonSetName | ||
- deployment | ||
- hostName | ||
- namespace | ||
- namespaceId | ||
- node | ||
- owners | ||
- podId | ||
- podName | ||
- replicaSetName | ||
- serviceName | ||
- startTime | ||
- statefulSetName | ||
tags: | ||
containerId: container_id | ||
containerName: container_name | ||
containerImage: conatiner_image | ||
cluster: cluster | ||
daemonSetName: daemonset | ||
deployment: deployment | ||
hostName: hostname | ||
namespace: namespace | ||
namespaceId: namespace_id | ||
node: node | ||
podId: pod_id | ||
podName: pod | ||
replicaSetName: replicaset | ||
serviceName: service_name | ||
startTime: start_time | ||
statefulSetName: statefulset | ||
annotations: | ||
- tag_name: pod_annotation_%s | ||
key: "*" | ||
labels: | ||
- tag_name: pod_label_%s | ||
key: "*" | ||
batch: | ||
enabled: true | ||
send_batch_size: 1024 | ||
timeout: 5s | ||
queued_retry: | ||
enabled: true | ||
num_workers: 16 | ||
queue_size: 10000 | ||
retry_on_failure: true | ||
receivers: | ||
jaeger: | ||
enabled: true | ||
zipkin: | ||
enabled: true | ||
endpoint: "0.0.0.0:9411" | ||
opencensus: | ||
enabled: true | ||
extensions: | ||
health_check: | ||
enabled: true | ||
exporters: | ||
zipkin: | ||
enabled: true | ||
url: null |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@perk-sumo The challenge here is that there is a number of processors: https://github.com/open-telemetry/opentelemetry-collector/tree/master/processor - the list is actually growing and their properties might change over time.
An ideal solution would to provide a template with the full config file, but we are not sure how to tackle it. Do you have some suggestions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sumo-drosiek perhaps we should minimally add sampling processors: https://github.com/open-telemetry/opentelemetry-collector/tree/master/processor#sampling-processor ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I think about it more and more, we should just take full config branch and put it as a configmap. If user have own processors it's gonna add changes to values or config file anyway. Additionally we want to support
--set
flags@perk-sumo any thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not so nice proposal, but had to support dynamic value for url :D
bb9c9b0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to keep some defaults for clients who don't want to deal with the config that much.
We could do it like fluent-bit: provide sane defaults in config.yaml file with some flags in values.yaml and if someone want to have a totally different config provide a special key in values.yaml for that.
We could also provide the template config but I'm not sure if that should go to values.yaml or we should create a new file for that like values.otelcol.yaml or sth. With that client would need to copy and paste something into values.yaml by hand.
I don't like the idea of whole otelcol config inside default values.yaml because it will grow really huge and that doesn't seem right.
Please take a look at:
https://github.com/helm/charts/blob/master/stable/fluent-bit/values.yaml#L146
https://github.com/helm/charts/blob/master/stable/fluent-bit/templates/config.yaml#L1
It's similar to what @sumo-drosiek did.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could do it like fluent-bit
I think that our case differs. We are able to useyaml
. fluentbit were obligated to convert yaml configuration into fluent-bit specific format.I would like to stick to the
values.yaml
. It's more clear and in both casesvalues.yaml
will be growing