fix

Related to
https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10189

Debug notes
https://github.com/VictoriaMetrics/debug-notes/tree/main/gh10189

app/vmalert/notifier/init.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
+	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
@@ -290,7 +291,7 @@ func GetTargets() map[TargetType][]Target {
 }
 
 // Send sends alerts to all active notifiers
-func Send(ctx context.Context, alerts []Alert, notifierHeaders map[string]string) chan error {
+func Send(ctx context.Context, alerts []Alert, notifierHeaders map[string]string) *vmalertutil.ErrGroup {
 	alertsToSend := make([]Alert, 0, len(alerts))
 	lblss := make([][]prompb.Label, 0, len(alerts))
 	// apply global relabel config first without modifying original alerts in alerts
@@ -303,18 +304,17 @@ func Send(ctx context.Context, alerts []Alert, notifierHeaders map[string]string
 		lblss = append(lblss, lbls)
 	}
 
+	errGr := new(vmalertutil.ErrGroup)
 	wg := sync.WaitGroup{}
 	activeNotifiers := getActiveNotifiers()
-	errCh := make(chan error, len(activeNotifiers))
-	defer close(errCh)
 	for i := range activeNotifiers {
 		nt := activeNotifiers[i]
 		wg.Go(func() {
 			if err := nt.Send(ctx, alertsToSend, lblss, notifierHeaders); err != nil {
-				errCh <- fmt.Errorf("failed to send alerts to addr %q: %w", nt.Addr(), err)
+				errGr.Add(fmt.Errorf("failed to send alerts to addr %q: %w", nt.Addr(), err))
 			}
 		})
 	}
 	wg.Wait()
-	return errCh
+	return errGr
 }

app/vmalert/notifier/init_test.go

@@ -205,9 +205,7 @@ alert_relabel_configs:
 		},
 	}
 	errG := Send(context.Background(), firingAlerts, nil)
-	for err := range errG {
-		if err != nil {
-			t.Errorf("unexpected error when sending alerts: %s", err)
-		}
+	if errG.Err() != nil {
+		t.Fatalf("unexpected error when sending alerts: %s", err)
 	}
 }

app/vmalert/rule/alerting.go

@@ -818,9 +818,7 @@ func (ar *AlertingRule) restore(ctx context.Context, q datasource.Querier, ts ti
 	expr := fmt.Sprintf("default_rollup(%s{%s%s}[%ds])",
 		alertForStateMetricName, nameStr, labelsFilter, int(lookback.Seconds()))
 
-	// query ALERTS_FOR_STATE at `ts-1s` instead `ts` to avoid retrieving data written in the current run,
-	// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10335
-	res, _, err := q.Query(ctx, expr, ts.Add(-1*time.Second))
+	res, _, err := q.Query(ctx, expr, ts)
 	if err != nil {
 		return fmt.Errorf("failed to execute restore query %q: %w ", expr, err)
 	}

app/vmalert/rule/group.go

@@ -18,7 +18,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/remotewrite"
-	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
 )
@@ -375,7 +374,7 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 
 	g.infof("started")
 
-	eval := func(ctx context.Context, ts time.Time) time.Time {
+	eval := func(ctx context.Context, ts time.Time) {
 		g.metrics.iterationTotal.Inc()
 
 		start := time.Now()
@@ -383,7 +382,7 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 		if len(g.Rules) < 1 {
 			g.metrics.iterationDuration.UpdateDuration(start)
 			g.LastEvaluation = start
-			return ts
+			return
 		}
 
 		resolveDuration := getResolveDuration(g.Interval, *resendDelay, *maxResolveDuration)
@@ -397,7 +396,6 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 		}
 		g.metrics.iterationDuration.UpdateDuration(start)
 		g.LastEvaluation = start
-		return ts
 	}
 
 	evalCtx, cancel := context.WithCancel(ctx)
@@ -406,7 +404,7 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 	g.mu.Unlock()
 	defer g.evalCancel()
 
-	realEvalTS := eval(evalCtx, evalTS)
+	eval(evalCtx, evalTS)
 
 	t := time.NewTicker(g.Interval)
 	defer t.Stop()
@@ -414,7 +412,7 @@ func (g *Group) Start(ctx context.Context, rw remotewrite.RWClient, rr datasourc
 	// restore the rules state after the first evaluation
 	// so only active alerts can be restored.
 	if rr != nil {
-		err := g.restore(ctx, rr, realEvalTS, *remoteReadLookBack)
+		err := g.restore(ctx, rr, evalTS, *remoteReadLookBack)
 		if err != nil {
 			logger.Errorf("error while restoring ruleState for group %q: %s", g.Name, err)
 		}
@@ -757,7 +755,6 @@ func (e *executor) exec(ctx context.Context, r Rule, ts time.Time, resolveDurati
 		return fmt.Errorf("rule %q: failed to execute: %w", r, err)
 	}
 
-	var errG vmalertutil.ErrGroup
 	if e.Rw != nil {
 		pushToRW := func(tss []prompb.TimeSeries) error {
 			var lastErr error
@@ -769,26 +766,20 @@ func (e *executor) exec(ctx context.Context, r Rule, ts time.Time, resolveDurati
 			return lastErr
 		}
 		if err := pushToRW(tss); err != nil {
-			errG.Add(err)
+			return err
 		}
 	}
 
 	ar, ok := r.(*AlertingRule)
 	if !ok {
-		return errG.Err()
+		return nil
 	}
 
 	alerts := ar.alertsToSend(resolveDuration, *resendDelay)
 	if len(alerts) < 1 {
-		return errG.Err()
+		return nil
 	}
 
-	notifierErr := notifier.Send(ctx, alerts, e.notifierHeaders)
-	for err := range notifierErr {
-		if err != nil {
-			errG.Add(fmt.Errorf("rule %q: notifier failure: %w", r, err))
-		}
-	}
-
-	return errG.Err()
+	errGr := notifier.Send(ctx, alerts, e.notifierHeaders)
+	return errGr.Err()
 }

app/vmalert/vmalertutil/err_group.go

@@ -45,7 +45,7 @@ func (eg *ErrGroup) Error() string {
 		return ""
 	}
 	var b strings.Builder
-	fmt.Fprintf(&b, "errors(%d): \n", len(eg.errs))
+	fmt.Fprintf(&b, "errors(%d): ", len(eg.errs))
 	for i, err := range eg.errs {
 		b.WriteString(err.Error())
 		if i != len(eg.errs)-1 {

app/vmalert/vmalertutil/err_group_test.go

@@ -30,8 +30,8 @@ func TestErrGroup(t *testing.T) {
 	}
 
 	f(nil, "")
-	f([]error{errors.New("timeout")}, "errors(1): \ntimeout")
-	f([]error{errors.New("timeout"), errors.New("deadline")}, "errors(2): \ntimeout\ndeadline")
+	f([]error{errors.New("timeout")}, "errors(1): timeout")
+	f([]error{errors.New("timeout"), errors.New("deadline")}, "errors(2): timeout\ndeadline")
 }
 
 // TestErrGroupConcurrent supposed to test concurrent

app/vmctl/backoff/backoff.go

@@ -7,8 +7,6 @@ import (
 	"math"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 )
 
@@ -57,7 +55,6 @@ func (b *Backoff) Retry(ctx context.Context, cb retryableFunc) (uint64, error) {
 			return attempt, err // fail fast if not recoverable
 		}
 		attempt++
-		retriesTotal.Inc()
 		backoff := float64(b.minDuration) * math.Pow(b.factor, float64(i))
 		dur := time.Duration(backoff)
 		logger.Errorf("got error: %s on attempt: %d; will retry in %v", err, attempt, dur)
@@ -77,7 +74,3 @@ func (b *Backoff) Retry(ctx context.Context, cb retryableFunc) (uint64, error) {
 	}
 	return attempt, fmt.Errorf("execution failed after %d retry attempts", b.retries)
 }
-
-var (
-	retriesTotal = metrics.NewCounter(`vmctl_backoff_retries_total`)
-)

app/vmctl/flags.go

@@ -14,12 +14,6 @@ const (
 	globalSilent             = "s"
 	globalVerbose            = "verbose"
 	globalDisableProgressBar = "disable-progress-bar"
-
-	globalPushMetricsURL         = "pushmetrics.url"
-	globalPushMetricsInterval    = "pushmetrics.interval"
-	globalPushExtraLabels        = "pushmetrics.extraLabel"
-	globalPushHeaders            = "pushmetrics.header"
-	globalPushDisableCompression = "pushmetrics.disableCompression"
 )
 
 var (
@@ -39,29 +33,6 @@ var (
 			Value: false,
 			Usage: "Whether to disable progress bar during the import.",
 		},
-		&cli.StringSliceFlag{
-			Name:  globalPushMetricsURL,
-			Usage: "Optional URL to push metrics. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#push-metrics",
-		},
-		&cli.DurationFlag{
-			Name:  globalPushMetricsInterval,
-			Value: 10 * time.Second,
-			Usage: "Interval for pushing metrics to every -pushmetrics.url",
-		},
-		&cli.StringSliceFlag{
-			Name: globalPushExtraLabels,
-			Usage: "Extra labels to add to pushed metrics. In case of collision, label value defined by flag will have priority. " +
-				"Flag can be set multiple times, to add few additional labels. " +
-				"For example, -pushmetrics.extraLabel='instance=\"foo\"' adds instance=\"foo\" label to all the metrics pushed to every -pushmetrics.url",
-		},
-		&cli.StringSliceFlag{
-			Name:  globalPushHeaders,
-			Usage: "Optional HTTP headers to add to pushed metrics. Flag can be set multiple times, to add few additional headers.",
-		},
-		&cli.BoolFlag{
-			Name:  globalPushDisableCompression,
-			Usage: "Whether to disable compression when pushing metrics.",
-		},
 	}
 )
 

app/vmctl/influx.go

@@ -7,8 +7,6 @@ import (
 	"log"
 	"sync"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/influx"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
@@ -54,7 +52,6 @@ func (ip *influxProcessor) run(ctx context.Context) error {
 		return nil
 	}
 
-	influxSeriesTotal.Add(len(series))
 	bar := barpool.AddWithTemplate(fmt.Sprintf(barTpl, "Processing series"), len(series))
 	if err := barpool.Start(); err != nil {
 		return err
@@ -70,11 +67,9 @@ func (ip *influxProcessor) run(ctx context.Context) error {
 		wg.Go(func() {
 			for s := range seriesCh {
 				if err := ip.do(s); err != nil {
-					influxErrorsTotal.Inc()
 					errCh <- fmt.Errorf("request failed for %q.%q: %s", s.Measurement, s.Field, err)
 					return
 				}
-				influxSeriesProcessed.Inc()
 				bar.Increment()
 			}
 		})
@@ -86,7 +81,6 @@ func (ip *influxProcessor) run(ctx context.Context) error {
 		case infErr := <-errCh:
 			return fmt.Errorf("influx error: %s", infErr)
 		case vmErr := <-ip.im.Errors():
-			influxErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, ip.isVerbose))
 		case seriesCh <- s:
 		}
@@ -99,7 +93,6 @@ func (ip *influxProcessor) run(ctx context.Context) error {
 	// drain import errors channel
 	for vmErr := range ip.im.Errors() {
 		if vmErr.Err != nil {
-			influxErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, ip.isVerbose))
 		}
 	}
@@ -174,9 +167,3 @@ func (ip *influxProcessor) do(s *influx.Series) error {
 		}
 	}
 }
-
-var (
-	influxSeriesTotal     = metrics.NewCounter(`vmctl_influx_migration_series_total`)
-	influxSeriesProcessed = metrics.NewCounter(`vmctl_influx_migration_series_processed`)
-	influxErrorsTotal     = metrics.NewCounter(`vmctl_influx_migration_errors_total`)
-)

app/vmctl/limiter/limiter.go

@@ -4,8 +4,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timerpool"
 )
 
@@ -47,16 +45,9 @@ func (l *Limiter) Register(dataLen int) {
 			t := timerpool.Get(d)
 			<-t.C
 			timerpool.Put(t)
-			limiterThrottleEventsTotal.Inc()
 		}
 		l.budget += limit
 		l.deadline = time.Now().Add(time.Second)
 	}
 	l.budget -= int64(dataLen)
-	limiterBytesProcessed.Add(dataLen)
 }
-
-var (
-	limiterBytesProcessed      = metrics.NewCounter(`vmctl_limiter_bytes_processed_total`)
-	limiterThrottleEventsTotal = metrics.NewCounter(`vmctl_limiter_throttle_events_total`)
-)

app/vmctl/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"log"
 	"net/http"
@@ -20,9 +19,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/native"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/remoteread"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/pushmetrics"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/influx"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/opentsdb"
@@ -44,20 +41,11 @@ func main() {
 	ctx, cancelCtx := context.WithCancel(context.Background())
 	start := time.Now()
 	beforeFn := func(c *cli.Context) error {
-		flag.Parse()
-		logger.Init()
 		isSilent = c.Bool(globalSilent)
 		if c.Bool(globalDisableProgressBar) {
 			barpool.Disable(true)
 		}
 		netutil.EnableIPv6()
-		pushmetrics.InitWith(&pushmetrics.Config{
-			URLs:               c.StringSlice(globalPushMetricsURL),
-			Interval:           c.Duration(globalPushMetricsInterval),
-			ExtraLabels:        c.StringSlice(globalPushExtraLabels),
-			DisableCompression: c.Bool(globalPushDisableCompression),
-			Headers:            c.StringSlice(globalPushHeaders),
-		})
 		return nil
 	}
 	app := &cli.App{
@@ -463,7 +451,6 @@ func main() {
 		log.Fatalln(err)
 	}
 	log.Printf("Total time: %v", time.Since(start))
-	pushmetrics.StopAndPush()
 }
 
 func initConfigVM(c *cli.Context) (vm.Config, error) {

app/vmctl/native/client.go

@@ -8,8 +8,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/auth"
 )
 
@@ -38,15 +36,12 @@ type Response struct {
 
 // Explore finds metric names by provided filter from api/v1/label/__name__/values
 func (c *Client) Explore(ctx context.Context, f Filter, tenantID string, start, end time.Time) ([]string, error) {
-	startTime := time.Now()
-	exploreRequestsTotal.Inc()
 	url := fmt.Sprintf("%s/%s", c.Addr, nativeMetricNamesAddr)
 	if tenantID != "" {
 		url = fmt.Sprintf("%s/select/%s/prometheus/%s", c.Addr, tenantID, nativeMetricNamesAddr)
 	}
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
-		exploreRequestsErrorsTotal.Inc()
 		return nil, fmt.Errorf("cannot create request to %q: %s", url, err)
 	}
 
@@ -58,53 +53,37 @@ func (c *Client) Explore(ctx context.Context, f Filter, tenantID string, start,
 
 	resp, err := c.do(req, http.StatusOK)
 	if err != nil {
-		exploreRequestsErrorsTotal.Inc()
-		exploreDuration.UpdateDuration(startTime)
 		return nil, fmt.Errorf("series request failed: %s", err)
 	}
 
 	var response Response
 	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
-		exploreRequestsErrorsTotal.Inc()
-		exploreDuration.UpdateDuration(startTime)
 		return nil, fmt.Errorf("cannot decode series response: %s", err)
 	}
-	exploreDuration.UpdateDuration(startTime)
 	return response.MetricNames, resp.Body.Close()
 }
 
 // ImportPipe uses pipe reader in request to process data
 func (c *Client) ImportPipe(ctx context.Context, dstURL string, pr *io.PipeReader) error {
-	startTime := time.Now()
-	importRequestsTotal.Inc()
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, dstURL, pr)
 	if err != nil {
-		importRequestsErrorsTotal.Inc()
 		return fmt.Errorf("cannot create import request to %q: %s", c.Addr, err)
 	}
 
 	importResp, err := c.do(req, http.StatusNoContent)
 	if err != nil {
-		importRequestsErrorsTotal.Inc()
-		importDuration.UpdateDuration(startTime)
 		return fmt.Errorf("import request failed: %s", err)
 	}
 	if err := importResp.Body.Close(); err != nil {
-		importRequestsErrorsTotal.Inc()
-		importDuration.UpdateDuration(startTime)
 		return fmt.Errorf("cannot close import response body: %s", err)
 	}
-	importDuration.UpdateDuration(startTime)
 	return nil
 }
 
 // ExportPipe makes request by provided filter and return io.ReadCloser which can be used to get data
 func (c *Client) ExportPipe(ctx context.Context, url string, f Filter) (io.ReadCloser, error) {
-	startTime := time.Now()
-	exportRequestsTotal.Inc()
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
-		exportRequestsErrorsTotal.Inc()
 		return nil, fmt.Errorf("cannot create request to %q: %s", c.Addr, err)
 	}
 
