PMM-12832 Timeouts for exporters.

admin/commands/config.go

@@ -91,8 +91,8 @@ func (cmd *ConfigCommand) args(globals *flags.GlobalFlags) ([]string, bool) {
 		res = append(res, "--server-insecure-tls")
 	}
 
-	if cmd.LogLevelFatalFlags.LogLevel != "" {
-		res = append(res, fmt.Sprintf("--log-level=%s", cmd.LogLevelFatalFlags.LogLevel))
+	if cmd.LogLevel != "" {
+		res = append(res, fmt.Sprintf("--log-level=%s", cmd.LogLevel))
 	}
 	if globals.EnableDebug {
 		res = append(res, "--debug")

admin/commands/helpers.go

@@ -0,0 +1,30 @@
+// Copyright (C) 2023 Percona LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"time"
+
+	"github.com/AlekSi/pointer"
+)
+
+// DurationString returns the string representation of a duration flag.
+func DurationString(value *time.Duration) *string {
+	if value == nil {
+		return nil
+	}
+
+	return pointer.ToString(value.String())
+}

admin/commands/inventory/add_agent_external_exporter.go

@@ -17,6 +17,7 @@ package inventory
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/AlekSi/pointer"
 
@@ -51,16 +52,17 @@ func (res *addAgentExternalExporterResult) String() string {
 
 // AddAgentExternalExporterCommand is used by Kong for CLI flags and commands.
 type AddAgentExternalExporterCommand struct {
-	RunsOnNodeID  string            `required:"" help:"Node identifier where this instance runs"`
-	ServiceID     string            `required:"" help:"Service identifier"`
-	Username      string            `help:"HTTP Basic auth username for scraping metrics"`
-	Password      string            `help:"HTTP Basic auth password for scraping metrics"`
-	Scheme        string            `help:"Scheme to generate URI to exporter metrics endpoints (http, https)"`
-	MetricsPath   string            `help:"Path under which metrics are exposed, used to generate URI"`
-	ListenPort    int64             `required:"" placeholder:"port" help:"Listen port for scraping metrics"`
-	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"`
+	RunsOnNodeID      string            `required:"" help:"Node identifier where this instance runs"`
+	ServiceID         string            `required:"" help:"Service identifier"`
+	Username          string            `help:"HTTP Basic auth username for scraping metrics"`
+	Password          string            `help:"HTTP Basic auth password for scraping metrics"`
+	Scheme            string            `help:"Scheme to generate URI to exporter metrics endpoints (http, https)"`
+	MetricsPath       string            `help:"Path under which metrics are exposed, used to generate URI"`
+	ListenPort        int64             `required:"" placeholder:"port" help:"Listen port for scraping metrics"`
+	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"`
+	ConnectionTimeout *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 }
 
 // RunCmd executes the AddAgentExternalExporterCommand and returns the result.
@@ -74,16 +76,17 @@ func (cmd *AddAgentExternalExporterCommand) RunCmd() (commands.Result, error) {
 	params := &agents.AddAgentParams{
 		Body: agents.AddAgentBody{
 			ExternalExporter: &agents.AddAgentParamsBodyExternalExporter{
-				RunsOnNodeID:  cmd.RunsOnNodeID,
-				ServiceID:     cmd.ServiceID,
-				Username:      cmd.Username,
-				Password:      cmd.Password,
-				Scheme:        cmd.Scheme,
-				MetricsPath:   cmd.MetricsPath,
-				ListenPort:    cmd.ListenPort,
-				CustomLabels:  pointer.Get(customLabels),
-				PushMetrics:   cmd.PushMetrics,
-				TLSSkipVerify: cmd.TLSSkipVerify,
+				RunsOnNodeID:      cmd.RunsOnNodeID,
+				ServiceID:         cmd.ServiceID,
+				Username:          cmd.Username,
+				Password:          cmd.Password,
+				Scheme:            cmd.Scheme,
+				MetricsPath:       cmd.MetricsPath,
+				ListenPort:        cmd.ListenPort,
+				CustomLabels:      pointer.Get(customLabels),
+				PushMetrics:       cmd.PushMetrics,
+				TLSSkipVerify:     cmd.TLSSkipVerify,
+				ConnectionTimeout: pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_mongodb_exporter.go

@@ -15,6 +15,8 @@
 package inventory
 
 import (
+	"time"
+
 	"github.com/AlekSi/pointer"
 
 	"github.com/percona/pmm/admin/commands"
@@ -67,6 +69,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
+	ConnectionTimeout             *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelFatalFlags
 }
@@ -104,7 +107,8 @@ func (cmd *AddAgentMongodbExporterCommand) RunCmd() (commands.Result, error) {
 				DisableCollectors:             commands.ParseDisableCollectors(cmd.DisableCollectors),
 				StatsCollections:              commands.ParseDisableCollectors(cmd.StatsCollections),
 				CollectionsLimit:              cmd.CollectionsLimit,
-				LogLevel:                      cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:                      cmd.LogLevel.EnumValue(),
+				ConnectionTimeout:             pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_mysqld_exporter.go

@@ -17,6 +17,7 @@ package inventory
 import (
 	"fmt"
 	"strconv"
+	"time"
 
 	"github.com/AlekSi/pointer"
 
@@ -103,6 +104,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"`
+	ConnectionTimeout         *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -152,7 +154,8 @@ func (cmd *AddAgentMysqldExporterCommand) RunCmd() (commands.Result, error) {
 				PushMetrics:               cmd.PushMetrics,
 				ExposeExporter:            cmd.ExposeExporter,
 				DisableCollectors:         commands.ParseDisableCollectors(cmd.DisableCollectors),
-				LogLevel:                  cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				LogLevel:                  cmd.LogLevel.EnumValue(),
+				ConnectionTimeout:         pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_node_exporter.go

@@ -15,6 +15,10 @@
 package inventory
 
 import (
+	"time"
+
+	"github.com/AlekSi/pointer"
+
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/pkg/flags"
 	"github.com/percona/pmm/api/inventory/v1/json/client"
@@ -49,6 +53,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"`
+	ConnectionTimeout *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -64,7 +69,8 @@ func (cmd *AddAgentNodeExporterCommand) RunCmd() (commands.Result, error) {
 				PushMetrics:       cmd.PushMetrics,
 				ExposeExporter:    cmd.ExposeExporter,
 				DisableCollectors: commands.ParseDisableCollectors(cmd.DisableCollectors),
-				LogLevel:          cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				LogLevel:          cmd.LogLevel.EnumValue(),
+				ConnectionTimeout: pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_postgres_exporter.go

@@ -15,6 +15,10 @@
 package inventory
 
 import (
+	"time"
+
+	"github.com/AlekSi/pointer"
+
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/pkg/flags"
 	"github.com/percona/pmm/api/inventory/v1/json/client"
@@ -67,6 +71,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)"`
+	ConnectionTimeout      *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -112,12 +117,13 @@ func (cmd *AddAgentPostgresExporterCommand) RunCmd() (commands.Result, error) {
 				AutoDiscoveryLimit:     cmd.AutoDiscoveryLimit,
 				MaxExporterConnections: cmd.MaxExporterConnections,
 
-				TLS:           cmd.TLS,
-				TLSSkipVerify: cmd.TLSSkipVerify,
-				TLSCa:         tlsCa,
-				TLSCert:       tlsCert,
-				TLSKey:        tlsKey,
-				LogLevel:      cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				TLS:               cmd.TLS,
+				TLSSkipVerify:     cmd.TLSSkipVerify,
+				TLSCa:             tlsCa,
+				TLSCert:           tlsCert,
+				TLSKey:            tlsKey,
+				LogLevel:          cmd.LogLevel.EnumValue(),
+				ConnectionTimeout: pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_proxysql_exporter.go

@@ -15,6 +15,10 @@
 package inventory
 
 import (
+	"time"
+
+	"github.com/AlekSi/pointer"
+
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/pkg/flags"
 	"github.com/percona/pmm/api/inventory/v1/json/client"
@@ -60,6 +64,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"`
+	ConnectionTimeout   *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelFatalFlags
 }
@@ -82,7 +87,8 @@ func (cmd *AddAgentProxysqlExporterCommand) RunCmd() (commands.Result, error) {
 				PushMetrics:         cmd.PushMetrics,
 				ExposeExporter:      cmd.ExposeExporter,
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
-				LogLevel:            cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:            cmd.LogLevel.EnumValue(),
+				ConnectionTimeout:   pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_rds_exporter.go

@@ -15,6 +15,10 @@
 package inventory
 
 import (
+	"time"
+
+	"github.com/AlekSi/pointer"
+
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/pkg/flags"
 	"github.com/percona/pmm/api/inventory/v1/json/client"
@@ -56,6 +60,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"`
+	ConnectionTimeout      *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelFatalFlags
 }
@@ -75,7 +80,8 @@ func (cmd *AddAgentRDSExporterCommand) RunCmd() (commands.Result, error) {
 				DisableBasicMetrics:    cmd.DisableBasicMetrics,
 				DisableEnhancedMetrics: cmd.DisableEnhancedMetrics,
 				PushMetrics:            cmd.PushMetrics,
-				LogLevel:               cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:               cmd.LogLevel.EnumValue(),
+				ConnectionTimeout:      pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_valkey_exporter.go

@@ -15,6 +15,8 @@
 package inventory
 
 import (
+	"time"
+
 	"github.com/AlekSi/pointer"
 
 	"github.com/percona/pmm/admin/commands"
@@ -68,6 +70,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"`
+	ConnectionTimeout   *time.Duration    `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	flags.LogLevelNoFatalFlags
 }
@@ -116,6 +119,7 @@ func (cmd *AddAgentValkeyExporterCommand) RunCmd() (commands.Result, error) {
 				ExposeExporter:      cmd.ExposeExporter,
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:            convertLogLevelPtr(&cmd.LogLevel),
+				ConnectionTimeout:   pointer.Get(commands.DurationString(cmd.ConnectionTimeout)),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/change_agent_azure_database_exporter.go

@@ -16,6 +16,7 @@ package inventory
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/pkg/flags"
@@ -77,7 +78,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"`
+	ConnectionTimeout *time.Duration `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -99,6 +101,7 @@ func (cmd *ChangeAgentAzureDatabaseExporterCommand) RunCmd() (commands.Result, e
 		AzureResourceGroup:  cmd.AzureResourceGroup,
 		EnablePushMetrics:   cmd.PushMetrics,
 		LogLevel:            convertLogLevelPtr(cmd.LogLevel),
+		ConnectionTimeout:   commands.DurationString(cmd.ConnectionTimeout),
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_external_exporter.go

@@ -16,6 +16,7 @@ package inventory
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/api/inventory/v1/json/client"
@@ -65,10 +66,11 @@ type ChangeAgentExternalExporterCommand struct {
 	Username *string `help:"Username for the external exporter"`
 
 	// External-specific options
-	ListenPort    *int64  `help:"Listen port for the external exporter"`
-	MetricsScheme *string `help:"Metrics scheme (http or https)"`
-	MetricsPath   *string `help:"Metrics path"`
-	PushMetrics   *bool   `help:"Enable push metrics with vmagent"`
+	ListenPort        *int64         `help:"Listen port for the external exporter"`
+	MetricsScheme     *string        `help:"Metrics scheme (http or https)"`
+	MetricsPath       *string        `help:"Metrics path"`
+	PushMetrics       *bool          `help:"Enable push metrics with vmagent"`
+	ConnectionTimeout *time.Duration `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -88,6 +90,7 @@ func (cmd *ChangeAgentExternalExporterCommand) RunCmd() (commands.Result, error)
 		Scheme:            cmd.MetricsScheme,
 		MetricsPath:       cmd.MetricsPath,
 		EnablePushMetrics: cmd.PushMetrics,
+		ConnectionTimeout: commands.DurationString(cmd.ConnectionTimeout),
 	}
 
 	if customLabels != nil {

admin/commands/inventory/change_agent_mongodb_exporter.go

@@ -17,6 +17,7 @@ package inventory
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/percona/pmm/admin/commands"
 	"github.com/percona/pmm/admin/pkg/flags"
@@ -89,9 +90,10 @@ type ChangeAgentMongodbExporterCommand struct {
 	CollectionsLimit        *int32  `help:"Collections limit"`
 
 	// Exporter options
-	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"`
+	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"`
+	ConnectionTimeout *time.Duration `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"`
 
 	// Custom labels
 	CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"`
@@ -152,6 +154,7 @@ func (cmd *ChangeAgentMongodbExporterCommand) RunCmd() (commands.Result, error)
 		ExposeExporter:                cmd.ExposeExporter,
 		EnablePushMetrics:             cmd.PushMetrics,
 		LogLevel:                      convertLogLevelPtr(cmd.LogLevel),
+		ConnectionTimeout:             commands.DurationString(cmd.ConnectionTimeout),
 	}
 
 	if customLabels != nil {