include group first evaluation into interval ticker

.github/dependabot.yml

@@ -4,8 +4,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    cooldown:
-      default-days: 21
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
@@ -25,8 +23,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    cooldown:
-      default-days: 21
   - package-ecosystem: "npm"
     directory: "/app/vmui/packages/vmui"
     schedule:

.github/pull_request_template.md

@@ -1 +1,10 @@
-Before creating the PR, please read [VictoriaMetrics contributing guidelines](https://docs.victoriametrics.com/victoriametrics/contributing/#pull-request-checklist) and remove this line after confirming you understand and follow them.
+### Describe Your Changes
+
+Please provide a brief description of the changes you made. Be as specific as possible to help others understand the purpose and impact of your modifications.
+
+### Checklist
+
+The following checks are **mandatory**:
+
+- [ ] My change adheres to [VictoriaMetrics contributing guidelines](https://docs.victoriametrics.com/victoriametrics/contributing/#pull-request-checklist).
+- [ ] My change adheres to [VictoriaMetrics development goals](https://docs.victoriametrics.com/victoriametrics/goals/).

.github/workflows/test.yml

@@ -66,8 +66,8 @@ jobs:
     strategy:
       matrix:
         scenario:
-          - 'test'
-          - 'test-386'
+          - 'test-full'
+          - 'test-full-386'
           - 'test-pure'
 
     steps:
@@ -88,6 +88,11 @@ jobs:
       - name: Run tests
         run: make ${{ matrix.scenario}}
 
+      - name: Publish coverage
+        uses: codecov/codecov-action@v6
+        with:
+          files: ./coverage.txt
+
   apptest:
     name: apptest
     runs-on: apptest

Makefile

@@ -457,9 +457,6 @@ test:
 test-race:
 	go test -tags 'synctest' -race ./lib/... ./app/...
 
-test-386:
-	GOARCH=386 go test -tags 'synctest' ./lib/... ./app/...
-
 test-pure:
 	CGO_ENABLED=0 go test -tags 'synctest' ./lib/... ./app/...
 
@@ -470,10 +467,10 @@ test-full-386:
 	GOARCH=386 go test -tags 'synctest' -coverprofile=coverage.txt -covermode=atomic ./lib/... ./app/...
 
 apptest:
-	$(MAKE) victoria-metrics-race vmagent-race vmalert-race vmauth-race vmctl-race vmbackup-race vmrestore-race
+	$(MAKE) victoria-metrics vmagent vmalert vmauth vmctl vmbackup vmrestore
 	go test ./apptest/... -skip="^Test(Cluster|Legacy).*"
 
-apptest-legacy: victoria-metrics-race vmbackup-race vmrestore-race
+apptest-legacy: victoria-metrics vmbackup vmrestore
 	OS=$$(uname | tr '[:upper:]' '[:lower:]'); \
 	ARCH=$$(uname -m | tr '[:upper:]' '[:lower:]' | sed 's/x86_64/amd64/'); \
 	VERSION=v1.132.0; \

README.md

@@ -4,6 +4,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/victoriametrics/victoria-metrics?label=&logo=docker&logoColor=white&labelColor=2496ED&color=2496ED&link=https%3A%2F%2Fhub.docker.com%2Fr%2Fvictoriametrics%2Fvictoria-metrics)](https://hub.docker.com/u/victoriametrics)
 [![Go Report](https://goreportcard.com/badge/github.com/VictoriaMetrics/VictoriaMetrics?link=https%3A%2F%2Fgoreportcard.com%2Freport%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics)](https://goreportcard.com/report/github.com/VictoriaMetrics/VictoriaMetrics)
 [![Build Status](https://github.com/VictoriaMetrics/VictoriaMetrics/actions/workflows/build.yml/badge.svg?branch=master&link=https%3A%2F%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics%2Factions)](https://github.com/VictoriaMetrics/VictoriaMetrics/actions/workflows/build.yml)
+[![codecov](https://codecov.io/gh/VictoriaMetrics/VictoriaMetrics/branch/master/graph/badge.svg?link=https%3A%2F%2Fcodecov.io%2Fgh%2FVictoriaMetrics%2FVictoriaMetrics)](https://app.codecov.io/gh/VictoriaMetrics/VictoriaMetrics)
 [![License](https://img.shields.io/github/license/VictoriaMetrics/VictoriaMetrics?labelColor=green&label=&link=https%3A%2F%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics%2Fblob%2Fmaster%2FLICENSE)](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/LICENSE)
 [![Join Slack](https://img.shields.io/badge/Join%20Slack-4A154B?logo=slack)](https://slack.victoriametrics.com)
 [![X](https://img.shields.io/twitter/follow/VictoriaMetrics?style=flat&label=Follow&color=black&logo=x&labelColor=black&link=https%3A%2F%2Fx.com%2FVictoriaMetrics)](https://x.com/VictoriaMetrics/)

app/victoria-metrics/main.go

@@ -118,8 +118,8 @@ func main() {
 		logger.Fatalf("cannot stop the webservice: %s", err)
 	}
 	logger.Infof("successfully shut down the webservice in %.3f seconds", time.Since(startTime).Seconds())
-	vminsertcommon.StopIngestionRateLimiter()
 	vminsert.Stop()
+	vminsertcommon.StopIngestionRateLimiter()
 
 	vmstorage.Stop()
 	vmselect.Stop()

app/vmagent/remotewrite/client.go

@@ -13,9 +13,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-	"github.com/golang/snappy"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/awsapi"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/encoding"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
@@ -24,7 +21,10 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/persistentqueue"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/ratelimiter"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timerpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeutil"
+	"github.com/VictoriaMetrics/metrics"
+	"github.com/golang/snappy"
 )
 
 var (
@@ -290,7 +290,7 @@ func getAWSAPIConfig(argIdx int) (*awsapi.Config, error) {
 	accessKey := awsAccessKey.GetOptionalArg(argIdx)
 	secretKey := awsSecretKey.GetOptionalArg(argIdx)
 	service := awsService.GetOptionalArg(argIdx)
-	cfg, err := awsapi.NewConfig(ec2Endpoint, stsEndpoint, region, roleARN, accessKey, secretKey, service, "")
+	cfg, err := awsapi.NewConfig(ec2Endpoint, stsEndpoint, region, roleARN, accessKey, secretKey, service)
 	if err != nil {
 		return nil, err
 	}
@@ -405,7 +405,8 @@ func (c *client) newRequest(url string, body []byte) (*http.Request, error) {
 // Otherwise, it tries sending the block to remote storage indefinitely.
 func (c *client) sendBlockHTTP(block []byte) bool {
 	c.rl.Register(len(block))
-	bt := timeutil.NewBackoffTimer(c.retryMinInterval, c.retryMaxInterval)
+	maxRetryDuration := timeutil.AddJitterToDuration(c.retryMaxInterval)
+	retryDuration := timeutil.AddJitterToDuration(c.retryMinInterval)
 	retriesCount := 0
 
 again:
@@ -414,10 +415,19 @@ again:
 	c.requestDuration.UpdateDuration(startTime)
 	if err != nil {
 		c.errorsCount.Inc()
-		remoteWriteRetryLogger.Warnf("couldn't send a block with size %d bytes to %q: %s; re-sending the block in %s",
-			len(block), c.sanitizedURL, err, bt.CurrentDelay())
-		if !bt.Wait(c.stopCh) {
+		retryDuration *= 2
+		if retryDuration > maxRetryDuration {
+			retryDuration = maxRetryDuration
+		}
+		remoteWriteRetryLogger.Warnf("couldn't send a block with size %d bytes to %q: %s; re-sending the block in %.3f seconds",
+			len(block), c.sanitizedURL, err, retryDuration.Seconds())
+		t := timerpool.Get(retryDuration)
+		select {
+		case <-c.stopCh:
+			timerpool.Put(t)
 			return false
+		case <-t.C:
+			timerpool.Put(t)
 		}
 		c.retriesCount.Inc()
 		goto again
@@ -483,10 +493,7 @@ again:
 	// Unexpected status code returned
 	retriesCount++
 	retryAfterHeader := parseRetryAfterHeader(resp.Header.Get("Retry-After"))
-	// retryAfterDuration has the highest priority duration
-	if retryAfterHeader > 0 {
-		bt.SetDelay(retryAfterHeader)
-	}
+	retryDuration = getRetryDuration(retryAfterHeader, retryDuration, maxRetryDuration)
 
 	// Handle response
 	body, err := io.ReadAll(resp.Body)
@@ -495,10 +502,15 @@ again:
 		logger.Errorf("cannot read response body from %q during retry #%d: %s", c.sanitizedURL, retriesCount, err)
 	} else {
 		logger.Errorf("unexpected status code received after sending a block with size %d bytes to %q during retry #%d: %d; response body=%q; "+
-			"re-sending the block in %s", len(block), c.sanitizedURL, retriesCount, statusCode, body, bt.CurrentDelay())
+			"re-sending the block in %.3f seconds", len(block), c.sanitizedURL, retriesCount, statusCode, body, retryDuration.Seconds())
 	}
-	if !bt.Wait(c.stopCh) {
+	t := timerpool.Get(retryDuration)
+	select {
+	case <-c.stopCh:
+		timerpool.Put(t)
 		return false
+	case <-t.C:
+		timerpool.Put(t)
 	}
 	c.retriesCount.Inc()
 	goto again
@@ -507,6 +519,27 @@ again:
 var remoteWriteRejectedLogger = logger.WithThrottler("remoteWriteRejected", 5*time.Second)
 var remoteWriteRetryLogger = logger.WithThrottler("remoteWriteRetry", 5*time.Second)
 
+// getRetryDuration returns retry duration.
+// retryAfterDuration has the highest priority.
+// If retryAfterDuration is not specified, retryDuration gets doubled.
+// retryDuration can't exceed maxRetryDuration.
+//
+// Also see: https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6097
+func getRetryDuration(retryAfterDuration, retryDuration, maxRetryDuration time.Duration) time.Duration {
+	// retryAfterDuration has the highest priority duration
+	if retryAfterDuration > 0 {
+		return timeutil.AddJitterToDuration(retryAfterDuration)
+	}
+
+	// default backoff retry policy
+	retryDuration *= 2
+	if retryDuration > maxRetryDuration {
+		retryDuration = maxRetryDuration
+	}
+
+	return retryDuration
+}
+
 // repackBlockFromZstdToSnappy repacks the given zstd-compressed block to snappy-compressed block.
 //
 // The input block may be corrupted, for example, if vmagent was shut down ungracefully and
@@ -537,20 +570,24 @@ func logBlockRejected(block []byte, sanitizedURL string, resp *http.Response) {
 }
 
 // parseRetryAfterHeader parses `Retry-After` value retrieved from HTTP response header.
-//
-// s should be in either HTTP-date or a number of seconds.
-// It returns time.Duration(0) if s does not follow RFC 7231.
-func parseRetryAfterHeader(s string) time.Duration {
-	if s == "" {
-		return 0
+// retryAfterString should be in either HTTP-date or a number of seconds.
+// It will return time.Duration(0) if `retryAfterString` does not follow RFC 7231.
+func parseRetryAfterHeader(retryAfterString string) (retryAfterDuration time.Duration) {
+	if retryAfterString == "" {
+		return retryAfterDuration
 	}
 
+	defer func() {
+		v := retryAfterDuration.Seconds()
+		logger.Infof("'Retry-After: %s' parsed into %.2f second(s)", retryAfterString, v)
+	}()
+
 	// Retry-After could be in "Mon, 02 Jan 2006 15:04:05 GMT" format.
-	if parsedTime, err := time.Parse(http.TimeFormat, s); err == nil {
+	if parsedTime, err := time.Parse(http.TimeFormat, retryAfterString); err == nil {
 		return time.Duration(time.Until(parsedTime).Seconds()) * time.Second
 	}
 	// Retry-After could be in seconds.
-	if seconds, err := strconv.Atoi(s); err == nil {
+	if seconds, err := strconv.Atoi(retryAfterString); err == nil {
 		return time.Duration(seconds) * time.Second
 	}
 

app/vmagent/remotewrite/client_test.go

@@ -6,11 +6,66 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/snappy"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/encoding"
+	"github.com/golang/snappy"
 )
 
+func TestCalculateRetryDuration(t *testing.T) {
+	// `testFunc` call `calculateRetryDuration` for `n` times
+	// and evaluate if the result of `calculateRetryDuration` is
+	// 1. >= expectMinDuration
+	// 2. <= expectMinDuration + 10% (see timeutil.AddJitterToDuration)
+	f := func(retryAfterDuration, retryDuration time.Duration, n int, expectMinDuration time.Duration) {
+		t.Helper()
+
+		for range n {
+			retryDuration = getRetryDuration(retryAfterDuration, retryDuration, time.Minute)
+		}
+
+		expectMaxDuration := helper(expectMinDuration)
+		expectMinDuration = expectMinDuration - (1000 * time.Millisecond) // Avoid edge case when calculating time.Until(now)
+
+		if retryDuration < expectMinDuration || retryDuration > expectMaxDuration {
+			t.Fatalf(
+				"incorrect retry duration, want (ms): [%d, %d], got (ms): %d",
+				expectMinDuration.Milliseconds(), expectMaxDuration.Milliseconds(),
+				retryDuration.Milliseconds(),
+			)
+		}
+	}
+
+	// Call calculateRetryDuration for 1 time.
+	{
+		// default backoff policy
+		f(0, time.Second, 1, 2*time.Second)
+		// default backoff policy exceed max limit"
+		f(0, 10*time.Minute, 1, time.Minute)
+
+		// retry after > default backoff policy
+		f(10*time.Second, 1*time.Second, 1, 10*time.Second)
+		// retry after < default backoff policy
+		f(1*time.Second, 10*time.Second, 1, 1*time.Second)
+		// retry after invalid and < default backoff policy
+		f(0, time.Second, 1, 2*time.Second)
+
+	}
+
+	// Call calculateRetryDuration for multiple times.
+	{
+		// default backoff policy 2 times
+		f(0, time.Second, 2, 4*time.Second)
+		// default backoff policy 3 times
+		f(0, time.Second, 3, 8*time.Second)
+		// default backoff policy N times exceed max limit
+		f(0, time.Second, 10, time.Minute)
+
+		// retry after 120s 1 times
+		f(120*time.Second, time.Second, 1, 120*time.Second)
+		// retry after 120s 2 times
+		f(120*time.Second, time.Second, 2, 120*time.Second)
+	}
+}
+
 func TestParseRetryAfterHeader(t *testing.T) {
 	f := func(retryAfterString string, expectResult time.Duration) {
 		t.Helper()
@@ -36,6 +91,13 @@ func TestParseRetryAfterHeader(t *testing.T) {
 	f(time.Now().Add(10*time.Second).Format("Mon, 02 Jan 2006 15:04:05 FAKETZ"), 0)
 }
 
+// helper calculate the max possible time duration calculated by timeutil.AddJitterToDuration.
+func helper(d time.Duration) time.Duration {
+	dv := min(d/10, 10*time.Second)
+
+	return d + dv
+}
+
 func TestRepackBlockFromZstdToSnappy(t *testing.T) {
 	expectedPlainBlock := []byte(`foobar`)
 

app/vmagent/remotewrite/remotewrite.go

@@ -3,7 +3,6 @@ package remotewrite
 import (
 	"flag"
 	"fmt"
-	"math"
 	"net/http"
 	"net/url"
 	"path/filepath"
@@ -12,10 +11,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/cespare/xxhash/v2"
-
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bloomfilter"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
@@ -28,7 +23,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/memory"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/persistentqueue"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prommetadata"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
@@ -36,6 +30,8 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/slicesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/streamaggr"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeserieslimits"
+	"github.com/VictoriaMetrics/metrics"
+	"github.com/cespare/xxhash/v2"
 )
 
 var (
@@ -84,14 +80,10 @@ var (
 		`This may be needed for reducing memory usage at remote storage when the order of labels in incoming samples is random. `+
 		`For example, if m{k1="v1",k2="v2"} may be sent as m{k2="v2",k1="v1"}`+
 		`Enabled sorting for labels can slow down ingestion performance a bit`)
-	maxHourlySeries = flag.Int64("remoteWrite.maxHourlySeries", 0, "The maximum number of unique series vmagent can send to remote storage systems during the last hour. "+
-		"Excess series are logged and dropped. This can be useful for limiting series cardinality. "+
-		fmt.Sprintf("Setting this flag to '-1' sets limit to maximum possible value (%d) which is useful in order to enable series tracking without enforcing limits. ", math.MaxInt32)+
-		"See https://docs.victoriametrics.com/victoriametrics/vmagent/#cardinality-limiter")
-	maxDailySeries = flag.Int64("remoteWrite.maxDailySeries", 0, "The maximum number of unique series vmagent can send to remote storage systems during the last 24 hours. "+
-		"Excess series are logged and dropped. This can be useful for limiting series churn rate. "+
-		fmt.Sprintf("Setting this flag to '-1' sets limit to maximum possible value (%d) which is useful in order to enable series tracking without enforcing limits. ", math.MaxInt32)+
-		"See https://docs.victoriametrics.com/victoriametrics/vmagent/#cardinality-limiter")
+	maxHourlySeries = flag.Int("remoteWrite.maxHourlySeries", 0, "The maximum number of unique series vmagent can send to remote storage systems during the last hour. "+
+		"Excess series are logged and dropped. This can be useful for limiting series cardinality. See https://docs.victoriametrics.com/victoriametrics/vmagent/#cardinality-limiter")
+	maxDailySeries = flag.Int("remoteWrite.maxDailySeries", 0, "The maximum number of unique series vmagent can send to remote storage systems during the last 24 hours. "+
+		"Excess series are logged and dropped. This can be useful for limiting series churn rate. See https://docs.victoriametrics.com/victoriametrics/vmagent/#cardinality-limiter")
 	maxIngestionRate = flag.Int("maxIngestionRate", 0, "The maximum number of samples vmagent can receive per second. Data ingestion is paused when the limit is exceeded. "+
 		"By default there are no limits on samples ingestion rate. See also -remoteWrite.rateLimit")
 
@@ -100,8 +92,6 @@ var (
 		"See https://docs.victoriametrics.com/victoriametrics/vmagent/#disabling-on-disk-persistence . See also -remoteWrite.dropSamplesOnOverload")
 	dropSamplesOnOverload = flag.Bool("remoteWrite.dropSamplesOnOverload", false, "Whether to drop samples when -remoteWrite.disableOnDiskQueue is set and if the samples "+
 		"cannot be pushed into the configured -remoteWrite.url systems in a timely manner. See https://docs.victoriametrics.com/victoriametrics/vmagent/#disabling-on-disk-persistence")
-	disableMetadataPerURL = flagutil.NewArrayBool("remoteWrite.disableMetadata", "Whether to disable sending metadata to the corresponding -remoteWrite.url. "+
-		"By default, metadata sending is controlled by the global -enableMetadata flag")
 )
 
 var (
@@ -167,8 +157,8 @@ func Init() {
 	if len(*remoteWriteURLs) == 0 {
 		logger.Fatalf("at least one `-remoteWrite.url` command-line flag must be set")
 	}
-	if limit := getMaxHourlySeries(); limit > 0 {
-		hourlySeriesLimiter = bloomfilter.NewLimiter(limit, time.Hour)
+	if *maxHourlySeries > 0 {
+		hourlySeriesLimiter = bloomfilter.NewLimiter(*maxHourlySeries, time.Hour)
 		_ = metrics.NewGauge(`vmagent_hourly_series_limit_max_series`, func() float64 {
 			return float64(hourlySeriesLimiter.MaxItems())
 		})
@@ -176,8 +166,8 @@ func Init() {
 			return float64(hourlySeriesLimiter.CurrentItems())
 		})
 	}
-	if limit := getMaxDailySeries(); limit > 0 {
-		dailySeriesLimiter = bloomfilter.NewLimiter(limit, 24*time.Hour)
+	if *maxDailySeries > 0 {
+		dailySeriesLimiter = bloomfilter.NewLimiter(*maxDailySeries, 24*time.Hour)
 		_ = metrics.NewGauge(`vmagent_daily_series_limit_max_series`, func() float64 {
 			return float64(dailySeriesLimiter.MaxItems())
 		})
@@ -550,10 +540,6 @@ func tryPushMetadataToRemoteStorages(rwctxs []*remoteWriteCtx, mms []prompb.Metr
 	var wg sync.WaitGroup
 	var anyPushFailed atomic.Bool
 	for _, rwctx := range rwctxs {
-		if !rwctx.enableMetadata {
-			// Skip remote storage with disabled metadata
-			continue
-		}
 		wg.Go(func() {
 			if !rwctx.tryPushMetadataInternal(mms) {
 				rwctx.pushFailures.Inc()
@@ -825,11 +811,6 @@ type remoteWriteCtx struct {
 	streamAggrKeepInput bool
 	streamAggrDropInput bool
 
-	// enableMetadata indicates whether metadata should be sent to this remote storage.
-	// It is determined by -remoteWrite.enableMetadata per-URL flag if set,
-	// otherwise by the global -enableMetadata flag.
-	enableMetadata bool
-
 	pss        []*pendingSeries
 	pssNextIdx atomic.Uint64
 
@@ -841,18 +822,6 @@ type remoteWriteCtx struct {
 	rowsDroppedOnPushFailure     *metrics.Counter
 }
 
-// isMetadataEnabledForURL returns true if metadata should be sent to the remote storage at argIdx.
-// It checks the per-URL -remoteWrite.disableMetadata flag first.
-// If not set, it falls back to the global -enableMetadata flag.
-func isMetadataEnabledForURL(argIdx int) bool {
-	if disableMetadataPerURL.GetOptionalArg(argIdx) {
-		// Metadata is explicitly disabled for this URL
-		return false
-	}
-	// Use global -enableMetadata value
-	return prommetadata.IsEnabled()
-}
-
 func newRemoteWriteCtx(argIdx int, remoteWriteURL *url.URL, sanitizedURL string) *remoteWriteCtx {
 	// strip query params, otherwise changing params resets pq
 	pqURL := *remoteWriteURL
@@ -923,11 +892,10 @@ func newRemoteWriteCtx(argIdx int, remoteWriteURL *url.URL, sanitizedURL string)
 	}
 
 	rwctx := &remoteWriteCtx{
-		idx:            argIdx,
-		fq:             fq,
-		c:              c,
-		pss:            pss,
-		enableMetadata: isMetadataEnabledForURL(argIdx),
+		idx: argIdx,
+		fq:  fq,
+		c:   c,
+		pss: pss,
 
 		rowsPushedAfterRelabel: metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_rows_pushed_after_relabel_total{path=%q,url=%q}`, queuePath, sanitizedURL)),
 		rowsDroppedByRelabel:   metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_relabel_metrics_dropped_total{path=%q,url=%q}`, queuePath, sanitizedURL)),
@@ -1148,21 +1116,3 @@ func newMapFromStrings(a []string) map[string]struct{} {
 	}
 	return m
 }
-
-func getMaxHourlySeries() int {
-	limit := *maxHourlySeries
-	if limit == -1 || limit > math.MaxInt32 {
-		return math.MaxInt32
-	}
-
-	return int(limit)
-}
-
-func getMaxDailySeries() int {
-	limit := *maxDailySeries
-	if limit == -1 || limit > math.MaxInt32 {
-		return math.MaxInt32
-	}
-
-	return int(limit)
-}

app/vmalert/remotewrite/client.go

@@ -13,18 +13,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cespare/xxhash/v2"
 	"github.com/golang/snappy"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeutil"
-
 	"github.com/VictoriaMetrics/metrics"
 )
 
@@ -117,10 +113,8 @@ func NewClient(ctx context.Context, cfg Config) (*Client, error) {
 		input:         make(chan prompb.TimeSeries, cfg.MaxQueueSize),
 	}
 
-	for i := 0; i < cc; i++ {
-		c.wg.Go(func() {
-			c.run(ctx, i)
-		})
+	for range cc {
+		c.run(ctx)
 	}
 	return c, nil
 }
@@ -162,7 +156,8 @@ func (c *Client) Close() error {
 	return nil
 }
 
-func (c *Client) run(ctx context.Context, id int) {
+func (c *Client) run(ctx context.Context) {
+	ticker := time.NewTicker(c.flushInterval)
 	wr := &prompb.WriteRequest{}
 	shutdown := func() {
 		lastCtx, cancel := context.WithTimeout(context.Background(), defaultWriteTimeout)
@@ -179,72 +174,45 @@ func (c *Client) run(ctx context.Context, id int) {
 		cancel()
 	}
 
-	// add jitter to spread remote write flushes over the flush interval to avoid congestion at the remote write destination
-	h := xxhash.Sum64(bytesutil.ToUnsafeBytes(fmt.Sprintf("%d", id)))
-	randJitter := uint64(float64(c.flushInterval) * (float64(h) / (1 << 64)))
-	timer := time.NewTimer(time.Duration(randJitter))
-addJitter:
-	for {
-		select {
-		case <-c.doneCh:
-			timer.Stop()
-			shutdown()
-			return
-		case <-ctx.Done():
-			timer.Stop()
-			shutdown()
-			return
-		case <-timer.C:
-			break addJitter
-		}
-	}
-
-	ticker := time.NewTicker(c.flushInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-c.doneCh:
-			shutdown()
-			return
-		case <-ctx.Done():
-			shutdown()
-			return
-		case <-ticker.C:
-			c.flush(ctx, wr)
-			// drain the potential stale tick to avoid small or empty flushes after a slow flush.
+	c.wg.Go(func() {
+		defer ticker.Stop()
+		for {
 			select {
+			case <-c.doneCh:
+				shutdown()
+				return
+			case <-ctx.Done():
+				shutdown()
+				return
 			case <-ticker.C:
-			default:
-			}
-		case ts, ok := <-c.input:
-			if !ok {
-				continue
-			}
-			wr.Timeseries = append(wr.Timeseries, ts)
-			if len(wr.Timeseries) >= c.maxBatchSize {
 				c.flush(ctx, wr)
+				// drain the potential stale tick to avoid small or empty flushes after a slow flush.
+				select {
+				case <-ticker.C:
+				default:
+				}
+			case ts, ok := <-c.input:
+				if !ok {
+					continue
+				}
+				wr.Timeseries = append(wr.Timeseries, ts)
+				if len(wr.Timeseries) >= c.maxBatchSize {
+					c.flush(ctx, wr)
+				}
 			}
 		}
-	}
+	})
 }
 
 var (
 	rwErrors = metrics.NewCounter(`vmalert_remotewrite_errors_total`)
 	rwTotal  = metrics.NewCounter(`vmalert_remotewrite_total`)
 
-	// sentRows and sentBytes are historical counters that can now be replaced by flushedRows and flushedBytes histograms. They may be deprecated in the future after the new histograms have been adopted for some time.
-	sentRows             = metrics.NewCounter(`vmalert_remotewrite_sent_rows_total`)
-	sentBytes            = metrics.NewCounter(`vmalert_remotewrite_sent_bytes_total`)
-	flushedRows          = metrics.NewHistogram(`vmalert_remotewrite_sent_rows`)
-	flushedBytes         = metrics.NewHistogram(`vmalert_remotewrite_sent_bytes`)
-	droppedRows          = metrics.NewCounter(`vmalert_remotewrite_dropped_rows_total`)
-	sendDuration         = metrics.NewFloatCounter(`vmalert_remotewrite_send_duration_seconds_total`)
-	bufferFlushDuration  = metrics.NewHistogram(`vmalert_remotewrite_flush_duration_seconds`)
-	remoteWriteQueueSize = metrics.NewHistogram(`vmalert_remotewrite_queue_size`)
-
-	_ = metrics.NewGauge(`vmalert_remotewrite_queue_capacity`, func() float64 {
-		return float64(*maxQueueSize)
-	})
+	sentRows            = metrics.NewCounter(`vmalert_remotewrite_sent_rows_total`)
+	sentBytes           = metrics.NewCounter(`vmalert_remotewrite_sent_bytes_total`)
+	droppedRows         = metrics.NewCounter(`vmalert_remotewrite_dropped_rows_total`)
+	sendDuration        = metrics.NewFloatCounter(`vmalert_remotewrite_send_duration_seconds_total`)
+	bufferFlushDuration = metrics.NewHistogram(`vmalert_remotewrite_flush_duration_seconds`)
 
 	_ = metrics.NewGauge(`vmalert_remotewrite_concurrency`, func() float64 {
 		return float64(*concurrency)
@@ -258,7 +226,6 @@ func GetDroppedRows() int { return int(droppedRows.Get()) }
 // it to remote-write endpoint. Flush performs limited amount of retries
 // if request fails.
 func (c *Client) flush(ctx context.Context, wr *prompb.WriteRequest) {
-	remoteWriteQueueSize.Update(float64(len(c.input)))
 	if len(wr.Timeseries) < 1 {
 		return
 	}
@@ -268,8 +235,10 @@ func (c *Client) flush(ctx context.Context, wr *prompb.WriteRequest) {
 	data := wr.MarshalProtobuf(nil)
 	b := snappy.Encode(nil, data)
 
-	maxRetryInterval := *retryMaxTime
-	bt := timeutil.NewBackoffTimer(*retryMinInterval, maxRetryInterval)
+	retryInterval, maxRetryInterval := *retryMinInterval, *retryMaxTime
+	if retryInterval > maxRetryInterval {
+		retryInterval = maxRetryInterval
+	}
 	timeStart := time.Now()
 	defer func() {
 		sendDuration.Add(time.Since(timeStart).Seconds())
@@ -287,8 +256,6 @@ L:
 		if err == nil {
 			sentRows.Add(len(wr.Timeseries))
 			sentBytes.Add(len(b))
-			flushedRows.Update(float64(len(wr.Timeseries)))
-			flushedBytes.Update(float64(len(b)))
 			return
 		}
 
@@ -314,11 +281,12 @@ L:
 			break
 		}
 
-		if bt.CurrentDelay() > timeLeftForRetries {
-			bt.SetDelay(timeLeftForRetries)
+		if retryInterval > timeLeftForRetries {
+			retryInterval = timeLeftForRetries
 		}
 		// sleeping to prevent remote db hammering
-		bt.Wait(ctx.Done())
+		time.Sleep(retryInterval)
+		retryInterval *= 2
 
 		attempts++
 	}

app/vmalert/rule/alerting.go

@@ -789,16 +789,7 @@ func firingAlertStaleTimeSeries(ls map[string]string, timestamp int64) []prompb.
 
 // restore restores the value of ActiveAt field for active alerts,
 // based on previously written time series `alertForStateMetricName`.
-// Only rules with For > 0 can be restored.
 func (ar *AlertingRule) restore(ctx context.Context, q datasource.Querier, ts time.Time, lookback time.Duration) error {
-	if ar.For < 1 {
-		return nil
-	}
-
-	if len(ar.alerts) < 1 {
-		return nil
-	}
-
 	nameStr := fmt.Sprintf("%s=%q", alertNameLabel, ar.Name)
 	if !*disableAlertGroupLabel {
 		nameStr = fmt.Sprintf("%s=%q,%s=%q", alertGroupNameLabel, ar.GroupName, alertNameLabel, ar.Name)

app/vmalert/rule/group.go

@@ -8,6 +8,7 @@ import (
 	"hash/fnv"
 	"maps"
 	"net/url"
+	"os"
 	"sync"
 	"time"
 
@@ -213,6 +214,7 @@ func (g *Group) CreateID() uint64 {
 // restore restores alerts state for group rules
 func (g *Group) restore(ctx context.Context, qb datasource.QuerierBuilder, ts time.Time, lookback time.Duration) error {
 	for _, rule := range g.Rules {
+		// Only alerting rule with for > 0 and has active alerts from the first evaluation can be restored
 		ar, ok := rule.(*AlertingRule)
 		if !ok {
 			continue
@@ -220,6 +222,9 @@ func (g *Group) restore(ctx context.Context, qb datasource.QuerierBuilder, ts ti
 		if ar.For < 1 {
 			continue
 		}
+		if len(ar.alerts) < 1 {
+			return nil
+		}
 		q := qb.BuildWithParams(datasource.QuerierParams{
 			EvaluationInterval: g.Interval,
 			QueryParams:        g.Params,
@@ -333,6 +338,11 @@ func (g *Group) Init() {
 // Start starts group's evaluation
 func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasource.QuerierBuilder) {
 	defer func() { close(g.finishedCh) }()
+	e := &executor{
+		Rw:              rw,
+		notifierHeaders: g.NotifierHeaders,
+	}
+
 	evalTS := time.Now()
 	// sleep random duration to spread group rules evaluation
 	// over maxStartDelay to reduce the load on datasource.
@@ -367,11 +377,6 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 		evalTS = evalTS.Add(sleepBeforeStart)
 	}
 
-	e := &executor{
-		Rw:              rw,
-		notifierHeaders: g.NotifierHeaders,
-	}
-
 	g.infof("started")
 
 	eval := func(ctx context.Context, ts time.Time) time.Time {
@@ -400,6 +405,29 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 		g.mu.Lock()
 		g.LastEvaluation = start
 		g.mu.Unlock()
+		if g.EvalOffset != nil && e.Rw != nil {
+			hostname, err := os.Hostname()
+			if err != nil {
+				hostname = "unknown"
+			}
+			labels := map[string]string{
+				"__name__": "vmalert_eval_timestamp",
+				"host":     hostname,
+				"group":    g.Name,
+				"file":     g.File,
+			}
+			var ls []prompb.Label
+			for k, v := range labels {
+				ls = append(ls, prompb.Label{
+					Name:  k,
+					Value: v,
+				})
+			}
+			ts := newTimeSeries([]float64{float64(ts.Unix())}, []int64{start.Unix()}, ls)
+			if err := e.Rw.Push(ts); err != nil {
+				logger.Errorf("group %q: failed to push evaluation timestamp: %s", g.Name, err)
+			}
+		}
 		return ts
 	}
 

app/vmalert/web.go

@@ -52,13 +52,7 @@ var (
 		"alert":  rule.TypeAlerting,
 		"record": rule.TypeRecording,
 	}
-
-	// The "recovering", "noData", "normal", "error" states are used by Grafana.
-	// Ignore "recovering" since it is not currently acknowledged by vmalert,
-	// treat "noData" as an alias for "nomatch",
-	// treat "normal" as an alias for "inactive",
-	// treat "error" as an alias for "unhealthy"
-	ruleStates = []string{"ok", "nomatch", "inactive", "firing", "pending", "unhealthy", "recovering", "noData", "normal", "error"}
+	ruleStates = []string{"ok", "nomatch", "inactive", "firing", "pending", "unhealthy"}
 )
 
 type requestHandler struct {
@@ -369,15 +363,6 @@ func newRulesFilter(r *http.Request) (*rulesFilter, *httpserver.ErrorWithStatusC
 			if !slices.Contains(ruleStates, v) {
 				return nil, errResponse(fmt.Errorf(`invalid parameter "state": contains not supported value %q`, v), http.StatusBadRequest)
 			}
-			// Replace grafana states with supported internal states
-			switch v {
-			case "noData":
-				v = "nomatch"
-			case "normal":
-				v = "inactive"
-			case "error":
-				v = "unhealthy"
-			}
 			rf.states = append(rf.states, v)
 		}
 	}

app/vmauth/auth_config.go

@@ -517,7 +517,6 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 			continue
 		}
 
-		logger.Infof("try to resolve backend IPs for %s", host)
 		var resolvedAddrs []string
 		if strings.HasPrefix(host, "srv+") {
 			// The host has the format 'srv+realhost'. Strip 'srv+' prefix before performing the lookup.
@@ -545,7 +544,6 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 				resolvedAddrs = make([]string, len(addrs))
 				for i, addr := range addrs {
 					resolvedAddrs[i] = net.JoinHostPort(addr.String(), port)
-					logger.Infof("discover backend IPs for %s into %d addresses, one is %s", bu, len(resolvedAddrs), resolvedAddrs[i])
 				}
 			}
 		}
@@ -568,7 +566,6 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 
 	bus := up.bus.Load()
 	if areEqualBackendURLs(bus.bus, busNew.bus) {
-		logger.Infof("resolved addr are the same as the original one")
 		return
 	}
 

app/vmauth/main.go

@@ -357,7 +357,6 @@ func bufferRequestBody(ctx context.Context, r io.ReadCloser, userName string) (i
 
 	maxBufSize := max(requestBufferSize.IntN(), maxRequestBodySizeToRetry.IntN())
 	if maxBufSize <= 0 {
-		// Request buffering is disabled.
 		return r, nil
 	}
 
@@ -481,9 +480,6 @@ func tryProcessingRequest(w http.ResponseWriter, r *http.Request, targetURL *url
 	canRetry := !bbOK || bb.canRetry()
 
 	res, err := ui.rt.RoundTrip(req)
-	if err == nil {
-		defer func() { _ = res.Body.Close() }()
-	}
 
 	if errors.Is(r.Context().Err(), context.Canceled) {
 		// Do not retry canceled requests.
@@ -553,6 +549,7 @@ func tryProcessingRequest(w http.ResponseWriter, r *http.Request, targetURL *url
 	w.WriteHeader(res.StatusCode)
 
 	err = copyStreamToClient(w, res.Body)
+	_ = res.Body.Close()
 
 	if errors.Is(r.Context().Err(), context.Canceled) {
 		// Do not retry canceled requests.
@@ -766,7 +763,7 @@ var concurrentRequestsLimitReached = metrics.NewCounter("vmauth_concurrent_reque
 
 func usage() {
 	const s = `
-vmauth authenticates and authorizes incoming requests and proxies them to VictoriaMetrics components or any other HTTP backends.
+vmauth authenticates and authorizes incoming requests and proxies them to VictoriaMetrics.
 
 See the docs at https://docs.victoriametrics.com/victoriametrics/vmauth/ .
 `
@@ -795,11 +792,10 @@ func handleConcurrencyLimitError(w http.ResponseWriter, r *http.Request, err err
 }
 
 // bufferedBody serves two purposes:
-//
-//  1. It enables request retries when the request body size does not exceed maxBufSize
-//     by fully buffering the request body in memory.
-//  2. It prevents slow clients from reducing effective server capacity
-//     by buffering the request body before acquiring a per-user concurrency slot.
+//  1. Enables request retries when the body size does not exceed maxBodySize
+//     by fully buffering the body in memory.
+//  2. Prevents slow clients from reducing effective server capacity by
+//     buffering the request body before acquiring a per-user concurrency slot.
 //
 // See bufferRequestBody for details on how bufferedBody is used.
 type bufferedBody struct {
@@ -823,7 +819,7 @@ func newBufferedBody(r io.ReadCloser, buf []byte, maxBufSize int) *bufferedBody
 	// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8051
 
 	if len(buf) < maxBufSize {
-		// The full request body has been already read into buf.
+		// Read the full request body into buf.
 		r = nil
 	}
 
@@ -836,7 +832,7 @@ func newBufferedBody(r io.ReadCloser, buf []byte, maxBufSize int) *bufferedBody
 // Read implements io.Reader interface.
 func (bb *bufferedBody) Read(p []byte) (int, error) {
 	if bb.cannotRetry {
-		return 0, fmt.Errorf("cannot read already closed request body")
+		return 0, fmt.Errorf("cannot read already closed body")
 	}
 	if bb.bufOffset < len(bb.buf) {
 		n := copy(p, bb.buf[bb.bufOffset:])

app/vmbackup/main.go

@@ -21,7 +21,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/procutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/pushmetrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/snapshot"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/snapshot/snapshotutil"
 )

app/vmctl/flags.go

@@ -416,16 +416,6 @@ const (
 	promTemporaryDirPath = "prom-tmp-dir-path"
 )
 
-const (
-	thanosSnapshot         = "thanos-snapshot"
-	thanosConcurrency      = "thanos-concurrency"
-	thanosFilterTimeStart  = "thanos-filter-time-start"
-	thanosFilterTimeEnd    = "thanos-filter-time-end"
-	thanosFilterLabel      = "thanos-filter-label"
-	thanosFilterLabelValue = "thanos-filter-label-value"
-	thanosAggrTypes        = "thanos-aggr-types"
-)
-
 var (
 	promFlags = []cli.Flag{
 		&cli.StringFlag{
@@ -461,43 +451,6 @@ var (
 			Value: os.TempDir(),
 		},
 	}
-
-	thanosFlags = []cli.Flag{
-		&cli.StringFlag{
-			Name:     thanosSnapshot,
-			Usage:    "Path to Thanos snapshot directory containing raw and/or downsampled blocks.",
-			Required: true,
-		},
-		&cli.IntFlag{
-			Name:  thanosConcurrency,
-			Usage: "Number of concurrently running snapshot readers",
-			Value: 1,
-		},
-		&cli.StringFlag{
-			Name:  thanosFilterTimeStart,
-			Usage: "The time filter in RFC3339 format to select timeseries with timestamp equal or higher than provided value. E.g. '2020-01-01T20:07:00Z'",
-		},
-		&cli.StringFlag{
-			Name:  thanosFilterTimeEnd,
-			Usage: "The time filter in RFC3339 format to select timeseries with timestamp equal or lower than provided value. E.g. '2020-01-01T20:07:00Z'",
-		},
-		&cli.StringFlag{
-			Name:  thanosFilterLabel,
-			Usage: "Thanos label name to filter timeseries by. E.g. '__name__' will filter timeseries by name.",
-		},
-		&cli.StringFlag{
-			Name:  thanosFilterLabelValue,
-			Usage: fmt.Sprintf("Thanos regular expression to filter label from %q flag.", thanosFilterLabel),
-			Value: ".*",
-		},
-		&cli.StringSliceFlag{
-			Name: thanosAggrTypes,
-			Usage: "Aggregate types to import from Thanos downsampled blocks. Supported values: count, sum, min, max, counter. " +
-				"Each aggregate will be imported as a separate metric with the aggregate type as suffix (e.g., metric_name:5m:count). " +
-				"If not specified, all aggregate types will be imported from downsampled blocks.",
-			Value: nil,
-		},
-	}
 )
 
 const (

app/vmctl/main.go

@@ -27,7 +27,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/influx"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/opentsdb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/prometheus"
-	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/thanos"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
@@ -286,7 +285,6 @@ func main() {
 					if err != nil {
 						return fmt.Errorf("failed to create prometheus client: %s", err)
 					}
-
 					pp := prometheusProcessor{
 						cl:        cl,
 						im:        importer,
@@ -296,59 +294,6 @@ func main() {
 					return pp.run(ctx)
 				},
 			},
-			{
-				Name:   "thanos",
-				Usage:  "Migrate time series from Thanos blocks (supports raw and downsampled data)",
-				Flags:  mergeFlags(globalFlags, thanosFlags, vmFlags),
-				Before: beforeFn,
-				Action: func(c *cli.Context) error {
-					fmt.Println("Thanos import mode")
-
-					vmCfg, err := initConfigVM(c)
-					if err != nil {
-						return fmt.Errorf("failed to init VM configuration: %s", err)
-					}
-
-					importer, err = vm.NewImporter(ctx, vmCfg)
-					if err != nil {
-						return fmt.Errorf("failed to create VM importer: %s", err)
-					}
-
-					thanosCfg := thanos.Config{
-						Snapshot: c.String(thanosSnapshot),
-						Filter: thanos.Filter{
-							TimeMin:    c.String(thanosFilterTimeStart),
-							TimeMax:    c.String(thanosFilterTimeEnd),
-							Label:      c.String(thanosFilterLabel),
-							LabelValue: c.String(thanosFilterLabelValue),
-						},
-					}
-					cl, err := thanos.NewClient(thanosCfg)
-					if err != nil {
-						return fmt.Errorf("failed to create thanos client: %s", err)
-					}
-
-					var aggrTypes []thanos.AggrType
-					if aggrTypesStr := c.StringSlice(thanosAggrTypes); len(aggrTypesStr) > 0 {
-						for _, typeStr := range aggrTypesStr {
-							aggrType, err := thanos.ParseAggrType(typeStr)
-							if err != nil {
-								return fmt.Errorf("failed to parse aggregate type %q: %s", typeStr, err)
-							}
-							aggrTypes = append(aggrTypes, aggrType)
-						}
-					}
-
-					tp := thanosProcessor{
-						cl:        cl,
-						im:        importer,
-						cc:        c.Int(thanosConcurrency),
-						isVerbose: c.Bool(globalVerbose),
-						aggrTypes: aggrTypes,
-					}
-					return tp.run(ctx)
-				},
-			},
 			{
 				Name:   "vm-native",
 				Usage:  "Migrate time series between VictoriaMetrics installations",

app/vmctl/thanos/aggr_chunk.go

@@ -1,233 +0,0 @@
-package thanos
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-
-	"github.com/prometheus/prometheus/tsdb/chunkenc"
-)
-
-// ChunkEncAggr is the top level encoding byte for the AggrChunk.
-// It is defined by Thanos as 0xff to prevent collisions with Prometheus encodings.
-const ChunkEncAggr = chunkenc.Encoding(0xff)
-
-// AggrType represents an aggregation type in Thanos downsampled blocks.
-type AggrType uint8
-
-// AggrTypeNone indicates raw blocks with no aggregation.
-// It is used as a sentinel to distinguish raw block processing from downsampled.
-const AggrTypeNone AggrType = 255
-
-// Valid aggregation types matching Thanos definitions.
-const (
-	AggrCount AggrType = iota
-	AggrSum
-	AggrMin
-	AggrMax
-	AggrCounter
-)
-
-// AllAggrTypes contains all supported aggregation types.
-var AllAggrTypes = []AggrType{AggrCount, AggrSum, AggrMin, AggrMax, AggrCounter}
-
-func (t AggrType) String() string {
-	switch t {
-	case AggrCount:
-		return "count"
-	case AggrSum:
-		return "sum"
-	case AggrMin:
-		return "min"
-	case AggrMax:
-		return "max"
-	case AggrCounter:
-		return "counter"
-	}
-	return "<unknown>"
-}
-
-// ParseAggrType parses aggregate type from string.
-func ParseAggrType(s string) (AggrType, error) {
-	switch s {
-	case "count":
-		return AggrCount, nil
-	case "sum":
-		return AggrSum, nil
-	case "min":
-		return AggrMin, nil
-	case "max":
-		return AggrMax, nil
-	case "counter":
-		return AggrCounter, nil
-	}
-	return 0, fmt.Errorf("unknown aggregate type: %q", s)
-}
-
-// ErrAggrNotExist is returned if a requested aggregation is not present in an AggrChunk.
-var ErrAggrNotExist = errors.New("aggregate does not exist")
-
-// AggrChunk is a chunk that is composed of a set of aggregates for the same underlying data.
-// Not all aggregates must be present.
-// This is a read-only implementation for decoding Thanos downsampled blocks.
-type AggrChunk []byte
-
-// IsAggrChunk checks if the encoding byte indicates this is an AggrChunk.
-func IsAggrChunk(enc chunkenc.Encoding) bool {
-	return enc == ChunkEncAggr
-}
-
-// Get returns the sub-chunk for the given aggregate type if it exists.
-func (c AggrChunk) Get(t AggrType) (chunkenc.Chunk, error) {
-	b := c[:]
-	var x []byte
-
-	for i := AggrType(0); i <= t; i++ {
-		l, n := binary.Uvarint(b)
-		if n < 1 {
-			return nil, errors.New("invalid size: failed to read uvarint")
-		}
-		if l > uint64(len(b[n:])) || l+1 > uint64(len(b[n:])) {
-			if l > 0 {
-				return nil, errors.New("invalid size: not enough bytes")
-			}
-		}
-		b = b[n:]
-		// If length is set to zero explicitly, that means the aggregate is unset.
-		if l == 0 {
-			if i == t {
-				return nil, ErrAggrNotExist
-			}
-			continue
-		}
-		chunkLen := int(l) + 1
-		x = b[:chunkLen]
-		b = b[chunkLen:]
-	}
-	if len(x) == 0 {
-		return nil, ErrAggrNotExist
-	}
-	return chunkenc.FromData(chunkenc.Encoding(x[0]), x[1:])
-}
-
-// Encoding returns the encoding type for AggrChunk.
-func (c AggrChunk) Encoding() chunkenc.Encoding {
-	return ChunkEncAggr
-}
-
-// errIterator wraps a nop iterator but reports an error via Err().
-// It embeds chunkenc.Iterator to inherit all methods (including Seek)
-// which avoids go vet stdmethods warning about Seek signature.
-type errIterator struct {
-	chunkenc.Iterator
-	err error
-}
-
-// Err returns the underlying error.
-func (it *errIterator) Err() error {
-	return it.err
-}
-
-// newAggrChunkIterator creates a new iterator for the specified aggregate type.
-// If the aggregate is not present in the chunk (ErrAggrNotExist), a nop iterator
-// is returned without error — the caller will simply see zero samples.
-// Real decoding/corruption errors are reported via the iterator's Err() method.
-func newAggrChunkIterator(data []byte, aggrType AggrType) chunkenc.Iterator {
-	chunk := AggrChunk(data)
-	subChunk, err := chunk.Get(aggrType)
-	if err != nil {
-		if errors.Is(err, ErrAggrNotExist) {
-			return chunkenc.NewNopIterator()
-		}
-		return &errIterator{
-			Iterator: chunkenc.NewNopIterator(),
-			err:      err,
-		}
-	}
-	return subChunk.Iterator(nil)
-}
-
-// AggrChunkWrapper wraps AggrChunk to implement chunkenc.Chunk interface.
-// It delegates iteration to a specific aggregate type.
-type AggrChunkWrapper struct {
-	data     []byte
-	aggrType AggrType
-}
-
-// NewAggrChunkWrapper creates a new AggrChunk wrapper for the specified aggregate type.
-func NewAggrChunkWrapper(data []byte, aggrType AggrType) *AggrChunkWrapper {
-	return &AggrChunkWrapper{
-		data:     data,
-		aggrType: aggrType,
-	}
-}
-
-// Bytes returns the underlying byte slice.
-func (c *AggrChunkWrapper) Bytes() []byte {
-	return c.data
-}
-
-// Encoding returns the AggrChunk encoding.
-func (c *AggrChunkWrapper) Encoding() chunkenc.Encoding {
-	return ChunkEncAggr
-}
-
-// Appender returns an error since AggrChunk is read-only.
-func (c *AggrChunkWrapper) Appender() (chunkenc.Appender, error) {
-	return nil, errors.New("AggrChunk is read-only")
-}
-
-// Iterator returns an iterator for the specified aggregate type.
-func (c *AggrChunkWrapper) Iterator(it chunkenc.Iterator) chunkenc.Iterator {
-	return newAggrChunkIterator(c.data, c.aggrType)
-}
-
-// NumSamples returns the number of samples in the aggregate.
-func (c *AggrChunkWrapper) NumSamples() int {
-	chunk := AggrChunk(c.data)
-	subChunk, err := chunk.Get(c.aggrType)
-	if err != nil {
-		return 0
-	}
-	return subChunk.NumSamples()
-}
-
-// Compact is a no-op for read-only AggrChunk.
-func (c *AggrChunkWrapper) Compact() {}
-
-// Reset resets the chunk with new data.
-func (c *AggrChunkWrapper) Reset(stream []byte) {
-	c.data = stream
-}
-
-// AggrChunkPool is a custom Pool that understands AggrChunk encoding (0xff).
-// It delegates standard encodings to the default pool and handles AggrChunk specially.
-type AggrChunkPool struct {
-	defaultPool chunkenc.Pool
-	aggrType    AggrType
-}
-
-// NewAggrChunkPool creates a new pool that handles AggrChunk encoding.
-func NewAggrChunkPool(aggrType AggrType) *AggrChunkPool {
-	return &AggrChunkPool{
-		defaultPool: chunkenc.NewPool(),
-		aggrType:    aggrType,
-	}
-}
-
-// Get returns a chunk for the given encoding and data.
-func (p *AggrChunkPool) Get(e chunkenc.Encoding, b []byte) (chunkenc.Chunk, error) {
-	if e == ChunkEncAggr {
-		return NewAggrChunkWrapper(b, p.aggrType), nil
-	}
-	return p.defaultPool.Get(e, b)
-}
-
-// Put returns a chunk to the pool.
-func (p *AggrChunkPool) Put(c chunkenc.Chunk) error {
-	if c.Encoding() == ChunkEncAggr {
-		// AggrChunk wrappers are not pooled
-		return nil
-	}
-	return p.defaultPool.Put(c)
-}

app/vmctl/thanos/block_meta.go

@@ -1,110 +0,0 @@
-package thanos
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-)
-
-// BlockMeta extends Prometheus BlockMeta with Thanos-specific fields.
-type BlockMeta struct {
-	// Thanos-specific metadata
-	Thanos ThanosMeta `json:"thanos,omitempty"`
-}
-
-// ThanosMeta contains Thanos-specific block metadata.
-type ThanosMeta struct {
-	// Labels are external labels identifying the producer.
-	Labels map[string]string `json:"labels,omitempty"`
-
-	// Downsample contains downsampling information.
-	Downsample ThanosDownsample `json:"downsample,omitempty"`
-
-	// Source indicates where the block came from.
-	Source string `json:"source,omitempty"`
-
-	// SegmentFiles contains list of segment files in the block.
-	SegmentFiles []string `json:"segment_files,omitempty"`
-
-	// Files contains metadata about files in the block.
-	Files []ThanosFile `json:"files,omitempty"`
-}
-
-// ThanosDownsample contains downsampling resolution info.
-type ThanosDownsample struct {
-	// Resolution is the downsampling resolution in milliseconds.
-	// 0 means raw data (no downsampling).
-	// 300000 (5 minutes) or 3600000 (1 hour) for downsampled data.
-	Resolution int64 `json:"resolution"`
-}
-
-// ThanosFile contains metadata about a file in the block.
-type ThanosFile struct {
-	RelPath   string `json:"rel_path"`
-	SizeBytes int64  `json:"size_bytes,omitempty"`
-}
-
-// ResolutionLevel represents the downsampling resolution.
-type ResolutionLevel int64
-
-const (
-	// ResolutionRaw is for raw, non-downsampled data.
-	ResolutionRaw ResolutionLevel = 0
-	// Resolution5m is for 5-minute downsampled data (300000 ms).
-	Resolution5m ResolutionLevel = 300000
-	// Resolution1h is for 1-hour downsampled data (3600000 ms).
-	Resolution1h ResolutionLevel = 3600000
-)
-
-// String returns human-readable resolution string.
-func (r ResolutionLevel) String() string {
-	switch r {
-	case ResolutionRaw:
-		return "raw"
-	case Resolution5m:
-		return "5m"
-	case Resolution1h:
-		return "1h"
-	default:
-		return "unknown"
-	}
-}
-
-// ReadBlockMeta reads Thanos-extended block metadata from meta.json.
-func ReadBlockMeta(blockDir string) (*BlockMeta, error) {
-	metaPath := filepath.Join(blockDir, "meta.json")
-	data, err := os.ReadFile(metaPath)
-	if err != nil {
-		return nil, err
-	}
-
-	var meta BlockMeta
-	if err := json.Unmarshal(data, &meta); err != nil {
-		return nil, err
-	}
-
-	return &meta, nil
-}
-
-// IsDownsampled returns true if the block contains downsampled data.
-func (m *BlockMeta) IsDownsampled() bool {
-	return m.Thanos.Downsample.Resolution > 0
-}
-
-// Resolution returns the block's downsampling resolution.
-func (m *BlockMeta) Resolution() ResolutionLevel {
-	return ResolutionLevel(m.Thanos.Downsample.Resolution)
-}
-
-// ResolutionSuffix returns a suffix string for metric names based on resolution.
-// For example: ":5m" or ":1h" for downsampled data, empty for raw data.
-func (m *BlockMeta) ResolutionSuffix() string {
-	switch m.Resolution() {
-	case Resolution5m:
-		return ":5m"
-	case Resolution1h:
-		return ":1h"
-	default:
-		return ""
-	}
-}

app/vmctl/thanos/block_reader.go

@@ -1,83 +0,0 @@
-package thanos
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/prometheus/prometheus/tsdb"
-	"github.com/prometheus/prometheus/tsdb/chunkenc"
-)
-
-// BlockInfo contains information about a block including Thanos metadata.
-type BlockInfo struct {
-	Block      tsdb.BlockReader
-	Resolution ResolutionLevel
-	IsThanos   bool
-	// Closer releases the block's resources (file descriptors, mmap).
-	// Must be called only after all queriers on this block have been closed.
-	Closer io.Closer
-}
-
-// OpenBlocksWithInfo opens all blocks and returns them with their metadata.
-// snapshotDir must be a snapshot directory containing block directories.
-func OpenBlocksWithInfo(snapshotDir string, aggrType AggrType) ([]BlockInfo, error) {
-	entries, err := os.ReadDir(snapshotDir)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read snapshot directory: %w", err)
-	}
-
-	var blocks []BlockInfo
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			continue
-		}
-
-		blockDir := filepath.Join(snapshotDir, entry.Name())
-		metaPath := filepath.Join(blockDir, "meta.json")
-
-		// Check if this is a valid block directory (has meta.json)
-		if _, err := os.Stat(metaPath); os.IsNotExist(err) {
-			continue
-		}
-
-		meta, err := ReadBlockMeta(blockDir)
-		if err != nil {
-			CloseBlocks(blocks)
-			return nil, fmt.Errorf("failed to read Thanos metadata for block %s: %w", blockDir, err)
-		}
-
-		var pool chunkenc.Pool
-		if meta.IsDownsampled() {
-			// Use AggrChunkPool for downsampled blocks
-			pool = NewAggrChunkPool(aggrType)
-		}
-
-		block, err := tsdb.OpenBlock(nil, blockDir, pool, nil)
-		if err != nil {
-			// Close previously opened blocks before returning error
-			CloseBlocks(blocks)
-			return nil, fmt.Errorf("failed to open block %s: %w", blockDir, err)
-		}
-
-		blocks = append(blocks, BlockInfo{
-			Block:      block,
-			Resolution: meta.Resolution(),
-			IsThanos:   true,
-			Closer:     block,
-		})
-	}
-
-	return blocks, nil
-}
-
-// CloseBlocks closes all blocks in the slice.
-// Must be called only after all queriers on these blocks have been closed.
-func CloseBlocks(blocks []BlockInfo) {
-	for _, bi := range blocks {
-		if bi.Closer != nil {
-			_ = bi.Closer.Close()
-		}
-	}
-}

app/vmctl/thanos/client.go

@@ -1,198 +0,0 @@
-package thanos
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/storage"
-	"github.com/prometheus/prometheus/tsdb"
-)
-
-// Config contains parameters for reading Thanos snapshots.
-type Config struct {
-	Snapshot string
-	Filter   Filter
-}
-
-// Filter contains configuration for filtering the timeseries.
-type Filter struct {
-	TimeMin    string
-	TimeMax    string
-	Label      string
-	LabelValue string
-}
-
-// Client reads Thanos snapshot blocks, including downsampled blocks with AggrChunk encoding.
-type Client struct {
-	snapshotPath string
-	filter       filter
-	statsPrinted bool
-}
-
-type filter struct {
-	min, max   int64
-	label      string
-	labelValue string
-}
-
-func (f filter) inRange(minV, maxV int64) bool {
-	fmin, fmax := f.min, f.max
-	if fmin == 0 {
-		fmin = minV
-	}
-	if fmax == 0 {
-		fmax = maxV
-	}
-	return minV <= fmax && fmin <= maxV
-}
-
-// NewClient creates a new Thanos snapshot client.
-func NewClient(cfg Config) (*Client, error) {
-	minTime, maxTime, err := parseTime(cfg.Filter.TimeMin, cfg.Filter.TimeMax)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse time in filter: %s", err)
-	}
-	return &Client{
-		snapshotPath: cfg.Snapshot,
-		filter: filter{
-			min:        minTime,
-			max:        maxTime,
-			label:      cfg.Filter.Label,
-			labelValue: cfg.Filter.LabelValue,
-		},
-	}, nil
-}
-
-// Explore fetches all available blocks from the snapshot with support for
-// Thanos AggrChunk (downsampled blocks). It opens blocks with a custom pool
-// that can decode AggrChunk encoding (0xff).
-func (c *Client) Explore(aggrType AggrType) ([]BlockInfo, error) {
-	blockInfos, err := OpenBlocksWithInfo(c.snapshotPath, aggrType)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open blocks: %w", err)
-	}
-
-	s := &Stats{
-		Filtered: c.filter.min != 0 || c.filter.max != 0 || c.filter.label != "",
-		Blocks:   len(blockInfos),
-	}
-
-	var blocksToImport []BlockInfo
-	for _, bi := range blockInfos {
-		meta := bi.Block.Meta()
-
-		if s.MinTime == 0 || meta.MinTime < s.MinTime {
-			s.MinTime = meta.MinTime
-		}
-		if s.MaxTime == 0 || meta.MaxTime > s.MaxTime {
-			s.MaxTime = meta.MaxTime
-		}
-
-		if !c.filter.inRange(meta.MinTime, meta.MaxTime) {
-			s.SkippedBlocks++
-			if bi.Closer != nil {
-				_ = bi.Closer.Close()
-			}
-			continue
-		}
-
-		s.Samples += meta.Stats.NumSamples
-		s.Series += meta.Stats.NumSeries
-		blocksToImport = append(blocksToImport, bi)
-	}
-	if !c.statsPrinted {
-		fmt.Println(s)
-		c.statsPrinted = true
-	}
-	return blocksToImport, nil
-}
-
-// querierSeriesSet wraps a SeriesSet and its underlying Querier, ensuring
-// the querier is closed once the SeriesSet has been fully consumed.
-// This releases the querier's read reference on the block, which is required
-// for Block.Close() to complete without hanging.
-type querierSeriesSet struct {
-	storage.SeriesSet
-	q      storage.Querier
-	closed bool
-}
-
-// Next advances the iterator. When the underlying SeriesSet is exhausted,
-// it closes the querier to release resources.
-func (s *querierSeriesSet) Next() bool {
-	if s.SeriesSet.Next() {
-		return true
-	}
-	if !s.closed {
-		_ = s.q.Close()
-		s.closed = true
-	}
-	return false
-}
-
-// Close explicitly closes the underlying querier.
-// This must be called if iteration is stopped early (before Next returns false)
-// to release block read references and prevent Block.Close() from hanging.
-func (s *querierSeriesSet) Close() {
-	if !s.closed {
-		_ = s.q.Close()
-		s.closed = true
-	}
-}
-
-// ClosableSeriesSet extends storage.SeriesSet with a Close method for explicit cleanup.
-type ClosableSeriesSet interface {
-	storage.SeriesSet
-	Close()
-}
-
-// Read reads the given BlockInfo according to configured time and label filters.
-// The returned ClosableSeriesSet automatically closes the underlying querier when fully consumed,
-// but Close() should be called explicitly (e.g., via defer) to handle early returns.
-func (c *Client) Read(bi BlockInfo) (ClosableSeriesSet, error) {
-	minTime, maxTime := bi.Block.Meta().MinTime, bi.Block.Meta().MaxTime
-	if c.filter.min != 0 {
-		minTime = c.filter.min
-	}
-	if c.filter.max != 0 {
-		maxTime = c.filter.max
-	}
-	q, err := tsdb.NewBlockQuerier(bi.Block, minTime, maxTime)
-	if err != nil {
-		return nil, err
-	}
-	ss := q.Select(
-		context.Background(),
-		false,
-		nil,
-		labels.MustNewMatcher(labels.MatchRegexp, c.filter.label, c.filter.labelValue),
-	)
-	return &querierSeriesSet{
-		SeriesSet: ss,
-		q:         q,
-	}, nil
-}
-
-func parseTime(start, end string) (int64, int64, error) {
-	var s, e int64
-	if start == "" && end == "" {
-		return 0, 0, nil
-	}
-	if start != "" {
-		v, err := time.Parse(time.RFC3339, start)
-		if err != nil {
-			return 0, 0, fmt.Errorf("failed to parse %q: %s", start, err)
-		}
-		s = v.UnixNano() / int64(time.Millisecond)
-	}
-	if end != "" {
-		v, err := time.Parse(time.RFC3339, end)
-		if err != nil {
-			return 0, 0, fmt.Errorf("failed to parse %q: %s", end, err)
-		}
-		e = v.UnixNano() / int64(time.Millisecond)
-	}
-	return s, e, nil
-}

app/vmctl/thanos/stats.go

@@ -1,38 +0,0 @@
-package thanos
-
-import (
-	"fmt"
-	"time"
-)
-
-// Stats represents data migration stats for Thanos blocks.
-type Stats struct {
-	Filtered      bool
-	MinTime       int64
-	MaxTime       int64
-	Samples       uint64
-	Series        uint64
-	Blocks        int
-	SkippedBlocks int
-}
-
-// String returns string representation for s.
-func (s Stats) String() string {
-	str := fmt.Sprintf("Thanos snapshot stats:\n"+
-		"  blocks found: %d;\n"+
-		"  blocks skipped by time filter: %d;\n"+
-		"  min time: %d (%v);\n"+
-		"  max time: %d (%v);\n"+
-		"  samples: %d;\n"+
-		"  series: %d.",
-		s.Blocks, s.SkippedBlocks,
-		s.MinTime, time.Unix(s.MinTime/1e3, 0).Format(time.RFC3339),
-		s.MaxTime, time.Unix(s.MaxTime/1e3, 0).Format(time.RFC3339),
-		s.Samples, s.Series)
-
-	if s.Filtered {
-		str += "\n* Stats numbers are based on blocks meta info and don't account for applied filters."
-	}
-
-	return str
-}

app/vmctl/thanos_processor.go

@@ -1,309 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"strings"
-	"sync"
-
-	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/tsdb/chunkenc"
-
-	"github.com/VictoriaMetrics/metrics"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
-	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/thanos"
-	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
-)
-
-type thanosProcessor struct {
-	cl *thanos.Client
-	im *vm.Importer
-	cc int
-
-	isVerbose bool
-	aggrTypes []thanos.AggrType
-}
-
-func (tp *thanosProcessor) run(ctx context.Context) error {
-	if len(tp.aggrTypes) == 0 {
-		tp.aggrTypes = thanos.AllAggrTypes
-	}
-
-	log.Printf("Processing blocks with aggregate types: %v", tp.aggrTypes)
-
-	// Use the first aggregate type to explore blocks (block list is the same for all types)
-	blocks, err := tp.cl.Explore(tp.aggrTypes[0])
-	if err != nil {
-		return fmt.Errorf("explore failed: %s", err)
-	}
-	if len(blocks) < 1 {
-		return fmt.Errorf("found no blocks to import")
-	}
-
-	// Separate blocks into raw (resolution=0) and downsampled (resolution>0)
-	var rawBlocks, downsampledBlocks []thanos.BlockInfo
-	for _, block := range blocks {
-		if block.Resolution == thanos.ResolutionRaw {
-			rawBlocks = append(rawBlocks, block)
-		} else {
-			downsampledBlocks = append(downsampledBlocks, block)
-		}
-	}
-
-	log.Printf("Found %d raw blocks and %d downsampled blocks", len(rawBlocks), len(downsampledBlocks))
-
-	question := fmt.Sprintf("Found %d blocks to import (%d raw + %d downsampled with %d aggregate types). Continue?",
-		len(blocks), len(rawBlocks), len(downsampledBlocks), len(tp.aggrTypes))
-	if !prompt(ctx, question) {
-		return nil
-	}
-
-	// Calculate total number of block processing passes for the progress bar:
-	// raw blocks are processed once, downsampled blocks are processed once per aggregate type.
-	totalPasses := len(rawBlocks) + len(downsampledBlocks)*len(tp.aggrTypes)
-	thanosBlocksTotal.Add(totalPasses)
-	bar := barpool.AddWithTemplate(fmt.Sprintf(barTpl, "Processing blocks"), totalPasses)
-	if err := barpool.Start(); err != nil {
-		return err
-	}
-	defer barpool.Stop()
-
-	tp.im.ResetStats()
-
-	type phaseStats struct {
-		name    string
-		series  uint64
-		samples uint64
-	}
-	var phases []phaseStats
-
-	// Process raw blocks first (no aggregate suffix)
-	if len(rawBlocks) > 0 {
-		log.Println("Processing raw blocks (resolution=0)...")
-		stats, err := tp.processBlocks(rawBlocks, thanos.AggrTypeNone, bar)
-		if err != nil {
-			return fmt.Errorf("migration failed for raw blocks: %s", err)
-		}
-		phases = append(phases, phaseStats{
-			name:    "raw",
-			series:  stats.series,
-			samples: stats.samples,
-		})
-	}
-
-	// Close blocks from the initial Explore. The querierSeriesSet wrapper
-	// has already released all querier read references, so Close won't hang.
-	thanos.CloseBlocks(blocks)
-
-	// Process downsampled blocks for each aggregate type.
-	// Each type needs its own AggrChunkPool, so we reopen blocks per type.
-	for _, aggrType := range tp.aggrTypes {
-		if len(downsampledBlocks) < 1 {
-			break
-		}
-
-		log.Printf("Processing downsampled blocks with aggregate type: %s", aggrType)
-
-		aggrBlocks, err := tp.cl.Explore(aggrType)
-		if err != nil {
-			return fmt.Errorf("explore failed for aggr type %s: %s", aggrType, err)
-		}
-
-		var downsampledOnly []thanos.BlockInfo
-		for _, block := range aggrBlocks {
-			if block.Resolution != thanos.ResolutionRaw {
-				downsampledOnly = append(downsampledOnly, block)
-			}
-		}
-
-		if len(downsampledOnly) < 1 {
-			log.Printf("No downsampled blocks found for aggregate type %s, skipping", aggrType)
-			thanos.CloseBlocks(aggrBlocks)
-			continue
-		}
-
-		log.Printf("Processing %d blocks for aggregate type: %s", len(downsampledOnly), aggrType)
-		stats, err := tp.processBlocks(downsampledOnly, aggrType, bar)
-		thanos.CloseBlocks(aggrBlocks)
-		if err != nil {
-			return fmt.Errorf("migration failed for aggr type %s: %s", aggrType, err)
-		}
-		phases = append(phases, phaseStats{
-			name:    aggrType.String(),
-			series:  stats.series,
-			samples: stats.samples,
-		})
-	}
-
-	// Print per-phase and total statistics
-	var totalSeries, totalSamples uint64
-	log.Printf("Migration statistics (%d raw blocks, %d downsampled blocks):", len(rawBlocks), len(downsampledBlocks))
-	for _, p := range phases {
-		log.Printf("  %s: %d series, %d samples", p.name, p.series, p.samples)
-		totalSeries += p.series
-		totalSamples += p.samples
-	}
-	log.Printf("  total: %d series, %d samples", totalSeries, totalSamples)
-
-	// Wait for all buffers to flush
-	tp.im.Close()
-	// Drain import errors channel
-	for vmErr := range tp.im.Errors() {
-		if vmErr.Err != nil {
-			thanosErrorsTotal.Inc()
-			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, tp.isVerbose))
-		}
-	}
-
-	log.Println("Import finished!")
-	log.Println(tp.im.Stats())
-	return nil
-}
-
-// processBlocksStats holds statistics collected during block processing.
-type processBlocksStats struct {
-	blocks  uint64
-	series  uint64
-	samples uint64
-}
-
-func (tp *thanosProcessor) processBlocks(blocks []thanos.BlockInfo, aggrType thanos.AggrType, bar barpool.Bar) (processBlocksStats, error) {
-	blockReadersCh := make(chan thanos.BlockInfo)
-	errCh := make(chan error, tp.cc)
-
-	var processedBlocks, totalSeries, totalSamples uint64
-	var mu sync.Mutex
-
-	var wg sync.WaitGroup
-	for i := range tp.cc {
-		workerID := i
-		wg.Go(func() {
-			for bi := range blockReadersCh {
-				seriesCount, samplesCount, err := tp.do(bi, aggrType)
-				if err != nil {
-					thanosErrorsTotal.Inc()
-					errCh <- fmt.Errorf("read failed for block %q with aggr %s: %s", bi.Block.Meta().ULID, aggrType, err)
-					return
-				}
-
-				mu.Lock()
-				processedBlocks++
-				totalSeries += seriesCount
-				totalSamples += samplesCount
-				log.Printf("[Worker %d] Block %s: %d series, %d samples | Total: %d/%d blocks, %d series, %d samples",
-					workerID, bi.Block.Meta().ULID.String()[:8], seriesCount, samplesCount,
-					processedBlocks, len(blocks), totalSeries, totalSamples)
-				mu.Unlock()
-
-				thanosBlocksProcessed.Inc()
-				bar.Increment()
-			}
-		})
-	}
-
-	// any error breaks the import
-	for _, bi := range blocks {
-		select {
-		case thanosErr := <-errCh:
-			close(blockReadersCh)
-			wg.Wait()
-			return processBlocksStats{}, fmt.Errorf("thanos error: %s", thanosErr)
-		case vmErr := <-tp.im.Errors():
-			close(blockReadersCh)
-			wg.Wait()
-			thanosErrorsTotal.Inc()
-			return processBlocksStats{}, fmt.Errorf("import process failed: %s", wrapErr(vmErr, tp.isVerbose))
-		case blockReadersCh <- bi:
-		}
-	}
-
-	close(blockReadersCh)
-	wg.Wait()
-	close(errCh)
-	for err := range errCh {
-		return processBlocksStats{}, fmt.Errorf("import process failed: %s", err)
-	}
-
-	return processBlocksStats{
-		blocks:  processedBlocks,
-		series:  totalSeries,
-		samples: totalSamples,
-	}, nil
-}
-
-func (tp *thanosProcessor) do(bi thanos.BlockInfo, aggrType thanos.AggrType) (uint64, uint64, error) {
-	ss, err := tp.cl.Read(bi)
-	if err != nil {
-		return 0, 0, fmt.Errorf("failed to read block: %s", err)
-	}
-	defer ss.Close() // Ensure querier is closed even on early returns
-
-	var it chunkenc.Iterator
-	var seriesCount, samplesCount uint64
-
-	for ss.Next() {
-		var name string
-		var labelPairs []vm.LabelPair
-		series := ss.At()
-
-		series.Labels().Range(func(label labels.Label) {
-			if label.Name == "__name__" {
-				name = label.Value
-				return
-			}
-			labelPairs = append(labelPairs, vm.LabelPair{
-				Name:  strings.Clone(label.Name),
-				Value: strings.Clone(label.Value),
-			})
-		})
-		if name == "" {
-			return seriesCount, samplesCount, fmt.Errorf("failed to find `__name__` label in labelset for block %v", bi.Block.Meta().ULID)
-		}
-
-		// Add resolution and aggregate type suffix to metric name for downsampled blocks
-		if bi.Resolution != thanos.ResolutionRaw && aggrType != thanos.AggrTypeNone {
-			name = fmt.Sprintf("%s:%s:%s", name, bi.Resolution.String(), aggrType.String())
-		}
-
-		var timestamps []int64
-		var values []float64
-		it = series.Iterator(it)
-		for {
-			typ := it.Next()
-			if typ == chunkenc.ValNone {
-				break
-			}
-			if typ != chunkenc.ValFloat {
-				continue
-			}
-			t, v := it.At()
-			timestamps = append(timestamps, t)
-			values = append(values, v)
-		}
-		if err := it.Err(); err != nil {
-			return seriesCount, samplesCount, err
-		}
-
-		samplesCount += uint64(len(timestamps))
-		seriesCount++
-
-		ts := vm.TimeSeries{
-			Name:       name,
-			LabelPairs: labelPairs,
-			Timestamps: timestamps,
-			Values:     values,
-		}
-		if err := tp.im.Input(&ts); err != nil {
-			return seriesCount, samplesCount, err
-		}
-	}
-	return seriesCount, samplesCount, ss.Err()
-}
-
-var (
-	thanosBlocksTotal     = metrics.NewCounter(`vmctl_thanos_migration_blocks_total`)
-	thanosBlocksProcessed = metrics.NewCounter(`vmctl_thanos_migration_blocks_processed`)
-	thanosErrorsTotal     = metrics.NewCounter(`vmctl_thanos_migration_errors_total`)
-)

app/vmselect/netstorage/netstorage.go

@@ -22,7 +22,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricnamestats"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricsmetadata"
 )
 
@@ -1363,7 +1362,7 @@ func applyGraphiteRegexpFilter(filter string, ss []string) ([]string, error) {
 const maxFastAllocBlockSize = 32 * 1024
 
 // GetMetricNamesStats returns statistic for timeseries metric names usage.
-func GetMetricNamesStats(qt *querytracer.Tracer, limit, le int, matchPattern string) (metricnamestats.StatsResult, error) {
+func GetMetricNamesStats(qt *querytracer.Tracer, limit, le int, matchPattern string) (storage.MetricNamesStatsResponse, error) {
 	qt = qt.NewChild("get metric names usage statistics with limit: %d, less or equal to: %d, match pattern=%q", limit, le, matchPattern)
 	defer qt.Done()
 	return vmstorage.GetMetricNamesStats(qt, limit, le, matchPattern)

app/vmselect/prometheus/export.qtpl

@@ -11,16 +11,6 @@
 
 {% stripspace %}
 
-{% func ExportCSVHeader(fieldNames []string) %}
-	{% if len(fieldNames) == 0 %}{% return %}{% endif %}
-	{%s= fieldNames[0] %}
-	{% for _, fieldName := range fieldNames[1:] %}
-		,
-		{%s= fieldName %}
-	{% endfor %}
-	{% newline %}
-{% endfunc %}
-
 {% func ExportCSVLine(xb *exportBlock, fieldNames []string) %}
 	{% if len(xb.timestamps) == 0 || len(fieldNames) == 0 %}{% return %}{% endif %}
 	{% for i, timestamp := range xb.timestamps %}

app/vmselect/prometheus/export_test.go

@@ -1,132 +0,0 @@
-package prometheus
-
-import (
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
-)
-
-func TestExportCSVHeader(t *testing.T) {
-	f := func(fieldNames []string, expected string) {
-		t.Helper()
-		got := ExportCSVHeader(fieldNames)
-		if got != expected {
-			t.Fatalf("ExportCSVHeader(%v): got %q; want %q", fieldNames, got, expected)
-		}
-	}
-
-	f(nil, "")
-	f([]string{}, "")
-
-	f([]string{"__value__"}, "__value__\n")
-	f([]string{"__timestamp__"}, "__timestamp__\n")
-	f([]string{"__timestamp__:rfc3339"}, "__timestamp__:rfc3339\n")
-	f([]string{"__name__"}, "__name__\n")
-	f([]string{"job"}, "job\n")
-
-	f([]string{"__timestamp__:rfc3339", "__value__"}, "__timestamp__:rfc3339,__value__\n")
-	f([]string{"__value__", "__timestamp__"}, "__value__,__timestamp__\n")
-	f([]string{"job", "instance"}, "job,instance\n")
-
-	f([]string{"__name__", "__value__", "__timestamp__:unix_s"}, "__name__,__value__,__timestamp__:unix_s\n")
-	f([]string{"job", "instance", "__value__", "__timestamp__:unix_ms"}, "job,instance,__value__,__timestamp__:unix_ms\n")
-	f([]string{"__timestamp__:custom:2006-01-02", "__value__", "host", "dc", "env"},
-		"__timestamp__:custom:2006-01-02,__value__,host,dc,env\n")
-
-	// duplicate fields
-	f([]string{"__value__", "__value__"}, "__value__,__value__\n")
-	f([]string{"__timestamp__", "__timestamp__:rfc3339"}, "__timestamp__,__timestamp__:rfc3339\n")
-}
-
-func TestExportCSVLine(t *testing.T) {
-	localBak := time.Local
-	time.Local = time.UTC
-	defer func() { time.Local = localBak }()
-
-	f := func(mn *storage.MetricName, timestamps []int64, values []float64, fieldNames []string, expected string) {
-		t.Helper()
-		xb := &exportBlock{
-			mn:         mn,
-			timestamps: timestamps,
-			values:     values,
-		}
-		got := ExportCSVLine(xb, fieldNames)
-		if got != expected {
-			t.Fatalf("ExportCSVLine: got %q; want %q", got, expected)
-		}
-	}
-
-	mn := &storage.MetricName{
-		MetricGroup: []byte("cpu_usage"),
-		Tags: []storage.Tag{
-			{Key: []byte("job"), Value: []byte("node")},
-			{Key: []byte("instance"), Value: []byte("localhost:9090")},
-		},
-	}
-
-	// empty inputs
-	f(mn, nil, nil, []string{"__value__"}, "")
-	f(mn, []int64{}, []float64{}, []string{"__value__"}, "")
-	f(mn, []int64{1000}, []float64{1.5}, nil, "")
-	f(mn, []int64{1000}, []float64{1.5}, []string{}, "")
-
-	f(mn, []int64{1000}, []float64{42.5}, []string{"__value__"}, "42.5\n")
-	f(mn, []int64{1704067200000}, []float64{1}, []string{"__timestamp__"}, "1704067200000\n")
-	f(mn, []int64{1704067200000}, []float64{1}, []string{"__timestamp__:unix_s"}, "1704067200\n")
-	f(mn, []int64{1704067200000}, []float64{1}, []string{"__timestamp__:unix_ms"}, "1704067200000\n")
-	f(mn, []int64{1704067200000}, []float64{1}, []string{"__timestamp__:unix_ns"}, "1704067200000000000\n")
-	f(mn, []int64{1704067200000}, []float64{1}, []string{"__timestamp__:rfc3339"}, "2024-01-01T00:00:00Z\n")
-
-	f(mn, []int64{1000}, []float64{1}, []string{"__name__"}, "cpu_usage\n")
-	f(mn, []int64{1000}, []float64{1}, []string{"job"}, "node\n")
-	f(mn, []int64{1000}, []float64{1}, []string{"instance"}, "localhost:9090\n")
-	f(mn, []int64{1000}, []float64{1}, []string{"missing_label"}, "\n")
-
-	// multiple fields
-	f(mn, []int64{1704067200000}, []float64{99.9},
-		[]string{"__timestamp__:unix_s", "__value__", "job"},
-		"1704067200,99.9,node\n")
-
-	// multiple rows
-	f(mn, []int64{1000, 2000}, []float64{1.1, 2.2},
-		[]string{"__value__", "__timestamp__"},
-		"1.1,1000\n2.2,2000\n")
-	f(mn, []int64{1000, 2000, 3000}, []float64{10, 20, 30},
-		[]string{"__timestamp__:unix_s", "__value__"},
-		"1,10\n2,20\n3,30\n")
-
-	// escaping for special characters in tag values
-	f(&storage.MetricName{
-		MetricGroup: []byte("m"),
-		Tags:        []storage.Tag{{Key: []byte("desc"), Value: []byte("a,b")}},
-	}, []int64{1000}, []float64{1}, []string{"desc"}, "\"a,b\"\n")
-
-	f(&storage.MetricName{
-		MetricGroup: []byte("m"),
-		Tags:        []storage.Tag{{Key: []byte("desc"), Value: []byte(`say "hello"`)}},
-	}, []int64{1000}, []float64{1}, []string{"desc"}, "\"say \\\"hello\\\"\"\n")
-
-	f(&storage.MetricName{
-		MetricGroup: []byte("m"),
-		Tags:        []storage.Tag{{Key: []byte("desc"), Value: []byte("line1\nline2")}},
-	}, []int64{1000}, []float64{1}, []string{"desc"}, "\"line1\\nline2\"\n")
-
-	// header and data line field counts must match
-	fieldNames := []string{"__name__", "job", "instance", "__value__", "__timestamp__:unix_s"}
-	header := ExportCSVHeader(fieldNames)
-	line := ExportCSVLine(&exportBlock{
-		mn:         mn,
-		timestamps: []int64{1704067200000},
-		values:     []float64{99.9},
-	}, fieldNames)
-	headerCommas := strings.Count(header, ",")
-	lineCommas := strings.Count(line, ",")
-	if headerCommas != lineCommas {
-		t.Fatalf("header has %d commas, data line has %d commas", headerCommas, lineCommas)
-	}
-	if headerCommas != len(fieldNames)-1 {
-		t.Fatalf("expected %d commas in header, got %d", len(fieldNames)-1, headerCommas)
-	}
-}

app/vmselect/prometheus/prometheus.go

@@ -175,7 +175,6 @@ func ExportCSVHandler(startTime time.Time, w http.ResponseWriter, r *http.Reques
 	w.Header().Set("Content-Type", "text/csv; charset=utf-8")
 	bw := bufferedwriter.Get(w)
 	defer bufferedwriter.Put(bw)
-	WriteExportCSVHeader(bw, fieldNames)
 	sw := newScalableWriter(bw)
 	writeCSVLine := func(xb *exportBlock, workerID uint) error {
 		if len(xb.timestamps) == 0 {

app/vmselect/prometheus/tsdb_status_response.qtpl

@@ -1,7 +1,6 @@
 {% import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricnamestats"
 ) %}
 
 {% stripspace %}
@@ -35,9 +34,9 @@ TSDBStatusResponse generates response for /api/v1/status/tsdb .
 ]
 {% endfunc %}
 
-{% func tsdbStatusMetricNameEntries(a []storage.TopHeapEntry, queryStats []metricnamestats.StatRecord) %}
+{% func tsdbStatusMetricNameEntries(a []storage.TopHeapEntry, queryStats []storage.MetricNamesStatsRecord) %}
 {% code
-  queryStatsByMetricName := make(map[string]metricnamestats.StatRecord,len(queryStats))
+  queryStatsByMetricName := make(map[string]storage.MetricNamesStatsRecord,len(queryStats))
   for _, record := range queryStats{
       queryStatsByMetricName[record.MetricName] = record
     }

app/vmselect/prometheus/tsdb_status_response.qtpl.go

@@ -8,229 +8,228 @@ package prometheus
 import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricnamestats"
 )
 
 // TSDBStatusResponse generates response for /api/v1/status/tsdb .
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:9
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:8
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:9
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:8
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:9
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:8
 func StreamTSDBStatusResponse(qw422016 *qt422016.Writer, status *storage.TSDBStatus, qt *querytracer.Tracer) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:9
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:8
 	qw422016.N().S(`{"status":"success","data":{"totalSeries":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:13
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:12
 	qw422016.N().DUL(status.TotalSeries)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:13
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:12
 	qw422016.N().S(`,"totalLabelValuePairs":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:14
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:13
 	qw422016.N().DUL(status.TotalLabelValuePairs)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:14
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:13
 	qw422016.N().S(`,"seriesCountByMetricName":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:15
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:14
 	streamtsdbStatusMetricNameEntries(qw422016, status.SeriesCountByMetricName, status.SeriesQueryStatsByMetricName)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:15
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:14
 	qw422016.N().S(`,"seriesCountByLabelName":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:16
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:15
 	streamtsdbStatusEntries(qw422016, status.SeriesCountByLabelName)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:16
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:15
 	qw422016.N().S(`,"seriesCountByFocusLabelValue":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:17
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:16
 	streamtsdbStatusEntries(qw422016, status.SeriesCountByFocusLabelValue)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:17
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:16
 	qw422016.N().S(`,"seriesCountByLabelValuePair":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:18
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:17
 	streamtsdbStatusEntries(qw422016, status.SeriesCountByLabelValuePair)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:18
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:17
 	qw422016.N().S(`,"labelValueCountByLabelName":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:19
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:18
 	streamtsdbStatusEntries(qw422016, status.LabelValueCountByLabelName)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:19
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:18
 	qw422016.N().S(`}`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:21
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:20
 	qt.Done()
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:22
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:21
 	streamdumpQueryTrace(qw422016, qt)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:22
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:21
 	qw422016.N().S(`}`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 func WriteTSDBStatusResponse(qq422016 qtio422016.Writer, status *storage.TSDBStatus, qt *querytracer.Tracer) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	StreamTSDBStatusResponse(qw422016, status, qt)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	qt422016.ReleaseWriter(qw422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 func TSDBStatusResponse(status *storage.TSDBStatus, qt *querytracer.Tracer) string {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	qb422016 := qt422016.AcquireByteBuffer()
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	WriteTSDBStatusResponse(qb422016, status, qt)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	qs422016 := string(qb422016.B)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	qt422016.ReleaseByteBuffer(qb422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 	return qs422016
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:24
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:23
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:26
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:25
 func streamtsdbStatusEntries(qw422016 *qt422016.Writer, a []storage.TopHeapEntry) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:26
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:25
 	qw422016.N().S(`[`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:28
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:27
 	for i, e := range a {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:28
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:27
 		qw422016.N().S(`{"name":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:30
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:29
 		qw422016.N().Q(e.Name)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:30
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:29
 		qw422016.N().S(`,"value":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:31
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:30
 		qw422016.N().D(int(e.Count))
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:31
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:30
 		qw422016.N().S(`}`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:33
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:32
 		if i+1 < len(a) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:33
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:32
 			qw422016.N().S(`,`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:33
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:32
 		}
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:34
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:33
 	}
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:34
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:33
 	qw422016.N().S(`]`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 func writetsdbStatusEntries(qq422016 qtio422016.Writer, a []storage.TopHeapEntry) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	streamtsdbStatusEntries(qw422016, a)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	qt422016.ReleaseWriter(qw422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 func tsdbStatusEntries(a []storage.TopHeapEntry) string {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	qb422016 := qt422016.AcquireByteBuffer()
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	writetsdbStatusEntries(qb422016, a)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	qs422016 := string(qb422016.B)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	qt422016.ReleaseByteBuffer(qb422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 	return qs422016
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:36
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:35
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:38
-func streamtsdbStatusMetricNameEntries(qw422016 *qt422016.Writer, a []storage.TopHeapEntry, queryStats []metricnamestats.StatRecord) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:40
-	queryStatsByMetricName := make(map[string]metricnamestats.StatRecord, len(queryStats))
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:37
+func streamtsdbStatusMetricNameEntries(qw422016 *qt422016.Writer, a []storage.TopHeapEntry, queryStats []storage.MetricNamesStatsRecord) {
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:39
+	queryStatsByMetricName := make(map[string]storage.MetricNamesStatsRecord, len(queryStats))
 	for _, record := range queryStats {
 		queryStatsByMetricName[record.MetricName] = record
 	}
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:44
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:43
 	qw422016.N().S(`[`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:46
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:45
 	for i, e := range a {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:46
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:45
 		qw422016.N().S(`{`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:49
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:48
 		entry, ok := queryStatsByMetricName[e.Name]
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:50
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:49
 		qw422016.N().S(`"name":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:51
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:50
 		qw422016.N().Q(e.Name)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:51
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:50
 		qw422016.N().S(`,`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:52
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:51
 		if !ok {
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:51
+			qw422016.N().S(`"value":`)
 //line app/vmselect/prometheus/tsdb_status_response.qtpl:52
-			qw422016.N().S(`"value":`)
+			qw422016.N().D(int(e.Count))
 //line app/vmselect/prometheus/tsdb_status_response.qtpl:53
-			qw422016.N().D(int(e.Count))
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:54
 		} else {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:54
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:53
 			qw422016.N().S(`"value":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:55
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:54
 			qw422016.N().D(int(e.Count))
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:55
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:54
 			qw422016.N().S(`,"requestsCount":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:56
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:55
 			qw422016.N().D(int(entry.RequestsCount))
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:56
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:55
 			qw422016.N().S(`,"lastRequestTimestamp":`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:57
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:56
 			qw422016.N().D(int(entry.LastRequestTs))
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:58
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:57
 		}
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:58
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:57
 		qw422016.N().S(`}`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:60
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:59
 		if i+1 < len(a) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:60
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:59
 			qw422016.N().S(`,`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:60
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:59
 		}
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:61
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:60
 	}
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:61
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:60
 	qw422016.N().S(`]`)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
-func writetsdbStatusMetricNameEntries(qq422016 qtio422016.Writer, a []storage.TopHeapEntry, queryStats []metricnamestats.StatRecord) {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
+func writetsdbStatusMetricNameEntries(qq422016 qtio422016.Writer, a []storage.TopHeapEntry, queryStats []storage.MetricNamesStatsRecord) {
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	streamtsdbStatusMetricNameEntries(qw422016, a, queryStats)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	qt422016.ReleaseWriter(qw422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 }
 
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
-func tsdbStatusMetricNameEntries(a []storage.TopHeapEntry, queryStats []metricnamestats.StatRecord) string {
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
+func tsdbStatusMetricNameEntries(a []storage.TopHeapEntry, queryStats []storage.MetricNamesStatsRecord) string {
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	qb422016 := qt422016.AcquireByteBuffer()
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	writetsdbStatusMetricNameEntries(qb422016, a, queryStats)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	qs422016 := string(qb422016.B)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	qt422016.ReleaseByteBuffer(qb422016)
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 	return qs422016
-//line app/vmselect/prometheus/tsdb_status_response.qtpl:63
+//line app/vmselect/prometheus/tsdb_status_response.qtpl:62
 }

app/vmselect/stats/metric_names_usage_response.qtpl

@@ -1,11 +1,11 @@
 {% import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricnamestats"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 ) %}
 
 {% stripspace %}
 MetricNamesStatsResponse generates response for /api/v1/status/metric_names_stats .
-{% func MetricNamesStatsResponse(stats *metricnamestats.StatsResult, qt *querytracer.Tracer) %}
+{% func MetricNamesStatsResponse(stats *storage.MetricNamesStatsResponse, qt *querytracer.Tracer) %}
 {
 	"status":"success",
   "statsCollectedSince": {%dul= stats.CollectedSinceTs %},

app/vmselect/stats/metric_names_usage_response.qtpl.go

@@ -7,7 +7,7 @@ package stats
 //line app/vmselect/stats/metric_names_usage_response.qtpl:1
 import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricnamestats"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 )
 
 // MetricNamesStatsResponse generates response for /api/v1/status/metric_names_stats .
@@ -26,7 +26,7 @@ var (
 )
 
 //line app/vmselect/stats/metric_names_usage_response.qtpl:8
-func StreamMetricNamesStatsResponse(qw422016 *qt422016.Writer, stats *metricnamestats.StatsResult, qt *querytracer.Tracer) {
+func StreamMetricNamesStatsResponse(qw422016 *qt422016.Writer, stats *storage.MetricNamesStatsResponse, qt *querytracer.Tracer) {
 //line app/vmselect/stats/metric_names_usage_response.qtpl:8
 	qw422016.N().S(`{"status":"success","statsCollectedSince":`)
 //line app/vmselect/stats/metric_names_usage_response.qtpl:11
@@ -91,7 +91,7 @@ func StreamMetricNamesStatsResponse(qw422016 *qt422016.Writer, stats *metricname
 }
 
 //line app/vmselect/stats/metric_names_usage_response.qtpl:31
-func WriteMetricNamesStatsResponse(qq422016 qtio422016.Writer, stats *metricnamestats.StatsResult, qt *querytracer.Tracer) {
+func WriteMetricNamesStatsResponse(qq422016 qtio422016.Writer, stats *storage.MetricNamesStatsResponse, qt *querytracer.Tracer) {
 //line app/vmselect/stats/metric_names_usage_response.qtpl:31
 	qw422016 := qt422016.AcquireWriter(qq422016)
 //line app/vmselect/stats/metric_names_usage_response.qtpl:31
@@ -102,7 +102,7 @@ func WriteMetricNamesStatsResponse(qq422016 qtio422016.Writer, stats *metricname
 }
 
 //line app/vmselect/stats/metric_names_usage_response.qtpl:31
-func MetricNamesStatsResponse(stats *metricnamestats.StatsResult, qt *querytracer.Tracer) string {
+func MetricNamesStatsResponse(stats *storage.MetricNamesStatsResponse, qt *querytracer.Tracer) string {
 //line app/vmselect/stats/metric_names_usage_response.qtpl:31
 	qb422016 := qt422016.AcquireByteBuffer()
 //line app/vmselect/stats/metric_names_usage_response.qtpl:31

app/vmselect/vmui/index.html

@@ -37,9 +37,9 @@
   <meta property="og:title" content="UI for VictoriaMetrics">
   <meta property="og:url" content="https://victoriametrics.com/">
   <meta property="og:description" content="Explore and troubleshoot your VictoriaMetrics data">
-  <script type="module" crossorigin src="./assets/index-C24BPpD_.js"></script>
+  <script type="module" crossorigin src="./assets/index-KEOgEEMl.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-COnpUsM8.js">
-  <link rel="modulepreload" crossorigin href="./assets/vendor-BWBgVCcr.js">
+  <link rel="modulepreload" crossorigin href="./assets/vendor-Mr0bmX1E.js">
   <link rel="stylesheet" crossorigin href="./assets/vendor-CnsZ1jie.css">
   <link rel="stylesheet" crossorigin href="./assets/index-D2OEy8Ra.css">
 </head>

app/vmstorage/main.go

@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"math"
 	"net/http"
 	"strconv"
 	"strings"
@@ -23,7 +22,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/mergeset"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricnamestats"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/metricsmetadata"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/stringsutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/syncwg"
@@ -57,13 +55,11 @@ var (
 	denyQueriesOutsideRetention = flag.Bool("denyQueriesOutsideRetention", false, "Whether to deny queries outside the configured -retentionPeriod. "+
 		"When set, then /api/v1/query_range would return '503 Service Unavailable' error for queries with 'from' value outside -retentionPeriod. "+
 		"This may be useful when multiple data sources with distinct retentions are hidden behind query-tee")
-	maxHourlySeries = flag.Int64("storage.maxHourlySeries", 0, "The maximum number of unique series can be added to the storage during the last hour. "+
+	maxHourlySeries = flag.Int("storage.maxHourlySeries", 0, "The maximum number of unique series can be added to the storage during the last hour. "+
 		"Excess series are logged and dropped. This can be useful for limiting series cardinality. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#cardinality-limiter . "+
-		fmt.Sprintf("Setting this flag to '-1' sets limit to maximum possible value (%d) which is useful in order to enable series tracking without enforcing limits. ", math.MaxInt32)+
 		"See also -storage.maxDailySeries")
-	maxDailySeries = flag.Int64("storage.maxDailySeries", 0, "The maximum number of unique series can be added to the storage during the last 24 hours. "+
+	maxDailySeries = flag.Int("storage.maxDailySeries", 0, "The maximum number of unique series can be added to the storage during the last 24 hours. "+
 		"Excess series are logged and dropped. This can be useful for limiting series churn rate. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#cardinality-limiter . "+
-		fmt.Sprintf("Setting this flag to '-1' sets limit to maximum possible value (%d) which is useful in order to enable series tracking without enforcing limits. ", math.MaxInt32)+
 		"See also -storage.maxHourlySeries")
 
 	minFreeDiskSpaceBytes = flagutil.NewBytes("storage.minFreeDiskSpaceBytes", 100e6, "The minimum free disk space at -storageDataPath after which the storage stops accepting new data")
@@ -145,8 +141,8 @@ func Init(resetCacheIfNeeded func(mrs []storage.MetricRow)) {
 	WG = syncwg.WaitGroup{}
 	opts := storage.OpenOptions{
 		Retention:             retentionPeriod.Duration(),
-		MaxHourlySeries:       getMaxHourlySeries(),
-		MaxDailySeries:        getMaxDailySeries(),
+		MaxHourlySeries:       *maxHourlySeries,
+		MaxDailySeries:        *maxDailySeries,
 		DisablePerDayIndex:    *disablePerDayIndex,
 		TrackMetricNamesStats: *trackMetricNamesStats,
 		IDBPrefillStart:       *idbPrefillStart,
@@ -237,7 +233,7 @@ func DeleteSeries(qt *querytracer.Tracer, tfss []*storage.TagFilters, maxMetrics
 }
 
 // GetMetricNamesStats returns metric names usage stats with give limit and lte predicate
-func GetMetricNamesStats(qt *querytracer.Tracer, limit, le int, matchPattern string) (metricnamestats.StatsResult, error) {
+func GetMetricNamesStats(qt *querytracer.Tracer, limit, le int, matchPattern string) (storage.MetricNamesStatsResponse, error) {
 	WG.Add(1)
 	r := Storage.GetMetricNamesStats(qt, limit, le, matchPattern)
 	WG.Done()
@@ -606,10 +602,10 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteCounterUint64(w, `vm_rows_ignored_total{reason="big_timestamp"}`, m.TooBigTimestampRows)
 	metrics.WriteCounterUint64(w, `vm_rows_ignored_total{reason="small_timestamp"}`, m.TooSmallTimestampRows)
 	metrics.WriteCounterUint64(w, `vm_rows_ignored_total{reason="invalid_raw_metric_name"}`, m.InvalidRawMetricNames)
-	if getMaxHourlySeries() > 0 {
+	if *maxHourlySeries > 0 {
 		metrics.WriteCounterUint64(w, `vm_rows_ignored_total{reason="hourly_limit_exceeded"}`, m.HourlySeriesLimitRowsDropped)
 	}
-	if getMaxDailySeries() > 0 {
+	if *maxDailySeries > 0 {
 		metrics.WriteCounterUint64(w, `vm_rows_ignored_total{reason="daily_limit_exceeded"}`, m.DailySeriesLimitRowsDropped)
 	}
 
@@ -619,13 +615,13 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteCounterUint64(w, `vm_slow_row_inserts_total`, m.SlowRowInserts)
 	metrics.WriteCounterUint64(w, `vm_slow_per_day_index_inserts_total`, m.SlowPerDayIndexInserts)
 
-	if getMaxHourlySeries() > 0 {
+	if *maxHourlySeries > 0 {
 		metrics.WriteGaugeUint64(w, `vm_hourly_series_limit_current_series`, m.HourlySeriesLimitCurrentSeries)
 		metrics.WriteGaugeUint64(w, `vm_hourly_series_limit_max_series`, m.HourlySeriesLimitMaxSeries)
 		metrics.WriteCounterUint64(w, `vm_hourly_series_limit_rows_dropped_total`, m.HourlySeriesLimitRowsDropped)
 	}
 
-	if getMaxDailySeries() > 0 {
+	if *maxDailySeries > 0 {
 		metrics.WriteGaugeUint64(w, `vm_daily_series_limit_current_series`, m.DailySeriesLimitCurrentSeries)
 		metrics.WriteGaugeUint64(w, `vm_daily_series_limit_max_series`, m.DailySeriesLimitMaxSeries)
 		metrics.WriteCounterUint64(w, `vm_daily_series_limit_rows_dropped_total`, m.DailySeriesLimitRowsDropped)
@@ -750,21 +746,3 @@ func jsonResponseError(w http.ResponseWriter, err error) {
 	errStr := err.Error()
 	fmt.Fprintf(w, `{"status":"error","msg":%s}`, stringsutil.JSONString(errStr))
 }
-
-func getMaxHourlySeries() int {
-	limit := *maxHourlySeries
-	if limit == -1 || limit > math.MaxInt32 {
-		return math.MaxInt32
-	}
-
-	return int(limit)
-}
-
-func getMaxDailySeries() int {
-	limit := *maxDailySeries
-	if limit == -1 || limit > math.MaxInt32 {
-		return math.MaxInt32
-	}
-
-	return int(limit)
-}

app/vmui/Dockerfile-web

@@ -1,4 +1,4 @@
-FROM golang:1.26.2 AS build-web-stage
+FROM golang:1.26.1 AS build-web-stage
 COPY build /build
 
 WORKDIR /build

app/vmui/packages/vmui/package.json

@@ -23,14 +23,14 @@
     "classnames": "^2.5.1",
     "dayjs": "^1.11.20",
     "lodash.debounce": "^4.0.8",
-    "marked": "^18.0.0",
-    "preact": "^10.29.1",
-    "qs": "^6.15.1",
+    "marked": "^17.0.5",
+    "preact": "^10.29.0",
+    "qs": "^6.15.0",
     "react-input-mask": "^2.0.4",
-    "react-router-dom": "^7.14.1",
+    "react-router-dom": "^7.13.2",
     "uplot": "^1.6.32",
-    "vite": "^8.0.8",
-    "web-vitals": "^5.2.0"
+    "vite": "^8.0.2",
+    "web-vitals": "^5.1.0"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.5",
@@ -39,24 +39,24 @@
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/preact": "^3.2.4",
     "@types/lodash.debounce": "^4.0.9",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.5.0",
     "@types/qs": "^6.15.0",
     "@types/react": "^19.2.14",
     "@types/react-input-mask": "^3.0.6",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^8.58.2",
-    "@typescript-eslint/parser": "^8.58.2",
+    "@typescript-eslint/eslint-plugin": "^8.57.2",
+    "@typescript-eslint/parser": "^8.57.2",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-unused-imports": "^4.4.1",
-    "globals": "^17.5.0",
+    "globals": "^17.4.0",
     "http-proxy-middleware": "^3.0.5",
-    "jsdom": "^29.0.2",
-    "postcss": "^8.5.10",
-    "sass-embedded": "^1.99.0",
-    "typescript": "^6.0.2",
-    "vitest": "^4.1.4"
+    "jsdom": "^29.0.1",
+    "postcss": "^8.5.8",
+    "sass-embedded": "^1.98.0",
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.1"
   },
   "browserslist": {
     "production": [

app/vmui/packages/vmui/src/api/query-range.ts

@@ -16,29 +16,23 @@ export const getExportDataUrl = (server: string, query: string, period: TimePara
   return `${server}/api/v1/export?${params}`;
 };
 
-const getBaseParams = (period: TimeParams, query: string[]): URLSearchParams => {
+export const getExportCSVDataUrl = (server: string, query: string[], period: TimeParams, reduceMemUsage: boolean): string => {
   const params = new URLSearchParams({
     start: period.start.toString(),
     end: period.end.toString(),
+    format: "__name__,__value__,__timestamp__:unix_ms",
   });
   query.forEach((q => params.append("match[]", q)));
-  return params;
-};
-
-export const getLabelsUrl = (server: string, query: string[], period: TimeParams): string => {
-  const params = getBaseParams(period, query);
-  return `${server}/api/v1/labels?${params}`;
-};
-
-export const getExportCSVDataUrl = (server: string, query: string[], period: TimeParams, reduceMemUsage: boolean, format: string): string => {
-  const params = getBaseParams(period, query);
-  params.set("format", format);
   if (reduceMemUsage) params.set("reduce_mem_usage", "1");
   return `${server}/api/v1/export/csv?${params}`;
 };
 
 export const getExportJSONDataUrl = (server: string, query: string[], period: TimeParams, reduceMemUsage: boolean): string => {
-  const params = getBaseParams(period, query);
+  const params = new URLSearchParams({
+    start: period.start.toString(),
+    end: period.end.toString(),
+  });
+  query.forEach((q => params.append("match[]", q)));
   if (reduceMemUsage) params.set("reduce_mem_usage", "1");
   return `${server}/api/v1/export?${params}`;
 };

app/vmui/packages/vmui/src/api/raw-query.test.ts

@@ -1,29 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { fetchRawQueryCSVExport } from "./raw-query";
-
-describe("fetchRawQueryCSVExport", () => {
-  it.skip("requests all label columns before exporting CSV data", async () => {
-    const fetchMock = vi.fn()
-      .mockResolvedValueOnce({
-        ok: true,
-        json: async () => ({ data: ["job", "__name__", "instance"] }),
-      })
-      .mockResolvedValueOnce({
-        ok: true,
-        text: async () => "up,localhost:9100,node_exporter,1,1710000000000",
-      });
-
-    const result = await fetchRawQueryCSVExport(
-      "http://localhost:8428",
-      ["up"],
-      { start: 1710000000, end: 1710000300, step: "15s", date: "2024-03-09T16:05:00Z" },
-      false,
-      fetchMock as unknown as typeof fetch,
-    );
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-    expect(fetchMock.mock.calls[0][0]).toBe("http://localhost:8428/api/v1/labels?start=1710000000&end=1710000300&match%5B%5D=up");
-    expect(fetchMock.mock.calls[1][0]).toBe("http://localhost:8428/api/v1/export/csv?start=1710000000&end=1710000300&match%5B%5D=up&format=__name__%2Cinstance%2Cjob%2C__value__%2C__timestamp__%3Aunix_ms");
-    expect(result).toBe("up,localhost:9100,node_exporter,1,1710000000000");
-  });
-});

app/vmui/packages/vmui/src/api/raw-query.ts

@@ -1,31 +0,0 @@
-import { getExportCSVDataUrl, getLabelsUrl } from "./query-range";
-import { TimeParams } from "../types";
-import { getCSVExportColumns } from "../utils/csv";
-
-interface LabelsResponse {
-  data?: string[];
-}
-
-export const fetchRawQueryCSVExport = async (
-  serverUrl: string,
-  query: string[],
-  period: TimeParams,
-  reduceMemUsage: boolean,
-  fetchFn: typeof fetch = fetch,
-): Promise<string> => {
-  const labelsResponse = await fetchFn(getLabelsUrl(serverUrl, query, period));
-  if (!labelsResponse.ok) {
-    throw new Error(await labelsResponse.text());
-  }
-
-  const { data = [] } = (await labelsResponse.json()) as LabelsResponse;
-  const columns = getCSVExportColumns(data);
-  const format = columns.join(",");
-
-  const response = await fetchFn(getExportCSVDataUrl(serverUrl, query, period, reduceMemUsage, format));
-  if (!response.ok) {
-    throw new Error(await response.text());
-  }
-
-  return await response.text();
-};

app/vmui/packages/vmui/src/components/ExploreAlerts/BaseAlert/index.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from "preact/compat";
 import "./style.scss";
-import { Alert as APIAlert, Group } from "../../../types";
-import { Link } from "react-router-dom";
+import { Alert as APIAlert } from "../../../types";
+import { createSearchParams } from "react-router-dom";
 import Button from "../../Main/Button/Button";
 import Badges, { BadgeColor } from "../Badges";
 import { formatEventTime } from "../helpers";
@@ -9,14 +9,12 @@ import {
   SearchIcon,
 } from "../../Main/Icons";
 import CodeExample from "../../Main/CodeExample/CodeExample";
-import router from "../../../router";
 
 interface BaseAlertProps {
   item: APIAlert;
-  group?: Group;
 }
 
-const BaseAlert = ({ item, group }: BaseAlertProps) => {
+const BaseAlert = ({ item }: BaseAlertProps) => {
   const query = item?.expression;
   const alertLabels = item?.labels || {};
   const alertLabelsItems = useMemo(() => {
@@ -26,19 +24,13 @@ const BaseAlert = ({ item, group }: BaseAlertProps) => {
     }]));
   }, [alertLabels]);
 
-  const queryLink = useMemo(() => {
-    if (!group?.interval) return;
-
-    const params = new URLSearchParams({
+  const openQueryLink = () => {
+    const params = {
       "g0.expr": query,
-      "g0.end_time": item.activeAt,
-      // Interval is the Group's evaluation interval in float seconds as present in the file. See: /app/vmalert/rule/web.go
-      "g0.step_input": `${group.interval}s`,
-      "g0.relative_time": "none",
-    });
-
-    return `${router.home}?${params.toString()}`;
-  }, [query, item.activeAt, group?.interval]);
+      "g0.end_time": ""
+    };
+    window.open(`#/?${createSearchParams(params).toString()}`, "_blank", "noopener noreferrer");
+  };
 
   return (
     <div className="vm-explore-alerts-alert-item">
@@ -53,22 +45,15 @@ const BaseAlert = ({ item, group }: BaseAlertProps) => {
               style={{ "text-align": "end" }}
               colSpan={2}
             >
-              {queryLink && (
-                <Link
-                  to={queryLink}
-                  target={"_blank"}
-                  rel="noreferrer"
-                >
-                  <Button
-                    size="small"
-                    variant="outlined"
-                    color="gray"
-                    startIcon={<SearchIcon />}
-                  >
-                    <span className="vm-button-text">Run query</span>
-                  </Button>
-                </Link>
-              )}
+              <Button
+                size="small"
+                variant="outlined"
+                color="gray"
+                startIcon={<SearchIcon />}
+                onClick={openQueryLink}
+              >
+                <span className="vm-button-text">Run query</span>
+              </Button>
             </td>
           </tr>
           <tr>

app/vmui/packages/vmui/src/components/ExploreAlerts/BaseRule/index.tsx

@@ -1,21 +1,19 @@
 import { useMemo } from "preact/compat";
 import "./style.scss";
-import { Group, Rule as APIRule } from "../../../types";
-import { useNavigate, Link } from "react-router-dom";
+import { Rule as APIRule } from "../../../types";
+import { useNavigate, createSearchParams } from "react-router-dom";
 import { SearchIcon, DetailsIcon } from "../../Main/Icons";
 import Button from "../../Main/Button/Button";
 import Alert from "../../Main/Alert/Alert";
 import Badges, { BadgeColor } from "../Badges";
 import { formatDuration, formatEventTime } from "../helpers";
 import CodeExample from "../../Main/CodeExample/CodeExample";
-import router from "../../../router";
 
 interface BaseRuleProps {
   item: APIRule;
-  group?: Group;
 }
 
-const BaseRule = ({ item, group }: BaseRuleProps) => {
+const BaseRule = ({ item }: BaseRuleProps) => {
   const query = item?.query;
   const navigate = useNavigate();
   const openAlertLink = (id: string) => {
@@ -35,19 +33,13 @@ const BaseRule = ({ item, group }: BaseRuleProps) => {
     }]));
   }, [ruleLabels]);
 
-  const queryLink = useMemo(() => {
-    if (!group?.interval) return;
-
-    const params = new URLSearchParams({
+  const openQueryLink = () => {
+    const params = {
       "g0.expr": query,
-      "g0.end_time": item.lastEvaluation,
-      // Interval is the Group's evaluation interval in float seconds as present in the file. See: /app/vmalert/rule/web.go
-      "g0.step_input": `${group.interval}s`,
-      "g0.relative_time": "none",
-    });
-
-    return `${router.home}?${params.toString()}`;
-  }, [query, item.lastEvaluation, group?.interval]);
+      "g0.end_time": ""
+    };
+    window.open(`#/?${createSearchParams(params).toString()}`, "_blank", "noopener noreferrer");
+  };
 
   return (
     <div className="vm-explore-alerts-rule-item">
@@ -62,22 +54,15 @@ const BaseRule = ({ item, group }: BaseRuleProps) => {
               style={{ "text-align": "end" }}
               colSpan={2}
             >
-              {queryLink && (
-                <Link
-                  to={queryLink}
-                  target={"_blank"}
-                  rel="noreferrer"
-                >
-                  <Button
-                    size="small"
-                    variant="outlined"
-                    color="gray"
-                    startIcon={<SearchIcon />}
-                  >
-                    <span className="vm-button-text">Run query</span>
-                  </Button>
-                </Link>
-              )}
+              <Button
+                size="small"
+                variant="outlined"
+                color="gray"
+                startIcon={<SearchIcon />}
+                onClick={openQueryLink}
+              >
+                <span className="vm-button-text">Run query</span>
+              </Button>
             </td>
           </tr>
           <tr>

app/vmui/packages/vmui/src/components/ExploreAlerts/Rule/index.tsx

@@ -2,16 +2,15 @@ import { FC } from "preact/compat";
 import ItemHeader from "../ItemHeader";
 import Accordion from "../../Main/Accordion/Accordion";
 import "./style.scss";
-import { Group, Rule as APIRule } from "../../../types";
+import { Rule as APIRule } from "../../../types";
 import BaseRule from "../BaseRule";
 
 interface RuleProps {
   states: Record<string, number>;
   rule: APIRule;
-  group: Group;
 }
 
-const Rule: FC<RuleProps> = ({ states, rule, group }) => {
+const Rule: FC<RuleProps> = ({ states, rule }) => {
   const state = Object.keys(states).length > 0 ? Object.keys(states)[0] : "ok";
   return (
     <div className={`vm-explore-alerts-rule vm-badge-item ${state.replace(" ", "-")}`}>
@@ -26,10 +25,7 @@ const Rule: FC<RuleProps> = ({ states, rule, group }) => {
           name={rule.name}
         />}
       >
-        <BaseRule
-          item={rule}
-          group={group}
-        />
+        <BaseRule item={rule} />
       </Accordion>
     </div>
   );

app/vmui/packages/vmui/src/components/ExploreAlerts/RulesHeader/index.tsx

@@ -50,6 +50,7 @@ const RulesHeader = ({
             label="Rule type"
             placeholder="Please select rule type"
             onChange={onChangeRuleType}
+            autofocus={!!types.length && !isMobile}
             includeAll
             searchable
           />

app/vmui/packages/vmui/src/components/ExploreAlerts/helpers.ts

@@ -17,7 +17,7 @@ export const formatDuration = (raw: number) => {
 
 export const formatEventTime = (raw: string) => {
   const t = dayjs(raw);
-  return t.year() <= 1 ? "Never" : t.tz().format("DD MMM YYYY HH:mm:ss");
+  return t.year() <= 1 ? "Never" : t.format("DD MMM YYYY HH:mm:ss");
 };
 
 export const getStates = (rule: Rule) => {

app/vmui/packages/vmui/src/pages/ExploreAlerts/ExploreAlert.tsx

@@ -2,11 +2,10 @@ import Spinner from "../../components/Main/Spinner/Spinner";
 import Alert from "../../components/Main/Alert/Alert";
 import { useFetchItem } from "./hooks/useFetchItem";
 import "./style.scss";
-import { Alert as APIAlert, Group as APIGroup } from "../../types";
+import { Alert as APIAlert } from "../../types";
 import ItemHeader from "../../components/ExploreAlerts/ItemHeader";
 import BaseAlert from "../../components/ExploreAlerts/BaseAlert";
 import Modal from "../../components/Main/Modal/Modal";
-import { useFetchGroup } from "./hooks/useFetchGroup";
 
 interface ExploreAlertProps {
   groupId: string;
@@ -18,19 +17,10 @@ interface ExploreAlertProps {
 const ExploreAlert = ({ groupId, id, mode, onClose }: ExploreAlertProps) => {
   const {
     item,
-    isLoading: isLoadingItem,
-    error: errorItem,
+    isLoading,
+    error,
   } = useFetchItem<APIAlert>({ groupId, id, mode });
 
-  const {
-    group,
-    isLoading: isLoadingGroup,
-    error: errorGroup,
-  } = useFetchGroup<APIGroup>({ id: groupId });
-
-  const error =  errorItem || errorGroup;
-  const isLoading = isLoadingItem || isLoadingGroup;
-
   if (isLoading) return (
     <Spinner />
   );
@@ -61,12 +51,7 @@ const ExploreAlert = ({ groupId, id, mode, onClose }: ExploreAlertProps) => {
       onClose={onClose}
     >
       <div className="vm-explore-alerts">
-        {item ? (
-          <BaseAlert
-            item={item}
-            group={group}
-          />
-        ) : (
+        {item && (<BaseAlert item={item} />) || (
           <Alert variant="info">{noItemFound}</Alert>
         )}
       </div>

app/vmui/packages/vmui/src/pages/ExploreAlerts/ExploreRule.tsx

@@ -2,12 +2,11 @@ import Spinner from "../../components/Main/Spinner/Spinner";
 import Alert from "../../components/Main/Alert/Alert";
 import { useFetchItem } from "./hooks/useFetchItem";
 import "./style.scss";
-import { Group as APIGroup, Rule as APIRule } from "../../types";
+import { Rule as APIRule } from "../../types";
 import ItemHeader from "../../components/ExploreAlerts/ItemHeader";
 import BaseRule from "../../components/ExploreAlerts/BaseRule";
 import Modal from "../../components/Main/Modal/Modal";
 import { getStates } from "../../components/ExploreAlerts/helpers";
-import { useFetchGroup } from "./hooks/useFetchGroup";
 
 interface ExploreRuleProps {
   groupId: string;
@@ -19,19 +18,10 @@ interface ExploreRuleProps {
 const ExploreRule = ({ groupId, id, mode, onClose }: ExploreRuleProps) => {
   const {
     item,
-    isLoading: isLoadingItem,
-    error: errorItem,
+    isLoading,
+    error,
   } = useFetchItem<APIRule>({ groupId, id, mode });
 
-  const {
-    group,
-    isLoading: isLoadingGroup,
-    error: errorGroup,
-  } = useFetchGroup<APIGroup>({ id: groupId });
-
-  const error =  errorItem || errorGroup;
-  const isLoading = isLoadingItem || isLoadingGroup;
-
   if (isLoading) return (
     <Spinner />
   );
@@ -59,12 +49,7 @@ const ExploreRule = ({ groupId, id, mode, onClose }: ExploreRuleProps) => {
       onClose={onClose}
     >
       <div className="vm-explore-alerts">
-        {item ? (
-          <BaseRule
-            item={item}
-            group={group}
-          />
-        ) : (
+        {item && (<BaseRule item={item} />) || (
           <Alert variant="info">{noItemFound}</Alert>
         )}
       </div>

app/vmui/packages/vmui/src/pages/ExploreAlerts/ExploreRules.tsx

@@ -132,7 +132,7 @@ const ExploreRules: FC = () => {
     newParams.set("page_num", "1");
     setSearchParams(newParams);
     const changes = getChanges(title, states);
-    setStates(changes.length === allStates.length ? [] : changes);
+    setStates(changes.length == allStates.length ? [] : changes);
   }, [states, searchParams]);
 
   const handleChangeRuleType = useCallback((title: string) => {
@@ -186,7 +186,6 @@ const ExploreRules: FC = () => {
                         <Rule
                           key={`rule-${rule.id}`}
                           rule={rule}
-                          group={group}
                           states={getStates(rule)}
                         />
                       ))}

app/vmui/packages/vmui/src/pages/RawQueryPage/hooks/useFetchExport.ts

@@ -6,11 +6,10 @@ import { useTimeState } from "../../../state/time/TimeStateContext";
 import { useAppState } from "../../../state/common/StateContext";
 import { useCustomPanelState } from "../../../state/customPanel/CustomPanelStateContext";
 import { isValidHttpUrl } from "../../../utils/url";
-import { getExportDataUrl, getExportJSONDataUrl } from "../../../api/query-range";
+import { getExportCSVDataUrl, getExportDataUrl, getExportJSONDataUrl } from "../../../api/query-range";
 import { parseLineToJSON } from "../../../utils/json";
 import { downloadCSV, downloadJSON } from "../../../utils/file";
 import { useSnack } from "../../../contexts/Snackbar";
-import { fetchRawQueryCSVExport } from "../../../api/raw-query";
 
 interface FetchQueryParams {
   hideQuery?: number[];
@@ -68,8 +67,11 @@ export const useFetchExport = ({ hideQuery, showAllSeries }: FetchQueryParams):
     const getFilename = (format: ExportFormats) => `vmui_export_${query.join("_")}_${period.start}_${period.end}.${format}`;
     return {
       csv: async () => {
+        const url = getExportCSVDataUrl(serverUrl, query, period, reduceMemUsage);
+        const response = await fetch(url);
         try {
-          const text = await fetchRawQueryCSVExport(serverUrl, query, period, reduceMemUsage);
+          let text = await response.text();
+          text = "name,value,timestamp\n" + text;
           downloadCSV(text, getFilename("csv"));
         } catch (e) {
           console.error(e);

app/vmui/packages/vmui/src/utils/csv.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { formatValueToCSV, getCSVExportColumns } from "./csv";
+import { formatValueToCSV } from "./csv";
 
 describe("formatValueToCSV", () => {
   it("should wrap value in quotes if it contains a comma", () => {
@@ -32,10 +32,3 @@ describe("formatValueToCSV", () => {
     expect(result).toBe("");
   });
 });
-
-describe("getCSVExportColumns", () => {
-  it("should prepend metric name and append value and timestamp columns", () => {
-    const result = getCSVExportColumns(["instance", "__name__", "job", "instance"]);
-    expect(result.join(",")).toEqual("__name__,instance,job,__value__,__timestamp__:unix_ms");
-  });
-});

app/vmui/packages/vmui/src/utils/csv.ts

@@ -2,8 +2,3 @@ export const formatValueToCSV= (value: string) =>
   (value.includes(",") || value.includes("\n") || value.includes("\""))
     ? "\"" + value.replace(/"/g, "\"\"") + "\""
     : value;
-
-export const getCSVExportColumns = (labelNames: string[]) => {
-  const labels = Array.from(new Set(labelNames.filter((label) => label && label !== "__name__"))).sort();
-  return ["__name__", ...labels, "__value__", "__timestamp__:unix_ms"];
-};

app/vmui/packages/vmui/tsconfig.json

@@ -15,12 +15,13 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "jsxImportSource": "preact",
+    "downlevelIteration": true,
     "noUnusedLocals": true,
     "paths": {
       "react": ["./node_modules/preact/compat/"],
@@ -31,8 +32,5 @@
   },
   "include": [
     "src"
-  ],
-  "exclude": [
-    "scripts/**/*.ts"
   ]
 }

apptest/client.go

@@ -33,41 +33,37 @@ func (c *Client) CloseConnections() {
 	c.httpCli.CloseIdleConnections()
 }
 
-// Get sends an HTTP GET request, returns
+// Get sends a HTTP GET request, returns
 // the response body and status code to the caller.
-func (c *Client) Get(t *testing.T, url string, headers http.Header) (string, int) {
+func (c *Client) Get(t *testing.T, url string) (string, int) {
 	t.Helper()
-	return c.do(t, http.MethodGet, url, nil, headers)
+	return c.do(t, http.MethodGet, url, "", nil)
 }
 
-// Post sends an HTTP POST request, returns
+// Post sends a HTTP POST request, returns
 // the response body and status code to the caller.
-func (c *Client) Post(t *testing.T, url string, data []byte, headers http.Header) (string, int) {
+func (c *Client) Post(t *testing.T, url, contentType string, data []byte) (string, int) {
 	t.Helper()
-	return c.do(t, http.MethodPost, url, data, headers)
+	return c.do(t, http.MethodPost, url, contentType, data)
 }
 
-// PostForm sends an HTTP POST request containing the POST-form data with attached getHeaders, returns
+// PostForm sends a HTTP POST request containing the POST-form data, returns
 // the response body and status code to the caller.
-func (c *Client) PostForm(t *testing.T, url string, data url.Values, headers http.Header) (string, int) {
+func (c *Client) PostForm(t *testing.T, url string, data url.Values) (string, int) {
 	t.Helper()
-	if headers == nil {
-		headers = make(http.Header)
-	}
-	headers.Set("Content-Type", "application/x-www-form-urlencoded")
-	return c.Post(t, url, []byte(data.Encode()), headers)
+	return c.Post(t, url, "application/x-www-form-urlencoded", []byte(data.Encode()))
 }
 
-// Delete sends an HTTP DELETE request and returns the response body and status code
+// Delete sends a HTTP DELETE request and returns the response body and status code
 // to the caller.
 func (c *Client) Delete(t *testing.T, url string) (string, int) {
 	t.Helper()
-	return c.do(t, http.MethodDelete, url, nil, nil)
+	return c.do(t, http.MethodDelete, url, "", nil)
 }
 
-// do prepares an HTTP request, sends it to the server, receives the response
+// do prepares a HTTP request, sends it to the server, receives the response
 // from the server, returns the response body and status code to the caller.
-func (c *Client) do(t *testing.T, method, url string, data []byte, headers http.Header) (string, int) {
+func (c *Client) do(t *testing.T, method, url, contentType string, data []byte) (string, int) {
 	t.Helper()
 
 	req, err := http.NewRequest(method, url, bytes.NewReader(data))
@@ -75,7 +71,9 @@ func (c *Client) do(t *testing.T, method, url string, data []byte, headers http.
 		t.Fatalf("could not create a HTTP request: %v", err)
 	}
 
-	req.Header = headers
+	if len(contentType) > 0 {
+		req.Header.Add("Content-Type", contentType)
+	}
 	res, err := c.httpCli.Do(req)
 	if err != nil {
 		t.Fatalf("could not send HTTP request: %v", err)
@@ -137,7 +135,7 @@ func (app *ServesMetrics) GetIntMetric(t *testing.T, metricName string) int {
 func (app *ServesMetrics) GetMetric(t *testing.T, metricName string) float64 {
 	t.Helper()
 
-	metrics, statusCode := app.cli.Get(t, app.metricsURL, nil)
+	metrics, statusCode := app.cli.Get(t, app.metricsURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}
@@ -163,7 +161,7 @@ func (app *ServesMetrics) GetMetricsByPrefix(t *testing.T, prefix string) []floa
 
 	values := []float64{}
 
-	metrics, statusCode := app.cli.Get(t, app.metricsURL, nil)
+	metrics, statusCode := app.cli.Get(t, app.metricsURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}
@@ -192,7 +190,7 @@ func (app *ServesMetrics) GetMetricsByRegexp(t *testing.T, re *regexp.Regexp) []
 
 	values := []float64{}
 
-	metrics, statusCode := app.cli.Get(t, app.metricsURL, nil)
+	metrics, statusCode := app.cli.Get(t, app.metricsURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}

apptest/model.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
-	"net/http"
 	"net/url"
 	"slices"
 	"sort"
@@ -89,15 +88,6 @@ type QueryOpts struct {
 	MaxLookback    string
 	LatencyOffset  string
 	Format         string
-	NoCache        string
-	Headers        http.Header
-}
-
-func (qos *QueryOpts) getHeaders() http.Header {
-	if qos.Headers == nil {
-		qos.Headers = make(http.Header)
-	}
-	return qos.Headers
 }
 
 func (qos *QueryOpts) asURLValues() url.Values {
@@ -122,11 +112,18 @@ func (qos *QueryOpts) asURLValues() url.Values {
 	addNonEmpty("max_lookback", qos.MaxLookback)
 	addNonEmpty("latency_offset", qos.LatencyOffset)
 	addNonEmpty("format", qos.Format)
-	addNonEmpty("nocache", qos.NoCache)
 
 	return uv
 }
 
+// getTenant returns tenant with optional default value
+func (qos *QueryOpts) getTenant() string {
+	if qos.Tenant == "" {
+		return "0"
+	}
+	return qos.Tenant
+}
+
 // PrometheusAPIV1QueryResponse is an inmemory representation of the
 // /prometheus/api/v1/query or /prometheus/api/v1/query_range response.
 type PrometheusAPIV1QueryResponse struct {

apptest/testcase.go

@@ -87,11 +87,11 @@ func (tc *TestCase) MustStartDefaultVmsingle() *Vmsingle {
 }
 
 // MustStartVmsingle is a test helper function that starts an instance of
-// vmsingle located at ../../bin/victoria-metrics-race and fails the test if the app
+// vmsingle located at ../../bin/victoria-metrics and fails the test if the app
 // fails to start.
 func (tc *TestCase) MustStartVmsingle(instance string, flags []string) *Vmsingle {
 	tc.t.Helper()
-	return tc.MustStartVmsingleAt(instance, "../../bin/victoria-metrics-race", flags)
+	return tc.MustStartVmsingleAt(instance, "../../bin/victoria-metrics", flags)
 }
 
 // MustStartVmsingleAt is a test helper function that starts an instance of
@@ -108,11 +108,11 @@ func (tc *TestCase) MustStartVmsingleAt(instance, binary string, flags []string)
 }
 
 // MustStartVmstorage is a test helper function that starts an instance of
-// vmstorage located at ../../bin/vmstorage-race and fails the test if the app fails
+// vmstorage located at ../../bin/vmstorage and fails the test if the app fails
 // to start.
 func (tc *TestCase) MustStartVmstorage(instance string, flags []string) *Vmstorage {
 	tc.t.Helper()
-	return tc.MustStartVmstorageAt(instance, "../../bin/vmstorage-race", flags)
+	return tc.MustStartVmstorageAt(instance, "../../bin/vmstorage", flags)
 }
 
 // MustStartVmstorageAt is a test helper function that starts an instance of
@@ -293,12 +293,12 @@ func (tc *TestCase) MustStartCluster(opts *ClusterOptions) *Vmcluster {
 	tc.t.Helper()
 
 	if opts.Vmstorage1Binary == "" {
-		opts.Vmstorage1Binary = "../../bin/vmstorage-race"
+		opts.Vmstorage1Binary = "../../bin/vmstorage"
 	}
 	vmstorage1 := tc.MustStartVmstorageAt(opts.Vmstorage1Instance, opts.Vmstorage1Binary, opts.Vmstorage1Flags)
 
 	if opts.Vmstorage2Binary == "" {
-		opts.Vmstorage2Binary = "../../bin/vmstorage-race"
+		opts.Vmstorage2Binary = "../../bin/vmstorage"
 	}
 	vmstorage2 := tc.MustStartVmstorageAt(opts.Vmstorage2Instance, opts.Vmstorage2Binary, opts.Vmstorage2Flags)
 

apptest/tests/backup_restore_test.go

@@ -28,6 +28,7 @@ func TestSingleBackupRestore(t *testing.T) {
 			return tc.MustStartVmsingle("vmsingle", []string{
 				"-storageDataPath=" + storageDataPath,
 				"-retentionPeriod=100y",
+				"-search.maxStalenessInterval=1m",
 			})
 		},
 		stopSUT: func() {
@@ -69,7 +70,9 @@ func TestClusterBackupRestore(t *testing.T) {
 				VminsertInstance: "vminsert",
 				VminsertFlags:    []string{},
 				VmselectInstance: "vmselect",
-				VmselectFlags:    []string{},
+				VmselectFlags: []string{
+					"-search.maxStalenessInterval=1m",
+				},
 			})
 		},
 		stopSUT: func() {
@@ -97,14 +100,15 @@ func TestClusterBackupRestore(t *testing.T) {
 func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 	t := tc.T()
 
-	genData := func(count int, prefix string, start, step int64) (recs []string, wantSeries []map[string]string, wantQueryResults []*apptest.QueryResult) {
+	const msecPerMinute = 60 * 1000
+	genData := func(count int, prefix string, start int64) (recs []string, wantSeries []map[string]string, wantQueryResults []*apptest.QueryResult) {
 		recs = make([]string, count)
 		wantSeries = make([]map[string]string, count)
 		wantQueryResults = make([]*apptest.QueryResult, count)
 		for i := range count {
 			name := fmt.Sprintf("%s_%03d", prefix, i)
 			value := float64(i)
-			timestamp := start + int64(i)*step
+			timestamp := start + int64(i)*msecPerMinute
 
 			recs[i] = fmt.Sprintf("%s %f %d", name, value, timestamp)
 			wantSeries[i] = map[string]string{"__name__": name}
@@ -144,17 +148,15 @@ func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 
 	// assertSeries retrieves all data from the storage and compares it with the
 	// expected result.
-	assertQueryResults := func(app apptest.PrometheusQuerier, query string, start, end, step int64, want []*apptest.QueryResult) {
+	assertQueryResults := func(app apptest.PrometheusQuerier, query string, start, end int64, want []*apptest.QueryResult) {
 		t.Helper()
 		tc.Assert(&apptest.AssertOptions{
 			Msg: "unexpected /api/v1/query_range response",
 			Got: func() any {
 				return app.PrometheusAPIV1QueryRange(t, query, apptest.QueryOpts{
-					Start:       fmt.Sprintf("%d", start),
-					End:         fmt.Sprintf("%d", end),
-					Step:        fmt.Sprintf("%dms", step),
-					MaxLookback: fmt.Sprintf("%dms", step-1),
-					NoCache:     "1",
+					Start: fmt.Sprintf("%d", start),
+					End:   fmt.Sprintf("%d", end),
+					Step:  "60s",
 				})
 			},
 			Want: &apptest.PrometheusAPIV1QueryResponse{
@@ -165,6 +167,7 @@ func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 				},
 			},
 			FailNow: true,
+			Retries: 300,
 		})
 	}
 
@@ -191,9 +194,8 @@ func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 	// below.
 	const numMetrics = 1000
 	// With 1000 metrics (one per minute), the time range spans 2 months.
-	start := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli()
-	end := time.Date(2025, 3, 1, 0, 0, 0, 0, time.UTC).UnixMilli()
-	step := (end - start) / numMetrics
+	end := time.Date(2025, 3, 1, 10, 0, 0, 0, time.UTC).UnixMilli()
+	start := end - numMetrics*msecPerMinute
 
 	// Verify backup/restore:
 	//
@@ -207,8 +209,8 @@ func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 	// - Start vmsingle
 	// - Ensure that the queries return batch1 data only.
 
-	batch1Data, wantBatch1Series, wantBatch1QueryResults := genData(numMetrics, "batch1", start, step)
-	batch2Data, wantBatch2Series, wantBatch2QueryResults := genData(numMetrics, "batch2", start, step)
+	batch1Data, wantBatch1Series, wantBatch1QueryResults := genData(numMetrics, "batch1", start)
+	batch2Data, wantBatch2Series, wantBatch2QueryResults := genData(numMetrics, "batch2", start)
 	wantBatch12Series := slices.Concat(wantBatch1Series, wantBatch2Series)
 	wantBatch12QueryResults := slices.Concat(wantBatch1QueryResults, wantBatch2QueryResults)
 
@@ -217,14 +219,13 @@ func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 	sut.PrometheusAPIV1ImportPrometheus(t, batch1Data, apptest.QueryOpts{})
 	sut.ForceFlush(t)
 	assertSeries(sut, `{__name__=~"batch1.*"}`, start, end, wantBatch1Series)
-	assertQueryResults(sut, `{__name__=~"batch1.*"}`, start, end, step, wantBatch1QueryResults)
-
+	assertQueryResults(sut, `{__name__=~"batch1.*"}`, start, end, wantBatch1QueryResults)
 	createBackup(sut, "batch1")
 
 	sut.PrometheusAPIV1ImportPrometheus(t, batch2Data, apptest.QueryOpts{})
 	sut.ForceFlush(t)
 	assertSeries(sut, `{__name__=~"batch(1|2).*"}`, start, end, wantBatch12Series)
-	assertQueryResults(sut, `{__name__=~"batch(1|2).*"}`, start, end, step, wantBatch12QueryResults)
+	assertQueryResults(sut, `{__name__=~"batch(1|2).*"}`, start, end, wantBatch12QueryResults)
 	createBackup(sut, "batch12")
 
 	opts.stopSUT()
@@ -234,5 +235,5 @@ func testBackupRestore(tc *apptest.TestCase, opts testBackupRestoreOpts) {
 	sut = opts.startSUT()
 
 	assertSeries(sut, `{__name__=~"batch1.*"}`, start, end, wantBatch1Series)
-	assertQueryResults(sut, `{__name__=~"batch1.*"}`, start, end, step, wantBatch1QueryResults)
+	assertQueryResults(sut, `{__name__=~"batch1.*"}`, start, end, wantBatch1QueryResults)
 }

apptest/tests/ingestprotocols_test.go

@@ -1,9 +1,7 @@
 package tests
 
 import (
-	"fmt"
 	"testing"
-	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -299,132 +297,6 @@ func TestSingleIngestionProtocols(t *testing.T) {
 
 }
 
-func TestSingleCardinalityLimiter(t *testing.T) {
-	waitFor := func(f func() bool) {
-		const (
-			retries = 20
-			period  = 100 * time.Millisecond
-		)
-
-		t.Helper()
-
-		for i := 0; i < retries; i++ {
-			if f() {
-				return
-			}
-			time.Sleep(period)
-		}
-		t.Fatalf("timed out waiting for retry #%d", retries)
-	}
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	singleHourly := tc.MustStartVmsingle("vmsingle-hourly", []string{
-		"-retentionPeriod=100y",
-		"-storage.maxHourlySeries=1",
-	})
-
-	singleHourly.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	if v := singleHourly.GetIntMetric(t, "vm_hourly_series_limit_max_series"); v != 1 {
-		t.Fatalf("unexpected vm_hourly_series_limit_max_series value: %d", v)
-	}
-
-	if v := singleHourly.GetIntMetric(t, "vm_hourly_series_limit_current_series"); v != 1 {
-		t.Fatalf("unexpected vm_hourly_series_limit_current_series value: %d", v)
-	}
-
-	if v := singleHourly.GetIntMetric(t, "vm_hourly_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_hourly_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	singleHourly.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar2 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return singleHourly.GetIntMetric(t, "vm_hourly_series_limit_rows_dropped_total") > 0
-		},
-	)
-
-	singleDaily := tc.MustStartVmsingle("vmsingle-daily", []string{
-		"-retentionPeriod=100y",
-		"-storage.maxDailySeries=1",
-	})
-
-	singleDaily.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	if v := singleDaily.GetIntMetric(t, "vm_daily_series_limit_max_series"); v != 1 {
-		t.Fatalf("unexpected vm_daily_series_limit_max_series value: %d", v)
-	}
-
-	if v := singleDaily.GetIntMetric(t, "vm_daily_series_limit_current_series"); v != 1 {
-		t.Fatalf("unexpected vm_daily_series_limit_current_series value: %d", v)
-	}
-
-	if v := singleDaily.GetIntMetric(t, "vm_daily_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_daily_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	singleDaily.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar2 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return singleDaily.GetIntMetric(t, "vm_daily_series_limit_rows_dropped_total") > 0
-		},
-	)
-
-	singleUnlimited := tc.MustStartVmsingle("vmsingle-unlimited", []string{
-		"-retentionPeriod=100y",
-		"-storage.maxHourlySeries=-1",
-		"-storage.maxDailySeries=-1",
-	})
-	metrics := make([]string, 0, 100)
-	for i := range 100 {
-		metrics = append(metrics, fmt.Sprintf("foo_bar%d 1 1652169600000", i)) // 2022-05-10T08:00:00Z
-	}
-
-	singleUnlimited.PrometheusAPIV1ImportPrometheus(t, metrics, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return singleUnlimited.GetIntMetric(t, "vm_hourly_series_limit_current_series") > 0
-		},
-	)
-
-	if v := singleUnlimited.GetIntMetric(t, "vm_hourly_series_limit_max_series"); v == 0 {
-		t.Fatalf("unexpected vm_hourly_series_limit_max_series value: %d", v)
-	}
-
-	if v := singleUnlimited.GetIntMetric(t, "vm_hourly_series_limit_current_series"); v != 100 {
-		t.Fatalf("unexpected vm_hourly_series_limit_current_series value: %d", v)
-	}
-
-	if v := singleUnlimited.GetIntMetric(t, "vm_hourly_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_hourly_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	if v := singleUnlimited.GetIntMetric(t, "vm_daily_series_limit_max_series"); v == 0 {
-		t.Fatalf("unexpected vm_daily_series_limit_max_series value: %d", v)
-	}
-
-	if v := singleUnlimited.GetIntMetric(t, "vm_daily_series_limit_current_series"); v != 100 {
-		t.Fatalf("unexpected vm_daily_series_limit_current_series value: %d", v)
-	}
-
-	if v := singleUnlimited.GetIntMetric(t, "vm_daily_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_daily_series_limit_rows_dropped_total value: %d", v)
-	}
-}
-
 func TestClusterIngestionProtocols(t *testing.T) {
 	fs.MustRemoveDir(t.Name())
 	tc := apptest.NewTestCase(t)
@@ -719,145 +591,3 @@ func TestClusterIngestionProtocols(t *testing.T) {
 	})
 
 }
-
-func TestClusterCardinalityLimiter(t *testing.T) {
-	waitFor := func(f func() bool) {
-		const (
-			retries = 20
-			period  = 100 * time.Millisecond
-		)
-
-		t.Helper()
-
-		for i := 0; i < retries; i++ {
-			if f() {
-				return
-			}
-			time.Sleep(period)
-		}
-		t.Fatalf("timed out waiting for retry #%d", retries)
-	}
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	// Test hourly series limit
-	vmstorageHourly := tc.MustStartVmstorage("vmstorage-hourly", []string{
-		"-storageDataPath=" + tc.Dir() + "/vmstorage-hourly",
-		"-retentionPeriod=100y",
-		"-storage.maxHourlySeries=1",
-	})
-	vminsertHourly := tc.MustStartVminsert("vminsert-hourly", []string{
-		"-storageNode=" + vmstorageHourly.VminsertAddr(),
-	})
-
-	vminsertHourly.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	if v := vmstorageHourly.GetIntMetric(t, "vm_hourly_series_limit_max_series"); v != 1 {
-		t.Fatalf("unexpected vm_hourly_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmstorageHourly.GetIntMetric(t, "vm_hourly_series_limit_current_series"); v != 1 {
-		t.Fatalf("unexpected vm_hourly_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmstorageHourly.GetIntMetric(t, "vm_hourly_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_hourly_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	vminsertHourly.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar2 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return vmstorageHourly.GetIntMetric(t, "vm_hourly_series_limit_rows_dropped_total") > 0
-		},
-	)
-
-	// Test daily series limit
-	vmstorageDaily := tc.MustStartVmstorage("vmstorage-daily", []string{
-		"-storageDataPath=" + tc.Dir() + "/vmstorage-daily",
-		"-retentionPeriod=100y",
-		"-storage.maxDailySeries=1",
-	})
-	vminsertDaily := tc.MustStartVminsert("vminsert-daily", []string{
-		"-storageNode=" + vmstorageDaily.VminsertAddr(),
-	})
-
-	vminsertDaily.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	if v := vmstorageDaily.GetIntMetric(t, "vm_daily_series_limit_max_series"); v != 1 {
-		t.Fatalf("unexpected vm_daily_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmstorageDaily.GetIntMetric(t, "vm_daily_series_limit_current_series"); v != 1 {
-		t.Fatalf("unexpected vm_daily_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmstorageDaily.GetIntMetric(t, "vm_daily_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_daily_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	vminsertDaily.PrometheusAPIV1ImportPrometheus(t, []string{
-		"foo_bar2 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return vmstorageDaily.GetIntMetric(t, "vm_daily_series_limit_rows_dropped_total") > 0
-		},
-	)
-
-	// Test unlimited series
-	vmstorageUnlimited := tc.MustStartVmstorage("vmstorage-unlimited", []string{
-		"-storageDataPath=" + tc.Dir() + "/vmstorage-unlimited",
-		"-retentionPeriod=100y",
-		"-storage.maxHourlySeries=-1",
-		"-storage.maxDailySeries=-1",
-	})
-	vminsertUnlimited := tc.MustStartVminsert("vminsert-unlimited", []string{
-		"-storageNode=" + vmstorageUnlimited.VminsertAddr(),
-	})
-
-	metrics := make([]string, 0, 100)
-	for i := range 100 {
-		metrics = append(metrics, fmt.Sprintf("foo_bar%d 1 1652169600000", i)) // 2022-05-10T08:00:00Z
-	}
-
-	vminsertUnlimited.PrometheusAPIV1ImportPrometheus(t, metrics, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return vmstorageUnlimited.GetIntMetric(t, "vm_hourly_series_limit_current_series") > 0
-		},
-	)
-
-	if v := vmstorageUnlimited.GetIntMetric(t, "vm_hourly_series_limit_max_series"); v == 0 {
-		t.Fatalf("unexpected vm_hourly_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmstorageUnlimited.GetIntMetric(t, "vm_hourly_series_limit_current_series"); v != 100 {
-		t.Fatalf("unexpected vm_hourly_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmstorageUnlimited.GetIntMetric(t, "vm_hourly_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_hourly_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	if v := vmstorageUnlimited.GetIntMetric(t, "vm_daily_series_limit_max_series"); v == 0 {
-		t.Fatalf("unexpected vm_daily_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmstorageUnlimited.GetIntMetric(t, "vm_daily_series_limit_current_series"); v != 100 {
-		t.Fatalf("unexpected vm_daily_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmstorageUnlimited.GetIntMetric(t, "vm_daily_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vm_daily_series_limit_rows_dropped_total value: %d", v)
-	}
-}

apptest/tests/multilevel_test.go

@@ -3,9 +3,7 @@ package tests
 import (
 	"fmt"
 	"math/rand/v2"
-	"net"
 	"testing"
-	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 )
@@ -72,162 +70,3 @@ func TestClusterMultilevelSelect(t *testing.T) {
 	assertSeries(vmselectL1)
 	assertSeries(vmselectL2)
 }
-
-// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10678.
-func TestClusterMultilevelPartialResponse(t *testing.T) {
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-	// Set up the following multi-level cluster configuration:
-	//
-	//				  			     				|--> available vmstorage
-	//					 	  |	------> vmselect1 --|
-	//						  |	     				|--> available vmstorage
-	// global-vmselect -------|
-	//				  		  |	     				|--> available vmstorage
-	// 					 	  |	------> vmselect2 --|
-	//						  	     				|--> unavailable vmstorage
-
-	vmstorage1 := tc.MustStartVmstorage("vmstorage1", []string{
-		"-storageDataPath=" + tc.Dir() + "/vmstorage1",
-	})
-	vmstorage2 := tc.MustStartVmstorage("vmstorage2", []string{
-		"-storageDataPath=" + tc.Dir() + "/vmstorage2",
-	})
-	regionalVmselect1 := tc.MustStartVmselect("regional-vmselect1", []string{
-		"-storageNode=" + vmstorage1.VmselectAddr() + "," + vmstorage2.VmselectAddr(),
-	})
-	regionalVmselect2 := tc.MustStartVmselect("regional-vmselect2", []string{
-		"-storageNode=" + vmstorage1.VmselectAddr() + "," + noopTCPServerAddr(t),
-	})
-	globalVmselect := tc.MustStartVmselect("global-vmselect", []string{
-		"-storageNode=" + regionalVmselect1.ClusternativeListenAddr() + "," + regionalVmselect2.ClusternativeListenAddr(),
-	})
-
-	// 1. /api/v1/query
-	qopts := apptest.QueryOpts{Tenant: "0"}
-	assertQuery := func(app *apptest.Vmselect, want *apptest.PrometheusAPIV1QueryResponse) {
-		t.Helper()
-		tc.Assert(&apptest.AssertOptions{
-			Msg: "unexpected /api/v1/query response",
-			Got: func() any {
-				res := app.PrometheusAPIV1Query(t, `{__name__=~".*"}`, qopts)
-				res.Sort()
-				return res
-			},
-			Want: want,
-		})
-	}
-	// regional-vmselect1 should return full response.
-	assertQuery(regionalVmselect1, &apptest.PrometheusAPIV1QueryResponse{
-		Status:    "success",
-		IsPartial: false,
-		Data:      &apptest.QueryData{ResultType: "vector", Result: []*apptest.QueryResult{}},
-	})
-	// regional-vmselect2 should return partial response.
-	assertQuery(regionalVmselect2, &apptest.PrometheusAPIV1QueryResponse{
-		Status:    "success",
-		IsPartial: true,
-		Data:      &apptest.QueryData{ResultType: "vector", Result: []*apptest.QueryResult{}},
-	})
-	// global-vmselect should return partial response.
-	assertQuery(globalVmselect, &apptest.PrometheusAPIV1QueryResponse{
-		Status:    "success",
-		IsPartial: true,
-		Data:      &apptest.QueryData{ResultType: "vector", Result: []*apptest.QueryResult{}},
-	})
-
-	// 2. /api/v1/labels
-	start := time.Now().Unix()
-	assertLabel := func(app *apptest.Vmselect, want *apptest.PrometheusAPIV1LabelsResponse) {
-		t.Helper()
-		tc.Assert(&apptest.AssertOptions{
-			Msg: "unexpected /api/v1/label response",
-
-			Got: func() any {
-				res := app.PrometheusAPIV1Labels(t, `{__name__="up"}`, apptest.QueryOpts{
-					Start: fmt.Sprintf("%d", start-100),
-					End:   fmt.Sprintf("%d", start),
-				})
-				return res
-			},
-			Want: want,
-		})
-	}
-
-	// regional-vmselect1 should return full response.
-	assertLabel(regionalVmselect1, &apptest.PrometheusAPIV1LabelsResponse{
-		Status:    "success",
-		IsPartial: false,
-		Data:      make([]string, 0),
-	})
-	// regional-vmselect2 should return partial response.
-	assertLabel(regionalVmselect2, &apptest.PrometheusAPIV1LabelsResponse{
-		Status:    "success",
-		IsPartial: true,
-		Data:      make([]string, 0),
-	})
-	// global-vmselect should return partial response.
-	assertLabel(globalVmselect, &apptest.PrometheusAPIV1LabelsResponse{
-		Status:    "success",
-		IsPartial: true,
-		Data:      make([]string, 0),
-	})
-
-	// 3. /api/v1/label/%s/values
-	assertSeries := func(app *apptest.Vmselect, want *apptest.PrometheusAPIV1SeriesResponse) {
-		t.Helper()
-		tc.Assert(&apptest.AssertOptions{
-			Msg: "unexpected /api/v1/series response",
-
-			Got: func() any {
-				res := app.PrometheusAPIV1Series(t, `{__name__="up"}`, apptest.QueryOpts{
-					Start: fmt.Sprintf("%d", start-100),
-					End:   fmt.Sprintf("%d", start),
-				})
-				return res
-			},
-			Want: want,
-		})
-	}
-
-	// regional-vmselect1 should return full response.
-	assertSeries(regionalVmselect1, &apptest.PrometheusAPIV1SeriesResponse{
-		Status:    "success",
-		IsPartial: false,
-		Data:      make([]map[string]string, 0),
-	})
-	// regional-vmselect2 should return partial response.
-	assertSeries(regionalVmselect2, &apptest.PrometheusAPIV1SeriesResponse{
-		Status:    "success",
-		IsPartial: true,
-		Data:      make([]map[string]string, 0),
-	})
-	// global-vmselect should return partial response.
-	assertSeries(globalVmselect, &apptest.PrometheusAPIV1SeriesResponse{
-		Status:    "success",
-		IsPartial: true,
-		Data:      make([]map[string]string, 0),
-	})
-}
-
-// noopTCPServerAddr start local tcp server,
-// which immediately closes any incoming connections
-// and return it's address
-func noopTCPServerAddr(t *testing.T) string {
-	t.Helper()
-	ln, err := net.Listen("tcp", "localhost:0")
-	if err != nil {
-		t.Fatalf("failed to create listener: %v", err)
-	}
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			conn.Close()
-		}
-	}()
-	t.Cleanup(func() { ln.Close() })
-	return ln.Addr().String()
-}

apptest/tests/testdata/thanos-snapshot/01KKS78P6B68DNJC87ZVPRGC3X/meta.json

@@ -1,28 +0,0 @@
-{
-	"compaction": {
-		"level": 1,
-		"sources": [
-			"01KKS78P6B68DNJC87ZVPRGC3X"
-		]
-	},
-	"maxTime": 1735696740001,
-	"minTime": 1735689600000,
-	"stats": {
-		"numChunks": 8,
-		"numFloatSamples": 480,
-		"numSamples": 480,
-		"numSeries": 4
-	},
-	"thanos": {
-		"downsample": {
-			"resolution": 0
-		},
-		"labels": {
-			"prometheus": "test",
-			"replica": "0"
-		},
-		"source": "prometheus"
-	},
-	"ulid": "01KKS78P6B68DNJC87ZVPRGC3X",
-	"version": 1
-}

apptest/tests/testdata/thanos-snapshot/01KKS78PKKR6BQ0SQ5BARRTAKC/meta.json

@@ -1,27 +0,0 @@
-{
-	"compaction": {
-		"level": 1,
-		"sources": [
-			"01KKS78PKKR6BQ0SQ5BARRTAKC"
-		]
-	},
-	"maxTime": 1735696500001,
-	"minTime": 1735689600000,
-	"stats": {
-		"numChunks": 4,
-		"numSamples": 4,
-		"numSeries": 4
-	},
-	"thanos": {
-		"downsample": {
-			"resolution": 300000
-		},
-		"labels": {
-			"prometheus": "test",
-			"replica": "0"
-		},
-		"source": "prometheus"
-	},
-	"ulid": "01KKS78PKKR6BQ0SQ5BARRTAKC",
-	"version": 1
-}

apptest/tests/testdata/thanos-snapshot/01KKS78PXE91TK8YX406DERWV2/meta.json

@@ -1,27 +0,0 @@
-{
-	"compaction": {
-		"level": 1,
-		"sources": [
-			"01KKS78PXE91TK8YX406DERWV2"
-		]
-	},
-	"maxTime": 1735693200001,
-	"minTime": 1735689600000,
-	"stats": {
-		"numChunks": 4,
-		"numSamples": 4,
-		"numSeries": 4
-	},
-	"thanos": {
-		"downsample": {
-			"resolution": 3600000
-		},
-		"labels": {
-			"prometheus": "test",
-			"replica": "0"
-		},
-		"source": "prometheus"
-	},
-	"ulid": "01KKS78PXE91TK8YX406DERWV2",
-	"version": 1
-}

apptest/tests/vmagent_remotewrite_test.go

@@ -3,7 +3,6 @@ package tests
 import (
 	"fmt"
 	"io"
-	"math"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -305,11 +304,6 @@ func TestSingleVMAgentDropOnOverload(t *testing.T) {
 		// See initRemoteWriteCtxs function in remotewrite.go for details.
 		"-remoteWrite.maxRowsPerBlock=1000000000",
 		"-remoteWrite.tmpDataPath=" + tc.Dir() + "/vmagent",
-
-		// Delay retry logic to avoid race conditions with waitFor assertions.
-		// It improves the test stability on resource-constrained runners.
-		// Should be bigger than retries * period
-		"-remoteWrite.retryMinInterval=3s",
 	}, ``)
 
 	const (
@@ -368,147 +362,3 @@ func TestSingleVMAgentDropOnOverload(t *testing.T) {
 		},
 	)
 }
-
-func TestSingleVMAgentCardinalityLimiter(t *testing.T) {
-	waitFor := func(f func() bool) {
-		const (
-			retries = 20
-			period  = 100 * time.Millisecond
-		)
-
-		t.Helper()
-
-		for i := 0; i < retries; i++ {
-			if f() {
-				return
-			}
-			time.Sleep(period)
-		}
-		t.Fatalf("timed out waiting for retry #%d", retries)
-	}
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	remoteWriteSrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	defer remoteWriteSrv.Close()
-
-	// Verify hourly limit is applied
-	vmagent := tc.MustStartVmagent("vmagent-hourly", []string{
-		`-remoteWrite.flushInterval=50ms`,
-		fmt.Sprintf(`-remoteWrite.url=%s/api/v1/write`, remoteWriteSrv.URL),
-		"-remoteWrite.maxRowsPerBlock=1",
-		"-remoteWrite.maxHourlySeries=1",
-		"-remoteWrite.tmpDataPath=" + tc.Dir() + "/vmagent-hourly",
-	}, ``)
-
-	vmagent.APIV1ImportPrometheus(t, []string{
-		"foo_bar 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	if v := vmagent.GetIntMetric(t, "vmagent_hourly_series_limit_max_series"); v != 1 {
-		t.Fatalf("unexpected vmagent_hourly_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmagent.GetIntMetric(t, "vmagent_hourly_series_limit_current_series"); v != 1 {
-		t.Fatalf("unexpected vmagent_hourly_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmagent.GetIntMetric(t, "vmagent_hourly_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vmagent_hourly_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	vmagent.APIV1ImportPrometheusNoWaitFlush(t, []string{
-		"foo_bar2 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return vmagent.GetIntMetric(t, "vmagent_hourly_series_limit_rows_dropped_total") > 0
-		},
-	)
-
-	// Daily limits
-	vmagent2 := tc.MustStartVmagent("vmagent-daily", []string{
-		`-remoteWrite.flushInterval=50ms`,
-		fmt.Sprintf(`-remoteWrite.url=%s/api/v1/write`, remoteWriteSrv.URL),
-		"-remoteWrite.maxRowsPerBlock=1",
-		"-remoteWrite.maxDailySeries=1",
-		"-remoteWrite.tmpDataPath=" + tc.Dir() + "/vmagent-daily",
-	}, ``)
-
-	vmagent2.APIV1ImportPrometheus(t, []string{
-		"foo_bar 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	if v := vmagent2.GetIntMetric(t, "vmagent_daily_series_limit_max_series"); v != 1 {
-		t.Fatalf("unexpected vmagent_daily_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmagent2.GetIntMetric(t, "vmagent_daily_series_limit_current_series"); v != 1 {
-		t.Fatalf("unexpected vmagent_daily_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmagent2.GetIntMetric(t, "vmagent_daily_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vmagent_daily_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	vmagent2.APIV1ImportPrometheusNoWaitFlush(t, []string{
-		"foo_bar2 1 1652169600000", // 2022-05-10T08:00:00Z
-	}, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return vmagent2.GetIntMetric(t, "vmagent_daily_series_limit_rows_dropped_total") > 0
-		},
-	)
-
-	// test running with unlimited tracker
-	vmagent3 := tc.MustStartVmagent("vmagent-unlimited", []string{
-		`-remoteWrite.flushInterval=50ms`,
-		fmt.Sprintf(`-remoteWrite.url=%s/api/v1/write`, remoteWriteSrv.URL),
-		"-remoteWrite.maxRowsPerBlock=10",
-		"-remoteWrite.maxDailySeries=-1",
-		"-remoteWrite.maxHourlySeries=-1",
-		"-remoteWrite.tmpDataPath=" + tc.Dir() + "/vmagent-unlimited",
-	}, ``)
-
-	metrics := make([]string, 0, 100)
-	for i := range 100 {
-		metrics = append(metrics, fmt.Sprintf("foo_bar%d 1 1652169600000", i)) // 2022-05-10T08:00:00Z
-	}
-
-	vmagent3.APIV1ImportPrometheusNoWaitFlush(t, metrics, apptest.QueryOpts{})
-
-	waitFor(
-		func() bool {
-			return vmagent3.GetIntMetric(t, "vmagent_hourly_series_limit_current_series") > 0
-		},
-	)
-
-	if v := vmagent3.GetIntMetric(t, "vmagent_hourly_series_limit_max_series"); v != math.MaxInt32 {
-		t.Fatalf("unexpected vmagent_hourly_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmagent3.GetIntMetric(t, "vmagent_hourly_series_limit_current_series"); v != 100 {
-		t.Fatalf("unexpected vmagent_hourly_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmagent3.GetIntMetric(t, "vmagent_hourly_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vmagent_hourly_series_limit_rows_dropped_total value: %d", v)
-	}
-
-	if v := vmagent3.GetIntMetric(t, "vmagent_daily_series_limit_max_series"); v != math.MaxInt32 {
-		t.Fatalf("unexpected vmagent_daily_series_limit_max_series value: %d", v)
-	}
-
-	if v := vmagent3.GetIntMetric(t, "vmagent_daily_series_limit_current_series"); v != 100 {
-		t.Fatalf("unexpected vmagent_daily_series_limit_current_series value: %d", v)
-	}
-
-	if v := vmagent3.GetIntMetric(t, "vmagent_daily_series_limit_rows_dropped_total"); v != 0 {
-		t.Fatalf("unexpected vmagent_daily_series_limit_rows_dropped_total value: %d", v)
-	}
-}

apptest/tests/vmctl_thanos_migration_test.go

@@ -1,180 +0,0 @@
-package tests
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
-)
-
-const (
-	// thanosSnapshot contains both raw (resolution=0) and downsampled (resolution>0) blocks
-	// with Thanos metadata in meta.json.
-	thanosSnapshot = "./testdata/thanos-snapshot"
-
-	// thanosExpectedAllAggrResponse is the expected response when all aggregate types are imported
-	// (default behavior without --thanos-aggr-types flag).
-	thanosExpectedAllAggrResponse = "./testdata/thanos-snapshot/expected_all_aggr_response.json"
-
-	// thanosExpectedFilteredAggrResponse is the expected response when only specific aggregate
-	// types are imported via --thanos-aggr-types flag.
-	thanosExpectedFilteredAggrResponse = "./testdata/thanos-snapshot/expected_filtered_aggr_response.json"
-
-	// thanosQueryFilter is the PromQL query to select the test metrics.
-	thanosQueryFilter = `{__name__=~"thanos_test.*"}`
-
-	// thanosQueryTimeStart and thanosQueryTimeEnd define the time range for querying imported data.
-	thanosQueryTimeStart = "2025-01-01T00:00:00Z"
-	thanosQueryTimeEnd   = "2025-01-01T02:00:00Z"
-)
-
-// TestSingleVmctlThanosMigrationAllAggr tests migration of Thanos blocks without
-// --thanos-aggr-types flag. All aggregate types should be imported by default.
-func TestSingleVmctlThanosMigrationAllAggr(t *testing.T) {
-	fs.MustRemoveDir(t.Name())
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	vmsingleDst := tc.MustStartDefaultVmsingle()
-	vmAddr := fmt.Sprintf("http://%s/", vmsingleDst.HTTPAddr())
-	vmctlFlags := []string{
-		`thanos`,
-		`--thanos-snapshot=` + thanosSnapshot,
-		`--vm-addr=` + vmAddr,
-		`--disable-progress-bar=true`,
-	}
-
-	testThanosMigration(tc, vmsingleDst, vmctlFlags, thanosExpectedAllAggrResponse)
-}
-
-// TestClusterVmctlThanosMigrationAllAggr tests migration of Thanos blocks to cluster
-// without --thanos-aggr-types flag. All aggregate types should be imported by default.
-func TestClusterVmctlThanosMigrationAllAggr(t *testing.T) {
-	fs.MustRemoveDir(t.Name())
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	cluster := tc.MustStartDefaultCluster()
-	vmAddr := fmt.Sprintf("http://%s/", cluster.Vminsert.HTTPAddr())
-	vmctlFlags := []string{
-		`thanos`,
-		`--thanos-snapshot=` + thanosSnapshot,
-		`--vm-addr=` + vmAddr,
-		`--disable-progress-bar=true`,
-		`--vm-account-id=0`,
-	}
-
-	testThanosMigration(tc, cluster, vmctlFlags, thanosExpectedAllAggrResponse)
-}
-
-// TestSingleVmctlThanosMigrationFilteredAggr tests migration of Thanos blocks with
-// --thanos-aggr-types flag set to specific types (e.g., count,sum).
-func TestSingleVmctlThanosMigrationFilteredAggr(t *testing.T) {
-	fs.MustRemoveDir(t.Name())
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	vmsingleDst := tc.MustStartDefaultVmsingle()
-	vmAddr := fmt.Sprintf("http://%s/", vmsingleDst.HTTPAddr())
-	vmctlFlags := []string{
-		`thanos`,
-		`--thanos-snapshot=` + thanosSnapshot,
-		`--vm-addr=` + vmAddr,
-		`--disable-progress-bar=true`,
-		`--thanos-aggr-types=count`,
-		`--thanos-aggr-types=sum`,
-	}
-
-	testThanosMigration(tc, vmsingleDst, vmctlFlags, thanosExpectedFilteredAggrResponse)
-}
-
-// TestClusterVmctlThanosMigrationFilteredAggr tests migration of Thanos blocks to cluster
-// with --thanos-aggr-types flag set to specific types (e.g., count,sum).
-func TestClusterVmctlThanosMigrationFilteredAggr(t *testing.T) {
-	fs.MustRemoveDir(t.Name())
-
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-
-	cluster := tc.MustStartDefaultCluster()
-	vmAddr := fmt.Sprintf("http://%s/", cluster.Vminsert.HTTPAddr())
-	vmctlFlags := []string{
-		`thanos`,
-		`--thanos-snapshot=` + thanosSnapshot,
-		`--vm-addr=` + vmAddr,
-		`--disable-progress-bar=true`,
-		`--vm-account-id=0`,
-		`--thanos-aggr-types=count`,
-		`--thanos-aggr-types=sum`,
-	}
-
-	testThanosMigration(tc, cluster, vmctlFlags, thanosExpectedFilteredAggrResponse)
-}
-
-func testThanosMigration(tc *apptest.TestCase, sut apptest.PrometheusWriteQuerier, vmctlFlags []string, expectedFile string) {
-	t := tc.T()
-	t.Helper()
-
-	cmpOpt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
-
-	// Verify no data exists before migration
-	got := sut.PrometheusAPIV1Query(t, thanosQueryFilter, apptest.QueryOpts{
-		Step: "5m",
-		Time: thanosQueryTimeStart,
-	})
-
-	want := apptest.NewPrometheusAPIV1QueryResponse(t, `{"data":{"result":[]}}`)
-	if diff := cmp.Diff(want, got, cmpOpt); diff != "" {
-		t.Errorf("unexpected response before migration (-want, +got):\n%s", diff)
-	}
-
-	// Run vmctl migration
-	tc.MustStartVmctl("vmctl", vmctlFlags)
-
-	sut.ForceFlush(t)
-
-	// Load expected response
-	file, err := os.Open(expectedFile)
-	if err != nil {
-		t.Fatalf("cannot open expected response file: %s", err)
-	}
-	defer file.Close()
-
-	bytes, err := io.ReadAll(file)
-	if err != nil {
-		t.Fatalf("cannot read expected response file: %s", err)
-	}
-
-	var wantResponse apptest.PrometheusAPIV1QueryResponse
-	if err := json.Unmarshal(bytes, &wantResponse); err != nil {
-		t.Fatalf("cannot unmarshal expected response file: %s", err)
-	}
-	wantResponse.Sort()
-
-	tc.Assert(&apptest.AssertOptions{
-		Retries: 300,
-		Msg:     "unexpected metrics stored after Thanos migration",
-		Got: func() any {
-			result := sut.PrometheusAPIV1Export(t, thanosQueryFilter, apptest.QueryOpts{
-				Start: thanosQueryTimeStart,
-				End:   thanosQueryTimeEnd,
-			})
-			result.Sort()
-			return result.Data.Result
-		},
-		Want: wantResponse.Data.Result,
-		CmpOpts: []cmp.Option{
-			cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType"),
-		},
-	})
-}

apptest/vmagent.go

@@ -29,7 +29,7 @@ func StartVmagent(instance string, flags []string, cli *Client, promScrapeConfig
 		httpListenAddrRE,
 	}
 
-	app, stderrExtracts, err := startApp(instance, "../../bin/vmagent-race", flags, &appOptions{
+	app, stderrExtracts, err := startApp(instance, "../../bin/vmagent", flags, &appOptions{
 		defaultFlags: map[string]string{
 			"-httpListenAddr":          "127.0.0.1:0",
 			"-promscrape.config":       promScrapeConfigFilePath,
@@ -76,13 +76,11 @@ func (app *Vmagent) APIV1ImportPrometheus(t *testing.T, records []string, opts Q
 // Flushing may still be in progress on the function return.
 //
 // See https://docs.victoriametrics.com/victoriametrics/url-examples/#apiv1importprometheus
-func (app *Vmagent) APIV1ImportPrometheusNoWaitFlush(t *testing.T, records []string, opts QueryOpts) {
+func (app *Vmagent) APIV1ImportPrometheusNoWaitFlush(t *testing.T, records []string, _ QueryOpts) {
 	t.Helper()
 
 	data := []byte(strings.Join(records, "\n"))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
-	_, statusCode := app.cli.Post(t, app.apiV1ImportPrometheusURL, data, headers)
+	_, statusCode := app.cli.Post(t, app.apiV1ImportPrometheusURL, "text/plain", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}

apptest/vmauth.go

@@ -32,7 +32,7 @@ func StartVmauth(instance string, flags []string, cli *Client, configFilePath st
 		httpBuilitinListenAddrRE,
 	}
 
-	app, stderrExtracts, err := startApp(instance, "../../bin/vmauth-race", flags, &appOptions{
+	app, stderrExtracts, err := startApp(instance, "../../bin/vmauth", flags, &appOptions{
 		defaultFlags: map[string]string{
 			"-httpListenAddr": "127.0.0.1:0",
 			"-auth.config":    configFilePath,

apptest/vmbackup.go

@@ -10,6 +10,6 @@ func StartVmbackup(instance, storageDataPath, snapshotCreateURL, dst string, out
 		"-snapshot.createURL=" + snapshotCreateURL,
 		"-dst=" + dst,
 	}
-	_, _, err := startApp(instance, "../../bin/vmbackup-race", flags, &appOptions{wait: true, output: output})
+	_, _, err := startApp(instance, "../../bin/vmbackup", flags, &appOptions{wait: true, output: output})
 	return err
 }

apptest/vmctl.go

@@ -4,6 +4,6 @@ import "io"
 
 // StartVmctl starts an instance of vmctl cli with the given flags
 func StartVmctl(instance string, flags []string, output io.Writer) error {
-	_, _, err := startApp(instance, "../../bin/vmctl-race", flags, &appOptions{wait: true, output: output})
+	_, _, err := startApp(instance, "../../bin/vmctl", flags, &appOptions{wait: true, output: output})
 	return err
 }

apptest/vminsert.go

@@ -57,7 +57,7 @@ func StartVminsert(instance string, flags []string, cli *Client, output io.Write
 		extractREs = append(extractREs, regexp.MustCompile(logRecord))
 	}
 
-	app, stderrExtracts, err := startApp(instance, "../../bin/vminsert-race", flags, &appOptions{
+	app, stderrExtracts, err := startApp(instance, "../../bin/vminsert", flags, &appOptions{
 		defaultFlags: map[string]string{
 			"-httpListenAddr":                              "127.0.0.1:0",
 			"-clusternativeListenAddr":                     "127.0.0.1:0",
@@ -106,7 +106,7 @@ func (app *Vminsert) HTTPAddr() string {
 func (app *Vminsert) InfluxWrite(t *testing.T, records []string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/influx/write", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/influx/write", app.httpListenAddr, opts.getTenant())
 	uv := opts.asURLValues()
 	uvs := uv.Encode()
 	if len(uvs) > 0 {
@@ -114,10 +114,8 @@ func (app *Vminsert) InfluxWrite(t *testing.T, records []string, opts QueryOpts)
 	}
 
 	data := []byte(strings.Join(records, "\n"))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
 	app.sendBlocking(t, len(records), func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "text/plain", data)
 		if statusCode != http.StatusNoContent {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 		}
@@ -141,17 +139,15 @@ func (app *Vminsert) GraphiteWrite(t *testing.T, records []string, _ QueryOpts)
 func (app *Vminsert) PrometheusAPIV1ImportCSV(t *testing.T, records []string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/import/csv", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/import/csv", app.httpListenAddr, opts.getTenant())
 	uv := opts.asURLValues()
 	uvs := uv.Encode()
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
 	data := []byte(strings.Join(records, "\n"))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
 	app.sendBlocking(t, len(records), func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "text/plain", data)
 		if statusCode != http.StatusNoContent {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 		}
@@ -166,16 +162,14 @@ func (app *Vminsert) PrometheusAPIV1ImportCSV(t *testing.T, records []string, op
 func (app *Vminsert) PrometheusAPIV1ImportNative(t *testing.T, data []byte, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/import/native", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/import/native", app.httpListenAddr, opts.getTenant())
 	uv := opts.asURLValues()
 	uvs := uv.Encode()
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
 	app.sendBlocking(t, 1, func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "text/plain", data)
 		if statusCode != http.StatusNoContent {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 		}
@@ -190,17 +184,15 @@ func (app *Vminsert) PrometheusAPIV1ImportNative(t *testing.T, data []byte, opts
 func (app *Vminsert) OpenTSDBAPIPut(t *testing.T, records []string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/opentsdb/api/put", app.openTSDBListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/opentsdb/api/put", app.openTSDBListenAddr, opts.getTenant())
 	uv := opts.asURLValues()
 	uvs := uv.Encode()
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
 	data := []byte("[" + strings.Join(records, ",") + "]")
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "application/json")
 	app.sendBlocking(t, len(records), func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "application/json", data)
 		if statusCode != http.StatusNoContent {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 		}
@@ -213,16 +205,14 @@ func (app *Vminsert) OpenTSDBAPIPut(t *testing.T, records []string, opts QueryOp
 func (app *Vminsert) PrometheusAPIV1Write(t *testing.T, wr prompb.WriteRequest, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/write", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/write", app.httpListenAddr, opts.getTenant())
 	data := snappy.Encode(nil, wr.MarshalProtobuf(nil))
 	recordsCount := len(wr.Timeseries)
 	if prommetadata.IsEnabled() {
 		recordsCount += len(wr.Metadata)
 	}
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "application/x-protobuf")
 	app.sendBlocking(t, recordsCount, func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "application/x-protobuf", data)
 		if statusCode != http.StatusNoContent {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 		}
@@ -238,7 +228,7 @@ func (app *Vminsert) PrometheusAPIV1Write(t *testing.T, wr prompb.WriteRequest,
 func (app *Vminsert) PrometheusAPIV1ImportPrometheus(t *testing.T, records []string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/import/prometheus", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/prometheus/api/v1/import/prometheus", app.httpListenAddr, opts.getTenant())
 	uv := opts.asURLValues()
 	uvs := uv.Encode()
 	if len(uvs) > 0 {
@@ -247,22 +237,8 @@ func (app *Vminsert) PrometheusAPIV1ImportPrometheus(t *testing.T, records []str
 	data := []byte(strings.Join(records, "\n"))
 	var recordsCount int
 	var metadataRecords int
-	uniqueMetadataMetricNames := make(map[string]struct{})
 	for _, record := range records {
-		// metric metadata has the following format:
-		//# HELP importprometheus_series
-		//# TYPE importprometheus_series
-		// it results into single metadata record
-		if strings.HasPrefix(record, "# ") {
-			metadataItems := strings.Split(record, " ")
-			if len(metadataItems) < 2 {
-				t.Fatalf("BUG: unexpected metadata format=%q", record)
-			}
-			metricName := metadataItems[2]
-			if _, ok := uniqueMetadataMetricNames[metricName]; ok {
-				continue
-			}
-			uniqueMetadataMetricNames[metricName] = struct{}{}
+		if strings.HasPrefix(record, "#") {
 			metadataRecords++
 			continue
 		}
@@ -271,10 +247,8 @@ func (app *Vminsert) PrometheusAPIV1ImportPrometheus(t *testing.T, records []str
 	if prommetadata.IsEnabled() {
 		recordsCount += metadataRecords
 	}
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
 	app.sendBlocking(t, recordsCount, func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "text/plain", data)
 		if statusCode != http.StatusNoContent {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 		}
@@ -287,17 +261,15 @@ func (app *Vminsert) PrometheusAPIV1ImportPrometheus(t *testing.T, records []str
 func (app *Vminsert) ZabbixConnectorHistory(t *testing.T, records []string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/insert/%s/zabbixconnector/api/v1/history", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/insert/%s/zabbixconnector/api/v1/history", app.httpListenAddr, opts.getTenant())
 	uv := opts.asURLValues()
 	uvs := uv.Encode()
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
 	data := []byte(strings.Join(records, "\n"))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "application/json")
 	app.sendBlocking(t, len(records), func() {
-		_, statusCode := app.cli.Post(t, url, data, headers)
+		_, statusCode := app.cli.Post(t, url, "application/json", data)
 		if statusCode != http.StatusOK {
 			t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 		}

apptest/vmrestore.go

@@ -9,6 +9,6 @@ func StartVmrestore(instance, src, storageDataPath string, output io.Writer) err
 		"-src=" + src,
 		"-storageDataPath=" + storageDataPath,
 	}
-	_, _, err := startApp(instance, "../../bin/vmrestore-race", flags, &appOptions{wait: true, output: output})
+	_, _, err := startApp(instance, "../../bin/vmrestore", flags, &appOptions{wait: true, output: output})
 	return err
 }

apptest/vmselect.go

@@ -25,7 +25,7 @@ type Vmselect struct {
 // sets the default flags and populates the app instance state with runtime
 // values extracted from the application log (such as httpListenAddr)
 func StartVmselect(instance string, flags []string, cli *Client, output io.Writer) (*Vmselect, error) {
-	app, stderrExtracts, err := startApp(instance, "../../bin/vmselect-race", flags, &appOptions{
+	app, stderrExtracts, err := startApp(instance, "../../bin/vmselect", flags, &appOptions{
 		defaultFlags: map[string]string{
 			"-httpListenAddr":          "127.0.0.1:0",
 			"-clusternativeListenAddr": "127.0.0.1:0",
@@ -72,11 +72,11 @@ func (app *Vmselect) HTTPAddr() string {
 func (app *Vmselect) PrometheusAPIV1Export(t *testing.T, query string, opts QueryOpts) *PrometheusAPIV1QueryResponse {
 	t.Helper()
 
-	exportURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/export", app.httpListenAddr, opts.Tenant)
+	exportURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/export", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("match[]", query)
 	values.Add("format", "promapi")
-	res, _ := app.cli.PostForm(t, exportURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, exportURL, values)
 	return NewPrometheusAPIV1QueryResponse(t, res)
 }
 
@@ -88,11 +88,11 @@ func (app *Vmselect) PrometheusAPIV1Export(t *testing.T, query string, opts Quer
 func (app *Vmselect) PrometheusAPIV1ExportNative(t *testing.T, query string, opts QueryOpts) []byte {
 	t.Helper()
 
-	exportURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/export/native", app.httpListenAddr, opts.Tenant)
+	exportURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/export/native", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("match[]", query)
 	values.Add("format", "promapi")
-	res, _ := app.cli.PostForm(t, exportURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, exportURL, values)
 	return []byte(res)
 }
 
@@ -104,11 +104,11 @@ func (app *Vmselect) PrometheusAPIV1ExportNative(t *testing.T, query string, opt
 func (app *Vmselect) PrometheusAPIV1Query(t *testing.T, query string, opts QueryOpts) *PrometheusAPIV1QueryResponse {
 	t.Helper()
 
-	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/query", app.httpListenAddr, opts.Tenant)
+	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/query", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("query", query)
 
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1QueryResponse(t, res)
 }
 
@@ -120,11 +120,11 @@ func (app *Vmselect) PrometheusAPIV1Query(t *testing.T, query string, opts Query
 func (app *Vmselect) PrometheusAPIV1QueryRange(t *testing.T, query string, opts QueryOpts) *PrometheusAPIV1QueryResponse {
 	t.Helper()
 
-	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/query_range", app.httpListenAddr, opts.Tenant)
+	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/query_range", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("query", query)
 
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1QueryResponse(t, res)
 }
 
@@ -135,11 +135,11 @@ func (app *Vmselect) PrometheusAPIV1QueryRange(t *testing.T, query string, opts
 func (app *Vmselect) PrometheusAPIV1Series(t *testing.T, matchQuery string, opts QueryOpts) *PrometheusAPIV1SeriesResponse {
 	t.Helper()
 
-	seriesURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/series", app.httpListenAddr, opts.Tenant)
+	seriesURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/series", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("match[]", matchQuery)
 
-	res, _ := app.cli.PostForm(t, seriesURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, seriesURL, values)
 	return NewPrometheusAPIV1SeriesResponse(t, res)
 }
 
@@ -150,10 +150,10 @@ func (app *Vmselect) PrometheusAPIV1Series(t *testing.T, matchQuery string, opts
 func (app *Vmselect) PrometheusAPIV1SeriesCount(t *testing.T, opts QueryOpts) *PrometheusAPIV1SeriesCountResponse {
 	t.Helper()
 
-	seriesURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/series/count", app.httpListenAddr, opts.Tenant)
+	seriesURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/series/count", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 
-	res, _ := app.cli.PostForm(t, seriesURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, seriesURL, values)
 	return NewPrometheusAPIV1SeriesCountResponse(t, res)
 }
 
@@ -167,8 +167,8 @@ func (app *Vmselect) PrometheusAPIV1Labels(t *testing.T, matchQuery string, opts
 	values := opts.asURLValues()
 	values.Add("match[]", matchQuery)
 
-	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/labels", app.httpListenAddr, opts.Tenant)
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/labels", app.httpListenAddr, opts.getTenant())
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1LabelsResponse(t, res)
 }
 
@@ -181,9 +181,9 @@ func (app *Vmselect) PrometheusAPIV1LabelValues(t *testing.T, labelName, matchQu
 
 	values := opts.asURLValues()
 	values.Add("match[]", matchQuery)
-	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/label/%s/values", app.httpListenAddr, opts.Tenant, labelName)
+	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/label/%s/values", app.httpListenAddr, opts.getTenant(), labelName)
 
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1LabelValuesResponse(t, res)
 }
 
@@ -195,9 +195,9 @@ func (app *Vmselect) PrometheusAPIV1Metadata(t *testing.T, metric string, limit
 	values := opts.asURLValues()
 	values.Add("metric", metric)
 	values.Add("limit", strconv.Itoa(limit))
-	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/metadata", app.httpListenAddr, opts.Tenant)
+	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/metadata", app.httpListenAddr, opts.getTenant())
 
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1Metadata(t, res)
 }
 
@@ -208,11 +208,11 @@ func (app *Vmselect) PrometheusAPIV1Metadata(t *testing.T, metric string, limit
 func (app *Vmselect) APIV1AdminTSDBDeleteSeries(t *testing.T, matchQuery string, opts QueryOpts) {
 	t.Helper()
 
-	queryURL := fmt.Sprintf("http://%s/delete/%s/prometheus/api/v1/admin/tsdb/delete_series", app.httpListenAddr, opts.Tenant)
+	queryURL := fmt.Sprintf("http://%s/delete/%s/prometheus/api/v1/admin/tsdb/delete_series", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("match[]", matchQuery)
 
-	res, statusCode := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, queryURL, values)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusNoContent, res)
 	}
@@ -229,9 +229,9 @@ func (app *Vmselect) MetricNamesStats(t *testing.T, limit, le, matchPattern stri
 	values.Add("limit", limit)
 	values.Add("le", le)
 	values.Add("match_pattern", matchPattern)
-	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/status/metric_names_stats", app.httpListenAddr, opts.Tenant)
+	queryURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/status/metric_names_stats", app.httpListenAddr, opts.getTenant())
 
-	res, statusCode := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, queryURL, values)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}
@@ -251,7 +251,7 @@ func (app *Vmselect) MetricNamesStatsReset(t *testing.T, opts QueryOpts) {
 	values := opts.asURLValues()
 	queryURL := fmt.Sprintf("http://%s/admin/api/v1/admin/status/metric_names_stats/reset", app.httpListenAddr)
 
-	res, statusCode := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, queryURL, values)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusNoContent, res)
 	}
@@ -263,7 +263,7 @@ func (app *Vmselect) MetricNamesStatsReset(t *testing.T, opts QueryOpts) {
 func (app *Vmselect) APIV1StatusTSDB(t *testing.T, matchQuery string, date string, topN string, opts QueryOpts) TSDBStatusResponse {
 	t.Helper()
 
-	seriesURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/status/tsdb", app.httpListenAddr, opts.Tenant)
+	seriesURL := fmt.Sprintf("http://%s/select/%s/prometheus/api/v1/status/tsdb", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	addNonEmpty := func(name, value string) {
 		if len(value) == 0 {
@@ -275,7 +275,7 @@ func (app *Vmselect) APIV1StatusTSDB(t *testing.T, matchQuery string, date strin
 	addNonEmpty("topN", topN)
 	addNonEmpty("date", date)
 
-	res, statusCode := app.cli.PostForm(t, seriesURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, seriesURL, values)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}
@@ -294,8 +294,8 @@ func (app *Vmselect) APIV1StatusTSDB(t *testing.T, matchQuery string, date strin
 func (app *Vmselect) GraphiteMetricsIndex(t *testing.T, opts QueryOpts) GraphiteMetricsIndexResponse {
 	t.Helper()
 
-	seriesURL := fmt.Sprintf("http://%s/select/%s/graphite/metrics/index.json", app.httpListenAddr, opts.Tenant)
-	res, statusCode := app.cli.Get(t, seriesURL, opts.Headers)
+	seriesURL := fmt.Sprintf("http://%s/select/%s/graphite/metrics/index.json", app.httpListenAddr, opts.getTenant())
+	res, statusCode := app.cli.Get(t, seriesURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}
@@ -313,11 +313,11 @@ func (app *Vmselect) GraphiteMetricsIndex(t *testing.T, opts QueryOpts) Graphite
 func (app *Vmselect) GraphiteTagsTagSeries(t *testing.T, record string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/select/%s/graphite/tags/tagSeries", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/select/%s/graphite/tags/tagSeries", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	values.Add("path", record)
 
-	_, statusCode := app.cli.PostForm(t, url, values, opts.Headers)
+	_, statusCode := app.cli.PostForm(t, url, values)
 	if got, want := statusCode, http.StatusNotImplemented; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d", got, want)
 	}
@@ -326,13 +326,13 @@ func (app *Vmselect) GraphiteTagsTagSeries(t *testing.T, record string, opts Que
 func (app *Vmselect) GraphiteTagsTagMultiSeries(t *testing.T, records []string, opts QueryOpts) {
 	t.Helper()
 
-	url := fmt.Sprintf("http://%s/select/%s/graphite/tags/tagMultiSeries", app.httpListenAddr, opts.Tenant)
+	url := fmt.Sprintf("http://%s/select/%s/graphite/tags/tagMultiSeries", app.httpListenAddr, opts.getTenant())
 	values := opts.asURLValues()
 	for _, rec := range records {
 		values.Add("path", rec)
 	}
 
-	_, statusCode := app.cli.PostForm(t, url, values, opts.Headers)
+	_, statusCode := app.cli.PostForm(t, url, values)
 	if got, want := statusCode, http.StatusNotImplemented; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d", got, want)
 	}
@@ -343,7 +343,7 @@ func (app *Vmselect) APIV1AdminTenants(t *testing.T) *AdminTenantsResponse {
 	t.Helper()
 
 	tenantsURL := fmt.Sprintf("http://%s/admin/tenants", app.httpListenAddr)
-	res, statusCode := app.cli.Get(t, tenantsURL, nil)
+	res, statusCode := app.cli.Get(t, tenantsURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}

apptest/vmsingle.go

@@ -98,7 +98,7 @@ func StartVmsingleAt(instance, binary string, flags []string, cli *Client, outpu
 func (app *Vmsingle) ForceFlush(t *testing.T) {
 	t.Helper()
 
-	_, statusCode := app.cli.Get(t, app.forceFlushURL, nil)
+	_, statusCode := app.cli.Get(t, app.forceFlushURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}
@@ -108,7 +108,7 @@ func (app *Vmsingle) ForceFlush(t *testing.T) {
 func (app *Vmsingle) ForceMerge(t *testing.T) {
 	t.Helper()
 
-	_, statusCode := app.cli.Get(t, app.forceMergeURL, nil)
+	_, statusCode := app.cli.Get(t, app.forceMergeURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}
@@ -130,9 +130,8 @@ func (app *Vmsingle) InfluxWrite(t *testing.T, records []string, opts QueryOpts)
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
-	_, statusCode := app.cli.Post(t, url, data, headers)
+
+	_, statusCode := app.cli.Post(t, url, "text/plain", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}
@@ -162,9 +161,7 @@ func (app *Vmsingle) PrometheusAPIV1ImportCSV(t *testing.T, records []string, op
 		url += "?" + uvs
 	}
 	data := []byte(strings.Join(records, "\n"))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
-	_, statusCode := app.cli.Post(t, url, data, headers)
+	_, statusCode := app.cli.Post(t, url, "text/plain", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}
@@ -184,9 +181,7 @@ func (app *Vmsingle) PrometheusAPIV1ImportNative(t *testing.T, data []byte, opts
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
-	_, statusCode := app.cli.Post(t, url, data, headers)
+	_, statusCode := app.cli.Post(t, url, "text/plain", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}
@@ -208,9 +203,7 @@ func (app *Vmsingle) OpenTSDBAPIPut(t *testing.T, records []string, opts QueryOp
 		url += "?" + uvs
 	}
 	data := []byte("[" + strings.Join(records, ",") + "]")
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
-	_, statusCode := app.cli.Post(t, url, data, headers)
+	_, statusCode := app.cli.Post(t, url, "text/plain", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}
@@ -219,13 +212,11 @@ func (app *Vmsingle) OpenTSDBAPIPut(t *testing.T, records []string, opts QueryOp
 // PrometheusAPIV1Write is a test helper function that inserts a
 // collection of records in Prometheus remote-write format by sending a HTTP
 // POST request to /prometheus/api/v1/write vmsingle endpoint.
-func (app *Vmsingle) PrometheusAPIV1Write(t *testing.T, wr prompb.WriteRequest, opts QueryOpts) {
+func (app *Vmsingle) PrometheusAPIV1Write(t *testing.T, wr prompb.WriteRequest, _ QueryOpts) {
 	t.Helper()
 
 	data := snappy.Encode(nil, wr.MarshalProtobuf(nil))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "application/x-protobuf")
-	_, statusCode := app.cli.Post(t, app.prometheusAPIV1WriteURL, data, headers)
+	_, statusCode := app.cli.Post(t, app.prometheusAPIV1WriteURL, "application/x-protobuf", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}
@@ -246,10 +237,9 @@ func (app *Vmsingle) PrometheusAPIV1ImportPrometheus(t *testing.T, records []str
 	if len(uvs) > 0 {
 		url += "?" + uvs
 	}
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "text/plain")
+
 	data := []byte(strings.Join(records, "\n"))
-	_, statusCode := app.cli.Post(t, url, data, headers)
+	_, statusCode := app.cli.Post(t, url, "text/plain", data)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusNoContent)
 	}
@@ -266,7 +256,7 @@ func (app *Vmsingle) PrometheusAPIV1Export(t *testing.T, query string, opts Quer
 	values.Add("match[]", query)
 	values.Add("format", "promapi")
 
-	res, _ := app.cli.PostForm(t, app.prometheusAPIV1ExportURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, app.prometheusAPIV1ExportURL, values)
 	return NewPrometheusAPIV1QueryResponse(t, res)
 }
 
@@ -283,7 +273,7 @@ func (app *Vmsingle) PrometheusAPIV1ExportNative(t *testing.T, query string, opt
 	values.Add("match[]", query)
 	values.Add("format", "promapi")
 
-	res, _ := app.cli.PostForm(t, app.prometheusAPIV1ExportNativeURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, app.prometheusAPIV1ExportNativeURL, values)
 	return []byte(res)
 }
 
@@ -297,7 +287,7 @@ func (app *Vmsingle) PrometheusAPIV1Query(t *testing.T, query string, opts Query
 
 	values := opts.asURLValues()
 	values.Add("query", query)
-	res, _ := app.cli.PostForm(t, app.prometheusAPIV1QueryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, app.prometheusAPIV1QueryURL, values)
 	return NewPrometheusAPIV1QueryResponse(t, res)
 }
 
@@ -312,7 +302,7 @@ func (app *Vmsingle) PrometheusAPIV1QueryRange(t *testing.T, query string, opts
 	values := opts.asURLValues()
 	values.Add("query", query)
 
-	res, _ := app.cli.PostForm(t, app.prometheusAPIV1QueryRangeURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, app.prometheusAPIV1QueryRangeURL, values)
 	return NewPrometheusAPIV1QueryResponse(t, res)
 }
 
@@ -326,7 +316,7 @@ func (app *Vmsingle) PrometheusAPIV1Series(t *testing.T, matchQuery string, opts
 	values := opts.asURLValues()
 	values.Add("match[]", matchQuery)
 
-	res, _ := app.cli.PostForm(t, app.prometheusAPIV1SeriesURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, app.prometheusAPIV1SeriesURL, values)
 	return NewPrometheusAPIV1SeriesResponse(t, res)
 }
 
@@ -340,7 +330,7 @@ func (app *Vmsingle) PrometheusAPIV1SeriesCount(t *testing.T, opts QueryOpts) *P
 	values := opts.asURLValues()
 
 	queryURL := fmt.Sprintf("http://%s/prometheus/api/v1/series/count", app.httpListenAddr)
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1SeriesCountResponse(t, res)
 }
 
@@ -355,7 +345,7 @@ func (app *Vmsingle) PrometheusAPIV1Labels(t *testing.T, matchQuery string, opts
 	values.Add("match[]", matchQuery)
 
 	queryURL := fmt.Sprintf("http://%s/prometheus/api/v1/labels", app.httpListenAddr)
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1LabelsResponse(t, res)
 }
 
@@ -370,7 +360,7 @@ func (app *Vmsingle) PrometheusAPIV1LabelValues(t *testing.T, labelName, matchQu
 	values.Add("match[]", matchQuery)
 
 	queryURL := fmt.Sprintf("http://%s/prometheus/api/v1/label/%s/values", app.httpListenAddr, labelName)
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1LabelValuesResponse(t, res)
 }
 
@@ -384,7 +374,7 @@ func (app *Vmsingle) PrometheusAPIV1Metadata(t *testing.T, metric string, limit
 	values.Add("limit", strconv.Itoa(limit))
 	queryURL := fmt.Sprintf("http://%s/prometheus/api/v1/metadata", app.httpListenAddr)
 
-	res, _ := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, _ := app.cli.PostForm(t, queryURL, values)
 	return NewPrometheusAPIV1Metadata(t, res)
 }
 
@@ -399,7 +389,7 @@ func (app *Vmsingle) APIV1AdminTSDBDeleteSeries(t *testing.T, matchQuery string,
 	values := opts.asURLValues()
 	values.Add("match[]", matchQuery)
 
-	res, statusCode := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, queryURL, values)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusNoContent, res)
 	}
@@ -412,7 +402,7 @@ func (app *Vmsingle) GraphiteMetricsIndex(t *testing.T, _ QueryOpts) GraphiteMet
 	t.Helper()
 
 	seriesURL := fmt.Sprintf("http://%s/metrics/index.json", app.httpListenAddr)
-	res, statusCode := app.cli.Get(t, seriesURL, nil)
+	res, statusCode := app.cli.Get(t, seriesURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}
@@ -434,7 +424,7 @@ func (app *Vmsingle) GraphiteTagsTagSeries(t *testing.T, record string, opts Que
 	values := opts.asURLValues()
 	values.Add("path", record)
 
-	_, statusCode := app.cli.PostForm(t, url, values, opts.Headers)
+	_, statusCode := app.cli.PostForm(t, url, values)
 	if got, want := statusCode, http.StatusNotImplemented; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d", got, want)
 	}
@@ -449,7 +439,7 @@ func (app *Vmsingle) GraphiteTagsTagMultiSeries(t *testing.T, records []string,
 		values.Add("path", rec)
 	}
 
-	_, statusCode := app.cli.PostForm(t, url, values, opts.Headers)
+	_, statusCode := app.cli.PostForm(t, url, values)
 	if got, want := statusCode, http.StatusNotImplemented; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d", got, want)
 	}
@@ -468,7 +458,7 @@ func (app *Vmsingle) APIV1StatusMetricNamesStats(t *testing.T, limit, le, matchP
 	values.Add("match_pattern", matchPattern)
 	queryURL := fmt.Sprintf("http://%s/api/v1/status/metric_names_stats", app.httpListenAddr)
 
-	res, statusCode := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, queryURL, values)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}
@@ -488,7 +478,7 @@ func (app *Vmsingle) APIV1AdminStatusMetricNamesStatsReset(t *testing.T, opts Qu
 	values := opts.asURLValues()
 	queryURL := fmt.Sprintf("http://%s/api/v1/admin/status/metric_names_stats/reset", app.httpListenAddr)
 
-	res, statusCode := app.cli.PostForm(t, queryURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, queryURL, values)
 	if statusCode != http.StatusNoContent {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusNoContent, res)
 	}
@@ -501,7 +491,7 @@ func (app *Vmsingle) APIV1AdminStatusMetricNamesStatsReset(t *testing.T, opts Qu
 func (app *Vmsingle) SnapshotCreate(t *testing.T) *SnapshotCreateResponse {
 	t.Helper()
 
-	data, statusCode := app.cli.Post(t, app.SnapshotCreateURL(), nil, nil)
+	data, statusCode := app.cli.Post(t, app.SnapshotCreateURL(), "", nil)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}
@@ -527,7 +517,7 @@ func (app *Vmsingle) APIV1AdminTSDBSnapshot(t *testing.T) *APIV1AdminTSDBSnapsho
 	t.Helper()
 
 	queryURL := fmt.Sprintf("http://%s/api/v1/admin/tsdb/snapshot", app.httpListenAddr)
-	data, statusCode := app.cli.Post(t, queryURL, nil, nil)
+	data, statusCode := app.cli.Post(t, queryURL, "", nil)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}
@@ -548,7 +538,7 @@ func (app *Vmsingle) SnapshotList(t *testing.T) *SnapshotListResponse {
 	t.Helper()
 
 	queryURL := fmt.Sprintf("http://%s/snapshot/list", app.httpListenAddr)
-	data, statusCode := app.cli.Get(t, queryURL, nil)
+	data, statusCode := app.cli.Get(t, queryURL)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}
@@ -594,7 +584,7 @@ func (app *Vmsingle) SnapshotDeleteAll(t *testing.T) *SnapshotDeleteAllResponse
 	t.Helper()
 
 	queryURL := fmt.Sprintf("http://%s/snapshot/delete_all", app.httpListenAddr)
-	data, statusCode := app.cli.Get(t, queryURL, nil)
+	data, statusCode := app.cli.Get(t, queryURL)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}
@@ -625,7 +615,7 @@ func (app *Vmsingle) APIV1StatusTSDB(t *testing.T, matchQuery string, date strin
 	addNonEmpty("topN", topN)
 	addNonEmpty("date", date)
 
-	res, statusCode := app.cli.PostForm(t, seriesURL, values, opts.Headers)
+	res, statusCode := app.cli.PostForm(t, seriesURL, values)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", statusCode, http.StatusOK, res)
 	}
@@ -651,9 +641,7 @@ func (app *Vmsingle) ZabbixConnectorHistory(t *testing.T, records []string, opts
 		url += "?" + uvs
 	}
 	data := []byte(strings.Join(records, "\n"))
-	headers := opts.getHeaders()
-	headers.Set("Content-Type", "application/json")
-	_, statusCode := app.cli.Post(t, url, data, headers)
+	_, statusCode := app.cli.Post(t, url, "application/json", data)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}

apptest/vmstorage.go

@@ -77,7 +77,7 @@ func (app *Vmstorage) ForceFlush(t *testing.T) {
 	t.Helper()
 
 	forceFlushURL := fmt.Sprintf("http://%s/internal/force_flush", app.httpListenAddr)
-	_, statusCode := app.cli.Get(t, forceFlushURL, nil)
+	_, statusCode := app.cli.Get(t, forceFlushURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}
@@ -88,7 +88,7 @@ func (app *Vmstorage) ForceMerge(t *testing.T) {
 	t.Helper()
 
 	forceMergeURL := fmt.Sprintf("http://%s/internal/force_merge", app.httpListenAddr)
-	_, statusCode := app.cli.Get(t, forceMergeURL, nil)
+	_, statusCode := app.cli.Get(t, forceMergeURL)
 	if statusCode != http.StatusOK {
 		t.Fatalf("unexpected status code: got %d, want %d", statusCode, http.StatusOK)
 	}
@@ -101,7 +101,7 @@ func (app *Vmstorage) ForceMerge(t *testing.T) {
 func (app *Vmstorage) SnapshotCreate(t *testing.T) *SnapshotCreateResponse {
 	t.Helper()
 
-	data, statusCode := app.cli.Post(t, app.SnapshotCreateURL(), nil, nil)
+	data, statusCode := app.cli.Post(t, app.SnapshotCreateURL(), "", nil)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}
@@ -127,7 +127,7 @@ func (app *Vmstorage) SnapshotList(t *testing.T) *SnapshotListResponse {
 	t.Helper()
 
 	queryURL := fmt.Sprintf("http://%s/snapshot/list", app.httpListenAddr)
-	data, statusCode := app.cli.Get(t, queryURL, nil)
+	data, statusCode := app.cli.Get(t, queryURL)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}
@@ -173,7 +173,7 @@ func (app *Vmstorage) SnapshotDeleteAll(t *testing.T) *SnapshotDeleteAllResponse
 	t.Helper()
 
 	queryURL := fmt.Sprintf("http://%s/snapshot/delete_all", app.httpListenAddr)
-	data, statusCode := app.cli.Post(t, queryURL, nil, nil)
+	data, statusCode := app.cli.Post(t, queryURL, "", nil)
 	if got, want := statusCode, http.StatusOK; got != want {
 		t.Fatalf("unexpected status code: got %d, want %d, resp text=%q", got, want, data)
 	}

codecov.yml

@@ -0,0 +1,9 @@
+# see https://docs.codecov.com/docs/common-recipe-list#set-non-blocking-status-checks
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch:
+      default:
+        informational: true

dashboards/alert-statistics.json

@@ -119,8 +119,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": 0
+                "color": "green"
               },
               {
                 "color": "yellow",
@@ -200,8 +199,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": 0
+                "color": "green"
               }
             ]
           }
@@ -210,14 +208,14 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
+        "w": 9,
         "x": 0,
         "y": 14
       },
       "id": 5,
       "options": {
-        "colorMode": "none",
-        "graphMode": "none",
+        "colorMode": "value",
+        "graphMode": "area",
         "justifyMode": "auto",
         "orientation": "auto",
         "percentChangeColorMode": "standard",
@@ -259,7 +257,7 @@
         "type": "prometheus",
         "uid": "$ds"
       },
-      "description": "Shows the total number of loaded alerting rules across selected instances and groups.",
+      "description": "",
       "fieldConfig": {
         "defaults": {
           "mappings": [],
@@ -268,8 +266,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": 0
+                "color": "green"
               }
             ]
           }
@@ -278,11 +275,11 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 6,
+        "w": 7,
+        "x": 9,
         "y": 14
       },
-      "id": 8,
+      "id": 4,
       "options": {
         "colorMode": "value",
         "graphMode": "area",
@@ -323,144 +320,6 @@
       "title": "Alerting rules",
       "type": "stat"
     },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$ds"
-      },
-      "description": "Shows the total number of pendings alerts in selected instances and grouping groups.",
-      "fieldConfig": {
-        "defaults": {
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "yellow",
-                "value": 0
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 6,
-        "x": 12,
-        "y": 14
-      },
-      "id": 9,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "percentChangeColorMode": "standard",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showPercentChange": false,
-        "text": {
-          "valueSize": 80
-        },
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "pluginVersion": "12.0.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${ds}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(vmalert_alerts_pending{job=~\"$job\",instance=~\"$instance\",group=~\"$group\"})",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Alerting pending",
-      "type": "stat"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "$ds"
-      },
-      "description": "Shows the total number of firing alerts in selected instances and grouping groups.",
-      "fieldConfig": {
-        "defaults": {
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": 0
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 6,
-        "x": 18,
-        "y": 14
-      },
-      "id": 10,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "percentChangeColorMode": "standard",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showPercentChange": false,
-        "text": {
-          "valueSize": 80
-        },
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "pluginVersion": "12.0.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${ds}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(vmalert_alerts_firing{job=~\"$job\",instance=~\"$instance\",group=~\"$group\"})",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Alerting firing",
-      "type": "stat"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -473,9 +332,6 @@
             "cellOptions": {
               "type": "auto"
             },
-            "footer": {
-              "reducers": []
-            },
             "inspect": false
           },
           "mappings": [],
@@ -483,8 +339,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": 0
+                "color": "green"
               },
               {
                 "color": "red",
@@ -497,7 +352,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Count"
+              "options": "Count (sum)"
             },
             "properties": [
               {
@@ -517,12 +372,20 @@
       "id": 2,
       "options": {
         "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
         "frameIndex": 1,
         "showHeader": true,
         "sortBy": [
           {
             "desc": true,
-            "displayName": "Count"
+            "displayName": "Count (sum)"
           }
         ]
       },
@@ -535,7 +398,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "topk_max(100, sum(increases_over_time(vmalert_alerts_firing{job=~\"$job\",instance=~\"$instance\",group=~\"$group\"}[$__range])) by(group) > 0)",
+          "expr": "topk_max(100, sum(increases_over_time(vmalert_alerts_firing{job=~\"$job\",instance=~\"$instance\",group=~\"$group\"}[$__range])) by(group, alertname) > 0)",
           "format": "table",
           "instant": true,
           "key": "Q-3934f0fb-8ad6-4519-a98d-c26d0fc6b312-0",
@@ -551,9 +414,8 @@
           "options": {
             "excludeByName": {
               "Time": true,
-              "alertname": true
+              "alertname": false
             },
-            "includeByName": {},
             "indexByName": {
               "Time": 0,
               "Value": 3,
@@ -566,6 +428,23 @@
               "group": "Group"
             }
           }
+        },
+        {
+          "id": "groupBy",
+          "options": {
+            "fields": {
+              "Count": {
+                "aggregations": [
+                  "sum"
+                ],
+                "operation": "aggregate"
+              },
+              "Group": {
+                "aggregations": [],
+                "operation": "groupby"
+              }
+            }
+          }
         }
       ],
       "type": "table"
@@ -589,8 +468,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": 0
+                "color": "green"
               },
               {
                 "color": "red",
@@ -653,14 +531,16 @@
       "id": 1,
       "options": {
         "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
         "frameIndex": 1,
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Count"
-          }
-        ]
+        "showHeader": true
       },
       "pluginVersion": "12.0.2",
       "targets": [

dashboards/vm/operator.json

@@ -115,7 +115,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 3,
+        "h": 4,
         "w": 4,
         "x": 0,
         "y": 1

dashboards/vm/vmalert.json

@@ -185,7 +185,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -250,7 +250,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -313,7 +313,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -380,7 +380,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -460,7 +460,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -557,7 +557,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -663,7 +663,7 @@
           "sort": "asc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -783,7 +783,7 @@
           "sort": "desc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -889,7 +889,7 @@
           "sort": "desc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -993,7 +993,7 @@
           "sort": "desc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -1097,7 +1097,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -1222,7 +1222,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1337,7 +1337,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1447,7 +1447,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1562,7 +1562,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1695,7 +1695,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1800,7 +1800,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1921,7 +1921,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2043,7 +2043,7 @@
               "sort": "none"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2151,7 +2151,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2260,7 +2260,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2368,7 +2368,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2472,7 +2472,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2592,7 +2592,7 @@
               }
             ]
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "10.4.2",
           "targets": [
             {
               "datasource": {
@@ -2722,7 +2722,7 @@
               "sort": "none"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -2827,7 +2827,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.1.0",
           "targets": [
             {
               "datasource": {
@@ -2942,7 +2942,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3044,7 +3044,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3146,7 +3146,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3247,7 +3247,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3346,7 +3346,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3462,7 +3462,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3564,7 +3564,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "8.0.3",
           "targets": [
             {
               "datasource": {
@@ -3663,7 +3663,7 @@
               "sort": "none"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3707,13 +3707,11 @@
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisBorderShow": false,
                 "axisCenteredZero": false,
                 "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
-                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 0,
                 "gradientMode": "none",
@@ -3722,7 +3720,6 @@
                   "tooltip": false,
                   "viz": false
                 },
-                "insertNulls": false,
                 "lineInterpolation": "linear",
                 "lineWidth": 1,
                 "pointSize": 5,
@@ -3730,7 +3727,6 @@
                   "type": "linear"
                 },
                 "showPoints": "auto",
-                "showValues": false,
                 "spanNulls": false,
                 "stacking": {
                   "group": "A",
@@ -3745,8 +3741,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": 0
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3761,7 +3756,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 30
+            "y": 351
           },
           "id": 52,
           "options": {
@@ -3772,12 +3767,10 @@
               "showLegend": true
             },
             "tooltip": {
-              "hideZeros": false,
               "mode": "single",
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
           "targets": [
             {
               "datasource": {
@@ -3785,7 +3778,7 @@
                 "uid": "$ds"
               },
               "editorMode": "code",
-              "expr": "sum(rate(vmalert_remotewrite_sent_rows_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job) default sum(rate(vmalert_remotewrite_sent_rows_sum{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job)",
+              "expr": "sum(rate(vmalert_remotewrite_sent_rows_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job)",
               "legendFormat": "__auto",
               "range": true,
               "refId": "A"
@@ -3799,20 +3792,18 @@
             "type": "victoriametrics-metrics-datasource",
             "uid": "$ds"
           },
-          "description": "Shows the global rate for number of written bytes via remote write connections.",
+          "description": "Shows the number of datapoints dropped by vmalert while sending to the configured remote write URL. vmalert performs up to 5 retries before dropping the data. Check vmalert's error logs for the specific error message.",
           "fieldConfig": {
             "defaults": {
               "color": {
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisBorderShow": false,
                 "axisCenteredZero": false,
                 "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
-                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 0,
                 "gradientMode": "none",
@@ -3821,115 +3812,6 @@
                   "tooltip": false,
                   "viz": false
                 },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "never",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "links": [],
-              "mappings": [],
-              "min": 0,
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "decbytes"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 30
-          },
-          "id": 60,
-          "options": {
-            "legend": {
-              "calcs": [
-                "mean",
-                "lastNotNull",
-                "max"
-              ],
-              "displayMode": "table",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "multi",
-              "sort": "desc"
-            }
-          },
-          "pluginVersion": "12.2.0",
-          "targets": [
-            {
-              "datasource": {
-                "type": "victoriametrics-metrics-datasource",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "exemplar": true,
-              "expr": "sum(rate(vmalert_remotewrite_conn_bytes_written_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job) > 0",
-              "interval": "",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Bytes write rate ($instance)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "victoriametrics-metrics-datasource",
-            "uid": "$ds"
-          },
-          "description": "Data could be dropped in two scenarios:\n1. The remote write queue(configured by -remoteWrite.maxQueueSize) is full:  \nThe queue can fill rapidly if heavy rules generate millions of series, or if remote write requests are unable to send data to the destination in a timely manner, resulting in data being jammed in the queue. Consider tuning -remoteWrite.maxQueueSize or -remoteWrite.concurrency.\nSee also Rows per request pannel.\n2. The request to the configured remote write URL failed(vmalert performs up to 5 retries before dropping the data).\n\nCheck vmalert's error logs for the specific error message.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
                 "lineInterpolation": "linear",
                 "lineWidth": 1,
                 "pointSize": 5,
@@ -3937,7 +3819,6 @@
                   "type": "linear"
                 },
                 "showPoints": "auto",
-                "showValues": false,
                 "spanNulls": false,
                 "stacking": {
                   "group": "A",
@@ -3952,8 +3833,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": 0
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3967,8 +3847,8 @@
           "gridPos": {
             "h": 8,
             "w": 12,
-            "x": 0,
-            "y": 38
+            "x": 12,
+            "y": 351
           },
           "id": 53,
           "options": {
@@ -3979,12 +3859,10 @@
               "showLegend": true
             },
             "tooltip": {
-              "hideZeros": false,
               "mode": "single",
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
           "targets": [
             {
               "datasource": {
@@ -4001,237 +3879,6 @@
           "title": "Datapoints drop rate ($instance)",
           "type": "timeseries"
         },
-        {
-          "datasource": {
-            "type": "victoriametrics-metrics-datasource",
-            "uid": "$ds"
-          },
-          "description": "Displays the maximum 99th percentile of the number of time series pending in the remote write queue.\n\nThe maximum queue size is configured by remoteWrite.maxQueueSize. \nvmalert will begin dropping data if the queue has no room for newly generated data.\nThe queue can fill rapidly when heavy rules generate millions of series, or when remote write requests are unable to send data to the destination in a timely manner, causing data to accumulate in the queue. Consider tuning -remoteWrite.maxQueueSize or -remoteWrite.concurrency.\n\nSee also the Rows per request panel.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": [
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "max"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "red",
-                      "mode": "fixed"
-                    }
-                  },
-                  {
-                    "id": "custom.fillOpacity",
-                    "value": 0
-                  }
-                ]
-              }
-            ]
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 38
-          },
-          "id": 68,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "multi",
-              "sort": "desc"
-            }
-          },
-          "pluginVersion": "12.2.0",
-          "targets": [
-            {
-              "datasource": {
-                "type": "victoriametrics-metrics-datasource",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "expr": "max(histogram_quantile(0.99, sum(increase(vmalert_remotewrite_queue_size_bucket{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by (instance, vmrange))) > 1",
-              "legendFormat": "current",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "victoriametrics-metrics-datasource",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "expr": "min(vmalert_remotewrite_queue_capacity{job=~\"$job\", instance=~\"$instance\"})",
-              "hide": false,
-              "instant": false,
-              "legendFormat": "max",
-              "range": true,
-              "refId": "B"
-            }
-          ],
-          "title": "Remote write queue size ($instance)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "victoriametrics-metrics-datasource",
-            "uid": "$ds"
-          },
-          "description": "Displays the maximum 99th percentile of the number of data samples sent per request to the configured remote write URL.\nThe value is influenced by the utilization of the remote write queue. It is normal for this metric to remain low when there are no rules generating a large number of series, and to spike when heavy rules generate thousands of series.\nDuring periods of high load (when many heavy rules are generating results), the optimal value for rows per request should be high to maximize the efficiency of each push operation.\n\nIf you observe datapoint drops and consistently low values for rows per request, try checking the write latency between vmalert and the remote write destination, or increasing `-remoteWrite.flushInterval`.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 0,
-            "y": 46
-          },
-          "id": 69,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "single",
-              "sort": "desc"
-            }
-          },
-          "pluginVersion": "12.2.0",
-          "targets": [
-            {
-              "datasource": {
-                "type": "victoriametrics-metrics-datasource",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "expr": "max(histogram_quantile(0.99, sum(increase(vmalert_remotewrite_sent_rows_bucket{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by (instance, vmrange)))",
-              "legendFormat": "max",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Rows per request ($instance)",
-          "type": "timeseries"
-        },
         {
           "datasource": {
             "type": "victoriametrics-metrics-datasource",
@@ -4250,7 +3897,6 @@
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
-                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 0,
                 "gradientMode": "none",
@@ -4267,7 +3913,6 @@
                   "type": "linear"
                 },
                 "showPoints": "never",
-                "showValues": false,
                 "spanNulls": false,
                 "stacking": {
                   "group": "A",
@@ -4284,8 +3929,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": 0
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -4300,8 +3944,8 @@
           "gridPos": {
             "h": 8,
             "w": 12,
-            "x": 12,
-            "y": 46
+            "x": 0,
+            "y": 378
           },
           "id": 54,
           "options": {
@@ -4316,12 +3960,10 @@
               "showLegend": true
             },
             "tooltip": {
-              "hideZeros": false,
               "mode": "multi",
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
           "targets": [
             {
               "datasource": {
@@ -4339,6 +3981,109 @@
           ],
           "title": "Connections ($instance)",
           "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "victoriametrics-metrics-datasource",
+            "uid": "$ds"
+          },
+          "description": "Shows the global rate for number of written bytes via remote write connections.",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisBorderShow": false,
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "insertNulls": false,
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "never",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "links": [],
+              "mappings": [],
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "decbytes"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 378
+          },
+          "id": 60,
+          "options": {
+            "legend": {
+              "calcs": [
+                "mean",
+                "lastNotNull",
+                "max"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "multi",
+              "sort": "desc"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "victoriametrics-metrics-datasource",
+                "uid": "$ds"
+              },
+              "editorMode": "code",
+              "exemplar": true,
+              "expr": "sum(rate(vmalert_remotewrite_conn_bytes_written_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job) > 0",
+              "interval": "",
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Bytes write rate ($instance)",
+          "type": "timeseries"
         }
       ],
       "title": "Remote write",

dashboards/vmalert.json

@@ -184,7 +184,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -249,7 +249,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -312,7 +312,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -379,7 +379,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -459,7 +459,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -556,7 +556,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -662,7 +662,7 @@
           "sort": "asc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -782,7 +782,7 @@
           "sort": "desc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -888,7 +888,7 @@
           "sort": "desc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -992,7 +992,7 @@
           "sort": "desc"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -1096,7 +1096,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "12.0.2",
       "targets": [
         {
           "datasource": {
@@ -1221,7 +1221,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1336,7 +1336,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1446,7 +1446,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1561,7 +1561,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1694,7 +1694,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1799,7 +1799,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -1920,7 +1920,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2042,7 +2042,7 @@
               "sort": "none"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2150,7 +2150,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2259,7 +2259,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2367,7 +2367,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2471,7 +2471,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "11.5.0",
           "targets": [
             {
               "datasource": {
@@ -2591,7 +2591,7 @@
               }
             ]
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "10.4.2",
           "targets": [
             {
               "datasource": {
@@ -2721,7 +2721,7 @@
               "sort": "none"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -2826,7 +2826,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.1.0",
           "targets": [
             {
               "datasource": {
@@ -2941,7 +2941,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3043,7 +3043,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3145,7 +3145,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3246,7 +3246,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3345,7 +3345,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3461,7 +3461,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3563,7 +3563,7 @@
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "8.0.3",
           "targets": [
             {
               "datasource": {
@@ -3662,7 +3662,7 @@
               "sort": "none"
             }
           },
-          "pluginVersion": "12.2.0",
+          "pluginVersion": "9.2.6",
           "targets": [
             {
               "datasource": {
@@ -3706,13 +3706,11 @@
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisBorderShow": false,
                 "axisCenteredZero": false,
                 "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
-                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 0,
                 "gradientMode": "none",
@@ -3721,7 +3719,6 @@
                   "tooltip": false,
                   "viz": false
                 },
-                "insertNulls": false,
                 "lineInterpolation": "linear",
                 "lineWidth": 1,
                 "pointSize": 5,
@@ -3729,7 +3726,6 @@
                   "type": "linear"
                 },
                 "showPoints": "auto",
-                "showValues": false,
                 "spanNulls": false,
                 "stacking": {
                   "group": "A",
@@ -3744,8 +3740,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": 0
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3760,7 +3755,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 30
+            "y": 351
           },
           "id": 52,
           "options": {
@@ -3771,12 +3766,10 @@
               "showLegend": true
             },
             "tooltip": {
-              "hideZeros": false,
               "mode": "single",
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
           "targets": [
             {
               "datasource": {
@@ -3784,7 +3777,7 @@
                 "uid": "$ds"
               },
               "editorMode": "code",
-              "expr": "sum(rate(vmalert_remotewrite_sent_rows_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job) default sum(rate(vmalert_remotewrite_sent_rows_sum{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job)",
+              "expr": "sum(rate(vmalert_remotewrite_sent_rows_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job)",
               "legendFormat": "__auto",
               "range": true,
               "refId": "A"
@@ -3798,20 +3791,18 @@
             "type": "prometheus",
             "uid": "$ds"
           },
-          "description": "Shows the global rate for number of written bytes via remote write connections.",
+          "description": "Shows the number of datapoints dropped by vmalert while sending to the configured remote write URL. vmalert performs up to 5 retries before dropping the data. Check vmalert's error logs for the specific error message.",
           "fieldConfig": {
             "defaults": {
               "color": {
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisBorderShow": false,
                 "axisCenteredZero": false,
                 "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
-                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 0,
                 "gradientMode": "none",
@@ -3820,115 +3811,6 @@
                   "tooltip": false,
                   "viz": false
                 },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "never",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "links": [],
-              "mappings": [],
-              "min": 0,
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "decbytes"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 30
-          },
-          "id": 60,
-          "options": {
-            "legend": {
-              "calcs": [
-                "mean",
-                "lastNotNull",
-                "max"
-              ],
-              "displayMode": "table",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "multi",
-              "sort": "desc"
-            }
-          },
-          "pluginVersion": "12.2.0",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "exemplar": true,
-              "expr": "sum(rate(vmalert_remotewrite_conn_bytes_written_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job) > 0",
-              "interval": "",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Bytes write rate ($instance)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$ds"
-          },
-          "description": "Data could be dropped in two scenarios:\n1. The remote write queue(configured by -remoteWrite.maxQueueSize) is full:  \nThe queue can fill rapidly if heavy rules generate millions of series, or if remote write requests are unable to send data to the destination in a timely manner, resulting in data being jammed in the queue. Consider tuning -remoteWrite.maxQueueSize or -remoteWrite.concurrency.\nSee also Rows per request pannel.\n2. The request to the configured remote write URL failed(vmalert performs up to 5 retries before dropping the data).\n\nCheck vmalert's error logs for the specific error message.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
                 "lineInterpolation": "linear",
                 "lineWidth": 1,
                 "pointSize": 5,
@@ -3936,7 +3818,6 @@
                   "type": "linear"
                 },
                 "showPoints": "auto",
-                "showValues": false,
                 "spanNulls": false,
                 "stacking": {
                   "group": "A",
@@ -3951,8 +3832,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": 0
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3966,8 +3846,8 @@
           "gridPos": {
             "h": 8,
             "w": 12,
-            "x": 0,
-            "y": 38
+            "x": 12,
+            "y": 351
           },
           "id": 53,
           "options": {
@@ -3978,12 +3858,10 @@
               "showLegend": true
             },
             "tooltip": {
-              "hideZeros": false,
               "mode": "single",
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
           "targets": [
             {
               "datasource": {
@@ -4000,237 +3878,6 @@
           "title": "Datapoints drop rate ($instance)",
           "type": "timeseries"
         },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$ds"
-          },
-          "description": "Displays the maximum 99th percentile of the number of time series pending in the remote write queue.\n\nThe maximum queue size is configured by remoteWrite.maxQueueSize. \nvmalert will begin dropping data if the queue has no room for newly generated data.\nThe queue can fill rapidly when heavy rules generate millions of series, or when remote write requests are unable to send data to the destination in a timely manner, causing data to accumulate in the queue. Consider tuning -remoteWrite.maxQueueSize or -remoteWrite.concurrency.\n\nSee also the Rows per request panel.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": [
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "max"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "red",
-                      "mode": "fixed"
-                    }
-                  },
-                  {
-                    "id": "custom.fillOpacity",
-                    "value": 0
-                  }
-                ]
-              }
-            ]
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 38
-          },
-          "id": 68,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "multi",
-              "sort": "desc"
-            }
-          },
-          "pluginVersion": "12.2.0",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "expr": "max(histogram_quantile(0.99, sum(increase(vmalert_remotewrite_queue_size_bucket{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by (instance, vmrange))) > 1",
-              "legendFormat": "current",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "expr": "min(vmalert_remotewrite_queue_capacity{job=~\"$job\", instance=~\"$instance\"})",
-              "hide": false,
-              "instant": false,
-              "legendFormat": "max",
-              "range": true,
-              "refId": "B"
-            }
-          ],
-          "title": "Remote write queue size ($instance)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "$ds"
-          },
-          "description": "Displays the maximum 99th percentile of the number of data samples sent per request to the configured remote write URL.\nThe value is influenced by the utilization of the remote write queue. It is normal for this metric to remain low when there are no rules generating a large number of series, and to spike when heavy rules generate thousands of series.\nDuring periods of high load (when many heavy rules are generating results), the optimal value for rows per request should be high to maximize the efficiency of each push operation.\n\nIf you observe datapoint drops and consistently low values for rows per request, try checking the write latency between vmalert and the remote write destination, or increasing `-remoteWrite.flushInterval`.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "barWidthFactor": 0.6,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "showValues": false,
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green",
-                    "value": 0
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 0,
-            "y": 46
-          },
-          "id": 69,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "hideZeros": false,
-              "mode": "single",
-              "sort": "desc"
-            }
-          },
-          "pluginVersion": "12.2.0",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "$ds"
-              },
-              "editorMode": "code",
-              "expr": "max(histogram_quantile(0.99, sum(increase(vmalert_remotewrite_sent_rows_bucket{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by (instance, vmrange)))",
-              "legendFormat": "max",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Rows per request ($instance)",
-          "type": "timeseries"
-        },
         {
           "datasource": {
             "type": "prometheus",
@@ -4249,7 +3896,6 @@
                 "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
-                "barWidthFactor": 0.6,
                 "drawStyle": "line",
                 "fillOpacity": 0,
                 "gradientMode": "none",
@@ -4266,7 +3912,6 @@
                   "type": "linear"
                 },
                 "showPoints": "never",
-                "showValues": false,
                 "spanNulls": false,
                 "stacking": {
                   "group": "A",
@@ -4283,8 +3928,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": 0
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -4299,8 +3943,8 @@
           "gridPos": {
             "h": 8,
             "w": 12,
-            "x": 12,
-            "y": 46
+            "x": 0,
+            "y": 378
           },
           "id": 54,
           "options": {
@@ -4315,12 +3959,10 @@
               "showLegend": true
             },
             "tooltip": {
-              "hideZeros": false,
               "mode": "multi",
               "sort": "desc"
             }
           },
-          "pluginVersion": "12.2.0",
           "targets": [
             {
               "datasource": {
@@ -4338,6 +3980,109 @@
           ],
           "title": "Connections ($instance)",
           "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds"
+          },
+          "description": "Shows the global rate for number of written bytes via remote write connections.",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisBorderShow": false,
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "insertNulls": false,
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "never",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "links": [],
+              "mappings": [],
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "decbytes"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 378
+          },
+          "id": 60,
+          "options": {
+            "legend": {
+              "calcs": [
+                "mean",
+                "lastNotNull",
+                "max"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "multi",
+              "sort": "desc"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "$ds"
+              },
+              "editorMode": "code",
+              "exemplar": true,
+              "expr": "sum(rate(vmalert_remotewrite_conn_bytes_written_total{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) by(job) > 0",
+              "interval": "",
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Bytes write rate ($instance)",
+          "type": "timeseries"
         }
       ],
       "title": "Remote write",

deployment/docker/Makefile

@@ -7,7 +7,7 @@ ROOT_IMAGE ?= alpine:3.23.3
 ROOT_IMAGE_SCRATCH ?= scratch
 CERTS_IMAGE := alpine:3.23.3
 
-GO_BUILDER_IMAGE := golang:1.26.2
+GO_BUILDER_IMAGE := golang:1.26.1
 
 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
 BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)

deployment/docker/compose-vm-cluster.yml

@@ -3,7 +3,7 @@ services:
   #  It scrapes targets defined in --promscrape.config
   #  And forward them to --remoteWrite.url
   vmagent:
-    image: victoriametrics/vmagent:v1.140.0
+    image: victoriametrics/vmagent:v1.138.0
     depends_on:
       - "vmauth"
     ports:
@@ -42,14 +42,14 @@ services:
   # vmstorage shards. Each shard receives 1/N of all metrics sent to vminserts,
   # where N is number of vmstorages (2 in this case).
   vmstorage-1:
-    image: victoriametrics/vmstorage:v1.140.0-cluster
+    image: victoriametrics/vmstorage:v1.138.0-cluster
     volumes:
       - strgdata-1:/storage
     command:
       - "--storageDataPath=/storage"
     restart: always
   vmstorage-2:
-    image: victoriametrics/vmstorage:v1.140.0-cluster
+    image: victoriametrics/vmstorage:v1.138.0-cluster
     volumes:
       - strgdata-2:/storage
     command:
@@ -59,7 +59,7 @@ services:
   # vminsert is ingestion frontend. It receives metrics pushed by vmagent,
   # pre-process them and distributes across configured vmstorage shards.
   vminsert-1:
-    image: victoriametrics/vminsert:v1.140.0-cluster
+    image: victoriametrics/vminsert:v1.138.0-cluster
     depends_on:
       - "vmstorage-1"
       - "vmstorage-2"
@@ -68,7 +68,7 @@ services:
       - "--storageNode=vmstorage-2:8400"
     restart: always
   vminsert-2:
-    image: victoriametrics/vminsert:v1.140.0-cluster
+    image: victoriametrics/vminsert:v1.138.0-cluster
     depends_on:
       - "vmstorage-1"
       - "vmstorage-2"
@@ -80,7 +80,7 @@ services:
   # vmselect is a query fronted. It serves read queries in MetricsQL or PromQL.
   # vmselect collects results from configured `--storageNode` shards.
   vmselect-1:
-    image: victoriametrics/vmselect:v1.140.0-cluster
+    image: victoriametrics/vmselect:v1.138.0-cluster
     depends_on:
       - "vmstorage-1"
       - "vmstorage-2"
@@ -90,7 +90,7 @@ services:
       - "--vmalert.proxyURL=http://vmalert:8880"
     restart: always
   vmselect-2:
-    image: victoriametrics/vmselect:v1.140.0-cluster
+    image: victoriametrics/vmselect:v1.138.0-cluster
     depends_on:
       - "vmstorage-1"
       - "vmstorage-2"
@@ -105,7 +105,7 @@ services:
   # read requests from Grafana, vmui, vmalert among vmselects.
   # It can be used as an authentication proxy.
   vmauth:
-    image: victoriametrics/vmauth:v1.140.0
+    image: victoriametrics/vmauth:v1.138.0
     depends_on:
       - "vmselect-1"
       - "vmselect-2"
@@ -119,7 +119,7 @@ services:
 
   # vmalert executes alerting and recording rules
   vmalert:
-    image: victoriametrics/vmalert:v1.140.0
+    image: victoriametrics/vmalert:v1.138.0
     depends_on:
       - "vmauth"
     ports:

deployment/docker/compose-vm-single.yml

@@ -3,7 +3,7 @@ services:
   #  It scrapes targets defined in --promscrape.config
   #  And forward them to --remoteWrite.url
   vmagent:
-    image: victoriametrics/vmagent:v1.140.0
+    image: victoriametrics/vmagent:v1.138.0
     depends_on:
       - "victoriametrics"
     ports:
@@ -18,7 +18,7 @@ services:
   # VictoriaMetrics instance, a single process responsible for
   # storing metrics and serve read requests.
   victoriametrics:
-    image: victoriametrics/victoria-metrics:v1.140.0
+    image: victoriametrics/victoria-metrics:v1.138.0
     ports:
       - 8428:8428
       - 8089:8089
@@ -59,7 +59,7 @@ services:
 
   # vmalert executes alerting and recording rules
   vmalert:
-    image: victoriametrics/vmalert:v1.140.0
+    image: victoriametrics/vmalert:v1.138.0
     depends_on:
       - "victoriametrics"
       - "alertmanager"

deployment/docker/rules/alerts-vmalert.yml

@@ -85,20 +85,6 @@ groups:
             to the configured remote write URL. This may result into gaps in recording rules or alerts state.
             Check vmalert's logs for detailed error message."
 
-      - alert: RemoteWriteQueueHighUsage
-        expr: histogram_quantile(0.99, sum(increase(vmalert_remotewrite_queue_size_bucket[5m])) by (job, instance, vmrange)) / vmalert_remotewrite_queue_capacity > 0.8
-        for: 15m
-        labels:
-          severity: warning
-        annotations:
-          summary: "Remote write queue capacity on the vmalert instance {{ $labels.instance }} has exceeded 80% utilization"
-          description: "The remote write queue on vmalert instance {{ $labels.instance }} has consistently high utilization.
-            The queue acts as a buffer between rules generating series and remote-write client consuming and pushing these series. When queue overflows, vmalert will start dropping newly generated series.
-            Queue may overflow due to multiple reasons:
-             1. Some bad rules produce too many series at once. This can be limited using the global `-rule.resultsLimit` flag or `limit` param at the rule group level.
-             2. Remote write connection is slow.  Increase `-remoteWrite.concurrency`,  so vmalert could establish more concurrent connections.
-             3. The queue size is too small. Increase `-remoteWrite.maxQueueSize` to extend the buffer size. Note that a larger queue will result in higher memory consumption when the queue is full."
-
       - alert: AlertmanagerErrors
         expr: increase(vmalert_alerts_send_errors_total[5m]) > 0
         for: 15m
@@ -108,4 +94,3 @@ groups:
           summary: "vmalert instance {{ $labels.instance }} is failing to send notifications to Alertmanager"
           description: "vmalert instance {{ $labels.instance }} is failing to send alert notifications to \"{{ $labels.addr }}\".
             Check vmalert's logs for detailed error message."
-

deployment/docker/vmanomaly/vmanomaly-integration/compose.yml

@@ -1,6 +1,6 @@
 services:
   vmagent:
-    image: victoriametrics/vmagent:v1.140.0
+    image: victoriametrics/vmagent:v1.138.0
     depends_on:
       - "victoriametrics"
     ports:
@@ -14,7 +14,7 @@ services:
     restart: always
 
   victoriametrics:
-    image: victoriametrics/victoria-metrics:v1.140.0
+    image: victoriametrics/victoria-metrics:v1.138.0
     ports:
       - 8428:8428
     volumes:
@@ -40,7 +40,7 @@ services:
     restart: always
 
   vmalert:
-    image: victoriametrics/vmalert:v1.140.0
+    image: victoriametrics/vmalert:v1.138.0
     depends_on:
       - "victoriametrics"
     ports:
@@ -59,7 +59,7 @@ services:
       - '--external.alert.source=explore?orgId=1&left=["now-1h","now","VictoriaMetrics",{"expr": },{"mode":"Metrics"},{"ui":[true,true,true,"none"]}]'
     restart: always
   vmanomaly:
-    image: victoriametrics/vmanomaly:v1.29.3
+    image: victoriametrics/vmanomaly:v1.29.1
     depends_on:
       - "victoriametrics"
     ports:

docs/Makefile

@@ -41,8 +41,18 @@ docs-debug: docs docs-image
 		$(foreach dir,$(wildcard ./docs/$(dir)/*), -v ./docs/$(notdir $(dir)):/opt/docs/content/$(notdir $(dir))) \
 			vmdocs-docker-package
 
-docs-update-version:
-	find docs/victoriametrics/ -name '*.md' -exec sed -i 's/{{% available_from "#" %}}/{{% available_from "$(TAG)" %}}/g' {} \;
+docs-update-version: docs-image
+	$(if $(filter v%,$(PKG_TAG)), \
+		docker run \
+			--rm \
+			--entrypoint /usr/bin/find \
+			--platform $(DOCKER_PLATFORM) \
+			--name vmdocs-docker-container \
+			-v ./docs:/opt/docs/content/victoriametrics vmdocs-docker-package \
+				content \
+					-regex ".*\.md" \
+					-exec sed -i 's/{{% available_from "#" %}}/{{% available_from "$(PKG_TAG)" %}}/g' {} \;, \
+		$(info "Skipping docs version update, invalid $$PKG_TAG: $(PKG_TAG)"))
 
 # Converts images at docs folder to webp format
 # See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#images-in-documentation
@@ -332,4 +342,4 @@ endif
 	$(MAKE) docs-update-vmagent-flags && git checkout "$$orig_branch" && \
 	$(MAKE) docs-update-vmselect-flags && git checkout "$$orig_branch" && \
 	$(MAKE) docs-update-vminsert-flags && git checkout "$$orig_branch" && \
-	$(MAKE) docs-update-vmstorage-flags && git checkout "$$orig_branch"
+	$(MAKE) docs-update-vmstorage-flags && git checkout "$$orig_branch"

docs/anomaly-detection/CHANGELOG.md

@@ -14,20 +14,6 @@ aliases:
 ---
 Please find the changelog for VictoriaMetrics Anomaly Detection below.
 
-## v1.29.3
-Released: 2026-04-16
-
-- UI: Updated [vmanomaly UI](https://docs.victoriametrics.com/anomaly-detection/ui/) from [v1.6.0](https://docs.victoriametrics.com/anomaly-detection/ui/#v160) to [v1.6.1](https://docs.victoriametrics.com/anomaly-detection/ui/#v161), see respective [release notes](https://docs.victoriametrics.com/anomaly-detection/ui/#v161) for details.
-
-## v1.29.2
-Released: 2026-04-02
-
-- UI: Updated [vmanomaly UI](https://docs.victoriametrics.com/anomaly-detection/ui/) from [v1.5.1](https://docs.victoriametrics.com/anomaly-detection/ui/#v151) to [v1.6.0](https://docs.victoriametrics.com/anomaly-detection/ui/#v160), see respective [release notes](https://docs.victoriametrics.com/anomaly-detection/ui/#v160) for details. Notable changes include **full UI state modification** from [AI assistant](https://docs.victoriametrics.com/anomaly-detection/ui/#ai-assistance) and [showing business boundaries](https://docs.victoriametrics.com/anomaly-detection/ui/#visualization-panel) on a graph.
-
-- IMPROVEMENT: Added an option to proxy reader TLS/credential configuration from the `config.reader` to UI, allowing users to leverage the same secure connection settings for both backend and UI queries to datasource without requiring `vmauth` in front of the datasource for UI access. See [authentication section](https://docs.victoriametrics.com/anomaly-detection/ui/#authentication) for details.
-
-- IMPROVEMENT: Added configurable reconnect retry handling for [`VmWriter`](https://docs.victoriametrics.com/anomaly-detection/components/writer/#vm-writer) with `connection_retry_attempts` arg after transient connection-level write failures.
-
 ## v1.29.1
 Released: 2026-03-25