From a2ea8bc97b717fdcf48b9126015c9d6922f90a3d Mon Sep 17 00:00:00 2001 From: hagen1778 Date: Thu, 14 Mar 2024 11:45:39 +0100 Subject: [PATCH] app/vmctl: fix arguments order in httputils.TLSConfig follow-up after https://github.com/VictoriaMetrics/VictoriaMetrics/commit/9d5bf5ba5d5424e7d4ffcd639b7e493527d55d65 Signed-off-by: hagen1778 --- app/vmctl/main.go | 46 +++++++++++++++++++----------- app/vmctl/remoteread/remoteread.go | 23 ++++----------- docs/CHANGELOG.md | 1 + 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/vmctl/main.go b/app/vmctl/main.go index f249f9423..35f69c915 100644 --- a/app/vmctl/main.go +++ b/app/vmctl/main.go @@ -57,7 +57,7 @@ func main() { insecureSkipVerify := c.Bool(otsdbInsecureSkipVerify) addr := c.String(otsdbAddr) - tr, err := httputils.Transport(addr, certFile, caFile, keyFile, serverName, insecureSkipVerify) + tr, err := httputils.Transport(addr, certFile, keyFile, caFile, serverName, insecureSkipVerify) if err != nil { return fmt.Errorf("failed to create Transport: %s", err) } @@ -107,7 +107,7 @@ func main() { serverName := c.String(influxServerName) insecureSkipVerify := c.Bool(influxInsecureSkipVerify) - tc, err := httputils.TLSConfig(certFile, caFile, keyFile, serverName, insecureSkipVerify) + tc, err := httputils.TLSConfig(certFile, keyFile, caFile, serverName, insecureSkipVerify) if err != nil { return fmt.Errorf("failed to create TLS Config: %s", err) } @@ -158,21 +158,33 @@ func main() { Usage: "Migrate time series via Prometheus remote-read protocol", Flags: mergeFlags(globalFlags, remoteReadFlags, vmFlags), Action: func(c *cli.Context) error { + fmt.Println("Remote-read import mode") + + addr := c.String(remoteReadSrcAddr) + + // create TLS config + certFile := c.String(remoteReadCertFile) + keyFile := c.String(remoteReadKeyFile) + caFile := c.String(remoteReadCAFile) + serverName := c.String(remoteReadServerName) + insecureSkipVerify := c.Bool(remoteReadInsecureSkipVerify) + + tr, err := httputils.Transport(addr, certFile, keyFile, caFile, serverName, insecureSkipVerify) + if err != nil { + return fmt.Errorf("failed to create transport: %s", err) + } + rr, err := remoteread.NewClient(remoteread.Config{ - Addr: c.String(remoteReadSrcAddr), - Username: c.String(remoteReadUser), - Password: c.String(remoteReadPassword), - Timeout: c.Duration(remoteReadHTTPTimeout), - UseStream: c.Bool(remoteReadUseStream), - Headers: c.String(remoteReadHeaders), - LabelName: c.String(remoteReadFilterLabel), - LabelValue: c.String(remoteReadFilterLabelValue), - CertFile: c.String(remoteReadCertFile), - KeyFile: c.String(remoteReadKeyFile), - CAFile: c.String(remoteReadCAFile), - ServerName: c.String(remoteReadServerName), - InsecureSkipVerify: c.Bool(remoteReadInsecureSkipVerify), - DisablePathAppend: c.Bool(remoteReadDisablePathAppend), + Addr: addr, + Transport: tr, + Username: c.String(remoteReadUser), + Password: c.String(remoteReadPassword), + Timeout: c.Duration(remoteReadHTTPTimeout), + UseStream: c.Bool(remoteReadUseStream), + Headers: c.String(remoteReadHeaders), + LabelName: c.String(remoteReadFilterLabel), + LabelValue: c.String(remoteReadFilterLabelValue), + DisablePathAppend: c.Bool(remoteReadDisablePathAppend), }) if err != nil { return fmt.Errorf("error create remote read client: %s", err) @@ -402,7 +414,7 @@ func initConfigVM(c *cli.Context) (vm.Config, error) { serverName := c.String(vmServerName) insecureSkipVerify := c.Bool(vmInsecureSkipVerify) - tr, err := httputils.Transport(addr, certFile, caFile, keyFile, serverName, insecureSkipVerify) + tr, err := httputils.Transport(addr, certFile, keyFile, caFile, serverName, insecureSkipVerify) if err != nil { return vm.Config{}, fmt.Errorf("failed to create Transport: %s", err) } diff --git a/app/vmctl/remoteread/remoteread.go b/app/vmctl/remoteread/remoteread.go index e0fcc19f9..2bf62a138 100644 --- a/app/vmctl/remoteread/remoteread.go +++ b/app/vmctl/remoteread/remoteread.go @@ -13,7 +13,6 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm" "github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/httputils" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" "github.com/prometheus/prometheus/prompb" @@ -46,6 +45,8 @@ type Client struct { type Config struct { // Addr of remote storage Addr string + // Transport allows specifying custom http.Transport + Transport *http.Transport // DisablePathAppend disable automatic appending of the remote read path DisablePathAppend bool // Timeout defines timeout for HTTP requests @@ -64,15 +65,6 @@ type Config struct { // LabelName, LabelValue stands for label=~value pair used for read requests. // Is optional. LabelName, LabelValue string - - // Optional cert file, key file, CA file and server name for client side TLS configuration - CertFile string - KeyFile string - CAFile string - ServerName string - - // TLSSkipVerify defines whether to skip TLS certificate verification when connecting to the remote read address. - InsecureSkipVerify bool } // Filter defines a list of filters applied to requested data @@ -110,16 +102,13 @@ func NewClient(cfg Config) (*Client, error) { } } - tr, err := httputils.Transport(cfg.Addr, cfg.CertFile, cfg.KeyFile, cfg.CAFile, cfg.ServerName, cfg.InsecureSkipVerify) - if err != nil { - return nil, fmt.Errorf("failed to create transport: %s", err) + client := &http.Client{Timeout: cfg.Timeout} + if cfg.Transport != nil { + client.Transport = cfg.Transport } c := &Client{ - c: &http.Client{ - Timeout: cfg.Timeout, - Transport: tr, - }, + c: client, addr: strings.TrimSuffix(cfg.Addr, "/"), disablePathAppend: cfg.DisablePathAppend, user: cfg.Username, diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index dd07f5550..3b2d070e1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -54,6 +54,7 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/). * BUGFIX: do not drop `match[]` filter at [`/api/v1/series`](https://docs.victoriametrics.com/url-examples/#apiv1series) if `-search.ignoreExtraFiltersAtLabelsAPI` command-line flag is set, since missing `match[]` filter breaks `/api/v1/series` requests. * BUGFIX: [stream aggregation](https://docs.victoriametrics.com/stream-aggregation/): take into account sample timestamp during [deduplication](https://docs.victoriametrics.com/stream-aggregation/#deduplication). If multiple samples have the same timestamp on the configured deduplication interval, then the sample with the biggest value is kept. The logic is aligned with [`-dedup.minScrapeInterval`](https://docs.victoriametrics.com/#deduplication). +* BUGFIX: [vmctl](https://docs.victoriametrics.com/vmctl.html): properly parse TLS key and CA files for [InfluxDB](https://docs.victoriametrics.com/vmctl/#migrating-data-from-influxdb-1x) and [OpenTSDB](https://docs.victoriametrics.com/vmctl/#migrating-data-from-opentsdb) migration modes. ## [v1.99.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.99.0)