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

feat(otelcol): do not send pod annotations #1803

Merged
merged 2 commits into from
Oct 29, 2021

Conversation

andrzej-stencel
Copy link
Contributor

Narrow down the metadata regexes to explicitly only match on pod and namespace labels.

This prevents pod annotations from being sent to Sumo, as they all start with pod_annotations_.

@andrzej-stencel andrzej-stencel requested a review from a team as a code owner October 5, 2021 17:11
Copy link
Contributor

@sumo-drosiek sumo-drosiek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

              annotations:
                - tag_name: "pod_annotations_%s"
                  key: "*"

from k8s_tagger or ensure they won't be send as part of the log body

@andrzej-stencel
Copy link
Contributor Author

andrzej-stencel commented Oct 29, 2021

I believe the commit from @sumo-drosiek: feat(helm/metadata/otc): drop pod attributes before exporting data relies on this pull request in upstream: open-telemetry/opentelemetry-collector-contrib#5750, which at the moment is still not merged.

Narrow down the metadata regexes to explicitly
only match on pod and namespace labels.
This prevents pod annotations from being sent to Sumo,
as they all start with `pod_annotations_`.
@andrzej-stencel andrzej-stencel force-pushed the feat-otelcol-do-not-send-pod-annotations branch from fc37d61 to bfa95f9 Compare October 29, 2021 11:26
@andrzej-stencel andrzej-stencel force-pushed the feat-otelcol-do-not-send-pod-annotations branch from 33e2467 to a77f54f Compare October 29, 2021 13:01
@andrzej-stencel
Copy link
Contributor Author

I believe the commit from @sumo-drosiek: feat(helm/metadata/otc): drop pod attributes before exporting data relies on this pull request in upstream: open-telemetry/opentelemetry-collector-contrib#5750, which at the moment is still not merged.

Due to the above, I have decided to extract Dominik's change using the unmerged Otelcol functionality to a separate pull request #1862, so that the original smaller change can be merged without waiting for the upstream merge.

@andrzej-stencel andrzej-stencel merged commit d55a2ee into main Oct 29, 2021
@andrzej-stencel andrzej-stencel deleted the feat-otelcol-do-not-send-pod-annotations branch October 29, 2021 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants