Merge branch 'master' into get-vlogs-tenants

Author: dmitryk-dk

.github/workflows/docs.yaml

@@ -51,7 +51,7 @@ jobs:
           git config --global user.email "${{ steps.import-gpg.outputs.email }}"
           if [[ -n $(git status --porcelain) ]]; then
             git add .
-            git commit -S -m "sync docs with VictoriaMetrics/VictoriaMetrics commit: ${{ steps.update.outputs.SHORT_SHA }}"
+            git commit -S -m "sync docs with VictoriaMetrics/VictoriaLogs commit: ${{ steps.update.outputs.SHORT_SHA }}"
             git push
           fi
         working-directory: __vm-docs

.golangci.yml

@@ -1,22 +1,29 @@
-run:
-  timeout: 2m
-
+version: "2"
 linters:
-  enable:
-  - revive
-
-issues:
-  exclude-rules:
-  - linters:
-    - staticcheck
-    text: "SA(4003|1019|5011):"
-  include:
-  - EXC0012
-  - EXC0014
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - "fmt.Fprintf"
-      - "fmt.Fprint"
-      - "(net/http.ResponseWriter).Write"
+  settings:
+    errcheck:
+      exclude-functions:
+        - fmt.Fprintf
+        - fmt.Fprint
+        - (net/http.ResponseWriter).Write
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - staticcheck
+        text: '(SA(4003|1019|5011)|QF1001):'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -11,9 +11,11 @@ ifeq ($(PKG_TAG),)
 PKG_TAG := $(BUILDINFO_TAG)
 endif
 
-GO_BUILDINFO = -X '$(PKG_PREFIX)/lib/buildinfo.Version=$(APP_NAME)-$(DATEINFO_TAG)-$(BUILDINFO_TAG)'
+GO_BUILDINFO = -X 'github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=$(APP_NAME)-$(DATEINFO_TAG)-$(BUILDINFO_TAG)'
 TAR_OWNERSHIP ?= --owner=1000 --group=1000
 
