Update the credis library to support Redis Sentinel 6 & 7 and add username+pwd support to the plugin.

Queue/Backend/Redis.php

@@ -23,6 +23,7 @@ class Redis implements Backend
     protected $port;
     protected $timeout;
     protected $password;
+    protected $username;
 
     /**
      * @var int
@@ -264,7 +265,7 @@ protected function connect()
         $success = $this->redis->connect($this->host, $this->port, $this->timeout, null, 100);
 
         if ($success && !empty($this->password)) {
-            $success = $this->redis->auth($this->password);
+            $success = $this->redis->auth($this->password, $this->username);
         }
 
         if (!empty($this->database) || 0 === $this->database) {
@@ -279,7 +280,8 @@ public function setConfig(
         $port,
         $timeout,
         #[\SensitiveParameter]
-        $password
+        $password,
+        $username = null
     ) {
         $this->disconnect();
 
@@ -290,6 +292,9 @@ public function setConfig(
         if (!empty($password)) {
             $this->password = $password;
         }
+        if (!empty($username)) {
+            $this->username = $username;
+        }
     }
 
     private function disconnect()

Queue/Backend/Sentinel.php

@@ -52,7 +52,7 @@ protected function connect()
                         $this->timeout = 0.05;
                     }
 
-                    $client = new \Credis_Client($master[0], $master[1], $this->timeout, $persistent = false, $this->database, $this->password);
+                    $client = new \Credis_Client($master[0], $master[1], $this->timeout, $persistent = false, $this->database, $this->password, $this->username);
                     $client->connect();
 
                     $this->redis = $client;

Queue/Factory.php

@@ -61,6 +61,7 @@ public static function makeBackendFromSettings(SystemSettings $settings)
         $host     = $settings->redisHost->getValue();
         $port     = $settings->redisPort->getValue();
         $timeout  = $settings->redisTimeout->getValue();
+        $username = $settings->redisUsername->getValue();
         $password = $settings->redisPassword->getValue();
         $database = $settings->redisDatabase->getValue();
 
@@ -83,7 +84,7 @@ public static function makeBackendFromSettings(SystemSettings $settings)
             $redis->setDatabase($database);
         }
 
-        $redis->setConfig($host, $port, $timeout, $password);
+        $redis->setConfig($host, $port, $timeout, $password, $username);
         return $redis;
     }
 }

SystemSettings.php

@@ -39,6 +39,9 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings
     /** @var Setting */
     public $redisDatabase;
 
+    /** @var Setting */
+    public $redisUsername;
+
     /** @var Setting */
     public $redisPassword;
 
@@ -90,6 +93,7 @@ protected function init()
         $this->redisHost = $this->createRedisHostSetting();
         $this->redisPort = $this->createRedisPortSetting();
         $this->redisTimeout = $this->createRedisTimeoutSetting();
+        $this->redisUsername = $this->createRedisUsernameSetting();
         $this->redisDatabase = $this->createRedisDatabaseSetting();
         $this->redisPassword = $this->createRedisPasswordSetting();
         $this->queueEnabled = $this->createQueueEnabledSetting();
@@ -235,6 +239,18 @@ private function createNumberOfQueueWorkerSetting()
         return $numQueueWorkers;
     }
 
+    private function createRedisUsernameSetting()
+    {
+        return $this->makeSetting('redisUsername', $default = '', FieldConfig::TYPE_STRING, function (FieldConfig $field) {
+            $field->title = 'Redis Username';
+            $field->condition = 'backend=="redis"';
+            $field->uiControl = FieldConfig::UI_CONTROL_TEXT;
+            $field->uiControlAttributes = array('size' => 128);
+            $field->inlineHelp = 'Username for Redis ACL authentication. Leave empty if not used.';
+            $field->validators[] = new CharacterLength(null, 128);
+        });
+    }
+
     private function createRedisPasswordSetting()
     {
         return $this->makeSetting('redisPassword', $default = '', FieldConfig::TYPE_STRING, function (FieldConfig $field) {