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.

Sign up for GitHub

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

Jump to bottom

Add Redis ACL Auth Support (and for Sentinels) #1708

Merged
merged 5 commits into from Sep 2, 2022
Merged

Add Redis ACL Auth Support (and for Sentinels) #1708

merged 5 commits into from Sep 2, 2022

Conversation

jsievenpiper
Copy link
Contributor

@jsievenpiper jsievenpiper commented Aug 31, 2022 •
edited

What this PR does:

  • Upgrades go-redis, which enables SentinelUsername to be configured in the redis UniversalOptions struct
  • Adds fields for username and sentinel_username in tempo's configuration for redis, which enables ACL-based auth against the redis instances and sentinels, respectively.

Which issue(s) this PR fixes:
N/A

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@CLAassistant
Copy link

CLAassistant commented Aug 31, 2022 •
edited

CLA assistant check
All committers have signed the CLA.

@jsievenpiper jsievenpiper changed the title Sentinel Add Redis ACL Auth Support (and for Sentinels) Aug 31, 2022
@joe-elliott
Copy link
Member

Appreciate the addition. Please run make update-mod and commit the changes to fix the vendoring issues.

@jsievenpiper
Copy link
Contributor Author

thanks @joe-elliott , done!

joe-elliott
joe-elliott approved these changes Sep 2, 2022
View reviewed changes
Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!

@joe-elliott joe-elliott merged commit 7b44bf8 into grafana:main Sep 2, 2022
@jsievenpiper jsievenpiper deleted the sentinel branch September 2, 2022 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joe-elliott joe-elliott joe-elliott approved these changes

@annanay25 annanay25 Awaiting requested review from annanay25 annanay25 is a code owner

@mdisibio mdisibio Awaiting requested review from mdisibio mdisibio is a code owner

@mapno mapno Awaiting requested review from mapno mapno is a code owner

@kvrhdn kvrhdn Awaiting requested review from kvrhdn kvrhdn is a code owner

@zalegrala zalegrala Awaiting requested review from zalegrala zalegrala is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jsievenpiper @CLAassistant @joe-elliott