@@ -123,11 +102,8 @@ func (c *Client) ExportPipe(ctx context.Context, url string, f Filter) (io.ReadC
 
 	resp, err := c.do(req, http.StatusOK)
 	if err != nil {
-		exportRequestsErrorsTotal.Inc()
-		exportDuration.UpdateDuration(startTime)
 		return nil, fmt.Errorf("export request failed: %w", err)
 	}
-	exportDuration.UpdateDuration(startTime)
 	return resp.Body, nil
 }
 
@@ -186,16 +162,3 @@ func (c *Client) do(req *http.Request, expSC int) (*http.Response, error) {
 	}
 	return resp, err
 }
-
-var (
-	importRequestsTotal        = metrics.NewCounter(`vmctl_vm_native_requests_total{type="import"}`)
-	exportRequestsTotal        = metrics.NewCounter(`vmctl_vm_native_requests_total{type="export"}`)
-	exploreRequestsTotal       = metrics.NewCounter(`vmctl_vm_native_requests_total{type="explore"}`)
-	importRequestsErrorsTotal  = metrics.NewCounter(`vmctl_vm_native_request_errors_total{type="import"}`)
-	exportRequestsErrorsTotal  = metrics.NewCounter(`vmctl_vm_native_request_errors_total{type="export"}`)
-	exploreRequestsErrorsTotal = metrics.NewCounter(`vmctl_vm_native_request_errors_total{type="explore"}`)
-
-	importDuration  = metrics.NewHistogram(`vmctl_vm_native_import_duration_seconds`)
-	exportDuration  = metrics.NewHistogram(`vmctl_vm_native_export_duration_seconds`)
-	exploreDuration = metrics.NewHistogram(`vmctl_vm_native_explore_duration_seconds`)
-)

app/vmctl/opentsdb.go

