Merge pull request #1165 from mkadokawa-idcf/mackerel-plugin-redis-us…

…ername Allow mackerel-plugin-redis to specify username
mackerelio · Mar 30, 2024 · c46e7c6 · c46e7c6
2 parents 99db858 + 7f498a1
commit c46e7c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mackerel-plugin-redis/README.md b/mackerel-plugin-redis/README.md
@@ -6,7 +6,7 @@ Redis custom metrics plugin for mackerel.io agent.
 ## Synopsis
 
 ```shell
-mackerel-plugin-redis [-host=<hostname>] [-port=<port>] [-password=<password>] [-socket=<unix socket>] [-timeout=<time>] [-metric-key-prefix=<prefix>] [-config-command=<CONFIG command name>] [-tls] [-tls-skip-verify]
+mackerel-plugin-redis [-host=<hostname>] [-port=<port>] [-username=<username>] [-password=<password>] [-socket=<unix socket>] [-timeout=<time>] [-metric-key-prefix=<prefix>] [-config-command=<CONFIG command name>] [-tls] [-tls-skip-verify]
 ```
 
 ## Example of mackerel-agent.conf

diff --git a/mackerel-plugin-redis/lib/redis.go b/mackerel-plugin-redis/lib/redis.go
@@ -31,6 +31,7 @@ type RedisPlugin struct {
 
 	Host          string
 	Port          string
+	Username      string
 	Password      string
 	Socket        string
 	Prefix        string
@@ -131,6 +132,7 @@ func (m *RedisPlugin) Connect() {
 	}
 	options := &redis.Options{
 		Addr:        address,
+		Username:    m.Username,
 		Password:    m.Password,
 		DB:          0,
 		Network:     network,
@@ -371,6 +373,7 @@ func (m RedisPlugin) GraphDefinition() map[string]mp.Graphs {
 func Do() {
 	optHost := flag.String("host", "localhost", "Hostname")
 	optPort := flag.String("port", "6379", "Port")
+	optUsername := flag.String("username", "default", "Username")
 	optPassword := flag.String("password", os.Getenv("REDIS_PASSWORD"), "Password")
 	optSocket := flag.String("socket", "", "Server socket (overrides host and port)")
 	optPrefix := flag.String("metric-key-prefix", "redis", "Metric key prefix")
@@ -396,6 +399,7 @@ func Do() {
 	} else {
 		redis.Host = *optHost
 		redis.Port = *optPort
+		redis.Username = *optUsername
 		redis.Password = *optPassword
 		redis.EnableTLS = *optEnableTLS
 		redis.InsecureSkipVerify = *optTLSSkipVerify