PMM-12832 Timeouts for exporters.

admin/commands/inventory/add_agent_external_exporter.go

@@ -59,6 +59,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.
@@ -82,6 +83,7 @@ func (cmd *AddAgentExternalExporterCommand) RunCmd() (commands.Result, error) {
 				CustomLabels:  customLabels,
 				PushMetrics:   cmd.PushMetrics,
 				TLSSkipVerify: cmd.TLSSkipVerify,
+				Timeout:       cmd.Timeout,
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_mongodb_exporter.go

@@ -65,6 +65,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
 }
@@ -98,6 +99,7 @@ func (cmd *AddAgentMongodbExporterCommand) RunCmd() (commands.Result, error) {
 				TLSCertificateKeyFilePassword: cmd.TLSCertificateKeyFilePassword,
 				TLSCa:                         tlsCa,
 				AuthenticationMechanism:       cmd.AuthenticationMechanism,
+				Timeout:                       cmd.Timeout,
 				PushMetrics:                   cmd.PushMetrics,
 				DisableCollectors:             commands.ParseDisableCollectors(cmd.DisableCollectors),
 				StatsCollections:              commands.ParseDisableCollectors(cmd.StatsCollections),

admin/commands/inventory/add_agent_mysqld_exporter.go

@@ -101,6 +101,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
 }
@@ -150,6 +151,7 @@ func (cmd *AddAgentMysqldExporterCommand) RunCmd() (commands.Result, error) {
 				PushMetrics:               cmd.PushMetrics,
 				ExposeExporter:            cmd.ExposeExporter,
 				DisableCollectors:         commands.ParseDisableCollectors(cmd.DisableCollectors),
+				Timeout:                   cmd.Timeout,
 				LogLevel:                  cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
 			},
 		},

admin/commands/inventory/add_agent_postgres_exporter.go

@@ -66,6 +66,7 @@ type AddAgentPostgresExporterCommand struct {
 	TLSCertFile         string            `help:"TLS certificate file"`
 	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)"`
+	Timeout             string            `help:"Connection timeout to use for exporter (e.g. 1s, 500ms)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -109,6 +110,7 @@ func (cmd *AddAgentPostgresExporterCommand) RunCmd() (commands.Result, error) {
 				ExposeExporter:      cmd.ExposeExporter,
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
 				AutoDiscoveryLimit:  cmd.AutoDiscoveryLimit,
+				Timeout:             cmd.Timeout,
 
 				TLS:           cmd.TLS,
 				TLSSkipVerify: cmd.TLSSkipVerify,

api/inventory/v1/agents.proto

@@ -1017,6 +1017,8 @@ message AddMySQLdExporterParams {
   bool expose_exporter = 17;
   // Extra DSN parameters for MySQL connection.
   map<string, string> extra_dsn_params = 18;
+  // Connection timeout for exporter (if set).
+  google.protobuf.Duration timeout = 19;
 }
 
 message ChangeMySQLdExporterParams {
@@ -1079,6 +1081,8 @@ message AddMongoDBExporterParams {
   // Environment variable names to pass to the exporter.
   // Values will be resolved from pmm-agent's environment when starting the exporter.
   repeated string environment_variable_names = 21;
+  // Connection timeout for exporter (if set).
+  google.protobuf.Duration timeout = 22;
 }
 
 message ChangeMongoDBExporterParams {
@@ -1131,6 +1135,8 @@ message AddPostgresExporterParams {
   bool expose_exporter = 17;
   // Maximum number of connections that exporter can open to the database instance.
   int32 max_exporter_connections = 18;
+  // Connection timeout for exporter (if set).
+  google.protobuf.Duration timeout = 19;
 }
 
 message ChangePostgresExporterParams {
@@ -1533,6 +1539,8 @@ message AddExternalExporterParams {
   bool push_metrics = 11;
   // Skip TLS certificate and hostname verification.
   bool tls_skip_verify = 12;
+  // Connection timeout for exporter (if set).
+  google.protobuf.Duration timeout = 13;
 }
 
 message ChangeExternalExporterParams {

api/inventory/v1/json/v1.json

@@ -2412,6 +2412,11 @@
                         "type": "string"
                       },
                       "x-order": 17
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 18
                     }
                   },
                   "x-order": 2
@@ -2546,6 +2551,11 @@
                         "type": "string"
                       },
                       "x-order": 20
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 21
                     }
                   },
                   "x-order": 3
@@ -2660,6 +2670,11 @@
                       "type": "integer",
                       "format": "int32",
                       "x-order": 17
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 18
                     }
                   },
                   "x-order": 4
@@ -2807,6 +2822,11 @@
                       "description": "Skip TLS certificate and hostname verification.",
                       "type": "boolean",
                       "x-order": 9
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 10
                     }
                   },
                   "x-order": 6

api/swagger/swagger-dev.json

@@ -7685,6 +7685,11 @@
                         "type": "string"
                       },
                       "x-order": 17
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 18
                     }
                   },
                   "x-order": 2
@@ -7819,6 +7824,11 @@
                         "type": "string"
                       },
                       "x-order": 20
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 21
                     }
                   },
                   "x-order": 3
@@ -7933,6 +7943,11 @@
                       "type": "integer",
                       "format": "int32",
                       "x-order": 17
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 18
                     }
                   },
                   "x-order": 4
@@ -8080,6 +8095,11 @@
                       "description": "Skip TLS certificate and hostname verification.",
                       "type": "boolean",
                       "x-order": 9
+                    },
+                    "timeout": {
+                      "description": "Connection timeout for exporter (if set).",
+                      "type": "string",
+                      "x-order": 10
                     }
                   },
                   "x-order": 6