@@ -7,8 +7,6 @@ import (
 	"sync"
 	"time"
 
-	vmetrics "github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/opentsdb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
 	"github.com/cheggaaa/pb/v3"
@@ -59,7 +57,6 @@ func (op *otsdbProcessor) run(ctx context.Context) error {
 	if !prompt(ctx, question) {
 		return nil
 	}
-
 	op.im.ResetStats()
 	var startTime int64
 	if op.oc.HardTS != 0 {
@@ -87,7 +84,6 @@ func (op *otsdbProcessor) run(ctx context.Context) error {
 		seriesCh := make(chan queryObj, op.otsdbcc)
 		errCh := make(chan error)
 		// we're going to make serieslist * queryRanges queries, so we should represent that in the progress bar
-		otsdbSeriesTotal.Add(len(serieslist) * queryRanges)
 		bar := pb.StartNew(len(serieslist) * queryRanges)
 		defer func(bar *pb.ProgressBar) {
 			bar.Finish()
@@ -97,11 +93,9 @@ func (op *otsdbProcessor) run(ctx context.Context) error {
 			wg.Go(func() {
 				for s := range seriesCh {
 					if err := op.do(s); err != nil {
-						otsdbErrorsTotal.Inc()
 						errCh <- fmt.Errorf("couldn't retrieve series for %s : %s", metric, err)
 						return
 					}
-					otsdbSeriesProcessed.Inc()
 					bar.Increment()
 				}
 			})
@@ -121,7 +115,6 @@ func (op *otsdbProcessor) run(ctx context.Context) error {
 					case otsdbErr := <-errCh:
 						return fmt.Errorf("opentsdb error: %s", otsdbErr)
 					case vmErr := <-op.im.Errors():
-						otsdbErrorsTotal.Inc()
 						return fmt.Errorf("import process failed: %s", wrapErr(vmErr, op.isVerbose))
 					case seriesCh <- queryObj{
 						Tr: tr, StartTime: startTime,
@@ -146,7 +139,6 @@ func (op *otsdbProcessor) run(ctx context.Context) error {
 	op.im.Close()
 	for vmErr := range op.im.Errors() {
 		if vmErr.Err != nil {
-			otsdbErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, op.isVerbose))
 		}
 	}
@@ -177,9 +169,3 @@ func (op *otsdbProcessor) do(s queryObj) error {
 	}
 	return op.im.Input(&ts)
 }
-
-var (
-	otsdbSeriesTotal     = vmetrics.NewCounter(`vmctl_opentsdb_migration_series_total`)
-	otsdbSeriesProcessed = vmetrics.NewCounter(`vmctl_opentsdb_migration_series_processed`)
-	otsdbErrorsTotal     = vmetrics.NewCounter(`vmctl_opentsdb_migration_errors_total`)
-)

app/vmctl/prometheus.go

@@ -11,8 +11,6 @@ import (
 	"github.com/prometheus/prometheus/tsdb"
 	"github.com/prometheus/prometheus/tsdb/chunkenc"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
@@ -115,7 +113,6 @@ func (pp *prometheusProcessor) do(b tsdb.BlockReader) error {
 }
 
 func (pp *prometheusProcessor) processBlocks(blocks []tsdb.BlockReader) error {
-	promBlocksTotal.Add(len(blocks))
 	bar := barpool.AddWithTemplate(fmt.Sprintf(barTpl, "Processing blocks"), len(blocks))
 	if err := barpool.Start(); err != nil {
 		return err
@@ -131,11 +128,9 @@ func (pp *prometheusProcessor) processBlocks(blocks []tsdb.BlockReader) error {
 		wg.Go(func() {
 			for br := range blockReadersCh {
 				if err := pp.do(br); err != nil {
-					promErrorsTotal.Inc()
 					errCh <- fmt.Errorf("read failed for block %q: %s", br.Meta().ULID, err)
 					return
 				}
-				promBlocksProcessed.Inc()
 				bar.Increment()
 			}
 		})
@@ -148,7 +143,6 @@ func (pp *prometheusProcessor) processBlocks(blocks []tsdb.BlockReader) error {
 			return fmt.Errorf("prometheus error: %s", promErr)
 		case vmErr := <-pp.im.Errors():
 			close(blockReadersCh)
-			promErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, pp.isVerbose))
 		case blockReadersCh <- br:
 		}
@@ -162,7 +156,6 @@ func (pp *prometheusProcessor) processBlocks(blocks []tsdb.BlockReader) error {
 	// drain import errors channel
 	for vmErr := range pp.im.Errors() {
 		if vmErr.Err != nil {
-			promErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, pp.isVerbose))
 		}
 	}
@@ -172,9 +165,3 @@ func (pp *prometheusProcessor) processBlocks(blocks []tsdb.BlockReader) error {
 
 	return nil
 }
-
-var (
-	promBlocksTotal     = metrics.NewCounter(`vmctl_prometheus_migration_blocks_total`)
-	promBlocksProcessed = metrics.NewCounter(`vmctl_prometheus_migration_blocks_processed`)
-	promErrorsTotal     = metrics.NewCounter(`vmctl_prometheus_migration_errors_total`)
-)

app/vmctl/remoteread.go

@@ -7,8 +7,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/remoteread"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/stepper"
@@ -53,7 +51,6 @@ func (rrp *remoteReadProcessor) run(ctx context.Context) error {
 		return nil
 	}
 
-	remoteReadRangesTotal.Add(len(ranges))
 	bar := barpool.AddWithTemplate(fmt.Sprintf(barTpl, "Processing ranges"), len(ranges))
 	if err := barpool.Start(); err != nil {
 		return err
@@ -73,11 +70,9 @@ func (rrp *remoteReadProcessor) run(ctx context.Context) error {
 		wg.Go(func() {
 			for r := range rangeC {
 				if err := rrp.do(ctx, r); err != nil {
-					remoteReadErrorsTotal.Inc()
 					errCh <- fmt.Errorf("request failed for: %s", err)
 					return
 				}
-				remoteReadRangesProcessed.Inc()
 				bar.Increment()
 			}
 		})
@@ -88,7 +83,6 @@ func (rrp *remoteReadProcessor) run(ctx context.Context) error {
 		case infErr := <-errCh:
 			return fmt.Errorf("remote read error: %s", infErr)
 		case vmErr := <-rrp.dst.Errors():
-			remoteReadErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, rrp.isVerbose))
 		case rangeC <- &remoteread.Filter{
 			StartTimestampMs: r[0].UnixMilli(),
@@ -104,7 +98,6 @@ func (rrp *remoteReadProcessor) run(ctx context.Context) error {
 	// drain import errors channel
 	for vmErr := range rrp.dst.Errors() {
 		if vmErr.Err != nil {
-			remoteReadErrorsTotal.Inc()
 			return fmt.Errorf("import process failed: %s", wrapErr(vmErr, rrp.isVerbose))
 		}
 	}
@@ -125,9 +118,3 @@ func (rrp *remoteReadProcessor) do(ctx context.Context, filter *remoteread.Filte
 		return nil
 	})
 }
-
-var (
-	remoteReadRangesTotal     = metrics.NewCounter(`vmctl_remote_read_migration_ranges_total`)
-	remoteReadRangesProcessed = metrics.NewCounter(`vmctl_remote_read_migration_ranges_processed`)
-	remoteReadErrorsTotal     = metrics.NewCounter(`vmctl_remote_read_migration_errors_total`)
-)

app/vmctl/vm/vm.go

@@ -12,8 +12,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/backoff"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter"
@@ -82,12 +80,6 @@ type Importer struct {
 
 	s       *stats
 	backoff *backoff.Backoff
-
-	importRequestsTotal       *metrics.Counter
-	importRequestsErrorsTotal *metrics.Counter
-	importSamplesTotal        *metrics.Counter
-	importBytesTotal          *metrics.Counter
-	importDuration            *metrics.Histogram
 }
 
 // ResetStats resets im stats.
@@ -155,12 +147,6 @@ func NewImporter(ctx context.Context, cfg Config) (*Importer, error) {
 		input:      make(chan *TimeSeries, cfg.Concurrency*4),
 		errors:     make(chan *ImportError, cfg.Concurrency),
 		backoff:    cfg.Backoff,
-
-		importRequestsTotal:       metrics.GetOrCreateCounter(`vmctl_importer_requests_total`),
-		importRequestsErrorsTotal: metrics.GetOrCreateCounter(`vmctl_importer_request_errors_total`),
-		importSamplesTotal:        metrics.GetOrCreateCounter(`vmctl_importer_samples_total`),
-		importBytesTotal:          metrics.GetOrCreateCounter(`vmctl_importer_bytes_total`),
-		importDuration:            metrics.GetOrCreateHistogram(`vmctl_importer_request_duration_seconds`),
 	}
 	if err := im.Ping(); err != nil {
 		return nil, fmt.Errorf("ping to %q failed: %s", addr, err)
@@ -325,13 +311,9 @@ func (im *Importer) Import(tsBatch []*TimeSeries) error {
 		return nil
 	}
 
-	startTime := time.Now()
-	im.importRequestsTotal.Inc()
-
 	pr, pw := io.Pipe()
 	req, err := http.NewRequest(http.MethodPost, im.importPath, pr)
 	if err != nil {
-		im.importRequestsErrorsTotal.Inc()
 		return fmt.Errorf("cannot create request to %q: %s", im.addr, err)
 	}
 	if im.user != "" {
@@ -351,7 +333,6 @@ func (im *Importer) Import(tsBatch []*TimeSeries) error {
 	if im.compress {
 		zw, err := gzip.NewWriterLevel(w, 1)
 		if err != nil {
-			im.importRequestsErrorsTotal.Inc()
 			return fmt.Errorf("unexpected error when creating gzip writer: %s", err)
 		}
 		w = zw
@@ -363,39 +344,29 @@ func (im *Importer) Import(tsBatch []*TimeSeries) error {
 	for _, ts := range tsBatch {
 		n, err := ts.write(bw)
 		if err != nil {
-			im.importRequestsErrorsTotal.Inc()
 			return fmt.Errorf("write err: %w", err)
 		}
 		totalBytes += n
 		totalSamples += len(ts.Values)
 	}
 	if err := bw.Flush(); err != nil {
-		im.importRequestsErrorsTotal.Inc()
 		return err
 	}
 	if closer, ok := w.(io.Closer); ok {
 		err := closer.Close()
 		if err != nil {
-			im.importRequestsErrorsTotal.Inc()
 			return err
 		}
 	}
 	if err := pw.Close(); err != nil {
-		im.importRequestsErrorsTotal.Inc()
 		return err
 	}
 
 	requestErr := <-errCh
 	if requestErr != nil {
-		im.importRequestsErrorsTotal.Inc()
-		im.importDuration.UpdateDuration(startTime)
 		return fmt.Errorf("import request error for %q: %w", im.addr, requestErr)
 	}
 
-	im.importSamplesTotal.Add(totalSamples)
-	im.importBytesTotal.Add(totalBytes)
-	im.importDuration.UpdateDuration(startTime)
-
 	im.s.Lock()
 	im.s.bytes += uint64(totalBytes)
 	im.s.samples += uint64(totalSamples)

app/vmctl/vm_native.go

@@ -9,8 +9,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/backoff"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter"
@@ -84,19 +82,13 @@ func (p *vmNativeProcessor) run(ctx context.Context) error {
 		if !prompt(ctx, question) {
 			return nil
 		}
-		migrationTenantsTotal.Set(uint64(len(tenants)))
 	}
 
 	for _, tenantID := range tenants {
 		err := p.runBackfilling(ctx, tenantID, ranges)
 		if err != nil {
-			migrationErrorsTotal.Inc()
 			return fmt.Errorf("migration failed: %s", err)
 		}
-
-		if p.interCluster {
-			migrationTenantsProcessed.Inc()
-		}
 	}
 
 	log.Println("Import finished!")
@@ -164,7 +156,6 @@ func (p *vmNativeProcessor) runSingle(ctx context.Context, f native.Filter, srcU
 	p.s.bytes += uint64(written)
 	p.s.requests++
 	p.s.Unlock()
-	migrationBytesTransferredTotal.AddInt64(written)
 
 	if err := pw.Close(); err != nil {
 		return err
@@ -208,7 +199,7 @@ func (p *vmNativeProcessor) runBackfilling(ctx context.Context, tenantID string,
 
 	var foundSeriesMsg string
 	var requestsToMake int
-	var metricsMap = map[string][][]time.Time{
+	var metrics = map[string][][]time.Time{
 		"": ranges,
 	}
 
@@ -220,11 +211,11 @@ func (p *vmNativeProcessor) runBackfilling(ctx context.Context, tenantID string,
 
 	if !p.disablePerMetricRequests {
 		format = fmt.Sprintf(nativeWithBackoffTpl, barPrefix)
-		metricsMap, err = p.explore(ctx, p.src, tenantID, ranges)
+		metrics, err = p.explore(ctx, p.src, tenantID, ranges)
 		if err != nil {
 			return fmt.Errorf("failed to explore metric names: %s", err)
 		}
-		if len(metricsMap) == 0 {
+		if len(metrics) == 0 {
 			errMsg := "no metrics found"
 			if tenantID != "" {
 				errMsg = fmt.Sprintf("%s for tenant id: %s", errMsg, tenantID)
@@ -232,14 +223,10 @@ func (p *vmNativeProcessor) runBackfilling(ctx context.Context, tenantID string,
 			log.Println(errMsg)
 			return nil
 		}
-		for _, m := range metricsMap {
+		for _, m := range metrics {
 			requestsToMake += len(m)
 		}
-		foundSeriesMsg = fmt.Sprintf("Found %d unique metric names to import. Total import/export requests to make %d", len(metricsMap), requestsToMake)
-
-		migrationMetricsTotal.Add(len(metricsMap))
-	} else {
-		requestsToMake = len(ranges)
+		foundSeriesMsg = fmt.Sprintf("Found %d unique metric names to import. Total import/export requests to make %d", len(metrics), requestsToMake)
 	}
 
 	if !p.interCluster {
@@ -253,7 +240,6 @@ func (p *vmNativeProcessor) runBackfilling(ctx context.Context, tenantID string,
 		log.Print(foundSeriesMsg)
 	}
 
-	migrationRequestsPlanned.Add(requestsToMake)
 	bar := barpool.NewSingleProgress(format, requestsToMake)
 	bar.Start()
 	defer bar.Finish()
@@ -277,13 +263,12 @@ func (p *vmNativeProcessor) runBackfilling(ctx context.Context, tenantID string,
 						return
 					}
 				}
-				migrationRequestsCompleted.Inc()
 			}
 		})
 	}
 
 	// any error breaks the import
-	for mName, mRanges := range metricsMap {
+	for mName, mRanges := range metrics {
 		match, err := buildMatchWithFilter(p.filter.Match, mName)
 		if err != nil {
 			logger.Errorf("failed to build filter %q for metric name %q: %s", p.filter.Match, mName, err)
@@ -303,9 +288,6 @@ func (p *vmNativeProcessor) runBackfilling(ctx context.Context, tenantID string,
 			}:
 			}
 		}
-		if !p.disablePerMetricRequests {
-			migrationMetricsProcessed.Inc()
-		}
 	}
 
 	close(filterCh)
@@ -414,18 +396,3 @@ func buildMatchWithFilter(filter string, metricName string) (string, error) {
 	match := "{" + strings.Join(filters, " or ") + "}"
 	return match, nil
 }
-
-var (
-	migrationMetricsTotal     = metrics.NewCounter(`vmctl_vm_native_migration_metrics_total`)
-	migrationMetricsProcessed = metrics.NewCounter(`vmctl_vm_native_migration_metrics_processed`)
-
-	migrationRequestsPlanned   = metrics.NewCounter(`vmctl_vm_native_migration_requests_planned`)
-	migrationRequestsCompleted = metrics.NewCounter(`vmctl_vm_native_migration_requests_completed`)
-
-	migrationErrorsTotal = metrics.NewCounter(`vmctl_vm_native_migration_errors_total`)
-
-	migrationTenantsTotal     = metrics.NewCounter(`vmctl_vm_native_migration_tenants_total`)
-	migrationTenantsProcessed = metrics.NewCounter(`vmctl_vm_native_migration_tenants_processed`)
-
-	migrationBytesTransferredTotal = metrics.NewCounter(`vmctl_vm_native_migration_bytes_transferred_total`)
-)

app/vmselect/promql/binary_op.go

@@ -566,24 +566,15 @@ func fillLeftNaNsWithRightValuesOrMerge(tssLeft, tssRight []*timeseries) {
 		return
 	}
 
-	// to avoid marshaling the same metric name multiple times, use a slice to store the results and an index to access them.
-	// todo: this may allocate a lot of []byte and could be further optimized.
-	nameRightSlice := make([][]byte, len(tssRight))
-	getRightName := func(idx int) []byte {
-		if nameRightSlice[idx] == nil {
-			nameRightSlice[idx] = marshalMetricNameSorted(nameRightSlice[idx], &tssRight[idx].MetricName)
-		}
-		return nameRightSlice[idx]
-	}
-
-	nameLeft := bbPool.Get()
+	nameLeft, nameRight := bbPool.Get(), bbPool.Get()
 	for _, tsLeft := range tssLeft {
 		valuesLeft := tsLeft.Values
 		nameLeft.B = marshalMetricNameSorted(nameLeft.B[:0], &tsLeft.MetricName)
 		for i, v := range valuesLeft {
 			leftIsNaN := math.IsNaN(v)
-			for rIdx, tsRight := range tssRight {
-				canBeMerged := bytes.Equal(nameLeft.B, getRightName(rIdx))
+			for _, tsRight := range tssRight {
+				nameRight.B = marshalMetricNameSorted(nameRight.B[:0], &tsRight.MetricName)
+				canBeMerged := bytes.Equal(nameLeft.B, nameRight.B)
 				valueRight := tsRight.Values[i]
 				if leftIsNaN && canBeMerged {
 					// fill NaNs with valueRight if labels match
@@ -598,6 +589,7 @@ func fillLeftNaNsWithRightValuesOrMerge(tssLeft, tssRight []*timeseries) {
 		}
 	}
 	bbPool.Put(nameLeft)
+	bbPool.Put(nameRight)
 }
 
 func binaryOpIfnot(bfa *binaryOpFuncArg) ([]*timeseries, error) {

app/vmselect/promql/binary_op_timing_test.go

@@ -92,22 +92,6 @@ func BenchmarkBinaryOpOr(b *testing.B) {
 		}
 		benchmarkBinaryOpOr(b, bfa)
 	})
-
-	b.Run("tss:1000 or tss:40000: new", func(b *testing.B) {
-		left, right := make([]*timeseries, 1000), make([]*timeseries, 40000)
-		for i := range left {
-			left[i] = ts(fmt.Sprintf(`a{foo="%d"}`, i))
-		}
-		for i := range right {
-			right[i] = ts(fmt.Sprintf(`b{foo="%d"}`, i))
-		}
-		bfa := &binaryOpFuncArg{
-			be:    mustParseMetricsQL("a or b"),
-			left:  left,
-			right: right,
-		}
-		benchmarkBinaryOpOr(b, bfa)
-	})
 }
 
 func benchmarkBinaryOpOr(b *testing.B, bfa *binaryOpFuncArg) {

app/vmselect/promql/eval.go

@@ -1713,7 +1713,6 @@ func evalRollupFuncNoCache(qt *querytracer.Tracer, ec *EvalConfig, funcName stri
 		return nil, err
 	}
 	defer rml.Put(uint64(rollupMemorySize))
-	qs.addMemoryUsage(rollupMemorySize)
 	qt.Printf("the rollup evaluation needs an estimated %d bytes of RAM for %d series and %d points per series (summary %d points)",
 		rollupMemorySize, timeseriesLen, pointsPerSeries, rollupPoints)
 

app/vmselect/promql/exec.go

@@ -37,7 +37,7 @@ func Exec(qt *querytracer.Tracer, ec *EvalConfig, q string, isFirstPointOnly boo
 	if querystats.Enabled() {
 		startTime := time.Now()
 		defer func() {
-			querystats.RegisterQuery(q, ec.End-ec.Start, startTime, ec.QueryStats.memoryUsage())
+			querystats.RegisterQuery(q, ec.End-ec.Start, startTime)
 			ec.QueryStats.addExecutionTimeMsec(startTime)
 		}()
 	}

app/vmselect/promql/query_stats.go

@@ -13,8 +13,6 @@ type QueryStats struct {
 	ExecutionDuration atomic.Pointer[time.Duration]
 	// SeriesFetched contains the number of series fetched from storage or cache.
 	SeriesFetched atomic.Int64
-	// MemoryUsage contains the estimated memory consumption of the query
-	MemoryUsage atomic.Int64
 
 	at *auth.Token
 
@@ -55,17 +53,3 @@ func (qs *QueryStats) addExecutionTimeMsec(startTime time.Time) {
 	d := time.Since(startTime)
 	qs.ExecutionDuration.Store(&d)
 }
-
-func (qs *QueryStats) addMemoryUsage(memoryUsage int64) {
-	if qs == nil {
-		return
-	}
-	qs.MemoryUsage.Store(memoryUsage)
-}
-
-func (qs *QueryStats) memoryUsage() int64 {
-	if qs == nil {
-		return 0
-	}
-	return qs.MemoryUsage.Load()
-}

app/vmselect/promql/transform_test.go

@@ -2,6 +2,7 @@ package promql
 
 import (
 	"fmt"
+	"math/rand"
 	"reflect"
 	"strconv"
 	"strings"
@@ -280,6 +281,87 @@ func timeseriesToPromMetrics(tss []*timeseries) string {
 	return strings.Join(a, "\n")
 }
 
+func TestTransformFuncSort(t *testing.T) {
+	f := func(isDesc bool, metrics, expectedMetrics string) {
+		t.Helper()
+
+		tss := promMetricsToTimeseries(metrics)
+
+		// Input tss order is not stable in VictoriaMetrics
+		// Shuffle tss to reflect that
+		// Commenting out the shuffle to make the test stable
+		rand.Shuffle(len(tss), func(i, j int) {
+			tss[i], tss[j] = tss[j], tss[i]
+		})
+
+		sortFunc := newTransformFuncSort(isDesc)
+		sorted, err := sortFunc(&transformFuncArg{
+			args: [][]*timeseries{tss},
+		})
+		if err != nil {
+			t.Fatalf("sort failed: %s", err)
+		}
+
+		result := timeseriesToPromMetrics(sorted)
+		if result != expectedMetrics {
+			t.Fatalf("unexpected sort result:\ngot\n%s\nwant\n%s", result, expectedMetrics)
+		}
+	}
+
+	// Test asc sort with different values
+	f(
+		false,
+		`foo{label="a"} 3 123
+foo{label="b"} 2 123
+foo{label="c"} 1 123`,
+		`foo{label="c"} 1 123
+foo{label="b"} 2 123
+foo{label="a"} 3 123`,
+	)
+
+	// Test desc sort with different values
+	f(
+		true,
+		`foo{label="a"} 3 123
+foo{label="b"} 2 123
+foo{label="c"} 1 123`,
+		`foo{label="a"} 3 123
+foo{label="b"} 2 123
+foo{label="c"} 1 123`,
+	)
+
+	// Test asc sort with mixed values
+	f(
+		false,
+		`foo{label="a"} 1 123
+	foo{label="b"} 1 123
+	foo{label="c"} 2 123
+	foo{label="d"} 2 123
+	foo{label="e"} 3 123
+	`,
+		`foo{label="a"} 1 123
+foo{label="b"} 1 123
+foo{label="c"} 2 123
+foo{label="d"} 2 123
+foo{label="e"} 3 123`,
+	)
+
+	// Test desc sort with mixed values
+	f(
+		true,
+		`foo{label="a"} 1 123
+	foo{label="b"} 1 123
+	foo{label="c"} 2 123
+	foo{label="d"} 2 123
+	foo{label="e"} 3 123`,
+		`foo{label="e"} 3 123
+foo{label="c"} 2 123
+foo{label="d"} 2 123
+foo{label="a"} 1 123
+foo{label="b"} 1 123`,
+	)
+}
+
 func TestGetNumPrefix(t *testing.T) {
 	f := func(s, prefixExpected string) {
 		t.Helper()

app/vmselect/querystats/querystats.go

@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/stringsutil"
 )
@@ -16,8 +15,7 @@ import (
 var (
 	lastQueriesCount = flag.Int("search.queryStats.lastQueriesCount", 20000, "Query stats for /api/v1/status/top_queries is tracked on this number of last queries. "+
 		"Zero value disables query stats tracking")
-	minQueryDuration    = flag.Duration("search.queryStats.minQueryDuration", time.Millisecond, "The minimum duration for queries to track in query stats at /api/v1/status/top_queries. Queries with lower duration are ignored in query stats")
-	minQueryMemoryUsage = flagutil.NewBytes("search.queryStats.minQueryMemoryUsage", 1024, "The minimum memory bytes consumption for queries to track in query stats at /api/v1/status/top_queries. Queries with lower memory bytes consumption are ignored in query stats")
+	minQueryDuration = flag.Duration("search.queryStats.minQueryDuration", time.Millisecond, "The minimum duration for queries to track in query stats at /api/v1/status/top_queries. Queries with lower duration are ignored in query stats")
 )
 
 var (
@@ -33,9 +31,9 @@ func Enabled() bool {
 // RegisterQuery registers the query on the given timeRangeMsecs, which has been started at startTime.
 //
 // RegisterQuery must be called when the query is finished.
-func RegisterQuery(query string, timeRangeMsecs int64, startTime time.Time, memoryUsage int64) {
+func RegisterQuery(query string, timeRangeMsecs int64, startTime time.Time) {
 	initOnce.Do(initQueryStats)
-	qsTracker.registerQuery(query, timeRangeMsecs, startTime, memoryUsage)
+	qsTracker.registerQuery(query, timeRangeMsecs, startTime)
 }
 
 // WriteJSONQueryStats writes query stats to given writer in json format.
@@ -56,7 +54,6 @@ type queryStatRecord struct {
 	timeRangeSecs int64
 	registerTime  time.Time
 	duration      time.Duration
-	memoryUsage   int64
 }
 
 type queryStatKey struct {
@@ -69,8 +66,8 @@ func initQueryStats() {
 	if recordsCount <= 0 {
 		recordsCount = 1
 	} else {
-		logger.Infof("enabled query stats tracking at `/api/v1/status/top_queries` with -search.queryStats.lastQueriesCount=%d, -search.queryStats.minQueryDuration=%s, -search.queryStats.minQueryMemoryUsage=%s",
-			*lastQueriesCount, *minQueryDuration, minQueryMemoryUsage)
+		logger.Infof("enabled query stats tracking at `/api/v1/status/top_queries` with -search.queryStats.lastQueriesCount=%d, -search.queryStats.minQueryDuration=%s",
+			*lastQueriesCount, *minQueryDuration)
 	}
 	qsTracker = &queryStatsTracker{
 		a: make([]queryStatRecord, recordsCount),
@@ -81,7 +78,6 @@ func (qst *queryStatsTracker) writeJSONQueryStats(w io.Writer, topN int, maxLife
 	fmt.Fprintf(w, `{"topN":"%d","maxLifetime":"%s",`, topN, maxLifetime)
 	fmt.Fprintf(w, `"search.queryStats.lastQueriesCount":%d,`, *lastQueriesCount)
 	fmt.Fprintf(w, `"search.queryStats.minQueryDuration":"%s",`, *minQueryDuration)
-	fmt.Fprintf(w, `"search.queryStats.minQueryMemoryUsage":"%s",`, minQueryMemoryUsage)
 	fmt.Fprintf(w, `"topByCount":[`)
 	topByCount := qst.getTopByCount(topN, maxLifetime)
 	for i, r := range topByCount {
@@ -106,28 +102,15 @@ func (qst *queryStatsTracker) writeJSONQueryStats(w io.Writer, topN int, maxLife
 			fmt.Fprintf(w, `,`)
 		}
 	}
-
-	fmt.Fprintf(w, `],"topByAvgMemoryUsage":[`)
-	topByAvgMemoryConsumption := qst.getTopByAvgMemoryUsage(topN, maxLifetime)
-	for i, r := range topByAvgMemoryConsumption {
-		fmt.Fprintf(w, `{"query":%s,"timeRangeSeconds":%d,"avgMemoryBytes":%d,"count":%d}`, stringsutil.JSONString(r.query), r.timeRangeSecs, r.memoryUsage, r.count)
-		if i+1 < len(topByAvgMemoryConsumption) {
-			fmt.Fprintf(w, `,`)
-		}
-	}
-
 	fmt.Fprintf(w, `]}`)
 }
 
-func (qst *queryStatsTracker) registerQuery(query string, timeRangeMsecs int64, startTime time.Time, memoryUsage int64) {
+func (qst *queryStatsTracker) registerQuery(query string, timeRangeMsecs int64, startTime time.Time) {
 	registerTime := time.Now()
 	duration := registerTime.Sub(startTime)
 	if duration < *minQueryDuration {
 		return
 	}
-	if memoryUsage < int64(minQueryMemoryUsage.IntN()) {
-		return
-	}
 
 	qst.mu.Lock()
 	defer qst.mu.Unlock()
@@ -143,7 +126,6 @@ func (qst *queryStatsTracker) registerQuery(query string, timeRangeMsecs int64,
 	r.timeRangeSecs = timeRangeMsecs / 1000
 	r.registerTime = registerTime
 	r.duration = duration
-	r.memoryUsage = memoryUsage
 }
 
 func (r *queryStatRecord) matches(currentTime time.Time, maxLifetime time.Duration) bool {
@@ -275,47 +257,3 @@ func (qst *queryStatsTracker) getTopBySumDuration(topN int, maxLifetime time.Dur
 	}
 	return a
 }
-
-type queryStatByMemory struct {
-	query         string
-	timeRangeSecs int64
-	memoryUsage   int64
-	count         int
-}
-
-func (qst *queryStatsTracker) getTopByAvgMemoryUsage(topN int, maxLifetime time.Duration) []queryStatByMemory {
-	currentTime := time.Now()
-	qst.mu.Lock()
-	type countSum struct {
-		count int
-		sum   int64
-	}
-	m := make(map[queryStatKey]countSum)
-	for _, r := range qst.a {
-		if r.matches(currentTime, maxLifetime) {
-			k := r.key()
-			ks := m[k]
-			ks.count++
-			ks.sum += r.memoryUsage
-			m[k] = ks
-		}
-	}
-	qst.mu.Unlock()
-
-	var a []queryStatByMemory
-	for k, ks := range m {
-		a = append(a, queryStatByMemory{
-			query:         k.query,
-			timeRangeSecs: k.timeRangeSecs,
-			memoryUsage:   ks.sum / int64(ks.count),
-			count:         ks.count,
-		})
-	}
-	sort.Slice(a, func(i, j int) bool {
-		return a[i].memoryUsage > a[j].memoryUsage
-	})
-	if len(a) > topN {
-		a = a[:topN]
-	}
-	return a
-}

app/vmselect/vmui/index.html

@@ -37,10 +37,10 @@
   <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-C4RD5Sxk.js"></script>
+  <script type="module" crossorigin src="./assets/index-B6lol36n.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/vendor-EZef-S_8.js">
   <link rel="stylesheet" crossorigin href="./assets/vendor-D1GxaB_c.css">
-  <link rel="stylesheet" crossorigin href="./assets/index-D7CzMv1O.css">
+  <link rel="stylesheet" crossorigin href="./assets/index-VQRcNK83.css">
 </head>
 <body>
 <noscript>You need to enable JavaScript to run this app.</noscript>

app/vmui/Makefile

@@ -2,6 +2,9 @@
 copy-metricsql-docs:
 	cp docs/victoriametrics/MetricsQL.md app/vmui/packages/vmui/src/assets/MetricsQL.md
 
+vmui-package-base-image:
+	docker build -t vmui-builder-image -f app/vmui/Dockerfile-build ./app/vmui
+
 vmui-run-npm-command: vmui-package-base-image
 	docker run --rm \
 		--user $(shell id -u):$(shell id -g) \

docs/guides/examples/guide-vmcluster-vmagent-values.yaml

@@ -37,6 +37,12 @@ config:
       relabel_configs:
         - action: labelmap
           regex: __meta_kubernetes_node_label_(.+)
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/$1/proxy/metrics
     - job_name: "kubernetes-nodes-cadvisor"
       scheme: https
       tls_config:
@@ -45,12 +51,15 @@ config:
       bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
       kubernetes_sd_configs:
         - role: node
-      metrics_path: /metrics/cadvisor
       relabel_configs:
         - action: labelmap
           regex: __meta_kubernetes_node_label_(.+)
-        - source_labels: [__metrics_path__]
-          target_label: metrics_path
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
       metric_relabel_configs:
         - action: replace
           source_labels: [pod]

docs/guides/examples/guide-vmsingle-values.yaml

@@ -37,6 +37,12 @@ server:
           relabel_configs:
             - action: labelmap
               regex: __meta_kubernetes_node_label_(.+)
+            - target_label: __address__
+              replacement: kubernetes.default.svc:443
+            - source_labels: [ __meta_kubernetes_node_name ]
+              regex: (.+)
+              target_label: __metrics_path__
+              replacement: /api/v1/nodes/$1/proxy/metrics
         - job_name: "kubernetes-nodes-cadvisor"
           scheme: https
           tls_config:
@@ -45,12 +51,15 @@ server:
           bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
           kubernetes_sd_configs:
             - role: node
-          metrics_path: /metrics/cadvisor
           relabel_configs:
             - action: labelmap
               regex: __meta_kubernetes_node_label_(.+)
-            - source_labels: [__metrics_path__]
-              target_label: metrics_path
+            - target_label: __address__
+              replacement: kubernetes.default.svc:443
+            - source_labels: [ __meta_kubernetes_node_name ]
+              regex: (.+)
+              target_label: __metrics_path__
+              replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
           metric_relabel_configs:
             - action: replace
               source_labels: [pod]
@@ -69,4 +78,4 @@ server:
               source_labels: [id]
               regex: '^/system\.slice/(.+)\.service$'
               target_label: systemd_service_name
-              replacement: '${1}'
+              replacement: '${1}'

docs/guides/k8s-ha-monitoring-via-vm-cluster/README.md

@@ -187,6 +187,12 @@ scrape_configs:
       relabel_configs:
         - action: labelmap
           regex: __meta_kubernetes_node_label_(.+)
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/$1/proxy/metrics
     - job_name: "kubernetes-nodes-cadvisor"
       scheme: https
       tls_config:
@@ -195,12 +201,15 @@ scrape_configs:
       bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
       kubernetes_sd_configs:
         - role: node
-      metrics_path: /metrics/cadvisor
       relabel_configs:
         - action: labelmap
           regex: __meta_kubernetes_node_label_(.+)
-        - source_labels: [__metrics_path__]
-          target_label: metrics_path
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
       metric_relabel_configs:
         - action: replace
           source_labels: [pod]

docs/guides/k8s-monitoring-via-vm-cluster/README.md

@@ -213,6 +213,12 @@ config:
       relabel_configs:
         - action: labelmap
           regex: __meta_kubernetes_node_label_(.+)
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/$1/proxy/metrics
     - job_name: "kubernetes-nodes-cadvisor"
       scheme: https
       tls_config:
@@ -221,12 +227,15 @@ config:
       bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
       kubernetes_sd_configs:
         - role: node
-      metrics_path: /metrics/cadvisor
       relabel_configs:
         - action: labelmap
           regex: __meta_kubernetes_node_label_(.+)
-        - source_labels: [__metrics_path__]
-          target_label: metrics_path
+        - target_label: __address__
+          replacement: kubernetes.default.svc:443
+        - source_labels: [__meta_kubernetes_node_name]
+          regex: (.+)
+          target_label: __metrics_path__
+          replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
       metric_relabel_configs:
         - action: replace
           source_labels: [pod]

docs/guides/k8s-monitoring-via-vm-single/README.md

@@ -114,6 +114,12 @@ server:
           relabel_configs:
             - action: labelmap
               regex: __meta_kubernetes_node_label_(.+)
+            - target_label: __address__
+              replacement: kubernetes.default.svc:443
+            - source_labels: [ __meta_kubernetes_node_name ]
+              regex: (.+)
+              target_label: __metrics_path__
+              replacement: /api/v1/nodes/$1/proxy/metrics
         - job_name: "kubernetes-nodes-cadvisor"
           scheme: https
           tls_config:
@@ -122,12 +128,15 @@ server:
           bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
           kubernetes_sd_configs:
             - role: node
-          metrics_path: /metrics/cadvisor
           relabel_configs:
             - action: labelmap
               regex: __meta_kubernetes_node_label_(.+)
-            - source_labels: [__metrics_path__]
-              target_label: metrics_path
+            - target_label: __address__
+              replacement: kubernetes.default.svc:443
+            - source_labels: [ __meta_kubernetes_node_name ]
+              regex: (.+)
+              target_label: __metrics_path__
+              replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
           metric_relabel_configs:
             - action: replace
               source_labels: [pod]

docs/victoriametrics/changelog/CHANGELOG.md

@@ -26,22 +26,13 @@ See also [LTS releases](https://docs.victoriametrics.com/victoriametrics/lts-rel
 
 ## tip
 
-* FEATURE: [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmselect` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): optimize the performance of the `or` operation by reducing the marshaling call from `O(m*n)` to `O(m+n)` when large volumes of series are involved. See [#10374](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10374).
-
-## [v1.135.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.135.0)
-
-Released at 2026-01-30
-
 * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent/) and [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/): improved scrape size display. Sizes below 1024 bytes are now shown in `B`, and larger sizes are shown as whole `KiB` (rounded up). This prevents confusion where values like 123.456 KiB were interpreted as 123456 KiB, while the actual size was only 123 KiB. See [#10307](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10307).
 * FEATURE: [vmauth](https://docs.victoriametrics.com/victoriametrics/vmauth/): allow buffering request bodies before proxying them to backends. This reduces load on backends when processing requests from slow clients such as IoT devices connected to `vmauth` via slow networks. See [#10309](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10309) and [request body buffering docs](https://docs.victoriametrics.com/victoriametrics/vmauth/#request-body-buffering).
-* FEATURE: [vmbackupmanager](https://docs.victoriametrics.com/victoriametrics/vmbackupmanager/): allow completely disabling scheduled backups by using `-disableScheduledBackups` command-line flag. This is useful to run `vmbackupmanager` only for on-demand backups and restores triggered via API. See [#10364](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10364).
 * FEATURE: [monitoring](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#monitoring): take into account all the generated log messages at `vm_log_messages_total` metric, including suppressed logs if the `-loggerLevel` command-line flag is set to values other than `INFO`. Add `is_printed` label to the `vm_log_messages_total` metric in order to understand whether the log at the given code `location` was suppressed or not. This simplifies troubleshooting of VictoriaMetrics components when logs aren't available. See [#10304](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10304).
 * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent/): support configuring different `-remoteWrite.queues` per remoteWrite url. This allows setting `-remoteWrite.queues=1` for backends that do not support out-of-order ingestion (e.g. Mimir), while keeping higher queue counts for other backends such as VictoriaMetrics. Previously, this required running multiple vmagent instances with different queue settings. See [#10270](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10270).
 * FEATURE: [alerts](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/deployment/docker/rules): add new alerting rules `PersistentQueueRunsOutOfSpaceIn12Hours` and `PersistentQueueRunsOutOfSpaceIn4Hours` for `vmagent` persistent queue capacity. These alerts help users to take proactive actions before `vmagent` starts dropping metrics due to insufficient persistent queue space. See [#10193](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10193)
 * FEATURE: All VictoriaMetrics components: add build version information to the home page for consistency with other projects. See [#10249](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10249).
 * FEATURE: all VictoriaMetrics components: add flag `fs.disableMincore`, which allows to disable `mincore` syscall. See [#10327](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10327).
-* FEATURE: [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmselect` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): expose topN average memory bytes consumption queries in `/api/v1/status/top_queries`. It can help users to find queries that consume a lot of memory and potentially cause OOM. See [#9330](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9330).
-* FEATURE: [vmctl](https://docs.victoriametrics.com/victoriametrics/vmctl/): add metrics for tracking the migration progress. See [vmctl - monitoring the migration process](https://docs.victoriametrics.com/victoriametrics/vmctl/#monitoring-the-migration-process) and [#10276](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/10276).
 
 * BUGFIX: [vmauth](https://docs.victoriametrics.com/victoriametrics/vmauth/): stop backend health checks for URL prefixes defined in `url_map` during configuration reloads. Previously, stale backends kept being health-checked and produced repeated warning logs after reloads. See [#10334](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10334).
 * BUGFIX: [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): properly return [/api/v1/status/tsdb](https://docs.victoriametrics.com/victoriametrics/#tsdb-stats) response for time range outside [partition index](https://docs.victoriametrics.com/victoriametrics/#indexdb). See [#10315](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10315).
@@ -50,10 +41,7 @@ Released at 2026-01-30
 * BUGFIX: [vmui](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#vmui): fix "Percentage from total" calculation on the Cardinality Explorer page when multiple metrics match the filter. See [#10323](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/10323). Thanks to @PleasingFungus for the contribution.
 * BUGFIX: [vmagent](https://docs.victoriametrics.com/victoriametrics/vmagent/): apply `-promscrape.maxScrapeSize` check to decompressed data instead of compressed data. See [#9481](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9481).
 * BUGFIX: [vmalert](https://docs.victoriametrics.com/victoriametrics/vmalert/): disallow setting the `-notifier.url` command-line flag to a null value. See [#10355](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10355).
-* BUGFIX: [vmalert](https://docs.victoriametrics.com/victoriametrics/vmalert/): fix [alert restore](https://docs.victoriametrics.com/victoriametrics/vmalert/#alerts-state-on-restarts) when a group contains many rules and is slow to complete evaluation. Previously, the restore process might not retrieve the correct previous alert state. See [#10335](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10335).
-* BUGFIX: [vmalert](https://docs.victoriametrics.com/victoriametrics/vmalert/): do not skip sending alert notifications to `-notifier.url` if remote write requests to `-remoteWrite.url` fail. See [#10376](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/10376).
 * BUGFIX: [MetricsQL](https://docs.victoriametrics.com/victoriametrics/metricsql/): fix `changes()` function when gaps between samples exceed the lookbehind window. Previously, it could yield a non-zero value even when the sample value remained unchanged. See [#10280](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10280).
-* BUGFIX: [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): previously ingestion could hit lock contention that triggered frequent context switches and storage connection saturation spikes; now the contention is removed to keep ingestion steady. See [#10367](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10367).
 
 ## [v1.134.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.134.0)
 
@@ -86,10 +74,6 @@ Released at 2026-01-16
 Released at 2026-01-02
 
 **Update Note 1:** [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): Upgrading to per-partition index requires registering all active time series. Expect slow down of data ingestion and queries during upgrade roll-out. This is a one-time operation. Additionally, for users with retention periods shorter than 1 month the disk usage may increase.
-**Update Note 2:** [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): Running this version in deployments with big datasets may cause high CPU utilization. See [10297](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10297).
-**Update Note 3:** [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): lock contention in the ingestion path may cause frequent context switches and storage connection saturation spikes. See [10367](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10367). Addressed in `v1.135.0`.
-**Update Note 4:** [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): TSDB status may be empty if the partition index does not have records for the requested date. See [10315](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10315). Addressed in `v1.135.0`.
-**Update Note 5:** [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): `indexdb/tagFiltersToMetricIDs`, `indexdb/metricID` and `indexdb/date_metricID` cache metrics are not reported properly. See [10275](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10275). Addressed in `v1.135.0`.
 
 * SECURITY: upgrade base docker image (Alpine) from 3.22.2 to 3.23.2. See [Alpine 3.23.2 release notes](https://www.alpinelinux.org/posts/Alpine-3.23.2-released.html).
 

docs/victoriametrics/scrape_config_examples.md

@@ -322,11 +322,16 @@ scrape_configs:
   bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
   tls_config:
     ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-  metrics_path: /metrics/cadvisor
+
   relabel_configs:
+    # Cadvisor metrics are better to scrape from Kubernetes API server proxy.
     # There is no need to add container, pod and node labels to the scraped metrics,
     # since cadvisor adds these labels on itself.
     #
+  - source_labels: [__meta_kubernetes_node_name]
+    target_label: __address__
+    regex: '(.+)'
+    replacement: https://kubernetes.default.svc/api/v1/nodes/$1/proxy/metrics/cadvisor
   - source_labels: [__meta_kubernetes_node_name]
     target_label: instance
 ```

docs/victoriametrics/victoria_metrics_common_flags.md

@@ -320,7 +320,7 @@ See the docs at https://docs.victoriametrics.com/victoriametrics/
      The maximum size of http response headers from Prometheus scrape targets
      Supports the following optional suffixes for size values: KB, MB, GB, TB, KiB, MiB, GiB, TiB (default 4096)
   -promscrape.maxScrapeSize size
-     The maximum size of uncompressed scrape response in bytes to process from Prometheus targets. Bigger uncompressed responses are rejected. See also max_scrape_size option at https://docs.victoriametrics.com/victoriametrics/sd_configs/#scrape_configs
+     The maximum size of scrape response in bytes to process from Prometheus targets. Bigger responses are rejected. See also max_scrape_size option at https://docs.victoriametrics.com/victoriametrics/sd_configs/#scrape_configs
      Supports the following optional suffixes for size values: KB, MB, GB, TB, KiB, MiB, GiB, TiB (default 16777216)
   -promscrape.minResponseSizeForStreamParse size
      The minimum target response size for automatic switching to stream parsing mode, which can reduce memory usage. See https://docs.victoriametrics.com/victoriametrics/vmagent/#stream-parsing-mode
@@ -486,9 +486,6 @@ See the docs at https://docs.victoriametrics.com/victoriametrics/
      Query stats for /api/v1/status/top_queries is tracked on this number of last queries. Zero value disables query stats tracking (default 20000)
   -search.queryStats.minQueryDuration duration
      The minimum duration for queries to track in query stats at /api/v1/status/top_queries. Queries with lower duration are ignored in query stats (default 1ms)
-  -search.queryStats.minQueryMemoryUsage size
-     The minimum memory bytes consumption for queries to track in query stats at /api/v1/status/top_queries. Queries with lower memory bytes consumption are ignored in query stats
-     Supports the following optional suffixes for size values: KB, MB, GB, TB, KiB, MiB, GiB, TiB (default 1024)
   -search.resetCacheAuthKey value
      Optional authKey for resetting rollup cache via /internal/resetRollupResultCache call. It could be passed via authKey query arg. It overrides -httpAuth.*
      Flag value can be read from the given file when using -search.resetCacheAuthKey=file:///abs/path/to/file or -search.resetCacheAuthKey=file://./relative/path/to/file.

docs/victoriametrics/vmagent_common_flags.md

@@ -286,7 +286,7 @@ See the docs at https://docs.victoriametrics.com/victoriametrics/vmagent/ .
      The maximum size of http response headers from Prometheus scrape targets
      Supports the following optional suffixes for size values: KB, MB, GB, TB, KiB, MiB, GiB, TiB (default 4096)
   -promscrape.maxScrapeSize size
-     The maximum size of uncompressed scrape response in bytes to process from Prometheus targets. Bigger uncompressed responses are rejected. See also max_scrape_size option at https://docs.victoriametrics.com/victoriametrics/sd_configs/#scrape_configs
+     The maximum size of scrape response in bytes to process from Prometheus targets. Bigger responses are rejected. See also max_scrape_size option at https://docs.victoriametrics.com/victoriametrics/sd_configs/#scrape_configs
      Supports the following optional suffixes for size values: KB, MB, GB, TB, KiB, MiB, GiB, TiB (default 16777216)
   -promscrape.minResponseSizeForStreamParse size
      The minimum target response size for automatic switching to stream parsing mode, which can reduce memory usage. See https://docs.victoriametrics.com/victoriametrics/vmagent/#stream-parsing-mode
@@ -459,10 +459,8 @@ See the docs at https://docs.victoriametrics.com/victoriametrics/vmagent/ .
      Optional proxy URL for writing data to the corresponding -remoteWrite.url. Supported proxies: http, https, socks5. Example: -remoteWrite.proxyURL=socks5://proxy:1234
      Supports an array of values separated by comma or specified via multiple flags.
      Each array item can contain comma inside single-quoted or double-quoted string, {}, [] and () braces.
-  -remoteWrite.queues array
+  -remoteWrite.queues int
      The number of concurrent queues to each -remoteWrite.url. Set more queues if default number of queues isn't enough for sending high volume of collected data to remote storage. Default value depends on the number of available CPU cores. It should work fine in most cases since it minimizes resource usage (default 2*cgroup.AvailableCPUs())
-     Supports array of values separated by comma or specified via multiple flags.
-     Empty values are set to default value.
   -remoteWrite.rateLimit array
      Optional rate limit in bytes per second for data sent to the corresponding -remoteWrite.url. By default, the rate limit is disabled. It can be useful for limiting load on remote storage when big amounts of buffered data is sent after temporary unavailability of the remote storage. See also -maxIngestionRate (default 0)
      Supports array of values separated by comma or specified via multiple flags.

docs/victoriametrics/vmauth.md

@@ -738,7 +738,7 @@ See also [request body buffering](https://docs.victoriametrics.com/victoriametri
 
 ## Request body buffering
 
-`vmauth` can buffer request bodies {{% available_from "v1.135.0" %}} before proxying the requests to backends. This prevent slow-writing clients from occupying connections to backends.
+`vmauth` can buffer request bodies {{% available_from "#" %}} before proxying the requests to backends. This prevent slow-writing clients from occupying connections to backends.
 This is especially important when clients send requests over unreliable or low-bandwidth networks (for example, [IoT](https://en.wikipedia.org/wiki/Internet_of_things) devices over EDGE networks),
 where slow uploads can exhaust concurrency limits, increase latency, reduce ingestion rate, and trigger `429 Too Many Requests` responses even when backend resources are not saturated.
 

docs/victoriametrics/vmbackupmanager.md

@@ -43,8 +43,6 @@ Backup schedule is controlled by the following flags:
 * `-disableMonthly` - disable monthly run. Default false
 
 By default, all flags are turned on and Backup Manager backups data every hour for every interval (hourly, daily, weekly and monthly).
-Note that if all intervals are disabled, the `vmbackupmanager` will create latest backups every 24 hours.
-Using `-disableScheduledBackups`{{% available_from "v1.135.0" %}} allows completely disabling scheduled backups. In this mode API can be used to trigger backups and restores on demand.
 
 The backup manager creates the following directory hierarchy at `-dst`:
 
@@ -539,8 +537,6 @@ command-line flags:
      Disable hourly run. Default false
   -disableMonthly
      Disable monthly run. Default false
-  -disableScheduledBackups
-     Disable all scheduled backups. This is useful in order to run vmbackupmanager in API only mode to allow requesting restore and performing manual backups. Default false
   -disableWeekly
      Disable weekly run. Default false
   -dst string

docs/victoriametrics/vmctl/vmctl.md

@@ -169,71 +169,6 @@ see `--vm-concurrency` flag.
 Please note, you can also use [vmagent](https://docs.victoriametrics.com/victoriametrics/vmagent/)
 as a proxy between `vmctl` and destination with `-remoteWrite.rateLimit` flag enabled.
 
-### Monitoring the migration process
-
-`vmctl` can push internal metrics {{% available_from "v1.135.0" %}} to a remote storage for monitoring migration progress and performance.
-This is especially useful for long-running migrations where you want to track progress, detect issues,
-or build dashboards to visualize the migration status.
-
-Example usage with VictoriaMetrics as the metrics destination:
-
-```sh
-./vmctl influx \
-  --influx-addr=http://localhost:8086 \
-  --influx-database=mydb \
-  --vm-addr=http://localhost:8428 \
-  --pushmetrics.url=http://localhost:8428/api/v1/import/prometheus \
-  --pushmetrics.extraLabel='job="vmctl"' \
-  --pushmetrics.extraLabel='instance="migration-1"'
-```
-
-#### Available metrics
-
-The following metrics are exposed by `vmctl`:
-
-General metrics (available for all migration modes):
-
-| Metric | Description |
-|--------|-------------|
-| `vmctl_backoff_retries_total` | Total number of retry attempts across all operations |
-| `vmctl_limiter_bytes_processed_total` | Total bytes processed through rate limiter (when `--vm-rate-limit` is set) |
-| `vmctl_limiter_throttle_events_total` | Number of times rate limiting caused a pause |
-
-Mode-specific metrics:
-
-Each migration mode exposes its own set of metrics with the mode name embedded in the metric name:
-
-| Mode | Metrics |
-|------|---------|
-| `influx` | `vmctl_influx_migration_series_total`, `vmctl_influx_migration_series_processed`, `vmctl_influx_migration_errors_total` |
-| `prometheus` | `vmctl_prometheus_migration_blocks_total`, `vmctl_prometheus_migration_blocks_processed`, `vmctl_prometheus_migration_errors_total` |
-| `opentsdb` | `vmctl_opentsdb_migration_series_total`, `vmctl_opentsdb_migration_series_processed`, `vmctl_opentsdb_migration_errors_total` |
-| `remote-read` | `vmctl_remote_read_migration_ranges_total`, `vmctl_remote_read_migration_ranges_processed`, `vmctl_remote_read_migration_errors_total` |
-| `vm-native` | `vmctl_vm_native_migration_metrics_total`, `vmctl_vm_native_migration_metrics_processed`, `vmctl_vm_native_migration_requests_planned`, `vmctl_vm_native_migration_requests_completed`, `vmctl_vm_native_migration_tenants_total`, `vmctl_vm_native_migration_tenants_processed`, `vmctl_vm_native_migration_bytes_transferred_total`, `vmctl_vm_native_migration_errors_total` |
-
-#### Example PromQL queries
-
-Monitor migration progress:
-```promql
-# Migration completion percentage for influx mode
-vmctl_influx_migration_series_processed / vmctl_influx_migration_series_total * 100
-
-# Migration completion percentage for vm-native mode
-vmctl_vm_native_migration_metrics_processed / vmctl_vm_native_migration_metrics_total * 100
-
-# Retry rate
-rate(vmctl_backoff_retries_total[5m])
-
-# Rate limiter throttling events per second
-rate(vmctl_limiter_throttle_events_total[5m])
-
-# Data transfer speed in bytes per second (when rate limiting is enabled)
-rate(vmctl_limiter_bytes_processed_total[5m])
-
-# Data transfer speed in MB per second for vm-native mode
-rate(vmctl_vm_native_migration_bytes_transferred_total[5m]) / 1Mb
-```
-
 ## Verifying exported blocks from VictoriaMetrics
 
 In this mode, `vmctl` allows verifying correctness and integrity of data exported via

docs/victoriametrics/vmctl/vmctl_influx_flags.md

@@ -15,22 +15,17 @@ USAGE:
    vmctl influx [command options]
 
 OPTIONS:
-   -s                                                                 Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
-   --verbose                                                          Whether to enable verbosity in logs output. (default: false)
-   --disable-progress-bar                                             Whether to disable progress bar during the import. (default: false)
-   --pushmetrics.url value [ --pushmetrics.url value ]                Optional URL to push metrics. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#push-metrics
-   --pushmetrics.interval value                                       Interval for pushing metrics to every -pushmetrics.url (default: 10s)
-   --pushmetrics.extraLabel value [ --pushmetrics.extraLabel value ]  Extra labels to add to pushed metrics. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels. For example, -pushmetrics.extraLabel='instance="foo"' adds instance="foo" label to all the metrics pushed to every -pushmetrics.url
-   --pushmetrics.header value [ --pushmetrics.header value ]          Optional HTTP headers to add to pushed metrics. Flag can be set multiple times, to add few additional headers.
-   --pushmetrics.disableCompression                                   Whether to disable compression when pushing metrics. (default: false)
-   --influx-addr value                                                InfluxDB server addr (default: "http://localhost:8086")
-   --influx-user value                                                InfluxDB user [$INFLUX_USERNAME]
-   --influx-password value                                            InfluxDB user password [$INFLUX_PASSWORD]
-   --influx-database value                                            InfluxDB database
-   --influx-retention-policy value                                    InfluxDB retention policy (default: "autogen")
-   --influx-chunk-size value                                          The chunkSize defines max amount of series to be returned in one chunk (default: 10000)
-   --influx-concurrency value                                         Number of concurrently running fetch queries to InfluxDB (default: 1)
-   --influx-filter-series value                                       InfluxDB filter expression to select series. E.g. "from cpu where arch='x86' AND hostname='host_2753'".
+   -s                               Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
+   --verbose                        Whether to enable verbosity in logs output. (default: false)
+   --disable-progress-bar           Whether to disable progress bar during the import. (default: false)
+   --influx-addr value              InfluxDB server addr (default: "http://localhost:8086")
+   --influx-user value              InfluxDB user [$INFLUX_USERNAME]
+   --influx-password value          InfluxDB user password [$INFLUX_PASSWORD]
+   --influx-database value          InfluxDB database
+   --influx-retention-policy value  InfluxDB retention policy (default: "autogen")
+   --influx-chunk-size value        The chunkSize defines max amount of series to be returned in one chunk (default: 10000)
+   --influx-concurrency value       Number of concurrently running fetch queries to InfluxDB (default: 1)
+   --influx-filter-series value     InfluxDB filter expression to select series. E.g. "from cpu where arch='x86' AND hostname='host_2753'".
       See for details https://docs.influxdata.com/influxdb/v1.7/query_language/schema_exploration#show-series
    --influx-filter-time-start value            The time filter to select timeseries with timestamp equal or higher than provided value. E.g. '2020-01-01T20:07:00Z'
    --influx-filter-time-end value              The time filter to select timeseries with timestamp equal or lower than provided value. E.g. '2020-01-01T20:07:00Z'
@@ -57,14 +52,14 @@ OPTIONS:
    --vm-batch-size value                              How many samples importer collects before sending the import request to VM (default: 200000)
    --vm-significant-figures value                     The number of significant figures to leave in metric values before importing. See https://en.wikipedia.org/wiki/Significant_figures. Zero value saves all the significant figures. This option may be used for increasing on-disk compression level for the stored metrics. See also --vm-round-digits option (default: 0)
    --vm-round-digits value                            Round metric values to the given number of decimal digits after the point. This option may be used for increasing on-disk compression level for the stored metrics (default: 100)
-   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels.
+   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flagwill have priority. Flag can be set multiple times, to add few additional labels.
    --vm-rate-limit value                              Optional data transfer rate limit in bytes per second.
-      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vm-addr' destination. (default: 0)
-   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vm-addr'
-   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vm-addr'
-   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vm-addr'. By default, system CA is used
-   --vm-server-name value           Optional TLS server name to use for connections to '--vm-addr'. By default, the server name from '--vm-addr' is used
-   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vm-addr' (default: false)
+      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vmAddr' destination. (default: 0)
+   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vmAddr'
+   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vmAddr'
+   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vmAddr'. By default, system CA is used
+   --vm-server-name value           Optional TLS server name to use for connections to '--vmAddr'. By default, the server name from '--vmAddr' is used
+   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vmAddr' (default: false)
    --vm-backoff-retries value       How many import retries to perform before giving up. (default: 10)
    --vm-backoff-factor value        Factor to multiply the base duration after each failed import retry. Must be greater than 1.0 (default: 1.8)
    --vm-backoff-min-duration value  Minimum duration to wait before the first import retry. Each subsequent import retry will be multiplied by the '--vm-backoff-factor'. (default: 2s)

docs/victoriametrics/vmctl/vmctl_opentsdb_flags.md

@@ -15,29 +15,24 @@ USAGE:
    vmctl opentsdb [command options]
 
 OPTIONS:
-   -s                                                                 Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
-   --verbose                                                          Whether to enable verbosity in logs output. (default: false)
-   --disable-progress-bar                                             Whether to disable progress bar during the import. (default: false)
-   --pushmetrics.url value [ --pushmetrics.url value ]                Optional URL to push metrics. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#push-metrics
-   --pushmetrics.interval value                                       Interval for pushing metrics to every -pushmetrics.url (default: 10s)
-   --pushmetrics.extraLabel value [ --pushmetrics.extraLabel value ]  Extra labels to add to pushed metrics. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels. For example, -pushmetrics.extraLabel='instance="foo"' adds instance="foo" label to all the metrics pushed to every -pushmetrics.url
-   --pushmetrics.header value [ --pushmetrics.header value ]          Optional HTTP headers to add to pushed metrics. Flag can be set multiple times, to add few additional headers.
-   --pushmetrics.disableCompression                                   Whether to disable compression when pushing metrics. (default: false)
-   --otsdb-addr value                                                 OpenTSDB server addr (default: "http://localhost:4242")
-   --otsdb-concurrency value                                          Number of concurrently running fetch queries to OpenTSDB per metric (default: 1)
-   --otsdb-retentions value [ --otsdb-retentions value ]              Retentions patterns to collect on. Each pattern should describe the aggregation performed for the query, the row size (in HBase) that will define how long each individual query is, and the time range to query for. e.g. sum-1m-avg:1h:3d. The first time range defined should be a multiple of the row size in HBase. e.g. if the row size is 2 hours, 4h is good, 5h less so. We want each query to land on unique rows.
-   --otsdb-filters value [ --otsdb-filters value ]                    Filters to process for discovering metrics in OpenTSDB (default: "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z")
-   --otsdb-offset-days value                                          Days to offset our 'starting' point for collecting data from OpenTSDB (default: 0)
-   --otsdb-hard-ts-start value                                        A specific timestamp to start from, will override using an offset (default: 0)
-   --otsdb-query-limit value                                          Result limit on meta queries to OpenTSDB (affects both metric name and tag value queries, recommended to use a value exceeding your largest series) (default: 100000000)
-   --otsdb-msecstime                                                  Whether OpenTSDB is writing values in milliseconds or seconds (default: false)
-   --otsdb-normalize                                                  Whether to normalize all data received to lower case before forwarding to VictoriaMetrics (default: false)
-   --otsdb-cert-file value                                            Optional path to client-side TLS certificate file to use when connecting to -otsdb-addr
-   --otsdb-key-file value                                             Optional path to client-side TLS key to use when connecting to -otsdb-addr
-   --otsdb-CA-file value                                              Optional path to TLS CA file to use for verifying connections to -otsdb-addr. By default, system CA is used
-   --otsdb-server-name value                                          Optional TLS server name to use for connections to -otsdb-addr. By default, the server name from -otsdb-addr is used
-   --otsdb-insecure-skip-verify                                       Whether to skip tls verification when connecting to -otsdb-addr (default: false)
-   --vm-addr value                                                    VictoriaMetrics address to perform import requests. 
+   -s                                                     Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
+   --verbose                                              Whether to enable verbosity in logs output. (default: false)
+   --disable-progress-bar                                 Whether to disable progress bar during the import. (default: false)
+   --otsdb-addr value                                     OpenTSDB server addr (default: "http://localhost:4242")
+   --otsdb-concurrency value                              Number of concurrently running fetch queries to OpenTSDB per metric (default: 1)
+   --otsdb-retentions value [ --otsdb-retentions value ]  Retentions patterns to collect on. Each pattern should describe the aggregation performed for the query, the row size (in HBase) that will define how long each individual query is, and the time range to query for. e.g. sum-1m-avg:1h:3d. The first time range defined should be a multiple of the row size in HBase. e.g. if the row size is 2 hours, 4h is good, 5h less so. We want each query to land on unique rows.
+   --otsdb-filters value [ --otsdb-filters value ]        Filters to process for discovering metrics in OpenTSDB (default: "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z")
+   --otsdb-offset-days value                              Days to offset our 'starting' point for collecting data from OpenTSDB (default: 0)
+   --otsdb-hard-ts-start value                            A specific timestamp to start from, will override using an offset (default: 0)
+   --otsdb-query-limit value                              Result limit on meta queries to OpenTSDB (affects both metric name and tag value queries, recommended to use a value exceeding your largest series) (default: 100000000)
+   --otsdb-msecstime                                      Whether OpenTSDB is writing values in milliseconds or seconds (default: false)
+   --otsdb-normalize                                      Whether to normalize all data received to lower case before forwarding to VictoriaMetrics (default: false)
+   --otsdb-cert-file value                                Optional path to client-side TLS certificate file to use when connecting to -otsdb-addr
+   --otsdb-key-file value                                 Optional path to client-side TLS key to use when connecting to -otsdb-addr
+   --otsdb-CA-file value                                  Optional path to TLS CA file to use for verifying connections to -otsdb-addr. By default, system CA is used
+   --otsdb-server-name value                              Optional TLS server name to use for connections to -otsdb-addr. By default, the server name from -otsdb-addr is used
+   --otsdb-insecure-skip-verify                           Whether to skip tls verification when connecting to -otsdb-addr (default: false)
+   --vm-addr value                                        VictoriaMetrics address to perform import requests. 
       Should be the same as --httpListenAddr value for single-node version or vminsert component. 
       When importing into the clustered version do not forget to set additionally --vm-account-id flag. 
       Please note, that vmctl performs initial readiness check for the given address by checking /health endpoint. (default: "http://localhost:8428")
@@ -52,14 +47,14 @@ OPTIONS:
    --vm-batch-size value                              How many samples importer collects before sending the import request to VM (default: 200000)
    --vm-significant-figures value                     The number of significant figures to leave in metric values before importing. See https://en.wikipedia.org/wiki/Significant_figures. Zero value saves all the significant figures. This option may be used for increasing on-disk compression level for the stored metrics. See also --vm-round-digits option (default: 0)
    --vm-round-digits value                            Round metric values to the given number of decimal digits after the point. This option may be used for increasing on-disk compression level for the stored metrics (default: 100)
-   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels.
+   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flagwill have priority. Flag can be set multiple times, to add few additional labels.
    --vm-rate-limit value                              Optional data transfer rate limit in bytes per second.
-      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vm-addr' destination. (default: 0)
-   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vm-addr'
-   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vm-addr'
-   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vm-addr'. By default, system CA is used
-   --vm-server-name value           Optional TLS server name to use for connections to '--vm-addr'. By default, the server name from '--vm-addr' is used
-   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vm-addr' (default: false)
+      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vmAddr' destination. (default: 0)
+   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vmAddr'
+   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vmAddr'
+   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vmAddr'. By default, system CA is used
+   --vm-server-name value           Optional TLS server name to use for connections to '--vmAddr'. By default, the server name from '--vmAddr' is used
+   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vmAddr' (default: false)
    --vm-backoff-retries value       How many import retries to perform before giving up. (default: 10)
    --vm-backoff-factor value        Factor to multiply the base duration after each failed import retry. Must be greater than 1.0 (default: 1.8)
    --vm-backoff-min-duration value  Minimum duration to wait before the first import retry. Each subsequent import retry will be multiplied by the '--vm-backoff-factor'. (default: 2s)

docs/victoriametrics/vmctl/vmctl_prometheus_flags.md

@@ -15,22 +15,17 @@ USAGE:
    vmctl prometheus [command options]
 
 OPTIONS:
-   -s                                                                 Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
-   --verbose                                                          Whether to enable verbosity in logs output. (default: false)
-   --disable-progress-bar                                             Whether to disable progress bar during the import. (default: false)
-   --pushmetrics.url value [ --pushmetrics.url value ]                Optional URL to push metrics. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#push-metrics
-   --pushmetrics.interval value                                       Interval for pushing metrics to every -pushmetrics.url (default: 10s)
-   --pushmetrics.extraLabel value [ --pushmetrics.extraLabel value ]  Extra labels to add to pushed metrics. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels. For example, -pushmetrics.extraLabel='instance="foo"' adds instance="foo" label to all the metrics pushed to every -pushmetrics.url
-   --pushmetrics.header value [ --pushmetrics.header value ]          Optional HTTP headers to add to pushed metrics. Flag can be set multiple times, to add few additional headers.
-   --pushmetrics.disableCompression                                   Whether to disable compression when pushing metrics. (default: false)
-   --prom-snapshot value                                              Path to Prometheus snapshot. Pls see for details https://www.robustperception.io/taking-snapshots-of-prometheus-data
-   --prom-concurrency value                                           Number of concurrently running snapshot readers (default: 1)
-   --prom-filter-time-start value                                     The time filter in RFC3339 format to select timeseries with timestamp equal or higher than provided value. E.g. '2020-01-01T20:07:00Z'
-   --prom-filter-time-end value                                       The time filter in RFC3339 format to select timeseries with timestamp equal or lower than provided value. E.g. '2020-01-01T20:07:00Z'
-   --prom-filter-label value                                          Prometheus label name to filter timeseries by. E.g. '__name__' will filter timeseries by name.
-   --prom-filter-label-value value                                    Prometheus regular expression to filter label from "prom-filter-label" flag. (default: ".*")
-   --prom-tmp-dir-path value                                          Path to directory to be used for temporary files. (default: "/var/folders/ds/3kj5p3v17ll0hsyvq380ryvm0000gn/T/")
-   --vm-addr value                                                    VictoriaMetrics address to perform import requests. 
+   -s                               Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
+   --verbose                        Whether to enable verbosity in logs output. (default: false)
+   --disable-progress-bar           Whether to disable progress bar during the import. (default: false)
+   --prom-snapshot value            Path to Prometheus snapshot. Pls see for details https://www.robustperception.io/taking-snapshots-of-prometheus-data
+   --prom-concurrency value         Number of concurrently running snapshot readers (default: 1)
+   --prom-filter-time-start value   The time filter in RFC3339 format to select timeseries with timestamp equal or higher than provided value. E.g. '2020-01-01T20:07:00Z'
+   --prom-filter-time-end value     The time filter in RFC3339 format to select timeseries with timestamp equal or lower than provided value. E.g. '2020-01-01T20:07:00Z'
+   --prom-filter-label value        Prometheus label name to filter timeseries by. E.g. '__name__' will filter timeseries by name.
+   --prom-filter-label-value value  Prometheus regular expression to filter label from "prom-filter-label" flag. (default: ".*")
+   --prom-tmp-dir-path value        Path to directory to be used for temporary files. (default: "/var/folders/ds/3kj5p3v17ll0hsyvq380ryvm0000gn/T/")
+   --vm-addr value                  VictoriaMetrics address to perform import requests. 
       Should be the same as --httpListenAddr value for single-node version or vminsert component. 
       When importing into the clustered version do not forget to set additionally --vm-account-id flag. 
       Please note, that vmctl performs initial readiness check for the given address by checking /health endpoint. (default: "http://localhost:8428")
@@ -45,14 +40,14 @@ OPTIONS:
    --vm-batch-size value                              How many samples importer collects before sending the import request to VM (default: 200000)
    --vm-significant-figures value                     The number of significant figures to leave in metric values before importing. See https://en.wikipedia.org/wiki/Significant_figures. Zero value saves all the significant figures. This option may be used for increasing on-disk compression level for the stored metrics. See also --vm-round-digits option (default: 0)
    --vm-round-digits value                            Round metric values to the given number of decimal digits after the point. This option may be used for increasing on-disk compression level for the stored metrics (default: 100)
-   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels.
+   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flagwill have priority. Flag can be set multiple times, to add few additional labels.
    --vm-rate-limit value                              Optional data transfer rate limit in bytes per second.
-      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vm-addr' destination. (default: 0)
-   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vm-addr'
-   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vm-addr'
-   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vm-addr'. By default, system CA is used
-   --vm-server-name value           Optional TLS server name to use for connections to '--vm-addr'. By default, the server name from '--vm-addr' is used
-   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vm-addr' (default: false)
+      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vmAddr' destination. (default: 0)
+   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vmAddr'
+   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vmAddr'
+   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vmAddr'. By default, system CA is used
+   --vm-server-name value           Optional TLS server name to use for connections to '--vmAddr'. By default, the server name from '--vmAddr' is used
+   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vmAddr' (default: false)
    --vm-backoff-retries value       How many import retries to perform before giving up. (default: 10)
    --vm-backoff-factor value        Factor to multiply the base duration after each failed import retry. Must be greater than 1.0 (default: 1.8)
    --vm-backoff-min-duration value  Minimum duration to wait before the first import retry. Each subsequent import retry will be multiplied by the '--vm-backoff-factor'. (default: 2s)

docs/victoriametrics/vmctl/vmctl_remote-read_flags.md

@@ -18,11 +18,6 @@ OPTIONS:
    -s                                                                                 Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
    --verbose                                                                          Whether to enable verbosity in logs output. (default: false)
    --disable-progress-bar                                                             Whether to disable progress bar during the import. (default: false)
-   --pushmetrics.url value [ --pushmetrics.url value ]                                Optional URL to push metrics. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#push-metrics
-   --pushmetrics.interval value                                                       Interval for pushing metrics to every -pushmetrics.url (default: 10s)
-   --pushmetrics.extraLabel value [ --pushmetrics.extraLabel value ]                  Extra labels to add to pushed metrics. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels. For example, -pushmetrics.extraLabel='instance="foo"' adds instance="foo" label to all the metrics pushed to every -pushmetrics.url
-   --pushmetrics.header value [ --pushmetrics.header value ]                          Optional HTTP headers to add to pushed metrics. Flag can be set multiple times, to add few additional headers.
-   --pushmetrics.disableCompression                                                   Whether to disable compression when pushing metrics. (default: false)
    --remote-read-concurrency value                                                    Number of concurrently running remote read readers (default: 1)
    --remote-read-filter-time-start value                                              The time filter in RFC3339 format to select timeseries with timestamp equal or higher than provided value. E.g. '2020-01-01T20:07:00Z'
    --remote-read-filter-time-end value                                                The time filter in RFC3339 format to select timeseries with timestamp equal or lower than provided value. E.g. '2020-01-01T20:07:00Z'
@@ -60,14 +55,14 @@ OPTIONS:
    --vm-batch-size value                              How many samples importer collects before sending the import request to VM (default: 200000)
    --vm-significant-figures value                     The number of significant figures to leave in metric values before importing. See https://en.wikipedia.org/wiki/Significant_figures. Zero value saves all the significant figures. This option may be used for increasing on-disk compression level for the stored metrics. See also --vm-round-digits option (default: 0)
    --vm-round-digits value                            Round metric values to the given number of decimal digits after the point. This option may be used for increasing on-disk compression level for the stored metrics (default: 100)
-   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels.
+   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flagwill have priority. Flag can be set multiple times, to add few additional labels.
    --vm-rate-limit value                              Optional data transfer rate limit in bytes per second.
-      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vm-addr' destination. (default: 0)
-   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vm-addr'
-   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vm-addr'
-   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vm-addr'. By default, system CA is used
-   --vm-server-name value           Optional TLS server name to use for connections to '--vm-addr'. By default, the server name from '--vm-addr' is used
-   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vm-addr' (default: false)
+      By default, the rate limit is disabled. It can be useful for limiting load on configured via '--vmAddr' destination. (default: 0)
+   --vm-cert-file value             Optional path to client-side TLS certificate file to use when connecting to '--vmAddr'
+   --vm-key-file value              Optional path to client-side TLS key to use when connecting to '--vmAddr'
+   --vm-CA-file value               Optional path to TLS CA file to use for verifying connections to '--vmAddr'. By default, system CA is used
+   --vm-server-name value           Optional TLS server name to use for connections to '--vmAddr'. By default, the server name from '--vmAddr' is used
+   --vm-insecure-skip-verify        Whether to skip tls verification when connecting to '--vmAddr' (default: false)
    --vm-backoff-retries value       How many import retries to perform before giving up. (default: 10)
    --vm-backoff-factor value        Factor to multiply the base duration after each failed import retry. Must be greater than 1.0 (default: 1.8)
    --vm-backoff-min-duration value  Minimum duration to wait before the first import retry. Each subsequent import retry will be multiplied by the '--vm-backoff-factor'. (default: 2s)

docs/victoriametrics/vmctl/vmctl_vm-native_flags.md

@@ -15,15 +15,10 @@ USAGE:
    vmctl vm-native [command options]
 
 OPTIONS:
-   -s                                                                 Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
-   --verbose                                                          Whether to enable verbosity in logs output. (default: false)
-   --disable-progress-bar                                             Whether to disable progress bar during the import. (default: false)
-   --pushmetrics.url value [ --pushmetrics.url value ]                Optional URL to push metrics. See https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#push-metrics
-   --pushmetrics.interval value                                       Interval for pushing metrics to every -pushmetrics.url (default: 10s)
-   --pushmetrics.extraLabel value [ --pushmetrics.extraLabel value ]  Extra labels to add to pushed metrics. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels. For example, -pushmetrics.extraLabel='instance="foo"' adds instance="foo" label to all the metrics pushed to every -pushmetrics.url
-   --pushmetrics.header value [ --pushmetrics.header value ]          Optional HTTP headers to add to pushed metrics. Flag can be set multiple times, to add few additional headers.
-   --pushmetrics.disableCompression                                   Whether to disable compression when pushing metrics. (default: false)
-   --vm-native-filter-match value                                     Time series selector to match series for export. For example, select {instance!="localhost"} will match all series with "instance" label different to "localhost".
+   -s                              Whether to run in silent mode. If set to true no confirmation prompts will appear. (default: false)
+   --verbose                       Whether to enable verbosity in logs output. (default: false)
+   --disable-progress-bar          Whether to disable progress bar during the import. (default: false)
+   --vm-native-filter-match value  Time series selector to match series for export. For example, select {instance!="localhost"} will match all series with "instance" label different to "localhost".
        See more details here https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#how-to-export-data-in-native-format (default: "{__name__!=\"\"}")
    --vm-native-filter-time-start value  The time filter may contain different timestamp formats. See more details here https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#timestamp-formats
    --vm-native-filter-time-end value    The time filter may contain different timestamp formats. See more details here https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#timestamp-formats
@@ -56,7 +51,7 @@ OPTIONS:
    --vm-native-dst-ca-file value                      Optional path to TLS CA file to use for verifying connections to --vm-native-dst-addr. By default, system CA is used
    --vm-native-dst-server-name value                  Optional TLS server name to use for connections to --vm-native-dst-addr. By default, the server name from --vm-native-dst-addr is used
    --vm-native-dst-insecure-skip-verify               Whether to skip TLS certificate verification when connecting to --vm-native-dst-addr (default: false)
-   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flag will have priority. Flag can be set multiple times, to add few additional labels.
+   --vm-extra-label value [ --vm-extra-label value ]  Extra labels, that will be added to imported timeseries. In case of collision, label value defined by flagwill have priority. Flag can be set multiple times, to add few additional labels.
    --vm-rate-limit value                              Optional data transfer rate limit in bytes per second.
       By default, the rate limit is disabled. It can be useful for limiting load on source or destination databases. 
       Rate limit is applied per worker, see --vm-concurrency. (default: 0)
@@ -65,7 +60,7 @@ OPTIONS:
        TenantID will be appended automatically after discovering tenants from src. (default: false)
    --vm-concurrency value                    Number of workers concurrently performing import requests to VM (default: 2)
    --vm-native-disable-per-metric-migration  Defines whether to disable per-metric migration and migrate all data via one connection. In this mode, vmctl makes less export/import requests, but can't provide a progress bar or retry failed requests. (default: false)
-   --vm-native-disable-binary-protocol       Whether to use https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#how-to-export-data-in-json-line-format instead of https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#how-to-export-data-in-native-format API. Binary export/import API protocol implies less network and resource usage, as it transfers compressed binary data blocks. Non-binary export/import API is less efficient, but supports deduplication if it is configured on vm-native-src-addr side. (default: false)
+   --vm-native-disable-binary-protocol       Whether to use https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#how-to-export-data-in-json-line-format instead of https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#how-to-export-data-in-native-format API.Binary export/import API protocol implies less network and resource usage, as it transfers compressed binary data blocks.Non-binary export/import API is less efficient, but supports deduplication if it is configured on vm-native-src-addr side. (default: false)
    --vm-native-backoff-retries value         How many export/import retries to perform before giving up. (default: 10)
    --vm-native-backoff-factor value          Factor to multiply the base duration after each failed export/import retry. Must be greater than 1.0 (default: 1.8)
    --vm-native-backoff-min-duration value    Minimum duration to wait before the first export/import retry. Each subsequent export/import retry will be multiplied by the '--vm-native-backoff-factor'. (default: 2s)

docs/victoriametrics/vminsert_common_flags.md

@@ -50,8 +50,6 @@ See the docs at https://docs.victoriametrics.com/victoriametrics/cluster-victori
      Auth key for /flags endpoint. It must be passed via authKey query arg. It overrides -httpAuth.*
      Flag value can be read from the given file when using -flagsAuthKey=file:///abs/path/to/file or -flagsAuthKey=file://./relative/path/to/file.
      Flag value can be read from the given http/https url when using -flagsAuthKey=http://host/path or -flagsAuthKey=https://host/path
-  -fs.disableMincore
-     Whether to disable the mincore() syscall for checking mmap()ed files. By default, mincore() is used to detect whether mmap()ed file pages are resident in memory. Disabling mincore() may be needed on older ZFS filesystems (below 2.1.5), since it may trigger ZFS bug. See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10327 for details.
   -fs.disableMmap
      Whether to use pread() instead of mmap() for reading data files. By default, mmap() is used for 64-bit arches and pread() is used for 32-bit arches, since they cannot read data files bigger than 2^32 bytes in memory. mmap() is usually faster for reading small data chunks than pread()
   -fs.maxConcurrency int

docs/victoriametrics/vmselect_common_flags.md

@@ -269,9 +269,6 @@ See the docs at https://docs.victoriametrics.com/victoriametrics/cluster-victori
      Query stats for /api/v1/status/top_queries is tracked on this number of last queries. Zero value disables query stats tracking (default 20000)
   -search.queryStats.minQueryDuration duration
      The minimum duration for queries to track in query stats at /api/v1/status/top_queries. Queries with lower duration are ignored in query stats (default 1ms)
-  -search.queryStats.minQueryMemoryUsage size
-     The minimum memory bytes consumption for queries to track in query stats at /api/v1/status/top_queries. Queries with lower memory bytes consumption are ignored in query stats
-     Supports the following optional suffixes for size values: KB, MB, GB, TB, KiB, MiB, GiB, TiB (default 1024)
   -search.resetCacheAuthKey value
      Optional authKey for resetting rollup cache via /internal/resetRollupResultCache call. It could be passed via authKey query arg. It overrides -httpAuth.*
      Flag value can be read from the given file when using -search.resetCacheAuthKey=file:///abs/path/to/file or -search.resetCacheAuthKey=file://./relative/path/to/file.

lib/pushmetrics/pushmetrics.go

@@ -50,29 +50,6 @@ func Init() {
 	}
 }
 
-type Config struct {
-	URLs               []string
-	Interval           time.Duration
-	ExtraLabels        []string
-	Headers            []string
-	DisableCompression bool
-}
-
-// InitWith must be called after logger.Init
-// Supersedes command-line flags related to pushmetrics and initializes pushmetrics with the given config.
-// This is needed for vmctl integration, see: https://github.com/VictoriaMetrics/VictoriaMetrics/issues/10375
-func InitWith(c *Config) {
-	*pushURL = c.URLs
-	*pushExtraLabel = c.ExtraLabels
-	*pushHeader = c.Headers
-	*disableCompression = c.DisableCompression
-	if c.Interval > 0 {
-		*pushInterval = c.Interval
-	}
-
-	Init()
-}
-
 // Stop stops the periodic push of metrics.
 // It is important to stop the push of metrics before disposing resources
 // these metrics attached to. See related https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5548

lib/storage/metric_id_cache.go

@@ -4,10 +4,7 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"unsafe"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/atomicutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/uint64set"
 )
@@ -16,119 +13,9 @@ import (
 // during data ingestion to decide whether a new entry needs to be added to the
 // global index.
 //
-// The cache consists of multiple shards and avoids synchronization on the read
-// path if possible to reduce contention.
+// The cache avoids synchronization on the read path if possible to reduce
+// contention. Based on dateMetricIDCache ideas.
 type metricIDCache struct {
-	shards []metricIDCacheShard
-
-	// The shards are rotated in groups, one group at a time.
-	// rotationGroupSize tells the number of shards in one group,
-	// rotationGroupCount tells how many groups to rotate, and
-	// rotationGroupPeriod tells how often a group is rotated.
-	rotationGroupSize   int
-	rotationGroupCount  int
-	rotationGroupPeriod time.Duration
-
-	stopCh            chan struct{}
-	rotationStoppedCh chan struct{}
-}
-
-func newMetricIDCache() *metricIDCache {
-	// Shards based on the number of CPUs are taken from
-	// lib/blockcache/blockcache.go.
-	rotationGroupSize := 1
-	rotationGroupCount := cgroup.AvailableCPUs()
-	if rotationGroupCount > 16 {
-		rotationGroupCount = 16
-	}
-	numShards := rotationGroupSize * rotationGroupCount
-
-	c := metricIDCache{
-		shards:              make([]metricIDCacheShard, numShards),
-		rotationGroupSize:   rotationGroupSize,
-		rotationGroupCount:  rotationGroupCount,
-		rotationGroupPeriod: timeutil.AddJitterToDuration(1 * time.Minute),
-		stopCh:              make(chan struct{}),
-		rotationStoppedCh:   make(chan struct{}),
-	}
-	for i := range numShards {
-		c.shards[i].prev = &uint64set.Set{}
-		c.shards[i].next = &uint64set.Set{}
-		c.shards[i].curr.Store(&uint64set.Set{})
-	}
-	go c.startRotation()
-	return &c
-}
-
-func (c *metricIDCache) MustStop() {
-	close(c.stopCh)
-	<-c.rotationStoppedCh
-}
-
-func (c *metricIDCache) numShards() uint64 {
-	return uint64(len(c.shards))
-}
-
-func (c *metricIDCache) fullRotationPeriod() time.Duration {
-	return time.Duration(c.rotationGroupCount) * c.rotationGroupPeriod
-}
-
-func (c *metricIDCache) Stats() metricIDCacheStats {
-	var stats metricIDCacheStats
-	for i := range len(c.shards) {
-		s := c.shards[i].Stats()
-		stats.Size += s.Size
-		stats.SizeBytes += s.SizeBytes
-		stats.SyncsCount += s.SyncsCount
-		stats.RotationsCount += s.RotationsCount
-	}
-	return stats
-}
-
-func (c *metricIDCache) Has(metricID uint64) bool {
-	shardIdx := fastHashUint64(metricID) % uint64(len(c.shards))
-	return c.shards[shardIdx].Has(metricID)
-}
-
-func (c *metricIDCache) Set(metricID uint64) {
-	shardIdx := fastHashUint64(metricID) % uint64(len(c.shards))
-	c.shards[shardIdx].Set(metricID)
-}
-
-func (c *metricIDCache) rotate(rotationGroup int) {
-	for i := range len(c.shards) {
-		if i/c.rotationGroupSize == rotationGroup {
-			c.shards[i].rotate()
-		}
-	}
-}
-
-func (c *metricIDCache) startRotation() {
-	ticker := time.NewTicker(c.rotationGroupPeriod)
-	defer ticker.Stop()
-	rotationGroup := 0
-	for {
-		select {
-		case <-c.stopCh:
-			close(c.rotationStoppedCh)
-			return
-		case <-ticker.C:
-			// each tick rotate only subset of size metricIDCacheRotationGroupSize
-			// to avoid slow access for all shards at once
-			rotationGroup = (rotationGroup + 1) % c.rotationGroupCount
-			c.rotate(rotationGroup)
-		}
-	}
-}
-
-type metricIDCacheStats struct {
-	Size           uint64
-	SizeBytes      uint64
-	SyncsCount     uint64
-	RotationsCount uint64
-}
-
-type metricIDCacheShardNopad struct {
 	// Contains immutable set of metricIDs.
 	curr atomic.Pointer[uint64set.Set]
 
@@ -152,16 +39,36 @@ type metricIDCacheShardNopad struct {
 	rotationsCount uint64
 
 	mu sync.Mutex
+
+	stopCh            chan struct{}
+	rotationStoppedCh chan struct{}
 }
 
-type metricIDCacheShard struct {
-	metricIDCacheShardNopad
-
-	// The padding prevents false sharing
-	_ [atomicutil.CacheLineSize - unsafe.Sizeof(metricIDCacheShardNopad{})%atomicutil.CacheLineSize]byte
+func newMetricIDCache() *metricIDCache {
+	c := metricIDCache{
+		prev:              &uint64set.Set{},
+		next:              &uint64set.Set{},
+		stopCh:            make(chan struct{}),
+		rotationStoppedCh: make(chan struct{}),
+	}
+	c.curr.Store(&uint64set.Set{})
+	go c.startRotation()
+	return &c
 }
 
-func (c *metricIDCacheShard) Stats() metricIDCacheStats {
+func (c *metricIDCache) MustStop() {
+	close(c.stopCh)
+	<-c.rotationStoppedCh
+}
+
+type metricIDCacheStats struct {
+	Size           uint64
+	SizeBytes      uint64
+	SyncsCount     uint64
+	RotationsCount uint64
+}
+
+func (c *metricIDCache) Stats() metricIDCacheStats {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -184,7 +91,7 @@ func (c *metricIDCacheShard) Stats() metricIDCacheStats {
 	return s
 }
 
-func (c *metricIDCacheShard) Has(metricID uint64) bool {
+func (c *metricIDCache) Has(metricID uint64) bool {
 	if c.curr.Load().Has(metricID) {
 		// Fast path. The majority of calls must go here.
 		return true
@@ -194,7 +101,7 @@ func (c *metricIDCacheShard) Has(metricID uint64) bool {
 	return c.hasSlow(metricID)
 }
 
-func (c *metricIDCacheShard) hasSlow(metricID uint64) bool {
+func (c *metricIDCache) hasSlow(metricID uint64) bool {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -225,7 +132,7 @@ func (c *metricIDCacheShard) hasSlow(metricID uint64) bool {
 	return ok
 }
 
-func (c *metricIDCacheShard) Set(metricID uint64) {
+func (c *metricIDCache) Set(metricID uint64) {
 	c.mu.Lock()
 	c.next.Add(metricID)
 	c.mu.Unlock()
@@ -233,7 +140,7 @@ func (c *metricIDCacheShard) Set(metricID uint64) {
 
 // syncLocked merges data from curr into next and atomically replaces curr with
 // next.
-func (c *metricIDCacheShard) syncLocked() {
+func (c *metricIDCache) syncLocked() {
 	curr := c.curr.Load()
 	c.next.Union(curr)
 	c.curr.Store(c.next)
@@ -241,8 +148,23 @@ func (c *metricIDCacheShard) syncLocked() {
 	c.syncsCount++
 }
 
+func (c *metricIDCache) startRotation() {
+	d := timeutil.AddJitterToDuration(10 * time.Minute)
+	ticker := time.NewTicker(d)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-c.stopCh:
+			close(c.rotationStoppedCh)
+			return
+		case <-ticker.C:
+			c.rotate()
+		}
+	}
+}
+
 // rotate atomically rotates next, curr, and prev cache parts.
-func (c *metricIDCacheShard) rotate() {
+func (c *metricIDCache) rotate() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	curr := c.curr.Load()

lib/storage/metric_id_cache_synctest_test.go

@@ -5,8 +5,8 @@ import (
 	"testing/synctest"
 	"time"
 
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/uint64set"
 	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 func TestMetricIDCache_ClearedWhenUnused(t *testing.T) {
@@ -16,7 +16,9 @@ func TestMetricIDCache_ClearedWhenUnused(t *testing.T) {
 		c := newMetricIDCache()
 		defer c.MustStop()
 		c.Set(123)
-		time.Sleep(3 * c.fullRotationPeriod())
+		time.Sleep(15 * time.Minute)
+		time.Sleep(15 * time.Minute)
+		time.Sleep(15 * time.Minute)
 		if c.Has(123) {
 			t.Fatalf("entry is still in cache")
 		}
@@ -28,11 +30,12 @@ func TestMetricIDCache_ClearedWhenUnused(t *testing.T) {
 		c := newMetricIDCache()
 		defer c.MustStop()
 		c.Set(123)
-		time.Sleep(c.rotationGroupPeriod - time.Second)
+		time.Sleep(5 * time.Minute)
 		if !c.Has(123) {
 			t.Fatalf("entry not in cache")
 		}
-		time.Sleep(2 * c.fullRotationPeriod())
+		time.Sleep(15 * time.Minute)
+		time.Sleep(15 * time.Minute)
 		if c.Has(123) {
 			t.Fatalf("entry is still in cache")
 		}
@@ -45,7 +48,7 @@ func TestMetricIDCache_ClearedWhenUnused(t *testing.T) {
 		defer c.MustStop()
 		c.Set(123)
 		for range 10_000 {
-			time.Sleep(c.rotationGroupPeriod - time.Second)
+			time.Sleep(5 * time.Minute)
 			if !c.Has(123) {
 				t.Fatalf("entry not in cache")
 			}
@@ -55,8 +58,7 @@ func TestMetricIDCache_ClearedWhenUnused(t *testing.T) {
 
 func TestMetricIDCache_Stats(t *testing.T) {
 	assertStats := func(t *testing.T, c *metricIDCache, want metricIDCacheStats) {
-		t.Helper()
-		if diff := cmp.Diff(want, c.Stats(), cmpopts.IgnoreFields(metricIDCacheStats{}, "SizeBytes")); diff != "" {
+		if diff := cmp.Diff(want, c.Stats()); diff != "" {
 			t.Fatalf("unexpected stats (-want, +got):\n%s", diff)
 		}
 	}
@@ -70,11 +72,14 @@ func TestMetricIDCache_Stats(t *testing.T) {
 
 		// Add metricIDs and check stats.
 		// At this point, all metricIDs are in next.
+		metricIDs := uint64set.Set{}
 		for metricID := range uint64(100_000) {
 			c.Set(metricID)
+			metricIDs.Add(metricID)
 		}
 		assertStats(t, c, metricIDCacheStats{
-			Size: 100_000,
+			Size:      100_000,
+			SizeBytes: metricIDs.SizeBytes(),
 		})
 
 		// Get all metricIDs and check stats.
@@ -86,24 +91,26 @@ func TestMetricIDCache_Stats(t *testing.T) {
 		}
 		assertStats(t, c, metricIDCacheStats{
 			Size:       100_000,
-			SyncsCount: c.numShards(),
+			SizeBytes:  metricIDs.SizeBytes(),
+			SyncsCount: 1,
 		})
 
-		// Wait until all groups are rotated.
+		// Wait until next rotation.
 		// curr metricIDs will be moved to prev.
-		time.Sleep(c.fullRotationPeriod() + time.Second)
+		time.Sleep(15 * time.Minute)
 		assertStats(t, c, metricIDCacheStats{
 			Size:           100_000,
-			SyncsCount:     c.numShards(),
-			RotationsCount: c.numShards(),
+			SizeBytes:      metricIDs.SizeBytes(),
+			SyncsCount:     1,
+			RotationsCount: 1,
 		})
 
-		// Wait until all groups are rotated.
+		// Wait until another rotation.
 		// The cache now should be empty.
-		time.Sleep(c.fullRotationPeriod())
+		time.Sleep(15 * time.Minute)
 		assertStats(t, c, metricIDCacheStats{
-			SyncsCount:     c.numShards(),
-			RotationsCount: 2 * c.numShards(),
+			SyncsCount:     1,
+			RotationsCount: 2,
 		})
 	})
 }

lib/storage/metric_id_cache_timing_test.go

@@ -7,29 +7,11 @@ import (
 	"time"
 )
 
-type benchCacheState int
-
-const (
-	benchCacheStateCold benchCacheState = iota
-	benchCacheStateWarm
-	benchCacheStateRotated
-)
-
-var benchCacheStates = [...]benchCacheState{benchCacheStateCold, benchCacheStateWarm, benchCacheStateRotated}
-
-func (s benchCacheState) String() string {
-	return [...]string{"   cold", "   warm", "rotated"}[s]
-}
-
 func BenchmarkMetricIDCache_Has(b *testing.B) {
-	f := func(b *testing.B, numMetricIDs, distance int64, hitsOnly bool, state benchCacheState) {
+	f := func(b *testing.B, numMetricIDs, distance int64, hitsOnly, warmUp bool) {
 		b.Helper()
 		c := newMetricIDCache()
 		defer c.MustStop()
-
-		warmUp := state == benchCacheStateWarm || state == benchCacheStateRotated
-		rotate := state == benchCacheStateRotated
-
 		metricIDMin := time.Now().UnixNano()
 		metricIDMax := metricIDMin + numMetricIDs*distance
 		for metricID := metricIDMin; metricID <= metricIDMax; metricID += distance {
@@ -38,11 +20,7 @@ func BenchmarkMetricIDCache_Has(b *testing.B) {
 				b.Fatalf("metricID not in cache: %d", metricID)
 			}
 		}
-		if rotate {
-			c.rotate(rand.Intn(c.rotationGroupCount))
-		}
 		b.ResetTimer()
-
 		b.RunParallel(func(pb *testing.PB) {
 			if hitsOnly {
 				metricID := metricIDMin + rand.Int63n(numMetricIDs)*distance
@@ -67,24 +45,27 @@ func BenchmarkMetricIDCache_Has(b *testing.B) {
 			}
 		})
 		b.ReportAllocs()
-		b.ReportMetric(float64(c.Stats().SizeBytes), "sizeBytes")
 	}
 
-	subB := func(numMetricIDs, distance int64, hitsOnly bool, state benchCacheState) {
-		hitsOrMisses := "  hits-only"
+	subB := func(numMetricIDs, distance int64, hitsOnly, warmUp bool) {
+		hitsOrMisses := "hitsss"
 		if !hitsOnly {
-			hitsOrMisses = "misses-only"
+			hitsOrMisses = "misses"
 		}
-		name := fmt.Sprintf("%s/%s/n%d/d%d", hitsOrMisses, state, numMetricIDs, distance)
+		coldOrWarm := "cold"
+		if warmUp {
+			coldOrWarm = "warm"
+		}
+		name := fmt.Sprintf("%s/%s/n%d/d%d", hitsOrMisses, coldOrWarm, numMetricIDs, distance)
 		b.Run(name, func(b *testing.B) {
-			f(b, numMetricIDs, distance, hitsOnly, state)
+			f(b, numMetricIDs, distance, hitsOnly, warmUp)
 		})
 	}
 	for _, hitsOnly := range []bool{true, false} {
-		for _, state := range benchCacheStates {
+		for _, warmUp := range []bool{false, true} {
 			for _, numMetricIDs := range []int64{100_000, 1_000_000, 10_000_000} {
 				for _, distance := range []int64{1, 10, 100} {
-					subB(numMetricIDs, distance, hitsOnly, state)
+					subB(numMetricIDs, distance, hitsOnly, warmUp)
 				}
 			}
 		}