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

[extension/ecsobserver] Add docker label based matcher #3276

Merged
merged 1 commit into from
May 11, 2021

Conversation

pingleig
Copy link
Contributor

Description:

Implements docker label based matching for Prometheus ECS discovery extension i.e. ecsobserver.
Split from #2734

  • Get port number from label value
  • Check if the port number exists in container definition

Link to tracking Issue:

Pending PRs

Previous PRs

Testing:

unit test

Documentation:

No new doc. See existing doc

@pingleig pingleig requested a review from jrcamp as a code owner April 28, 2021 22:17
@pingleig pingleig requested a review from a team April 28, 2021 22:17
@pingleig pingleig force-pushed the ecssd-matcher-docker branch from 38e93ad to 0d9d759 Compare April 28, 2021 22:18
@pingleig
Copy link
Contributor Author

cc @jrcamp @Aneurysm9

@pingleig pingleig changed the title ext: ecsobserver Add docker label based matcher [extension/ecsobserver] Add docker label based matcher Apr 28, 2021
@pingleig pingleig force-pushed the ecssd-matcher-docker branch from 0d9d759 to e8413b7 Compare April 28, 2021 22:41
Copy link
Member

@mxiamxia mxiamxia left a comment

Choose a reason for hiding this comment

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

Overall, LGTM!

@pingleig pingleig force-pushed the ecssd-matcher-docker branch 3 times, most recently from 9e70efc to 6df9ea8 Compare May 4, 2021 21:09
@bogdandrutu
Copy link
Member

Please rebase and fix conflicts :)

@pingleig pingleig force-pushed the ecssd-matcher-docker branch 2 times, most recently from f55dde7 to a6b77ea Compare May 7, 2021 17:25
@pingleig
Copy link
Contributor Author

pingleig commented May 7, 2021

@bogdandrutu Fixed the conflict.

@pingleig
Copy link
Contributor Author

ping @bogdandrutu

Split from open-telemetry#2734

- Get port number from label value
- Check if the port number exists in container definition
@pingleig pingleig force-pushed the ecssd-matcher-docker branch from a6b77ea to 891ff2d Compare May 11, 2021 17:25
@bogdandrutu bogdandrutu merged commit c7591c8 into open-telemetry:main May 11, 2021
alexperez52 referenced this pull request in open-o11y/opentelemetry-collector-contrib Aug 18, 2021
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
alexperez52 referenced this pull request in open-o11y/opentelemetry-collector-contrib Aug 18, 2021
… extensions configuration map (#3340)

This PR is a port of the configfrpc's ToDialOptions() and confighttp ToClient() from PR #3128  in a piece meal fashion. 

The following are the changes
- Refactored configgrpc.PerRPCAuth as extension implementing configauth.GrpcClientAuthenticator
- Plugged in extensions configuration to all the grpc based clients in the core (OTLP, OpenCensus, Jaeger, JaegerReceiver)
- Plugged in extensions configuration to all the HTTP based clients in the core (Zipkin, OTLPHTTP)

Link to tracking Issue:
 #3282 #3276

Testing:
Unit tests, [manual test described (for only oidc)](#3128 (comment))
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.

5 participants