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

Honor Prometheus external labels #3127

Merged
merged 3 commits into from
May 17, 2021
Merged

Honor Prometheus external labels #3127

merged 3 commits into from
May 17, 2021

Conversation

rakyll
Copy link
Contributor

@rakyll rakyll commented May 7, 2021

Add external labels to every scraped sample in the Prometheus receiver if user has external labels configured.

Fixes #2904.
Related to https://github.com/open-telemetry/opentelemetry-collector/issues/3016.

rakyll added 3 commits May 7, 2021 11:49
Add external labels to every scraped sample in the Prometheus receiver if user has external labels configured.

Fixes #2904.
@rakyll rakyll marked this pull request as ready for review May 7, 2021 20:32
@rakyll rakyll requested a review from a team May 7, 2021 20:32
@rakyll
Copy link
Contributor Author

rakyll commented May 7, 2021

cc @Aneurysm9 @odeke-em

@rakyll
Copy link
Contributor Author

rakyll commented May 10, 2021

Can I get a review, @Aneurysm9 @odeke-em?

@rakyll
Copy link
Contributor Author

rakyll commented May 11, 2021

cc @open-telemetry/collector-approvers, this is ready to review.

Copy link
Member

@gramidt gramidt left a comment

Choose a reason for hiding this comment

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

Looks good! LGTM

@alolita
Copy link
Member

alolita commented May 12, 2021

@open-telemetry/collector-approvers can you please review asap? Thanks! Ping @jpkrohling

@alolita alolita added the ready-to-merge Code review completed; ready to merge by maintainers label May 14, 2021
@rakyll
Copy link
Contributor Author

rakyll commented May 15, 2021

Can someone merge this PR? It's been sitting here for a long time and is important for Prometheus compliance.

cc @bogdandrutu

@alolita
Copy link
Member

alolita commented May 15, 2021

@bogdandrutu can you please merge this PR? Its been reviewed and is awaiting to be merged. Many thanks.

@bogdandrutu bogdandrutu merged commit 23d714a into open-telemetry:main May 17, 2021
@rakyll rakyll deleted the external-labels branch May 17, 2021 20:53
@jpkrohling
Copy link
Member

For the record, I also missed the notification for this one.

dashpole pushed a commit to dashpole/opentelemetry-collector that referenced this pull request Jun 14, 2021
* Honor Prometheus external labels

Add external labels to every scraped sample in the Prometheus receiver if user has external labels configured.

Fixes open-telemetry#2904.

* Fix typo

* Fix lint
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Code review completed; ready to merge by maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

prometheus receiver : external labels are not honored
9 participants