Skip to content
This repository has been archived by the owner on Jun 1, 2022. It is now read-only.

PMM-4879 Added support for defaultsfile parameter. #199

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

PMM-4879 Added support for defaultsfile parameter. #199

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7abac2e
PMM-4879 Added support for defaultsfile parameter.
pkadej Apr 8, 2022
5585aa0
PMM-4879 Removing default value for defaults-file.
pkadej Apr 15, 2022
d27eb0a
Merge branch 'main' into PMM-4879-defaults-file
ritbl Apr 18, 2022
352922c
PMM-4879 Removing default value for username.
pkadej Apr 21, 2022
f07e024
PMM-4879 Removing passing default MySQL address if not specified.
pkadej Apr 22, 2022
ccf48d1
Merge branch 'main' into PMM-4879-defaults-file
pkadej Apr 28, 2022
3f9a487
PMM-4879 Code review adjustments.
pkadej Apr 28, 2022
30ab469
Merge branch 'main' into PMM-4879-defaults-file
pkadej Apr 30, 2022
1707775
PMM-4879 Switching API to percona/pmm repository.
pkadej Apr 30, 2022
ec016a5
Merge branch 'main' into PMM-4879-defaults-file
pkadej May 26, 2022
d0081c4
Merge branch 'main' into PMM-4879-defaults-file
pkadej May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions commands/management/add_mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ type addMySQLCommand struct {
ServiceName string
Username string
Password string
DefaultsFile string
AgentPassword string
Environment string
Cluster string
Expand Down Expand Up @@ -125,7 +126,8 @@ func (cmd *addMySQLCommand) GetAddress() string {
}

func (cmd *addMySQLCommand) GetDefaultAddress() string {
return "127.0.0.1:3306"
BupycHuk marked this conversation as resolved.
Show resolved Hide resolved
// address may be specified in defaults file
return ""
}

func (cmd *addMySQLCommand) GetSocket() string {
Expand Down Expand Up @@ -201,6 +203,7 @@ func (cmd *addMySQLCommand) Run() (commands.Result, error) {
ReplicationSet: cmd.ReplicationSet,
Username: cmd.Username,
Password: cmd.Password,
DefaultsFile: cmd.DefaultsFile,
AgentPassword: cmd.AgentPassword,
CustomLabels: customLabels,

Expand Down Expand Up @@ -251,8 +254,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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And for username let's use the same logic as for default address.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed.

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
Expand Down