PMM-12832 Timeouts for exporters.

admin/commands/inventory/add_agent_external_exporter.go

@@ -61,6 +61,7 @@ type AddAgentExternalExporterCommand struct {
 	CustomLabels  map[string]string `mapsep:"," help:"Custom user-assigned labels"`
 	PushMetrics   bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
 	TLSSkipVerify bool              `help:"Skip TLS certificate verification"`
+	Timeout       string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 }
 
 // RunCmd executes the AddAgentExternalExporterCommand and returns the result.
@@ -84,6 +85,7 @@ func (cmd *AddAgentExternalExporterCommand) RunCmd() (commands.Result, error) {
 				CustomLabels:  pointer.Get(customLabels),
 				PushMetrics:   cmd.PushMetrics,
 				TLSSkipVerify: cmd.TLSSkipVerify,
+				Timeout:       cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_mongodb_exporter.go

@@ -67,6 +67,7 @@ type AddAgentMongodbExporterCommand struct {
 	DisableCollectors             []string          `help:"Comma-separated list of collector names to exclude from exporter"`
 	StatsCollections              []string          `help:"Collections for collstats & indexstats"`
 	CollectionsLimit              int32             `name:"max-collections-limit" placeholder:"number" help:"Disable collstats & indexstats if there are more than <n> collections"` //nolint:lll
+	Timeout                       string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelFatalFlags
 }
@@ -105,6 +106,7 @@ func (cmd *AddAgentMongodbExporterCommand) RunCmd() (commands.Result, error) {
 				StatsCollections:              commands.ParseDisableCollectors(cmd.StatsCollections),
 				CollectionsLimit:              cmd.CollectionsLimit,
 				LogLevel:                      cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				Timeout:                       cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_mysqld_exporter.go

@@ -103,6 +103,7 @@ type AddAgentMysqldExporterCommand struct {
 	PushMetrics               bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
 	ExposeExporter            bool              `help:"Expose the address of the exporter publicly on 0.0.0.0"`
 	DisableCollectors         []string          `help:"Comma-separated list of collector names to exclude from exporter"`
+	Timeout                   string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -153,6 +154,7 @@ func (cmd *AddAgentMysqldExporterCommand) RunCmd() (commands.Result, error) {
 				ExposeExporter:            cmd.ExposeExporter,
 				DisableCollectors:         commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:                  cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				Timeout:                   cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_node_exporter.go

@@ -49,6 +49,7 @@ type AddAgentNodeExporterCommand struct {
 	PushMetrics       bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
 	ExposeExporter    bool              `help:"Expose the address of the exporter publicly on 0.0.0.0"`
 	DisableCollectors []string          `help:"Comma-separated list of collector names to exclude from exporter"`
+	Timeout           string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -65,6 +66,7 @@ func (cmd *AddAgentNodeExporterCommand) RunCmd() (commands.Result, error) {
 				ExposeExporter:    cmd.ExposeExporter,
 				DisableCollectors: commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:          cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				Timeout:           cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_postgres_exporter.go

@@ -67,6 +67,7 @@ type AddAgentPostgresExporterCommand struct {
 	TLSKeyFile             string            `help:"TLS certificate key file"`
 	AutoDiscoveryLimit     int32             `default:"0" placeholder:"NUMBER" help:"Auto-discovery will be disabled if there are more than that number of databases (default: server-defined, -1: always disabled)"`
 	MaxExporterConnections int32             `default:"0" placeholder:"NUMBER" help:"Maximum number of connections that exporter can make to PostgreSQL instance (default: server-defined)"`
+	Timeout                string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -118,6 +119,7 @@ func (cmd *AddAgentPostgresExporterCommand) RunCmd() (commands.Result, error) {
 				TLSCert:       tlsCert,
 				TLSKey:        tlsKey,
 				LogLevel:      cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				Timeout:       cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_proxysql_exporter.go

@@ -60,6 +60,7 @@ type AddAgentProxysqlExporterCommand struct {
 	PushMetrics         bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
 	ExposeExporter      bool              `help:"Expose the address of the exporter publicly on 0.0.0.0"`
 	DisableCollectors   []string          `help:"Comma-separated list of collector names to exclude from exporter"`
+	Timeout             string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelFatalFlags
 }
@@ -83,6 +84,7 @@ func (cmd *AddAgentProxysqlExporterCommand) RunCmd() (commands.Result, error) {
 				ExposeExporter:      cmd.ExposeExporter,
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:            cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				Timeout:             cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_rds_exporter.go

@@ -56,6 +56,7 @@ type AddAgentRDSExporterCommand struct {
 	DisableBasicMetrics    bool              `help:"Disable basic metrics"`
 	DisableEnhancedMetrics bool              `help:"Disable enhanced metrics"`
 	PushMetrics            bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
+	Timeout                string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelFatalFlags
 }
@@ -76,6 +77,7 @@ func (cmd *AddAgentRDSExporterCommand) RunCmd() (commands.Result, error) {
 				DisableEnhancedMetrics: cmd.DisableEnhancedMetrics,
 				PushMetrics:            cmd.PushMetrics,
 				LogLevel:               cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				Timeout:                cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_valkey_exporter.go

@@ -68,6 +68,7 @@ type AddAgentValkeyExporterCommand struct {
 	PushMetrics         bool              `help:"Enables push metrics model flow, it will be sent to the server by an agent"`
 	ExposeExporter      bool              `help:"Expose the address of the exporter publicly on 0.0.0.0"`
 	DisableCollectors   []string          `help:"Comma-separated list of collector names to exclude from exporter"`
+	Timeout             string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -116,6 +117,7 @@ func (cmd *AddAgentValkeyExporterCommand) RunCmd() (commands.Result, error) {
 				ExposeExporter:      cmd.ExposeExporter,
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:            convertLogLevelPtr(&cmd.LogLevel),
+				Timeout:             cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/change_agent_azure_database_exporter.go

@@ -77,7 +77,8 @@ type ChangeAgentAzureDatabaseExporterCommand struct {
 	AzureResourceGroup  *string `help:"Azure Resource Group"`
 
 	// Exporter options
-	PushMetrics *bool `help:"Enable push metrics with vmagent"`
+	PushMetrics *bool  `help:"Enable push metrics with vmagent"`
+	Timeout     string `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -99,6 +100,7 @@ func (cmd *ChangeAgentAzureDatabaseExporterCommand) RunCmd() (commands.Result, e
 		AzureResourceGroup:  cmd.AzureResourceGroup,
 		EnablePushMetrics:   cmd.PushMetrics,
 		LogLevel:            convertLogLevelPtr(cmd.LogLevel),
+		Timeout:             cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_external_exporter.go

@@ -69,6 +69,7 @@ type ChangeAgentExternalExporterCommand struct {
 	MetricsScheme *string `help:"Metrics scheme (http or https)"`
 	MetricsPath   *string `help:"Metrics path"`
 	PushMetrics   *bool   `help:"Enable push metrics with vmagent"`
+	Timeout       string  `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -88,6 +89,7 @@ func (cmd *ChangeAgentExternalExporterCommand) RunCmd() (commands.Result, error)
 		Scheme:            cmd.MetricsScheme,
 		MetricsPath:       cmd.MetricsPath,
 		EnablePushMetrics: cmd.PushMetrics,
+		Timeout:           cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_mongodb_exporter.go

@@ -92,6 +92,7 @@ type ChangeAgentMongodbExporterCommand struct {
 	DisableCollectors []string `help:"List of collector names to disable"`
 	ExposeExporter    *bool    `help:"Expose the exporter process on all public interfaces"`
 	PushMetrics       *bool    `help:"Enable push metrics with vmagent"`
+	Timeout           string   `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -152,6 +153,7 @@ func (cmd *ChangeAgentMongodbExporterCommand) RunCmd() (commands.Result, error)
 		ExposeExporter:                cmd.ExposeExporter,
 		EnablePushMetrics:             cmd.PushMetrics,
 		LogLevel:                      convertLogLevelPtr(cmd.LogLevel),
+		Timeout:                       cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_mysqld_exporter.go

@@ -86,6 +86,7 @@ type ChangeAgentMysqldExporterCommand struct {
 	DisableCollectors         []string `help:"List of collector names to disable"`
 	ExposeExporter            *bool    `help:"Expose the exporter process on all public interfaces"`
 	PushMetrics               *bool    `help:"Enable push metrics with vmagent"`
+	Timeout                   string   `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -143,6 +144,7 @@ func (cmd *ChangeAgentMysqldExporterCommand) RunCmd() (commands.Result, error) {
 		ExposeExporter:            cmd.ExposeExporter,
 		EnablePushMetrics:         cmd.PushMetrics,
 		LogLevel:                  convertLogLevelPtr(cmd.LogLevel),
+		Timeout:                   cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_node_exporter.go

@@ -71,6 +71,7 @@ type ChangeAgentNodeExporterCommand struct {
 	PushMetrics       *bool    `help:"Enable push metrics with vmagent"`
 	ExposeExporter    *bool    `help:"Expose the exporter process on all public interfaces"`
 	DisableCollectors []string `help:"List of collector names to disable"`
+	Timeout           string   `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -89,6 +90,7 @@ func (cmd *ChangeAgentNodeExporterCommand) RunCmd() (commands.Result, error) {
 		DisableCollectors: cmd.DisableCollectors,
 		ExposeExporter:    cmd.ExposeExporter,
 		LogLevel:          convertLogLevelPtr(cmd.LogLevel),
+		Timeout:           cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_postgres_exporter.go

@@ -87,6 +87,7 @@ type ChangeAgentPostgresExporterCommand struct {
 	PushMetrics            *bool    `help:"Enable push metrics with vmagent"`
 	AutoDiscoveryLimit     *int32   `help:"Auto-discovery limit"`
 	MaxExporterConnections *int32   `help:"Maximum number of connections that exporter can make to PostgreSQL instance"`
+	Timeout                string   `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -145,6 +146,7 @@ func (cmd *ChangeAgentPostgresExporterCommand) RunCmd() (commands.Result, error)
 		AutoDiscoveryLimit:     cmd.AutoDiscoveryLimit,
 		MaxExporterConnections: cmd.MaxExporterConnections,
 		LogLevel:               convertLogLevelPtr(cmd.LogLevel),
+		Timeout:                cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_proxysql_exporter.go

@@ -82,6 +82,7 @@ type ChangeAgentProxysqlExporterCommand struct {
 	DisableCollectors []string `help:"List of collector names to disable"`
 	ExposeExporter    *bool    `help:"Expose the exporter process on all public interfaces"`
 	PushMetrics       *bool    `help:"Enable push metrics with vmagent"`
+	Timeout           string   `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -105,6 +106,7 @@ func (cmd *ChangeAgentProxysqlExporterCommand) RunCmd() (commands.Result, error)
 		ExposeExporter:    cmd.ExposeExporter,
 		EnablePushMetrics: cmd.PushMetrics,
 		LogLevel:          convertLogLevelPtr(cmd.LogLevel),
+		Timeout:           cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_rds_exporter.go

@@ -78,7 +78,8 @@ type ChangeAgentRDSExporterCommand struct {
 	DisableEnhancedMetrics *bool `help:"Disable enhanced metrics"`
 
 	// Exporter options
-	PushMetrics *bool `help:"Enable push metrics with vmagent"`
+	PushMetrics *bool  `help:"Enable push metrics with vmagent"`
+	Timeout     string `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -99,6 +100,7 @@ func (cmd *ChangeAgentRDSExporterCommand) RunCmd() (commands.Result, error) {
 		DisableEnhancedMetrics: cmd.DisableEnhancedMetrics,
 		EnablePushMetrics:      cmd.PushMetrics,
 		LogLevel:               convertLogLevelPtr(cmd.LogLevel),
+		Timeout:                cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_valkey_exporter.go

@@ -84,6 +84,7 @@ type ChangeAgentValkeyExporterCommand struct {
 	DisableCollectors []string `help:"List of collector names to disable"`
 	ExposeExporter    *bool    `help:"Expose the exporter process on all public interfaces"`
 	PushMetrics       *bool    `help:"Enable push metrics with vmagent"`
+	Timeout           string   `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -137,6 +138,7 @@ func (cmd *ChangeAgentValkeyExporterCommand) RunCmd() (commands.Result, error) {
 		ExposeExporter:    cmd.ExposeExporter,
 		EnablePushMetrics: cmd.PushMetrics,
 		LogLevel:          convertLogLevelPtr(cmd.LogLevel),
+		Timeout:           cmd.Timeout,
 	}
 
 	if customLabels != nil {

admin/commands/management/add_external.go

@@ -70,6 +70,7 @@ type AddExternalCommand struct {
 	Group               string            `default:"${externalDefaultGroupExporter}" help:"Group name of external service (default: ${externalDefaultGroupExporter})"`
 	SkipConnectionCheck bool              `help:"Skip exporter connection checks"`
 	TLSSkipVerify       bool              `help:"Skip TLS certificate verification"`
+	Timeout             string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.MetricsModeFlags
 }
@@ -140,6 +141,7 @@ func (cmd *AddExternalCommand) RunCmd() (commands.Result, error) {
 				Group:               cmd.Group,
 				SkipConnectionCheck: cmd.SkipConnectionCheck,
 				TLSSkipVerify:       cmd.TLSSkipVerify,
+				Timeout:             cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/management/add_mongodb.go

@@ -83,6 +83,7 @@ type AddMongoDBCommand struct {
 	CollectionsLimit              int32             `name:"max-collections-limit" default:"-1" help:"Disable collstats, dbstats, topmetrics and indexstats if there are more than <n> collections. 0: No limit. Default is -1, which let PMM automatically set this value"`
 	ExposeExporter                bool              `name:"expose-exporter" help:"Optionally expose the address of the exporter publicly on 0.0.0.0"`
 	AgentEnvVars                  []string          `name:"agent-env-vars" help:"Comma-separated list of environment variable names to pass to the exporter (values are read from the current environment), e.g. 'VAR1,VAR2'"`
+	Timeout                       string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	AddCommonFlags
 	flags.MetricsModeFlags
@@ -203,6 +204,7 @@ func (cmd *AddMongoDBCommand) RunCmd() (commands.Result, error) {
 				StatsCollections:    commands.ParseDisableCollectors(cmd.StatsCollections),
 				CollectionsLimit:    cmd.CollectionsLimit,
 				LogLevel:            cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				Timeout:             cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/management/add_mysql.go

@@ -120,6 +120,7 @@ type AddMySQLCommand struct {
 	CreateUser             bool              `hidden:"" help:"Create pmm user"`
 	DisableCollectors      []string          `help:"Comma-separated list of collector names to exclude from exporter"`
 	ExposeExporter         bool              `name:"expose-exporter" help:"Optionally expose the address of the exporter publicly on 0.0.0.0"`
+	Timeout                string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	AddCommonFlags
 	flags.MetricsModeFlags
@@ -242,6 +243,7 @@ func (cmd *AddMySQLCommand) RunCmd() (commands.Result, error) {
 				MetricsMode:               cmd.MetricsModeFlags.MetricsMode.EnumValue(),
 				DisableCollectors:         commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:                  cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				Timeout:                   cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/management/add_postgresql.go

@@ -76,6 +76,7 @@ type AddPostgreSQLCommand struct {
 	ExposeExporter         bool              `name:"expose-exporter" help:"Optionally expose the address of the exporter publicly on 0.0.0.0"`
 	AutoDiscoveryLimit     int32             `placeholder:"NUMBER" help:"Auto-discovery will be disabled if there are more than that number of databases (default: server-defined, -1: always disabled)"`
 	MaxExporterConnections int32             `placeholder:"NUMBER" help:"Maximum number of connections to PostgreSQL instance that exporter can use (default: server-defined)"`
+	Timeout                string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	AddCommonFlags
 	flags.MetricsModeFlags
@@ -213,6 +214,7 @@ func (cmd *AddPostgreSQLCommand) RunCmd() (commands.Result, error) {
 				AutoDiscoveryLimit:     cmd.AutoDiscoveryLimit,
 				MaxExporterConnections: cmd.MaxExporterConnections,
 				LogLevel:               cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				Timeout:                cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/management/add_proxysql.go

@@ -60,6 +60,7 @@ type AddProxySQLCommand struct {
 	TLSSkipVerify       bool              `help:"Skip TLS certificate verification"`
 	DisableCollectors   []string          `help:"Comma-separated list of collector names to exclude from exporter"`
 	ExposeExporter      bool              `name:"expose-exporter" help:"Optionally expose the address of the exporter publicly on 0.0.0.0"`
+	Timeout             string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	AddCommonFlags
 	flags.MetricsModeFlags
@@ -152,6 +153,7 @@ func (cmd *AddProxySQLCommand) RunCmd() (commands.Result, error) {
 				MetricsMode:         cmd.MetricsModeFlags.MetricsMode.EnumValue(),
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:            cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				Timeout:             cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,