PMM-4879 Added support for defaultsfile parameter.

commands/management/add_mysql.go

@@ -93,6 +93,7 @@ type addMySQLCommand struct {
 	ServiceName       string
 	Username          string
 	Password          string
+	DefaultsFile      string
 	AgentPassword     string
 	Environment       string
 	Cluster           string
@@ -125,9 +126,17 @@ func (cmd *addMySQLCommand) GetAddress() string {
 }
 
 func (cmd *addMySQLCommand) GetDefaultAddress() string {
+	if cmd.DefaultsFile != "" {
+		// address might be specified in defaults file
+		return ""
+	}
 	return "127.0.0.1:3306"
 }
 
+func (cmd *addMySQLCommand) GetDefaultUsername() string {
+	return "root"
+}
+
 func (cmd *addMySQLCommand) GetSocket() string {
 	return cmd.Socket
 }
@@ -179,6 +188,8 @@ func (cmd *addMySQLCommand) Run() (commands.Result, error) {
 		return nil, err
 	}
 
+	username := defaultsFileUsernameCheck(cmd)
+
 	tablestatsGroupTableLimit := int32(cmd.DisableTablestatsLimit)
 	if cmd.DisableTablestats {
 		if tablestatsGroupTableLimit != 0 {
@@ -199,8 +210,9 @@ func (cmd *addMySQLCommand) Run() (commands.Result, error) {
 			Environment:    cmd.Environment,
 			Cluster:        cmd.Cluster,
 			ReplicationSet: cmd.ReplicationSet,
-			Username:       cmd.Username,
+			Username:       username,
 			Password:       cmd.Password,
+			DefaultsFile:   cmd.DefaultsFile,
 			AgentPassword:  cmd.AgentPassword,
 			CustomLabels:   customLabels,
 
@@ -251,8 +263,9 @@ func init() {
 	AddMySQLC.Flag("node-id", "Node ID (default is autodetected)").StringVar(&AddMySQL.NodeID)
 	AddMySQLC.Flag("pmm-agent-id", "The pmm-agent identifier which runs this instance (default is autodetected)").StringVar(&AddMySQL.PMMAgentID)
 
-	AddMySQLC.Flag("username", "MySQL username").Default("root").StringVar(&AddMySQL.Username)
+	AddMySQLC.Flag("username", "MySQL username").StringVar(&AddMySQL.Username)
 	AddMySQLC.Flag("password", "MySQL password").StringVar(&AddMySQL.Password)
+	AddMySQLC.Flag("defaults-file", "Path to defaults file").StringVar(&AddMySQL.DefaultsFile)
 	AddMySQLC.Flag("agent-password", "Custom password for /metrics endpoint").StringVar(&AddMySQL.AgentPassword)
 
 	querySources := []string{mysqlQuerySourceSlowLog, mysqlQuerySourcePerfSchema, mysqlQuerySourceNone} // TODO add "auto", make it default
@@ -284,3 +297,17 @@ func init() {
 	AddMySQLC.Flag("disable-collectors", "Comma-separated list of collector names to exclude from exporter").StringVar(&AddMySQL.DisableCollectors)
 	addGlobalFlags(AddMySQLC)
 }
+
+func defaultsFileUsernameCheck(cmd *addMySQLCommand) string {
+	// defaults file specified, but passed username has higher priority
+	if cmd.Username != "" && cmd.DefaultsFile != "" {
+		return cmd.Username
+	}
+
+	// username not specified, but can be in defaults files
+	if cmd.Username == "" && cmd.DefaultsFile != "" {
+		return ""
+	}
+
+	return cmd.GetDefaultUsername()
+}

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/AlekSi/pointer v1.2.0
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d
 	github.com/go-openapi/runtime v0.23.3
-	github.com/percona/pmm v0.0.0-20220425171601-f7d00530d1ae
+	github.com/percona/pmm v0.0.0-20220425222533-a6e4e7330135
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.1

go.sum

@@ -111,8 +111,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/percona/pmm v0.0.0-20220425171601-f7d00530d1ae h1:7URruB9o4o7ooKOUmFcyjhykgx5mfy9BdmIspGWCXlM=
-github.com/percona/pmm v0.0.0-20220425171601-f7d00530d1ae/go.mod h1:FFbpyZXm+Ilg8M/GewuhdjJhPaW1/v1zjRRerYhCfEA=
+github.com/percona/pmm v0.0.0-20220425222533-a6e4e7330135 h1:n0FRmvraxr+uAMl7qUcmz5ADj5XHb1PrNhE28fKEt8M=
+github.com/percona/pmm v0.0.0-20220425222533-a6e4e7330135/go.mod h1:FFbpyZXm+Ilg8M/GewuhdjJhPaW1/v1zjRRerYhCfEA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=