From ffa327d6d1cc1ecfa8c28324a57da2667ff2030e Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 26 Feb 2023 12:07:30 -0800 Subject: [PATCH 1/2] app/vmagent: use the provided auth options when checking whether the remote storage supports VictoriaMetrics remote write protocol Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3847 Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1225 --- app/vmagent/README.md | 7 +- app/vmagent/remotewrite/client.go | 113 ++++++++++++-------- app/vmagent/remotewrite/remotewrite.go | 18 +--- docs/CHANGELOG.md | 2 + docs/vmagent.md | 7 +- lib/protoparser/common/vmproto_handshake.go | 18 ++-- 6 files changed, 98 insertions(+), 67 deletions(-) diff --git a/app/vmagent/README.md b/app/vmagent/README.md index c7a8e36be..e2307df65 100644 --- a/app/vmagent/README.md +++ b/app/vmagent/README.md @@ -193,9 +193,11 @@ VictoriaMetrics remote write protocol provides the following benefits comparing In this case `vmagent` buffers the incoming data to disk using the VictoriaMetrics remote write format. This reduces disk read/write IO and disk space usage by 2x-5x comparing to Prometheus remote write format. -`vmagent` automatically uses VictoriaMetrics remote write protocol when it sends data to VictoriaMetrics components such as other `vmagent` instances, +`vmagent` automatically switches to VictoriaMetrics remote write protocol when it sends data to VictoriaMetrics components such as other `vmagent` instances, [single-node VictoriaMetrics](https://docs.victoriametrics.com/Single-server-VictoriaMetrics.html) or `vminsert` at [cluster version](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html). +It is possible to force switch to VictoriaMetrics remote write protocol by specifying `-remoteWrite.forceVMProto` +command-line flag for the corresponding `-remoteWrite.url`. `vmagent` automatically switches to Prometheus remote write protocol when it sends data to old versions of VictoriaMetrics components or to other Prometheus-compatible remote storage systems. It is possible to force switch to Prometheus remote write protocol @@ -1451,6 +1453,9 @@ See the docs at https://docs.victoriametrics.com/vmagent.html . -remoteWrite.forcePromProto array Whether to force Prometheus remote write protocol for sending data to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol Supports array of values separated by comma or specified via multiple flags. + -remoteWrite.forceVMProto array + Whether to force VictoriaMetrics remote write protocol for sending data to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol + Supports array of values separated by comma or specified via multiple flags. -remoteWrite.headers array Optional HTTP headers to send with each request to the corresponding -remoteWrite.url. For example, -remoteWrite.headers='My-Auth:foobar' would send 'My-Auth: foobar' HTTP header with every request to the corresponding -remoteWrite.url. Multiple headers must be delimited by '^^': -remoteWrite.headers='header1:value1^^header2:value2' Supports an array of values separated by comma or specified via multiple flags. diff --git a/app/vmagent/remotewrite/client.go b/app/vmagent/remotewrite/client.go index 6993fd27f..0ebff6203 100644 --- a/app/vmagent/remotewrite/client.go +++ b/app/vmagent/remotewrite/client.go @@ -15,11 +15,17 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/lib/logger" "github.com/VictoriaMetrics/VictoriaMetrics/lib/persistentqueue" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth" + "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common" "github.com/VictoriaMetrics/VictoriaMetrics/lib/timerpool" "github.com/VictoriaMetrics/metrics" ) var ( + forcePromProto = flagutil.NewArrayBool("remoteWrite.forcePromProto", "Whether to force Prometheus remote write protocol for sending data "+ + "to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol") + forceVMProto = flagutil.NewArrayBool("remoteWrite.forceVMProto", "Whether to force VictoriaMetrics remote write protocol for sending data "+ + "to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol") + rateLimit = flagutil.NewArrayInt("remoteWrite.rateLimit", "Optional rate limit in bytes per second for data sent to the corresponding -remoteWrite.url. "+ "By default the rate limit is disabled. It can be useful for limiting load on remote storage when big amounts of buffered data "+ "is sent after temporary unavailability of the remote storage") @@ -67,11 +73,14 @@ var ( ) type client struct { - sanitizedURL string - remoteWriteURL string - isVMRemoteWrite bool - fq *persistentqueue.FastQueue - hc *http.Client + sanitizedURL string + remoteWriteURL string + + // Whether to use VictoriaMetrics remote write protocol for sending the data to remoteWriteURL + useVMProto bool + + fq *persistentqueue.FastQueue + hc *http.Client sendBlock func(block []byte) bool authCfg *promauth.Config @@ -93,7 +102,7 @@ type client struct { stopCh chan struct{} } -func newHTTPClient(argIdx int, remoteWriteURL, sanitizedURL string, fq *persistentqueue.FastQueue, concurrency int, isVMRemoteWrite bool) *client { +func newHTTPClient(argIdx int, remoteWriteURL, sanitizedURL string, fq *persistentqueue.FastQueue, concurrency int) *client { authCfg, err := getAuthConfig(argIdx) if err != nil { logger.Panicf("FATAL: cannot initialize auth config for remoteWrite.url=%q: %s", remoteWriteURL, err) @@ -128,20 +137,38 @@ func newHTTPClient(argIdx int, remoteWriteURL, sanitizedURL string, fq *persiste Timeout: sendTimeout.GetOptionalArgOrDefault(argIdx, time.Minute), } c := &client{ - sanitizedURL: sanitizedURL, - remoteWriteURL: remoteWriteURL, - isVMRemoteWrite: isVMRemoteWrite, - authCfg: authCfg, - awsCfg: awsCfg, - fq: fq, - hc: hc, - stopCh: make(chan struct{}), + sanitizedURL: sanitizedURL, + remoteWriteURL: remoteWriteURL, + authCfg: authCfg, + awsCfg: awsCfg, + fq: fq, + hc: hc, + stopCh: make(chan struct{}), } c.sendBlock = c.sendBlockHTTP + return c } func (c *client) init(argIdx, concurrency int, sanitizedURL string) { + useVMProto := forceVMProto.GetOptionalArg(argIdx) + usePromProto := forcePromProto.GetOptionalArg(argIdx) + if useVMProto && usePromProto { + logger.Fatalf("-remoteWrite.useVMProto and -remoteWrite.usePromProto cannot be set simultaneously for -remoteWrite.url=%s", sanitizedURL) + } + if !useVMProto && !usePromProto { + // Auto-detect whether the remote storage supports VictoriaMetrics remote write protocol. + doRequest := func(url string) (*http.Response, error) { + return c.doRequest(url, nil) + } + useVMProto = common.HandleVMProtoClientHandshake(c.remoteWriteURL, doRequest) + if !useVMProto { + logger.Infof("the remote storage at %q doesn't support VictoriaMetrics remote write protocol. Switching to Prometheus remote write protocol. "+ + "See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol", sanitizedURL) + } + } + c.useVMProto = useVMProto + if bytesPerSec := rateLimit.GetOptionalArgOrDefault(argIdx, 0); bytesPerSec > 0 { logger.Infof("applying %d bytes per second rate limit for -remoteWrite.url=%q", bytesPerSec, sanitizedURL) c.rl.perSecondLimit = int64(bytesPerSec) @@ -294,6 +321,33 @@ func (c *client) runWorker() { } } +func (c *client) doRequest(url string, body []byte) (*http.Response, error) { + reqBody := bytes.NewBuffer(body) + req, err := http.NewRequest(http.MethodPost, url, reqBody) + if err != nil { + logger.Panicf("BUG: unexpected error from http.NewRequest(%q): %s", url, err) + } + c.authCfg.SetHeaders(req, true) + h := req.Header + h.Set("User-Agent", "vmagent") + h.Set("Content-Type", "application/x-protobuf") + if c.useVMProto { + h.Set("Content-Encoding", "zstd") + h.Set("X-VictoriaMetrics-Remote-Write-Version", "1") + } else { + h.Set("Content-Encoding", "snappy") + h.Set("X-Prometheus-Remote-Write-Version", "0.1.0") + } + if c.awsCfg != nil { + sigv4Hash := awsapi.HashHex(body) + if err := c.awsCfg.SignRequest(req, sigv4Hash); err != nil { + // there is no need in retry, request will be rejected by client.Do and retried by code below + logger.Warnf("cannot sign remoteWrite request with AWS sigv4: %s", err) + } + } + return c.hc.Do(req) +} + // sendBlockHTTP sends the given block to c.remoteWriteURL. // // The function returns false only if c.stopCh is closed. @@ -302,37 +356,10 @@ func (c *client) sendBlockHTTP(block []byte) bool { c.rl.register(len(block), c.stopCh) retryDuration := time.Second retriesCount := 0 - c.bytesSent.Add(len(block)) - c.blocksSent.Inc() - sigv4Hash := "" - if c.awsCfg != nil { - sigv4Hash = awsapi.HashHex(block) - } again: - req, err := http.NewRequest(http.MethodPost, c.remoteWriteURL, bytes.NewBuffer(block)) - if err != nil { - logger.Panicf("BUG: unexpected error from http.NewRequest(%q): %s", c.sanitizedURL, err) - } - c.authCfg.SetHeaders(req, true) - h := req.Header - h.Set("User-Agent", "vmagent") - h.Set("Content-Type", "application/x-protobuf") - if c.isVMRemoteWrite { - h.Set("Content-Encoding", "zstd") - h.Set("X-VictoriaMetrics-Remote-Write-Version", "1") - } else { - h.Set("Content-Encoding", "snappy") - h.Set("X-Prometheus-Remote-Write-Version", "0.1.0") - } - if c.awsCfg != nil { - if err := c.awsCfg.SignRequest(req, sigv4Hash); err != nil { - // there is no need in retry, request will be rejected by client.Do and retried by code below - logger.Warnf("cannot sign remoteWrite request with AWS sigv4: %s", err) - } - } startTime := time.Now() - resp, err := c.hc.Do(req) + resp, err := c.doRequest(c.remoteWriteURL, block) c.requestDuration.UpdateDuration(startTime) if err != nil { c.errorsCount.Inc() @@ -357,6 +384,8 @@ again: if statusCode/100 == 2 { _ = resp.Body.Close() c.requestsOKCount.Inc() + c.bytesSent.Add(len(block)) + c.blocksSent.Inc() return true } metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_requests_total{url=%q, status_code="%d"}`, c.sanitizedURL, statusCode)).Inc() diff --git a/app/vmagent/remotewrite/remotewrite.go b/app/vmagent/remotewrite/remotewrite.go index 9a9e4dfbc..b27141769 100644 --- a/app/vmagent/remotewrite/remotewrite.go +++ b/app/vmagent/remotewrite/remotewrite.go @@ -21,7 +21,6 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel" - "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/common" "github.com/VictoriaMetrics/VictoriaMetrics/lib/streamaggr" "github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics" "github.com/VictoriaMetrics/metrics" @@ -35,8 +34,6 @@ var ( remoteWriteMultitenantURLs = flagutil.NewArrayString("remoteWrite.multitenantURL", "Base path for multitenant remote storage URL to write data to. "+ "See https://docs.victoriametrics.com/vmagent.html#multitenancy for details. Example url: http://:8480 . "+ "Pass multiple -remoteWrite.multitenantURL flags in order to replicate data to multiple remote storage systems. See also -remoteWrite.url") - forcePromProto = flagutil.NewArrayBool("remoteWrite.forcePromProto", "Whether to force Prometheus remote write protocol for sending data "+ - "to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol") tmpDataPath = flag.String("remoteWrite.tmpDataPath", "vmagent-remotewrite-data", "Path to directory where temporary data for remote write component is stored. "+ "See also -remoteWrite.maxDiskUsagePerURL") queues = flag.Int("remoteWrite.queues", cgroup.AvailableCPUs()*2, "The number of concurrent queues to each -remoteWrite.url. Set more queues if default number of queues "+ @@ -479,21 +476,10 @@ func newRemoteWriteCtx(argIdx int, at *auth.Token, remoteWriteURL *url.URL, maxI return float64(fq.GetInmemoryQueueLen()) }) - // Auto-detect whether the remote storage supports VictoriaMetrics remote write protocol. - isVMRemoteWrite := false - usePromProto := forcePromProto.GetOptionalArg(argIdx) - if !usePromProto { - isVMRemoteWrite = common.HandleVMProtoClientHandshake(remoteWriteURL) - if !isVMRemoteWrite { - logger.Infof("the remote storage at %q doesn't support VictoriaMetrics remote write protocol. Switching to Prometheus remote write protocol. "+ - "See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol", sanitizedURL) - } - } - var c *client switch remoteWriteURL.Scheme { case "http", "https": - c = newHTTPClient(argIdx, remoteWriteURL.String(), sanitizedURL, fq, *queues, isVMRemoteWrite) + c = newHTTPClient(argIdx, remoteWriteURL.String(), sanitizedURL, fq, *queues) default: logger.Fatalf("unsupported scheme: %s for remoteWriteURL: %s, want `http`, `https`", remoteWriteURL.Scheme, sanitizedURL) } @@ -510,7 +496,7 @@ func newRemoteWriteCtx(argIdx int, at *auth.Token, remoteWriteURL *url.URL, maxI } pss := make([]*pendingSeries, pssLen) for i := range pss { - pss[i] = newPendingSeries(fq.MustWriteBlock, isVMRemoteWrite, sf, rd) + pss[i] = newPendingSeries(fq.MustWriteBlock, c.useVMProto, sf, rd) } rwctx := &remoteWriteCtx{ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8bd8be786..feb35595a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,6 +15,8 @@ The following tip changes can be tested by building VictoriaMetrics components f ## tip +* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): use the provided `-remoteWrite.*` auth options when determining whether the remote storage supports [VictoriaMetrics remote write protocol](https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol). Previously the auth options were ignored. This was preventing from automatic switch to VictoriaMetrics remote write protocol. + ## [v1.88.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.88.0) Released at 2023-02-24 diff --git a/docs/vmagent.md b/docs/vmagent.md index d19aa0865..8fb77eb11 100644 --- a/docs/vmagent.md +++ b/docs/vmagent.md @@ -197,9 +197,11 @@ VictoriaMetrics remote write protocol provides the following benefits comparing In this case `vmagent` buffers the incoming data to disk using the VictoriaMetrics remote write format. This reduces disk read/write IO and disk space usage by 2x-5x comparing to Prometheus remote write format. -`vmagent` automatically uses VictoriaMetrics remote write protocol when it sends data to VictoriaMetrics components such as other `vmagent` instances, +`vmagent` automatically switches to VictoriaMetrics remote write protocol when it sends data to VictoriaMetrics components such as other `vmagent` instances, [single-node VictoriaMetrics](https://docs.victoriametrics.com/Single-server-VictoriaMetrics.html) or `vminsert` at [cluster version](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html). +It is possible to force switch to VictoriaMetrics remote write protocol by specifying `-remoteWrite.forceVMProto` +command-line flag for the corresponding `-remoteWrite.url`. `vmagent` automatically switches to Prometheus remote write protocol when it sends data to old versions of VictoriaMetrics components or to other Prometheus-compatible remote storage systems. It is possible to force switch to Prometheus remote write protocol @@ -1455,6 +1457,9 @@ See the docs at https://docs.victoriametrics.com/vmagent.html . -remoteWrite.forcePromProto array Whether to force Prometheus remote write protocol for sending data to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol Supports array of values separated by comma or specified via multiple flags. + -remoteWrite.forceVMProto array + Whether to force VictoriaMetrics remote write protocol for sending data to the corresponding -remoteWrite.url . See https://docs.victoriametrics.com/vmagent.html#victoriametrics-remote-write-protocol + Supports array of values separated by comma or specified via multiple flags. -remoteWrite.headers array Optional HTTP headers to send with each request to the corresponding -remoteWrite.url. For example, -remoteWrite.headers='My-Auth:foobar' would send 'My-Auth: foobar' HTTP header with every request to the corresponding -remoteWrite.url. Multiple headers must be delimited by '^^': -remoteWrite.headers='header1:value1^^header2:value2' Supports an array of values separated by comma or specified via multiple flags. diff --git a/lib/protoparser/common/vmproto_handshake.go b/lib/protoparser/common/vmproto_handshake.go index 2b2887294..edc299dc1 100644 --- a/lib/protoparser/common/vmproto_handshake.go +++ b/lib/protoparser/common/vmproto_handshake.go @@ -3,16 +3,20 @@ package common import ( "io" "net/http" - "net/url" "strconv" + "strings" ) -func HandleVMProtoClientHandshake(remoteWriteURL *url.URL) bool { - u := *remoteWriteURL - q := u.Query() - q.Set("get_vm_proto_version", "1") - u.RawQuery = q.Encode() - resp, err := http.Get(u.String()) +// HandleVMProtoClientHashake returns true if the server at remoteWriteURL supports VictoriaMetrics remote write protocol. +func HandleVMProtoClientHandshake(remoteWriteURL string, doRequest func(handshakeURL string) (*http.Response, error)) bool { + u := remoteWriteURL + if strings.Contains(u, "?") { + u += "&" + } else { + u += "?" + } + u += "get_vm_proto_version=1" + resp, err := doRequest(u) if err != nil { return false } From f7ef80aaadc44aaa57183a85fa79c47f984ee2d5 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 26 Feb 2023 12:18:59 -0800 Subject: [PATCH 2/2] .golangci.yml: properly enable `revive` linter and fix all the warnings it detects --- .golangci.yml | 12 ++++++++---- app/vmbackup/main.go | 12 ++++++------ app/vmctl/backoff/backoff.go | 1 + app/vmselect/promql/aggr.go | 6 +++--- lib/awsapi/sign.go | 8 ++++---- lib/fs/fs.go | 5 +++-- lib/promscrape/client.go | 2 +- lib/promscrape/discovery/nomad/service.go | 2 ++ lib/promscrape/scraper.go | 2 +- lib/protoparser/common/vmproto_handshake.go | 2 +- 10 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 5c6ebc779..c0df40161 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,14 +1,18 @@ run: timeout: 2m -enable: +linters: + enable: - revive issues: exclude-rules: - - linters: - - staticcheck - text: "SA(4003|1019|5011):" + - linters: + - staticcheck + text: "SA(4003|1019|5011):" + include: + - EXC0012 + - EXC0014 linters-settings: errcheck: diff --git a/app/vmbackup/main.go b/app/vmbackup/main.go index bbf36d374..d7fbe3d1d 100644 --- a/app/vmbackup/main.go +++ b/app/vmbackup/main.go @@ -51,27 +51,27 @@ func main() { if len(*snapshotCreateURL) > 0 { // create net/url object - createUrl, err := url.Parse(*snapshotCreateURL) + createURL, err := url.Parse(*snapshotCreateURL) if err != nil { logger.Fatalf("cannot parse snapshotCreateURL: %s", err) } if len(*snapshotName) > 0 { logger.Fatalf("-snapshotName shouldn't be set if -snapshot.createURL is set, since snapshots are created automatically in this case") } - logger.Infof("Snapshot create url %s", createUrl.Redacted()) + logger.Infof("Snapshot create url %s", createURL.Redacted()) if len(*snapshotDeleteURL) <= 0 { err := flag.Set("snapshot.deleteURL", strings.Replace(*snapshotCreateURL, "/create", "/delete", 1)) if err != nil { logger.Fatalf("Failed to set snapshot.deleteURL flag: %v", err) } } - deleteUrl, err := url.Parse(*snapshotDeleteURL) + deleteURL, err := url.Parse(*snapshotDeleteURL) if err != nil { logger.Fatalf("cannot parse snapshotDeleteURL: %s", err) } - logger.Infof("Snapshot delete url %s", deleteUrl.Redacted()) + logger.Infof("Snapshot delete url %s", deleteURL.Redacted()) - name, err := snapshot.Create(createUrl.String()) + name, err := snapshot.Create(createURL.String()) if err != nil { logger.Fatalf("cannot create snapshot: %s", err) } @@ -81,7 +81,7 @@ func main() { } defer func() { - err := snapshot.Delete(deleteUrl.String(), name) + err := snapshot.Delete(deleteURL.String(), name) if err != nil { logger.Fatalf("cannot delete snapshot: %s", err) } diff --git a/app/vmctl/backoff/backoff.go b/app/vmctl/backoff/backoff.go index 31cbf0017..beb14304d 100644 --- a/app/vmctl/backoff/backoff.go +++ b/app/vmctl/backoff/backoff.go @@ -19,6 +19,7 @@ const ( // retryableFunc describes call back which will repeat on errors type retryableFunc func() error +// ErrBadRequest is an error returned on bad request var ErrBadRequest = errors.New("bad request") // Backoff describes object with backoff policy params diff --git a/app/vmselect/promql/aggr.go b/app/vmselect/promql/aggr.go index 98fb1a6a9..3ba78615a 100644 --- a/app/vmselect/promql/aggr.go +++ b/app/vmselect/promql/aggr.go @@ -783,7 +783,7 @@ func fillNaNsAtIdx(idx int, k float64, tss []*timeseries) { } } -func getIntK(k float64, kMax int) int { +func getIntK(k float64, max int) int { if math.IsNaN(k) { return 0 } @@ -791,8 +791,8 @@ func getIntK(k float64, kMax int) int { if kn < 0 { return 0 } - if kn > kMax { - return kMax + if kn > max { + return max } return kn } diff --git a/lib/awsapi/sign.go b/lib/awsapi/sign.go index dba942c5d..a8c41193a 100644 --- a/lib/awsapi/sign.go +++ b/lib/awsapi/sign.go @@ -84,10 +84,10 @@ func signRequestWithTime(req *http.Request, service, region, payloadHash string, } func getSignatureKey(key, datestamp, region, service string) string { - kDate := hmacBin("AWS4"+key, datestamp) - kRegion := hmacBin(kDate, region) - kService := hmacBin(kRegion, service) - return hmacBin(kService, "aws4_request") + dateKey := hmacBin("AWS4"+key, datestamp) + regionKey := hmacBin(dateKey, region) + serviceKey := hmacBin(regionKey, service) + return hmacBin(serviceKey, "aws4_request") } func hashHex(s string) string { diff --git a/lib/fs/fs.go b/lib/fs/fs.go index 6332b90eb..f346b7953 100644 --- a/lib/fs/fs.go +++ b/lib/fs/fs.go @@ -468,6 +468,7 @@ func isHTTPURL(targetURL string) bool { } -func IsScheduledForRemoval(name string) bool { - return strings.Contains(name, ".must-remove.") +// IsScheduledForRemoval returns true if the filename contains .must-remove. substring +func IsScheduledForRemoval(filename string) bool { + return strings.Contains(filename, ".must-remove.") } diff --git a/lib/promscrape/client.go b/lib/promscrape/client.go index 9d0be0fbc..fa2b60c9e 100644 --- a/lib/promscrape/client.go +++ b/lib/promscrape/client.go @@ -79,7 +79,7 @@ func concatTwoStrings(x, y string) string { return s } -func newClient(sw *ScrapeWork, ctx context.Context) *client { +func newClient(ctx context.Context, sw *ScrapeWork) *client { var u fasthttp.URI u.Update(sw.ScrapeURL) hostPort := string(u.Host()) diff --git a/lib/promscrape/discovery/nomad/service.go b/lib/promscrape/discovery/nomad/service.go index 41ce4932e..1147308ce 100644 --- a/lib/promscrape/discovery/nomad/service.go +++ b/lib/promscrape/discovery/nomad/service.go @@ -22,6 +22,8 @@ func getServiceLabels(cfg *apiConfig) []*promutils.Labels { return ms } +// ServiceList is a list of Nomad services. +// See https://developer.hashicorp.com/nomad/api-docs/services#list-services type ServiceList struct { Namespace string `json:"Namespace"` Services []struct { diff --git a/lib/promscrape/scraper.go b/lib/promscrape/scraper.go index 8118fe719..cf653776a 100644 --- a/lib/promscrape/scraper.go +++ b/lib/promscrape/scraper.go @@ -442,7 +442,7 @@ func newScraper(sw *ScrapeWork, group string, pushData func(at *auth.Token, wr * cancel: cancel, stoppedCh: make(chan struct{}), } - c := newClient(sw, ctx) + c := newClient(ctx, sw) sc.sw.Config = sw sc.sw.ScrapeGroup = group sc.sw.ReadData = c.ReadData diff --git a/lib/protoparser/common/vmproto_handshake.go b/lib/protoparser/common/vmproto_handshake.go index edc299dc1..a0cf9f00e 100644 --- a/lib/protoparser/common/vmproto_handshake.go +++ b/lib/protoparser/common/vmproto_handshake.go @@ -7,7 +7,7 @@ import ( "strings" ) -// HandleVMProtoClientHashake returns true if the server at remoteWriteURL supports VictoriaMetrics remote write protocol. +// HandleVMProtoClientHandshake returns true if the server at remoteWriteURL supports VictoriaMetrics remote write protocol. func HandleVMProtoClientHandshake(remoteWriteURL string, doRequest func(handshakeURL string) (*http.Response, error)) bool { u := remoteWriteURL if strings.Contains(u, "?") {