search

gnocchixyz / gnocchi

Timeseries database
Apache License 2.0
302 stars 85 forks source link

Support authentication and SSL for redis sentinel (backport #1376) #1397

Closed mergify[bot] closed 3 months ago

mergify[bot] commented 3 months ago

This change allows enabling SSL and/or authentication for redis sentinel. Previously both of these were possible for only redis, and connections to redis sentinel servers were not protected.

This is an automatic backport of pull request #1376 done by Mergify.

mergify[bot] commented 3 months ago

Cherry-pick of 20e596456e850578df753a89b55e22693ab813f5 has failed:

On branch mergify/bp/stable/4.6/pr-1376
Your branch is up to date with 'origin/stable/4.6'.

You are currently cherry-picking commit 20e59645.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   gnocchi/common/redis.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally