PMM-11341 Auto discovery limit.

admin/commands/inventory/add_agent_mysqld_exporter.go

@@ -62,7 +62,7 @@ func (res *addAgentMysqldExporterResult) TablestatStatus() string {
 	}
 
 	switch {
-	case res.Agent.TablestatsGroupTableLimit == 0: // no limit
+	case res.Agent.TablestatsGroupTableLimit == 0: // server defined
 		s += " (the table count limit is not set)."
 	case res.Agent.TablestatsGroupTableLimit < 0: // always disabled
 		s += " (always)."
@@ -94,7 +94,7 @@ type AddAgentMysqldExporterCommand struct {
 	TLSCAFile                 string            `name:"tls-ca" help:"Path to certificate authority certificate file"`
 	TLSCertFile               string            `name:"tls-cert" help:"Path to client certificate file"`
 	TLSKeyFile                string            `name:"tls-key" help:"Path to client key file"`
-	TablestatsGroupTableLimit int32             `placeholder:"number" help:"Tablestats group collectors will be disabled if there are more than that number of tables (default: 0 - always enabled; negative value - always disabled)"`
+	TablestatsGroupTableLimit int32             `placeholder:"number" help:"Tablestats group collectors will be disabled if there are more than that number of tables (default: server-defined)"`
 	PushMetrics               bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
 	DisableCollectors         []string          `help:"Comma-separated list of collector names to exclude from exporter"`
 	LogLevel                  string            `enum:"debug,info,warn,error" default:"warn" help:"Service logging level. One of: [debug, info, warn, error]"`

admin/commands/inventory/add_agent_postgres_exporter.go

@@ -46,6 +46,8 @@ func (res *addAgentPostgresExporterResult) String() string {
 }
 
 // AddAgentPostgresExporterCommand is used by Kong for CLI flags and commands.
+//
+//nolint:lll
 type AddAgentPostgresExporterCommand struct {
 	PMMAgentID          string            `arg:"" help:"The pmm-agent identifier which runs this instance"`
 	ServiceID           string            `arg:"" help:"Service identifier"`
@@ -62,6 +64,7 @@ type AddAgentPostgresExporterCommand struct {
 	TLSCertFile         string            `help:"TLS certificate file"`
 	TLSKeyFile          string            `help:"TLS certificate key file"`
 	LogLevel            string            `enum:"debug,info,warn,error" default:"warn" help:"Service logging level. One of: [debug, info, warn, error]"`
+	AutoDiscoveryLimit  int32             `default:"0" placeholder:"NUMBER" help:"Auto-discovery will be disabled if there are more than that number of databases (default: server-defined)"`
 }
 
 func (cmd *AddAgentPostgresExporterCommand) RunCmd() (commands.Result, error) {
@@ -99,6 +102,7 @@ func (cmd *AddAgentPostgresExporterCommand) RunCmd() (commands.Result, error) {
 			SkipConnectionCheck: cmd.SkipConnectionCheck,
 			PushMetrics:         cmd.PushMetrics,
 			DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
+			AutoDiscoveryLimit:  cmd.AutoDiscoveryLimit,
 
 			TLS:           cmd.TLS,
 			TLSSkipVerify: cmd.TLSSkipVerify,

admin/commands/management/add_mysql.go

@@ -71,7 +71,7 @@ func (res *addMySQLResult) TablestatStatus() string {
 	s := "Table statistics collection " + status
 
 	switch {
-	case res.MysqldExporter.TablestatsGroupTableLimit == 0: // no limit
+	case res.MysqldExporter.TablestatsGroupTableLimit == 0: // server defined
 		s += " (the table count limit is not set)."
 	case res.MysqldExporter.TablestatsGroupTableLimit < 0: // always disabled
 		s += " (always)."

admin/commands/management/add_postgresql.go

@@ -73,6 +73,7 @@ type AddPostgreSQLCommand struct {
 	DisableQueryExamples bool              `name:"disable-queryexamples" help:"Disable collection of query examples"`
 	MetricsMode          string            `enum:"${metricsModesEnum}" default:"auto" help:"Metrics flow mode, can be push - agent will push metrics, pull - server scrape metrics from agent or auto - chosen by server"`
 	DisableCollectors    []string          `help:"Comma-separated list of collector names to exclude from exporter"`
+	AutoDiscoveryLimit   int32             `default:"0" placeholder:"NUMBER" help:"Auto-discovery will be disabled if there are more than that number of databases (default: server-defined)"`
 
 	AddCommonFlags
 	AddLogLevelNoFatalFlags
@@ -203,6 +204,7 @@ func (cmd *AddPostgreSQLCommand) RunCmd() (commands.Result, error) {
 			DisableQueryExamples: cmd.DisableQueryExamples,
 			MetricsMode:          pointer.ToString(strings.ToUpper(cmd.MetricsMode)),
 			DisableCollectors:    commands.ParseDisableCollectors(cmd.DisableCollectors),
+			AutoDiscoveryLimit:   cmd.AutoDiscoveryLimit,
 			LogLevel:             &cmd.AddLogLevel,
 		},
 		Context: commands.Ctx,

agent/serviceinfobroker/service_info_broker.go

@@ -219,12 +219,32 @@ func (sib *ServiceInfoBroker) getPostgreSQLInfo(ctx context.Context, dsn string,
 	db := sql.OpenDB(c)
 	defer db.Close() //nolint:errcheck
 
+	var databaseList []string
+	databaseListQuery := "SELECT /* agent='serviceinfobroker' */ datname FROM pg_database WHERE datallowconn = true AND datistemplate = false AND has_database_privilege(current_user, datname, 'connect')" //nolint:lll
+	rows, err := db.QueryContext(ctx, databaseListQuery)
+	if err != nil {
+		res.Error = err.Error()
+		return &res
+	}
+	defer rows.Close() //nolint:errcheck
+	for rows.Next() {
+		var databaseName string
+		err := rows.Scan(&databaseName)
+		if err != nil {
+			res.Error = err.Error()
+			return &res
+		}
+
+		databaseList = append(databaseList, databaseName)
+	}
+	res.DatabaseList = databaseList
+
 	var version string
 	if err = db.QueryRowContext(ctx, "SHOW /* agent='serviceinfobroker' */ SERVER_VERSION").Scan(&version); err != nil {
 		res.Error = err.Error()
 	}
-
 	res.Version = version
+
 	return &res
 }