PMM-10231 Service Params Source

admin/commands/management/add_external.go

@@ -68,18 +68,6 @@ type addExternalCommand struct {
 	SkipConnectionCheck bool
 }
 
-func (cmd *addExternalCommand) GetCredentials() error {
-	creds, err := commands.ReadFromSource(cmd.CredentialsSource)
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	cmd.Password = creds.Password
-	cmd.Username = creds.Username
-
-	return nil
-}
-
 func (cmd *addExternalCommand) Run() (commands.Result, error) {
 	customLabels, err := commands.ParseCustomLabels(cmd.CustomLabels)
 	if err != nil {
@@ -110,12 +98,6 @@ func (cmd *addExternalCommand) Run() (commands.Result, error) {
 		cmd.MetricsPath = fmt.Sprintf("/%s", cmd.MetricsPath)
 	}
 
-	if cmd.CredentialsSource != "" {
-		if err := cmd.GetCredentials(); err != nil {
-			return nil, fmt.Errorf("failed to retrieve credentials from %s: %w", cmd.CredentialsSource, err)
-		}
-	}
-
 	params := &external.AddExternalParams{
 		Body: external.AddExternalBody{
 			RunsOnNodeID:        cmd.RunsOnNodeID,
@@ -133,6 +115,7 @@ func (cmd *addExternalCommand) Run() (commands.Result, error) {
 			MetricsMode:         pointer.ToString(strings.ToUpper(cmd.MetricsMode)),
 			Group:               cmd.Group,
 			SkipConnectionCheck: cmd.SkipConnectionCheck,
+			CredentialsSource:   cmd.CredentialsSource,
 		},
 		Context: commands.Ctx,
 	}
@@ -162,7 +145,7 @@ func init() {
 
 	AddExternalC.Flag("username", "External username").StringVar(&AddExternal.Username)
 	AddExternalC.Flag("password", "External password").StringVar(&AddExternal.Password)
-	AddExternalC.Flag("credentials-source", "Credentials provider").ExistingFileVar(&AddExternal.CredentialsSource)
+	AddExternalC.Flag("credentials-source", "Credentials provider").StringVar(&AddExternal.CredentialsSource)
 
 	AddExternalC.Flag("scheme", "Scheme to generate URI to exporter metrics endpoints").
 		PlaceHolder("http or https").StringVar(&AddExternal.Scheme)

admin/commands/management/add_external_serverless.go

@@ -75,18 +75,6 @@ type addExternalServerlessCommand struct {
 	SkipConnectionCheck bool
 }
 
-func (cmd *addExternalServerlessCommand) GetCredentials() error {
-	creds, err := commands.ReadFromSource(cmd.CredentialsSource)
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	cmd.Password = creds.Password
-	cmd.Username = creds.Username
-
-	return nil
-}
-
 func (cmd *addExternalServerlessCommand) Run() (commands.Result, error) {
 	customLabels, err := commands.ParseCustomLabels(cmd.CustomLabels)
 	if err != nil {
@@ -107,12 +95,6 @@ func (cmd *addExternalServerlessCommand) Run() (commands.Result, error) {
 		cmd.MetricsPath = fmt.Sprintf("/%s", cmd.MetricsPath)
 	}
 
-	if cmd.CredentialsSource != "" {
-		if err := cmd.GetCredentials(); err != nil {
-			return nil, fmt.Errorf("failed to retrieve credentials from %s: %w", cmd.CredentialsSource, err)
-		}
-	}
-
 	params := &external.AddExternalParams{
 		Body: external.AddExternalBody{
 			AddNode: &external.AddExternalParamsBodyAddNode{
@@ -141,6 +123,7 @@ func (cmd *addExternalServerlessCommand) Run() (commands.Result, error) {
 			MetricsMode:         pointer.ToString(external.AddExternalBodyMetricsModePULL),
 			Group:               cmd.Group,
 			SkipConnectionCheck: cmd.SkipConnectionCheck,
+			CredentialsSource:   cmd.CredentialsSource,
 		},
 		Context: commands.Ctx,
 	}
@@ -224,7 +207,7 @@ func init() {
 
 	AddExternalServerlessC.Flag("username", "External username").StringVar(&AddExternalServerless.Username)
 	AddExternalServerlessC.Flag("password", "External password").StringVar(&AddExternalServerless.Password)
-	AddExternalServerlessC.Flag("credentials-source", "Credentials provider").ExistingFileVar(&AddExternalServerless.CredentialsSource)
+	AddExternalServerlessC.Flag("credentials-source", "Credentials provider").StringVar(&AddExternalServerless.CredentialsSource)
 
 	AddExternalServerlessC.Flag("address", "External exporter address and port").
 		PlaceHolder("1.2.3.4:9000").StringVar(&AddExternalServerless.Address)

admin/commands/management/add_haproxy.go

@@ -61,18 +61,6 @@ type addHAProxyCommand struct {
 	SkipConnectionCheck bool
 }
 
-func (cmd *addHAProxyCommand) GetCredentials() error {
-	creds, err := commands.ReadFromSource(cmd.CredentialsSource)
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	cmd.Password = creds.Password
-	cmd.Username = creds.Username
-
-	return nil
-}
-
 func (cmd *addHAProxyCommand) Run() (commands.Result, error) {
 	isSupported, err := helpers.IsHAProxySupported()
 	if !isSupported {
@@ -98,12 +86,6 @@ func (cmd *addHAProxyCommand) Run() (commands.Result, error) {
 		cmd.MetricsPath = fmt.Sprintf("/%s", cmd.MetricsPath)
 	}
 
-	if cmd.CredentialsSource != "" {
-		if err := cmd.GetCredentials(); err != nil {
-			return nil, fmt.Errorf("failed to retrieve credentials from %s: %w", cmd.CredentialsSource, err)
-		}
-	}
-
 	params := &ha_proxy.AddHAProxyParams{
 		Body: ha_proxy.AddHAProxyBody{
 			ServiceName:         cmd.ServiceName,
@@ -119,6 +101,7 @@ func (cmd *addHAProxyCommand) Run() (commands.Result, error) {
 			CustomLabels:        customLabels,
 			MetricsMode:         pointer.ToString(strings.ToUpper(cmd.MetricsMode)),
 			SkipConnectionCheck: cmd.SkipConnectionCheck,
+			CredentialsSource:   cmd.CredentialsSource,
 		},
 		Context: commands.Ctx,
 	}
@@ -146,7 +129,7 @@ func init() {
 
 	AddHAProxyC.Flag("username", "HAProxy username").StringVar(&AddHAProxy.Username)
 	AddHAProxyC.Flag("password", "HAProxy password").StringVar(&AddHAProxy.Password)
-	AddHAProxyC.Flag("credentials-source", "Credentials provider").ExistingFileVar(&AddHAProxy.CredentialsSource)
+	AddHAProxyC.Flag("credentials-source", "Credentials provider").StringVar(&AddHAProxy.CredentialsSource)
 
 	AddHAProxyC.Flag("scheme", "Scheme to generate URI to exporter metrics endpoints").
 		PlaceHolder("http or https").StringVar(&AddHAProxy.Scheme)

admin/commands/management/add_mongodb.go

@@ -97,19 +97,6 @@ func (cmd *addMongoDBCommand) GetSocket() string {
 	return cmd.Socket
 }
 
-func (cmd *addMongoDBCommand) GetCredentials() error {
-	creds, err := commands.ReadFromSource(cmd.CredentialsSource)
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	cmd.AgentPassword = creds.AgentPassword
-	cmd.Password = creds.Password
-	cmd.Username = creds.Username
-
-	return nil
-}
-
 func (cmd *addMongoDBCommand) Run() (commands.Result, error) {
 	customLabels, err := commands.ParseCustomLabels(cmd.CustomLabels)
 	if err != nil {
@@ -143,26 +130,21 @@ func (cmd *addMongoDBCommand) Run() (commands.Result, error) {
 		return nil, err
 	}
 
-	if cmd.CredentialsSource != "" {
-		if err := cmd.GetCredentials(); err != nil {
-			return nil, fmt.Errorf("failed to retrieve credentials from %s: %w", cmd.CredentialsSource, err)
-		}
-	}
-
 	params := &mongodb.AddMongoDBParams{
 		Body: mongodb.AddMongoDBBody{
-			NodeID:         cmd.NodeID,
-			ServiceName:    serviceName,
-			Address:        host,
-			Port:           int64(port),
-			Socket:         socket,
-			PMMAgentID:     cmd.PMMAgentID,
-			Environment:    cmd.Environment,
-			Cluster:        cmd.Cluster,
-			ReplicationSet: cmd.ReplicationSet,
-			Username:       cmd.Username,
-			Password:       cmd.Password,
-			AgentPassword:  cmd.AgentPassword,
+			NodeID:            cmd.NodeID,
+			ServiceName:       serviceName,
+			Address:           host,
+			Port:              int64(port),
+			Socket:            socket,
+			PMMAgentID:        cmd.PMMAgentID,
+			Environment:       cmd.Environment,
+			Cluster:           cmd.Cluster,
+			ReplicationSet:    cmd.ReplicationSet,
+			Username:          cmd.Username,
+			Password:          cmd.Password,
+			AgentPassword:     cmd.AgentPassword,
+			CredentialsSource: cmd.CredentialsSource,
 
 			QANMongodbProfiler: cmd.QuerySource == mongodbQuerySourceProfiler,
 
@@ -216,7 +198,7 @@ func init() {
 	AddMongoDBC.Flag("username", "MongoDB username").StringVar(&AddMongoDB.Username)
 	AddMongoDBC.Flag("password", "MongoDB password").StringVar(&AddMongoDB.Password)
 	AddMongoDBC.Flag("agent-password", "Custom password for /metrics endpoint").StringVar(&AddMongoDB.AgentPassword)
-	AddMongoDBC.Flag("credentials-source", "Credentials provider").ExistingFileVar(&AddMongoDB.CredentialsSource)
+	AddMongoDBC.Flag("credentials-source", "Credentials provider").StringVar(&AddMongoDB.CredentialsSource)
 
 	querySources := []string{mongodbQuerySourceProfiler, mongodbQuerySourceNone} // TODO add "auto"
 	querySourceHelp := fmt.Sprintf("Source of queries, one of: %s (default: %s)", strings.Join(querySources, ", "), querySources[0])

admin/commands/management/add_mysql.go

@@ -94,6 +94,7 @@ type addMySQLCommand struct {
 	Username          string
 	Password          string
 	AgentPassword     string
+	CredentialsSource string
 	Environment       string
 	Cluster           string
 	ReplicationSet    string
@@ -190,19 +191,20 @@ func (cmd *addMySQLCommand) Run() (commands.Result, error) {
 
 	params := &mysql.AddMySQLParams{
 		Body: mysql.AddMySQLBody{
-			NodeID:         cmd.NodeID,
-			ServiceName:    serviceName,
-			Address:        host,
-			Socket:         socket,
-			Port:           int64(port),
-			PMMAgentID:     cmd.PMMAgentID,
-			Environment:    cmd.Environment,
-			Cluster:        cmd.Cluster,
-			ReplicationSet: cmd.ReplicationSet,
-			Username:       cmd.Username,
-			Password:       cmd.Password,
-			AgentPassword:  cmd.AgentPassword,
-			CustomLabels:   customLabels,
+			NodeID:            cmd.NodeID,
+			ServiceName:       serviceName,
+			Address:           host,
+			Socket:            socket,
+			Port:              int64(port),
+			PMMAgentID:        cmd.PMMAgentID,
+			Environment:       cmd.Environment,
+			Cluster:           cmd.Cluster,
+			ReplicationSet:    cmd.ReplicationSet,
+			Username:          cmd.Username,
+			Password:          cmd.Password,
+			AgentPassword:     cmd.AgentPassword,
+			CredentialsSource: cmd.CredentialsSource,
+			CustomLabels:      customLabels,
 
 			QANMysqlSlowlog:    cmd.QuerySource == mysqlQuerySourceSlowLog,
 			QANMysqlPerfschema: cmd.QuerySource == mysqlQuerySourcePerfSchema,
@@ -255,6 +257,7 @@ func init() {
 	AddMySQLC.Flag("username", "MySQL username").Default("root").StringVar(&AddMySQL.Username)
 	AddMySQLC.Flag("password", "MySQL password").StringVar(&AddMySQL.Password)
 	AddMySQLC.Flag("agent-password", "Custom password for /metrics endpoint").StringVar(&AddMySQL.AgentPassword)
+	AddMySQLC.Flag("credentials-source", "Credentials provider").StringVar(&AddMySQL.CredentialsSource)
 
 	querySources := []string{mysqlQuerySourceSlowLog, mysqlQuerySourcePerfSchema, mysqlQuerySourceNone} // TODO add "auto", make it default
 	querySourceHelp := fmt.Sprintf("Source of SQL queries, one of: %s (default: %s)", strings.Join(querySources, ", "), querySources[0])

admin/commands/management/add_postgresql.go

@@ -89,19 +89,6 @@ func (cmd *addPostgreSQLCommand) GetSocket() string {
 	return cmd.Socket
 }
 
-func (cmd *addPostgreSQLCommand) GetCredentials() error {
-	creds, err := commands.ReadFromSource(cmd.CredentialsSource)
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	cmd.AgentPassword = creds.AgentPassword
-	cmd.Password = creds.Password
-	cmd.Username = creds.Username
-
-	return nil
-}
-
 func (cmd *addPostgreSQLCommand) Run() (commands.Result, error) {
 	customLabels, err := commands.ParseCustomLabels(cmd.CustomLabels)
 	if err != nil {
@@ -156,12 +143,6 @@ func (cmd *addPostgreSQLCommand) Run() (commands.Result, error) {
 		}
 	}
 
-	if cmd.CredentialsSource != "" {
-		if err := cmd.GetCredentials(); err != nil {
-			return nil, fmt.Errorf("failed to retrieve credentials from %s: %w", cmd.CredentialsSource, err)
-		}
-	}
-
 	params := &postgresql.AddPostgreSQLParams{
 		Body: postgresql.AddPostgreSQLBody{
 			NodeID:      cmd.NodeID,
@@ -175,6 +156,7 @@ func (cmd *addPostgreSQLCommand) Run() (commands.Result, error) {
 			AgentPassword:       cmd.AgentPassword,
 			Socket:              socket,
 			SkipConnectionCheck: cmd.SkipConnectionCheck,
+			CredentialsSource:   cmd.CredentialsSource,
 
 			PMMAgentID:     cmd.PMMAgentID,
 			Environment:    cmd.Environment,
@@ -226,7 +208,7 @@ func init() {
 	AddPostgreSQLC.Flag("password", "PostgreSQL password").StringVar(&AddPostgreSQL.Password)
 	AddPostgreSQLC.Flag("database", "PostgreSQL database").StringVar(&AddPostgreSQL.Database)
 	AddPostgreSQLC.Flag("agent-password", "Custom password for /metrics endpoint").StringVar(&AddPostgreSQL.AgentPassword)
-	AddPostgreSQLC.Flag("credentials-source", "Credentials provider").ExistingFileVar(&AddPostgreSQL.CredentialsSource)
+	AddPostgreSQLC.Flag("credentials-source", "Credentials provider").StringVar(&AddPostgreSQL.CredentialsSource)
 
 	AddPostgreSQLC.Flag("node-id", "Node ID (default is autodetected)").StringVar(&AddPostgreSQL.NodeID)
 	AddPostgreSQLC.Flag("pmm-agent-id", "The pmm-agent identifier which runs this instance (default is autodetected)").StringVar(&AddPostgreSQL.PMMAgentID)

admin/commands/management/add_proxysql.go

@@ -81,19 +81,6 @@ func (cmd *addProxySQLCommand) GetSocket() string {
 	return cmd.Socket
 }
 
-func (cmd *addProxySQLCommand) GetCredentials() error {
-	creds, err := commands.ReadFromSource(cmd.CredentialsSource)
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	cmd.AgentPassword = creds.AgentPassword
-	cmd.Password = creds.Password
-	cmd.Username = creds.Username
-
-	return nil
-}
-
 func (cmd *addProxySQLCommand) Run() (commands.Result, error) {
 	customLabels, err := commands.ParseCustomLabels(cmd.CustomLabels)
 	if err != nil {
@@ -118,26 +105,21 @@ func (cmd *addProxySQLCommand) Run() (commands.Result, error) {
 		return nil, err
 	}
 
-	if cmd.CredentialsSource != "" {
-		if err := cmd.GetCredentials(); err != nil {
-			return nil, fmt.Errorf("failed to retrieve credentials from %s: %w", cmd.CredentialsSource, err)
-		}
-	}
-
 	params := &proxysql.AddProxySQLParams{
 		Body: proxysql.AddProxySQLBody{
-			NodeID:         cmd.NodeID,
-			ServiceName:    serviceName,
-			Address:        host,
-			Port:           int64(port),
-			Socket:         socket,
-			PMMAgentID:     cmd.PMMAgentID,
-			Environment:    cmd.Environment,
-			Cluster:        cmd.Cluster,
-			ReplicationSet: cmd.ReplicationSet,
-			Username:       cmd.Username,
-			Password:       cmd.Password,
-			AgentPassword:  cmd.AgentPassword,
+			NodeID:            cmd.NodeID,
+			ServiceName:       serviceName,
+			Address:           host,
+			Port:              int64(port),
+			Socket:            socket,
+			PMMAgentID:        cmd.PMMAgentID,
+			Environment:       cmd.Environment,
+			Cluster:           cmd.Cluster,
+			ReplicationSet:    cmd.ReplicationSet,
+			Username:          cmd.Username,
+			Password:          cmd.Password,
+			AgentPassword:     cmd.AgentPassword,
+			CredentialsSource: cmd.CredentialsSource,
 
 			CustomLabels:        customLabels,
 			SkipConnectionCheck: cmd.SkipConnectionCheck,
@@ -180,7 +162,7 @@ func init() {
 	AddProxySQLC.Flag("username", "ProxySQL username").Default("admin").StringVar(&AddProxySQL.Username)
 	AddProxySQLC.Flag("password", "ProxySQL password").Default("admin").StringVar(&AddProxySQL.Password)
 	AddProxySQLC.Flag("agent-password", "Custom password for /metrics endpoint").StringVar(&AddProxySQL.AgentPassword)
-	AddProxySQLC.Flag("credentials-source", "Credentials provider").ExistingFileVar(&AddProxySQL.CredentialsSource)
+	AddProxySQLC.Flag("credentials-source", "Credentials provider").StringVar(&AddProxySQL.CredentialsSource)
 
 	AddProxySQLC.Flag("environment", "Environment name").StringVar(&AddProxySQL.Environment)
 	AddProxySQLC.Flag("cluster", "Cluster name").StringVar(&AddProxySQL.Cluster)

agent/client/channel/channel.go

@@ -277,10 +277,10 @@ func (c *Channel) runReceiver() {
 				ID:      msg.Id,
 				Payload: p.PbmSwitchPitr,
 			}
-		case *agentpb.ServerMessage_ParseDefaultsFile:
+		case *agentpb.ServerMessage_ParseCredentialsSource:
 			c.requests <- &ServerRequest{
 				ID:      msg.Id,
-				Payload: p.ParseDefaultsFile,
+				Payload: p.ParseCredentialsSource,
 			}
 
 		// responses