+GOLANGCI_LINT_VERSION := 2.2.1
+
 .PHONY: $(MAKECMDGOALS)
 
 include app/*/Makefile
@@ -330,7 +332,7 @@ golangci-lint: install-golangci-lint
 	GOEXPERIMENT=synctest golangci-lint run
 
 install-golangci-lint:
-	which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.64.7
+	which golangci-lint && (golangci-lint --version | grep -q $(GOLANGCI_LINT_VERSION)) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v$(GOLANGCI_LINT_VERSION)
 
 remove-golangci-lint:
 	rm -rf `which golangci-lint`

app/vlagent/remotewrite/client_test.go

@@ -22,7 +22,7 @@ func TestCalculateRetryDuration(t *testing.T) {
 		expectMaxDuration := helper(expectMinDuration)
 		expectMinDuration = expectMinDuration - (1000 * time.Millisecond) // Avoid edge case when calculating time.Until(now)
 
-		if !(retryDuration >= expectMinDuration && retryDuration <= expectMaxDuration) {
+		if retryDuration < expectMinDuration || retryDuration > expectMaxDuration {
 			t.Fatalf(
 				"incorrect retry duration, want (ms): [%d, %d], got (ms): %d",
 				expectMinDuration.Milliseconds(), expectMaxDuration.Milliseconds(),

app/vlinsert/elasticsearch/elasticsearch_test.go

@@ -3,12 +3,13 @@ package elasticsearch
 import (
 	"bytes"
 	"fmt"
+	"io"
+	"testing"
+
 	"github.com/golang/snappy"
 	"github.com/klauspost/compress/gzip"
 	"github.com/klauspost/compress/zlib"
 	"github.com/klauspost/compress/zstd"
-	"io"
-	"testing"
 
 	"github.com/VictoriaMetrics/VictoriaLogs/app/vlinsert/insertutil"
 )

app/vlogscli/main.go

@@ -19,7 +19,9 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/envflag"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
 	"github.com/ergochat/readline"
 
 	"github.com/VictoriaMetrics/VictoriaLogs/lib/logstorage"
@@ -31,9 +33,21 @@ var (
 	tailURL = flag.String("tail.url", "", "URL for live tailing queries to VictoriaLogs; see https://docs.victoriametrics.com/victorialogs/querying/#live-tailing ."+
 		"The url is automatically detected from -datasource.url by replacing /query with /tail at the end if -tail.url is empty")
 	historyFile = flag.String("historyFile", "vlogscli-history", "Path to file with command history")
-	header      = flagutil.NewArrayString("header", "Optional header to pass in request -datasource.url in the form 'HeaderName: value'")
-	accountID   = flag.Int("accountID", 0, "Account ID to query; see https://docs.victoriametrics.com/victorialogs/#multitenancy")
-	projectID   = flag.Int("projectID", 0, "Project ID to query; see https://docs.victoriametrics.com/victorialogs/#multitenancy")
+
+	header    = flagutil.NewArrayString("header", "Optional header to pass in request -datasource.url in the form 'HeaderName: value'")
+	accountID = flag.Int("accountID", 0, "Account ID to query; see https://docs.victoriametrics.com/victorialogs/#multitenancy")
+	projectID = flag.Int("projectID", 0, "Project ID to query; see https://docs.victoriametrics.com/victorialogs/#multitenancy")
+
+	username    = flag.String("username", "", "Optional basic auth username to use for the -datasource.url")
+	password    = flagutil.NewPassword("password", "Optional basic auth password to use for the -datsource.url")
+	bearerToken = flagutil.NewPassword("bearerToken", "Optional bearer auth token to use for the -datasource.url")
+
+	tlsCAFile     = flag.String("tlsCAFile", "", "Optional path to TLS CA file to use for verifying connections to the -datasource.url. By default, system CA is used")
+	tlsCertFile   = flag.String("tlsCertFile", "", "Optional path to client-side TLS certificate file to use when connecting to the -datasource.url")
+	tlsKeyFile    = flag.String("tlsKeyFile", "", "Optional path to client-side TLS certificate key to use when connecting to the -datasource.url")
+	tlsServerName = flag.String("tlsServerName", "", "Optional TLS server name to use for connections to the -datasource.url. "+
+		"By default, the server name from -datasource.url is used")
+	tlsInsecureSkipVerify = flag.Bool("tlsInsecureSkipVerify", false, "Whether to skip tls verification when connecting to the -datasource.url")
 )
 
 const (
@@ -55,6 +69,8 @@ func main() {
 	}
 	headers = hes
 
+	httpClient = newHTTPClient()
+
 	incompleteLine := ""
 	cfg := &readline.Config{
 		Prompt:                 firstLinePrompt,
@@ -418,7 +434,48 @@ func getQueryResponse(ctx context.Context, output io.Writer, qStr string, output
 	return jp
 }
 
-var httpClient = &http.Client{}
+func newHTTPClient() *http.Client {
+	ac := newAuthConfig()
+	tr := httputil.NewTransport(true, "vlogscli")
+	c := &http.Client{
+		Transport: ac.NewRoundTripper(tr),
+	}
+	return c
+}
+
+func newAuthConfig() *promauth.Config {
+	username := *username
+	password := password.Get()
+	var basicAuthCfg *promauth.BasicAuthConfig
+	if username != "" || password != "" {
+		basicAuthCfg = &promauth.BasicAuthConfig{
+			Username: username,
+			Password: promauth.NewSecret(password),
+		}
+	}
+
+	tlsCfg := &promauth.TLSConfig{
+		CAFile:             *tlsCAFile,
+		CertFile:           *tlsCertFile,
+		KeyFile:            *tlsKeyFile,
+		ServerName:         *tlsServerName,
+		InsecureSkipVerify: *tlsInsecureSkipVerify,
+	}
+
+	opts := &promauth.Options{
+		BasicAuth:   basicAuthCfg,
+		BearerToken: bearerToken.Get(),
+		TLSConfig:   tlsCfg,
+	}
+	ac, err := opts.NewConfig()
+	if err != nil {
+		logger.Panicf("FATAL: cannot populate auth config: %s", err)
+	}
+
+	return ac
+}
+
+var httpClient *http.Client
 
 var headers []headerEntry