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

Update Redis config options #5861

Merged
merged 11 commits into from
Oct 28, 2021

Conversation

Mrod1598
Copy link
Contributor

Description:
Add additional configuration options to redis to enable defining a specific network as well as TLS.

Testing:
Added testing to verify TLS config is working properly

Documentation:
Added additional config options to doc

@Mrod1598 Mrod1598 requested review from a team and bogdandrutu October 21, 2021 14:09
receiver/redisreceiver/config.go Outdated Show resolved Hide resolved
receiver/redisreceiver/redis_scraper.go Outdated Show resolved Hide resolved
receiver/redisreceiver/redis_scraper.go Outdated Show resolved Hide resolved
@Mrod1598 Mrod1598 requested a review from bogdandrutu October 25, 2021 13:46
Copy link
Member

@djaglowski djaglowski left a comment

Choose a reason for hiding this comment

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

LGTM

@djaglowski
Copy link
Member

@bogdandrutu, would you mind giving this a final review?

@djaglowski
Copy link
Member

@Mrod1598 please resolve the conflict

@Mrod1598
Copy link
Contributor Author

@Mrod1598 please resolve the conflict

resolved

@qingling128
Copy link

Looks like this has been approved and the conflict with HEAD has been resolved. Can someone help merge this?

@Mrod1598 Mrod1598 requested a review from bogdandrutu October 28, 2021 19:32
@Mrod1598
Copy link
Contributor Author

@bogdandrutu checks passed

@bogdandrutu bogdandrutu merged commit e6fab41 into open-telemetry:main Oct 28, 2021
@Mrod1598 Mrod1598 deleted the update-redis-options branch October 28, 2021 20:53
@qingling128
Copy link

Thank you so much, Bogdan!

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.

None yet

4 participants