Support Redis 6 ACL authentication

pkg/datasource.go

@@ -152,9 +152,14 @@ func newDataSourceInstance(setting backend.DataSourceInstanceSettings) (instance
 	connFunc := func(network, addr string) (radix.Conn, error) {
 		opts := []radix.DialOpt{radix.DialTimeout(time.Duration(timeout) * time.Second)}
 
-		// Add Password
+		// Authentication
 		if secureData != nil && secureData["password"] != "" {
-			opts = append(opts, radix.DialAuthPass(secureData["password"]))
+			// If ACL enabled
+			if jsonData.ACL {
+				opts = append(opts, radix.DialAuthUser(jsonData.User, secureData["password"]))
+			} else {
+				opts = append(opts, radix.DialAuthPass(secureData["password"]))
+			}
 		}
 
 		// TLS Authentication

pkg/types.go

@@ -37,6 +37,8 @@ type dataModel struct {
 	TLSSkipVerify  bool   `json:"tlsSkipVerify"`
 	Client         string `json:"client"`
 	SentinelName   string `json:"sentinelName"`
+	ACL            bool   `json:"acl"`
+	User           string `json:"user"`
 }
 
 /*

src/components/ConfigEditor.tsx

@@ -219,6 +219,32 @@ export class ConfigEditor extends PureComponent<Props, State> {
           />
         </div>
 
+        <div className="gf-form">
+          <Switch
+            label="ACL"
+            labelClass="width-10"
+            tooltip="Allows certain connections to be limited in terms of the commands that can be executed and the keys that can be accessed"
+            checked={jsonData.acl || false}
+            onChange={(event) => {
+              const jsonData = { ...options.jsonData, acl: event.currentTarget.checked };
+              onOptionsChange({ ...options, jsonData });
+            }}
+          />
+
+          {jsonData.acl && (
+            <FormField
+              label="Username"
+              labelWidth={10}
+              inputWidth={10}
+              value={jsonData.user}
+              tooltip="Provide ACL Username to authenticate."
+              onChange={(event: ChangeEvent<HTMLInputElement>) => {
+                onOptionsChange({ ...options, jsonData: { ...options.jsonData, user: event.target.value } });
+              }}
+            />
+          )}
+        </div>
+
         <div className="gf-form">
           <SecretFormField
             isConfigured={(secureJsonFields && secureJsonFields.password) as boolean}

src/types.ts

@@ -59,6 +59,20 @@ export interface RedisDataSourceOptions extends DataSourceJsonData {
    * @type {string}
    */
   sentinelName: string;
+
+  /**
+   * ACL enabled
+   *
+   * @type {boolean}
+   */
+  acl: boolean;
+
+  /**
+   * ACL Username
+   *
+   * @type {string}
+   */
+  user: string;
 }
 
 /**
@@ -108,8 +122,8 @@ export enum ClientTypeValue {
  * Client Types
  */
 export const ClientType = [
-  { label: 'Redis Cluster', value: ClientTypeValue.CLUSTER },
+  { label: 'Standalone', value: ClientTypeValue.STANDALONE },
+  { label: 'Cluster', value: ClientTypeValue.CLUSTER },
   { label: 'Sentinel', value: ClientTypeValue.SENTINEL },
   { label: 'Socket', value: ClientTypeValue.SOCKET },
-  { label: 'Standalone', value: ClientTypeValue.STANDALONE },
 ];