convention

new dropSamplesOnOverload rerouting
delay sending bufs from broken node to other nodes
2026-06-13 05:44:02 +03:00 · 2025-01-15 10:36:49 +07:00 · 2025-01-15 10:31:11 +07:00 · 2025-01-09 22:08:38 +07:00 · 2025-01-09 21:41:15 +07:00 · 2025-01-09 21:16:42 +07:00
1649 changed files with 419861 additions and 39343 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -85,7 +85,7 @@ jobs:
          restore-keys: go-artifacts-${{ runner.os }}-${{ matrix.scenario }}-

      - name: Run tests
-        run: GOGC=10 make ${{ matrix.scenario}}
+        run: make ${{ matrix.scenario}}

      - name: Publish coverage
        uses: codecov/codecov-action@v5
--- a/2
+++ b/2
@@ -175,7 +175,7 @@

   END OF TERMS AND CONDITIONS

-   Copyright 2019-2025 VictoriaMetrics, Inc.
+   Copyright 2019-2024 VictoriaMetrics, Inc.

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/12
+++ b/12
@@ -204,19 +204,19 @@ check-all: fmt vet golangci-lint govulncheck
 clean-checkers: remove-golangci-lint remove-govulncheck

 test:
-	go test ./lib/... ./app/...
+	DISABLE_FSYNC_FOR_TESTING=1 go test ./lib/... ./app/...

 test-race:
-	go test -race ./lib/... ./app/...
+	DISABLE_FSYNC_FOR_TESTING=1 go test -race ./lib/... ./app/...

 test-pure:
-	CGO_ENABLED=0 go test ./lib/... ./app/...
+	DISABLE_FSYNC_FOR_TESTING=1 CGO_ENABLED=0 go test ./lib/... ./app/...

 test-full:
-	go test -coverprofile=coverage.txt -covermode=atomic ./lib/... ./app/...
+	DISABLE_FSYNC_FOR_TESTING=1 go test -coverprofile=coverage.txt -covermode=atomic ./lib/... ./app/...

 test-full-386:
-	GOARCH=386 go test -coverprofile=coverage.txt -covermode=atomic ./lib/... ./app/...
+	DISABLE_FSYNC_FOR_TESTING=1 GOARCH=386 go test -coverprofile=coverage.txt -covermode=atomic ./lib/... ./app/...

 integration-test: all
 	go test ./apptest/... -skip="^TestSingle.*"
@@ -258,7 +258,7 @@ golangci-lint: install-golangci-lint
 	golangci-lint run

 install-golangci-lint:
-	which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.63.4
+	which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.60.3

 remove-golangci-lint:
 	rm -rf `which golangci-lint`
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
 # VictoriaMetrics

-![Latest Release](https://img.shields.io/github/v/release/VictoriaMetrics/VictoriaMetrics?sort=semver&label=&filter=!*-victorialogs&logo=github&labelColor=gray&color=gray&link=https%3A%2F%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics%2Freleases%2Flatest)
-![Docker Pulls](https://img.shields.io/docker/pulls/victoriametrics/victoria-metrics?label=&logo=docker&logoColor=white&labelColor=2496ED&color=2496ED&link=https%3A%2F%2Fhub.docker.com%2Fr%2Fvictoriametrics%2Fvictoria-metrics)
-![Go Report](https://goreportcard.com/badge/github.com/VictoriaMetrics/VictoriaMetrics?link=https%3A%2F%2Fgoreportcard.com%2Freport%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics)
-![Build Status](https://github.com/VictoriaMetrics/VictoriaMetrics/workflows/main/badge.svg?link=https%3A%2F%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics%2Factions)
-![codecov](https://codecov.io/gh/VictoriaMetrics/VictoriaMetrics/branch/master/graph/badge.svg?link=https%3A%2F%2Fcodecov.io%2Fgh%2FVictoriaMetrics%2FVictoriaMetrics)
-![License](https://img.shields.io/github/license/VictoriaMetrics/VictoriaMetrics?labelColor=green&label=&link=https%3A%2F%2Fgithub.com%2FVictoriaMetrics%2FVictoriaMetrics%2Fblob%2Fmaster%2FLICENSE)
-![Slack](https://img.shields.io/badge/Join-4A154B?logo=slack&link=https%3A%2F%2Fslack.victoriametrics.com)
-![X](https://img.shields.io/twitter/follow/VictoriaMetrics?style=flat&label=Follow&color=black&logo=x&labelColor=black&link=https%3A%2F%2Fx.com%2FVictoriaMetrics)
-![Reddit](https://img.shields.io/reddit/subreddit-subscribers/VictoriaMetrics?style=flat&label=Join&labelColor=red&logoColor=white&logo=reddit&link=https%3A%2F%2Fwww.reddit.com%2Fr%2FVictoriaMetrics)
+[![Latest Release](https://img.shields.io/github/release/VictoriaMetrics/VictoriaMetrics.svg?style=flat-square)](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/latest)
+[![Docker Pulls](https://img.shields.io/docker/pulls/victoriametrics/victoria-metrics.svg?maxAge=604800)](https://hub.docker.com/r/victoriametrics/victoria-metrics)
+[![Slack](https://img.shields.io/badge/join%20slack-%23victoriametrics-brightgreen.svg)](https://slack.victoriametrics.com/)
+[![GitHub license](https://img.shields.io/github/license/VictoriaMetrics/VictoriaMetrics.svg)](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/LICENSE)
+[![Go Report](https://goreportcard.com/badge/github.com/VictoriaMetrics/VictoriaMetrics)](https://goreportcard.com/report/github.com/VictoriaMetrics/VictoriaMetrics)
+[![Build Status](https://github.com/VictoriaMetrics/VictoriaMetrics/workflows/main/badge.svg)](https://github.com/VictoriaMetrics/VictoriaMetrics/actions)
+[![codecov](https://codecov.io/gh/VictoriaMetrics/VictoriaMetrics/branch/master/graph/badge.svg)](https://codecov.io/gh/VictoriaMetrics/VictoriaMetrics)

 <picture>
  <source srcset="docs/logo_white.webp" media="(prefers-color-scheme: dark)">
--- a/app/vlinsert/insertutils/line_reader.go
+++ b/app/vlinsert/insertutils/line_reader.go
@@ -15,8 +15,6 @@ import (
 // LineReader reads newline-delimited lines from the underlying reader
 type LineReader struct {
 	// Line contains the next line read after the call to NextLine
-	//
-	// The Line contents is valid until the next call to NextLine.
 	Line []byte

 	// name is the LineReader name
@@ -28,9 +26,6 @@ type LineReader struct {
 	// buf is a buffer for reading the next line
 	buf []byte

-	// bufOffset is the offset at buf to read the next line from
-	bufOffset int
-
 	// err is the last error when reading data from r
 	err error

@@ -56,27 +51,26 @@ func NewLineReader(name string, r io.Reader) *LineReader {
 // Check for Err in this case.
 func (lr *LineReader) NextLine() bool {
 	for {
-		if lr.bufOffset >= len(lr.buf) {
+		if len(lr.buf) == 0 {
 			if lr.err != nil || lr.eofReached {
 				return false
 			}
 			if !lr.readMoreData() {
 				return false
 			}
-			if lr.bufOffset >= len(lr.buf) && lr.eofReached {
+			if len(lr.buf) == 0 && lr.eofReached {
 				return false
 			}
 		}

-		buf := lr.buf[lr.bufOffset:]
-		if n := bytes.IndexByte(buf, '\n'); n >= 0 {
-			lr.Line = buf[:n]
-			lr.bufOffset += n + 1
+		if n := bytes.IndexByte(lr.buf, '\n'); n >= 0 {
+			lr.Line = append(lr.Line[:0], lr.buf[:n]...)
+			lr.buf = append(lr.buf[:0], lr.buf[n+1:]...)
 			return true
 		}
 		if lr.eofReached {
-			lr.Line = buf
-			lr.bufOffset += len(buf)
+			lr.Line = append(lr.Line[:0], lr.buf...)
+			lr.buf = lr.buf[:0]
 			return true
 		}
 		if !lr.readMoreData() {
@@ -94,11 +88,6 @@ func (lr *LineReader) Err() error {
 }

 func (lr *LineReader) readMoreData() bool {
-	if lr.bufOffset > 0 {
-		lr.buf = append(lr.buf[:0], lr.buf[lr.bufOffset:]...)
-		lr.bufOffset = 0
-	}
-
 	bufLen := len(lr.buf)
 	if bufLen >= MaxLineSizeBytes.IntN() {
 		logger.Warnf("%s: the line length exceeds -insert.maxLineSizeBytes=%d; skipping it; line contents=%q", lr.name, MaxLineSizeBytes.IntN(), lr.buf)
--- a/app/vlogscli/json_prettifier.go
+++ b/app/vlogscli/json_prettifier.go
@@ -176,7 +176,7 @@ func writeCompactObject(w io.Writer, fields []logstorage.Field) error {
 		_, err := fmt.Fprintf(w, "%s\n", fields[0].Value)
 		return err
 	}
-	if len(fields) == 2 && (fields[0].Name == "_time" || fields[1].Name == "_time") {
+	if len(fields) == 2 && fields[0].Name == "_time" || fields[1].Name == "_time" {
 		// Write _time\tfieldValue as is
 		if fields[0].Name == "_time" {
 			_, err := fmt.Fprintf(w, "%s\t%s\n", fields[0].Value, fields[1].Value)
--- a/app/vlogsgenerator/main.go
+++ b/app/vlogsgenerator/main.go
@@ -45,8 +45,6 @@ var (
 		"see https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model")
 	u64FieldsPerLog = flag.Int("u64FieldsPerLog", 1, "The number of fields with uint64 values to generate per each log entry; "+
 		"see https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model")
-	i64FieldsPerLog = flag.Int("i64FieldsPerLog", 1, "The number of fields with int64 values to generate per each log entry; "+
-		"see https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model")
 	floatFieldsPerLog = flag.Int("floatFieldsPerLog", 1, "The number of fields with float64 values to generate per each log entry; "+
 		"see https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model")
 	ipFieldsPerLog = flag.Int("ipFieldsPerLog", 1, "The number of fields with IPv4 values to generate per each log entry; "+
@@ -256,9 +254,6 @@ func generateLogsAtTimestamp(bw *bufio.Writer, workerID int, ts int64, firstStre
 		for j := 0; j < *u64FieldsPerLog; j++ {
 			fmt.Fprintf(bw, `,"u64_%d":"%d"`, j, rand.Uint64())
 		}
-		for j := 0; j < *i64FieldsPerLog; j++ {
-			fmt.Fprintf(bw, `,"i64_%d":"%d"`, j, int64(rand.Uint64()))
-		}
 		for j := 0; j < *floatFieldsPerLog; j++ {
 			fmt.Fprintf(bw, `,"float_%d":"%v"`, j, math.Round(10_000*rand.Float64())/1000)
 		}
--- a/app/vlselect/logsql/logsql.go
+++ b/app/vlselect/logsql/logsql.go
@@ -688,13 +688,13 @@ func ProcessStatsQueryRangeRequest(ctx context.Context, w http.ResponseWriter, r
 	m := make(map[string]*statsSeries)
 	var mLock sync.Mutex

-	timestamp := q.GetTimestamp()
 	writeBlock := func(_ uint, timestamps []int64, columns []logstorage.BlockColumn) {
 		clonedColumnNames := make([]string, len(columns))
 		for i, c := range columns {
 			clonedColumnNames[i] = strings.Clone(c.Name)
 		}
 		for i := range timestamps {
+			timestamp := q.GetTimestamp()
 			labels := make([]logstorage.Field, 0, len(byFields))
 			for j, c := range columns {
 				if c.Name == "_time" {
--- a/app/vlselect/logsql/logsql_test.go
+++ b/app/vlselect/logsql/logsql_test.go
@@ -28,7 +28,7 @@ func TestParseExtraFilters_Success(t *testing.T) {
 	// LogsQL filter
 	f(`foobar`, `foobar`)
 	f(`foo:bar`, `foo:bar`)
-	f(`foo:(bar or baz) error _time:5m {"foo"=bar,baz="z"}`, `{foo="bar",baz="z"} (foo:bar or foo:baz) error _time:5m`)
+	f(`foo:(bar or baz) error _time:5m {"foo"=bar,baz="z"}`, `(foo:bar or foo:baz) error _time:5m {foo="bar",baz="z"}`)
 }

 func TestParseExtraFilters_Failure(t *testing.T) {
@@ -77,7 +77,7 @@ func TestParseExtraStreamFilters_Success(t *testing.T) {
 	// LogsQL filter
 	f(`foobar`, `foobar`)
 	f(`foo:bar`, `foo:bar`)
-	f(`foo:(bar or baz) error _time:5m {"foo"=bar,baz="z"}`, `{foo="bar",baz="z"} (foo:bar or foo:baz) error _time:5m`)
+	f(`foo:(bar or baz) error _time:5m {"foo"=bar,baz="z"}`, `(foo:bar or foo:baz) error _time:5m {foo="bar",baz="z"}`)
 }

 func TestParseExtraStreamFilters_Failure(t *testing.T) {
--- a/app/vlselect/vmui/asset-manifest.json
+++ b/app/vlselect/vmui/asset-manifest.json
@@ -1,12 +1,13 @@
 {
  "files": {
-    "main.css": "./static/css/main.02a1c6cb.css",
-    "main.js": "./static/js/main.55c8060b.js",
+    "main.css": "./static/css/main.fa83344e.css",
+    "main.js": "./static/js/main.8ad2bc1f.js",
    "static/js/685.f772060c.chunk.js": "./static/js/685.f772060c.chunk.js",
+    "static/media/MetricsQL.md": "./static/media/MetricsQL.a00044c91d9781cf8557.md",
    "index.html": "./index.html"
  },
  "entrypoints": [
-    "static/css/main.02a1c6cb.css",
-    "static/js/main.55c8060b.js"
+    "static/css/main.fa83344e.css",
+    "static/js/main.8ad2bc1f.js"
  ]
 }
--- a/app/vlselect/vmui/index.html
+++ b/app/vlselect/vmui/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.svg"/><link rel="apple-touch-icon" href="./favicon.svg"/><link rel="mask-icon" href="./favicon.svg" color="#000000"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=5"/><meta name="theme-color" content="#000000"/><meta name="description" content="Explore your log data with VictoriaLogs UI"/><link rel="manifest" href="./manifest.json"/><title>UI for VictoriaLogs</title><meta name="twitter:card" content="summary"><meta name="twitter:title" content="UI for VictoriaLogs"><meta name="twitter:site" content="@https://victoriametrics.com/products/victorialogs/"><meta name="twitter:description" content="Explore your log data with VictoriaLogs UI"><meta name="twitter:image" content="./preview.jpg"><meta property="og:type" content="website"><meta property="og:title" content="UI for VictoriaLogs"><meta property="og:url" content="https://victoriametrics.com/products/victorialogs/"><meta property="og:description" content="Explore your log data with VictoriaLogs UI"><script defer="defer" src="./static/js/main.55c8060b.js"></script><link href="./static/css/main.02a1c6cb.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.svg"/><link rel="apple-touch-icon" href="./favicon.svg"/><link rel="mask-icon" href="./favicon.svg" color="#000000"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=5"/><meta name="theme-color" content="#000000"/><meta name="description" content="Explore your log data with VictoriaLogs UI"/><link rel="manifest" href="./manifest.json"/><title>UI for VictoriaLogs</title><meta name="twitter:card" content="summary"><meta name="twitter:title" content="UI for VictoriaLogs"><meta name="twitter:site" content="@https://victoriametrics.com/products/victorialogs/"><meta name="twitter:description" content="Explore your log data with VictoriaLogs UI"><meta name="twitter:image" content="./preview.jpg"><meta property="og:type" content="website"><meta property="og:title" content="UI for VictoriaLogs"><meta property="og:url" content="https://victoriametrics.com/products/victorialogs/"><meta property="og:description" content="Explore your log data with VictoriaLogs UI"><script defer="defer" src="./static/js/main.8ad2bc1f.js"></script><link href="./static/css/main.fa83344e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
--- a/app/vlselect/vmui/static/css/main.02a1c6cb.css
+++ b/app/vlselect/vmui/static/css/main.02a1c6cb.css
--- a/app/vlselect/vmui/static/css/main.fa83344e.css
+++ b/app/vlselect/vmui/static/css/main.fa83344e.css
--- a/app/vlselect/vmui/static/js/main.55c8060b.js
+++ b/app/vlselect/vmui/static/js/main.55c8060b.js
--- a/app/vlselect/vmui/static/js/main.8ad2bc1f.js
+++ b/app/vlselect/vmui/static/js/main.8ad2bc1f.js
--- a/app/vlselect/vmui/static/js/main.8ad2bc1f.js.LICENSE.txt
+++ b/app/vlselect/vmui/static/js/main.8ad2bc1f.js.LICENSE.txt
--- a/app/vlselect/vmui/static/media/MetricsQL.a00044c91d9781cf8557.md
+++ b/app/vlselect/vmui/static/media/MetricsQL.a00044c91d9781cf8557.md
--- a/app/vmalert/manager.go
+++ b/app/vmalert/manager.go
@@ -160,8 +160,8 @@ func (m *manager) update(ctx context.Context, groupsCfg []config.Group, restore
 			// it is important to call InterruptEval before the update, because cancel fn
 			// can be re-assigned during the update.
 			item.old.InterruptEval()
-			go func(oldGroup *rule.Group, newGroup *rule.Group) {
-				oldGroup.UpdateWith(newGroup)
+			go func(old *rule.Group, new *rule.Group) {
+				old.UpdateWith(new)
 				wg.Done()
 			}(item.old, item.new)
 		}
--- a/app/vmalert/notifier/alertmanager.go
+++ b/app/vmalert/notifier/alertmanager.go
@@ -13,7 +13,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputils"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )

@@ -70,17 +69,7 @@ func (am *AlertManager) Send(ctx context.Context, alerts []Alert, headers map[st

 func (am *AlertManager) send(ctx context.Context, alerts []Alert, headers map[string]string) error {
 	b := &bytes.Buffer{}
-	alertsToSend := alerts[:0]
-	lblss := make([][]prompbmarshal.Label, 0, len(alerts))
-	for _, a := range alerts {
-		lbls := a.applyRelabelingIfNeeded(am.relabelConfigs)
-		if len(lbls) == 0 {
-			continue
-		}
-		alertsToSend = append(alertsToSend, a)
-		lblss = append(lblss, lbls)
-	}
-	writeamRequest(b, alertsToSend, am.argFunc, lblss)
+	writeamRequest(b, alerts, am.argFunc, am.relabelConfigs)

 	req, err := http.NewRequest(http.MethodPost, am.addr.String(), b)
 	if err != nil {
--- a/app/vmalert/notifier/alertmanager_request.qtpl
+++ b/app/vmalert/notifier/alertmanager_request.qtpl
@@ -1,14 +1,15 @@
 {% import (
    "time"

-    "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+    "github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 ) %}
 {% stripspace %}

-{% func amRequest(alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) %}
+{% func amRequest(alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) %}
 [
 {% for i, alert := range alerts %}
-{% code lbls := lblss[i] %}
+{% code lbls := alert.applyRelabelingIfNeeded(relabelCfg) %}
+{% if len(lbls) == 0 %} {% continue %} {% endif %}
 {
    "startsAt":{%q= alert.Start.Format(time.RFC3339Nano) %},
    "generatorURL": {%q= generatorURL(alert) %},
--- a/app/vmalert/notifier/alertmanager_request.qtpl.go
+++ b/app/vmalert/notifier/alertmanager_request.qtpl.go
@@ -8,7 +8,7 @@ package notifier
 import (
 	"time"

-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
 )

 //line app/vmalert/notifier/alertmanager_request.qtpl:8
@@ -25,116 +25,122 @@ var (
 )

 //line app/vmalert/notifier/alertmanager_request.qtpl:8
-func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) {
+func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) {
 //line app/vmalert/notifier/alertmanager_request.qtpl:8
 	qw422016.N().S(`[`)
 //line app/vmalert/notifier/alertmanager_request.qtpl:10
 	for i, alert := range alerts {
 //line app/vmalert/notifier/alertmanager_request.qtpl:11
-		lbls := lblss[i]
+		lbls := alert.applyRelabelingIfNeeded(relabelCfg)

-//line app/vmalert/notifier/alertmanager_request.qtpl:11
-		qw422016.N().S(`{"startsAt":`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:13
-		qw422016.N().Q(alert.Start.Format(time.RFC3339Nano))
-//line app/vmalert/notifier/alertmanager_request.qtpl:13
-		qw422016.N().S(`,"generatorURL":`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:14
-		qw422016.N().Q(generatorURL(alert))
-//line app/vmalert/notifier/alertmanager_request.qtpl:14
-		qw422016.N().S(`,`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:15
-		if !alert.End.IsZero() {
-//line app/vmalert/notifier/alertmanager_request.qtpl:15
-			qw422016.N().S(`"endsAt":`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:16
-			qw422016.N().Q(alert.End.Format(time.RFC3339Nano))
-//line app/vmalert/notifier/alertmanager_request.qtpl:16
-			qw422016.N().S(`,`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:17
+//line app/vmalert/notifier/alertmanager_request.qtpl:12
+		if len(lbls) == 0 {
+//line app/vmalert/notifier/alertmanager_request.qtpl:12
+			continue
+//line app/vmalert/notifier/alertmanager_request.qtpl:12
 		}
+//line app/vmalert/notifier/alertmanager_request.qtpl:12
+		qw422016.N().S(`{"startsAt":`)
+//line app/vmalert/notifier/alertmanager_request.qtpl:14
+		qw422016.N().Q(alert.Start.Format(time.RFC3339Nano))
+//line app/vmalert/notifier/alertmanager_request.qtpl:14
+		qw422016.N().S(`,"generatorURL":`)
+//line app/vmalert/notifier/alertmanager_request.qtpl:15
+		qw422016.N().Q(generatorURL(alert))
+//line app/vmalert/notifier/alertmanager_request.qtpl:15
+		qw422016.N().S(`,`)
+//line app/vmalert/notifier/alertmanager_request.qtpl:16
+		if !alert.End.IsZero() {
+//line app/vmalert/notifier/alertmanager_request.qtpl:16
+			qw422016.N().S(`"endsAt":`)
 //line app/vmalert/notifier/alertmanager_request.qtpl:17
+			qw422016.N().Q(alert.End.Format(time.RFC3339Nano))
+//line app/vmalert/notifier/alertmanager_request.qtpl:17
+			qw422016.N().S(`,`)
+//line app/vmalert/notifier/alertmanager_request.qtpl:18
+		}
+//line app/vmalert/notifier/alertmanager_request.qtpl:18
 		qw422016.N().S(`"labels": {`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:19
+//line app/vmalert/notifier/alertmanager_request.qtpl:20
 		ll := len(lbls)

-//line app/vmalert/notifier/alertmanager_request.qtpl:20
+//line app/vmalert/notifier/alertmanager_request.qtpl:21
 		for idx, l := range lbls {
-//line app/vmalert/notifier/alertmanager_request.qtpl:21
+//line app/vmalert/notifier/alertmanager_request.qtpl:22
 			qw422016.N().Q(l.Name)
-//line app/vmalert/notifier/alertmanager_request.qtpl:21
+//line app/vmalert/notifier/alertmanager_request.qtpl:22
 			qw422016.N().S(`:`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:21
+//line app/vmalert/notifier/alertmanager_request.qtpl:22
 			qw422016.N().Q(l.Value)
-//line app/vmalert/notifier/alertmanager_request.qtpl:21
+//line app/vmalert/notifier/alertmanager_request.qtpl:22
 			if idx != ll-1 {
-//line app/vmalert/notifier/alertmanager_request.qtpl:21
+//line app/vmalert/notifier/alertmanager_request.qtpl:22
 				qw422016.N().S(`,`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:21
+//line app/vmalert/notifier/alertmanager_request.qtpl:22
 			}
-//line app/vmalert/notifier/alertmanager_request.qtpl:22
+//line app/vmalert/notifier/alertmanager_request.qtpl:23
 		}
-//line app/vmalert/notifier/alertmanager_request.qtpl:22
+//line app/vmalert/notifier/alertmanager_request.qtpl:23
 		qw422016.N().S(`},"annotations": {`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:25
+//line app/vmalert/notifier/alertmanager_request.qtpl:26
 		c := len(alert.Annotations)

-//line app/vmalert/notifier/alertmanager_request.qtpl:26
-		for k, v := range alert.Annotations {
 //line app/vmalert/notifier/alertmanager_request.qtpl:27
+		for k, v := range alert.Annotations {
+//line app/vmalert/notifier/alertmanager_request.qtpl:28
 			c = c - 1

-//line app/vmalert/notifier/alertmanager_request.qtpl:28
+//line app/vmalert/notifier/alertmanager_request.qtpl:29
 			qw422016.N().Q(k)
-//line app/vmalert/notifier/alertmanager_request.qtpl:28
+//line app/vmalert/notifier/alertmanager_request.qtpl:29
 			qw422016.N().S(`:`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:28
+//line app/vmalert/notifier/alertmanager_request.qtpl:29
 			qw422016.N().Q(v)
-//line app/vmalert/notifier/alertmanager_request.qtpl:28
+//line app/vmalert/notifier/alertmanager_request.qtpl:29
 			if c > 0 {
-//line app/vmalert/notifier/alertmanager_request.qtpl:28
+//line app/vmalert/notifier/alertmanager_request.qtpl:29
 				qw422016.N().S(`,`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:28
+//line app/vmalert/notifier/alertmanager_request.qtpl:29
 			}
-//line app/vmalert/notifier/alertmanager_request.qtpl:29
+//line app/vmalert/notifier/alertmanager_request.qtpl:30
 		}
-//line app/vmalert/notifier/alertmanager_request.qtpl:29
+//line app/vmalert/notifier/alertmanager_request.qtpl:30
 		qw422016.N().S(`}}`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:32
+//line app/vmalert/notifier/alertmanager_request.qtpl:33
 		if i != len(alerts)-1 {
-//line app/vmalert/notifier/alertmanager_request.qtpl:32
+//line app/vmalert/notifier/alertmanager_request.qtpl:33
 			qw422016.N().S(`,`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:32
+//line app/vmalert/notifier/alertmanager_request.qtpl:33
 		}
-//line app/vmalert/notifier/alertmanager_request.qtpl:33
+//line app/vmalert/notifier/alertmanager_request.qtpl:34
 	}
-//line app/vmalert/notifier/alertmanager_request.qtpl:33
+//line app/vmalert/notifier/alertmanager_request.qtpl:34
 	qw422016.N().S(`]`)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 }

-//line app/vmalert/notifier/alertmanager_request.qtpl:35
-func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) {
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
+func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) {
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
-	streamamRequest(qw422016, alerts, generatorURL, lblss)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
+	streamamRequest(qw422016, alerts, generatorURL, relabelCfg)
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 	qt422016.ReleaseWriter(qw422016)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 }

-//line app/vmalert/notifier/alertmanager_request.qtpl:35
-func amRequest(alerts []Alert, generatorURL func(Alert) string, lblss [][]prompbmarshal.Label) string {
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
+func amRequest(alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) string {
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 	qb422016 := qt422016.AcquireByteBuffer()
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
-	writeamRequest(qb422016, alerts, generatorURL, lblss)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
+	writeamRequest(qb422016, alerts, generatorURL, relabelCfg)
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 	qs422016 := string(qb422016.B)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 	qt422016.ReleaseByteBuffer(qb422016)
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 	return qs422016
-//line app/vmalert/notifier/alertmanager_request.qtpl:35
+//line app/vmalert/notifier/alertmanager_request.qtpl:36
 }
--- a/app/vmalert/notifier/alertmanager_test.go
+++ b/app/vmalert/notifier/alertmanager_test.go
@@ -105,16 +105,6 @@ func TestAlertManager_Send(t *testing.T) {
 			if r.Header.Get(headerKey) != "bar" {
 				t.Fatalf("expected header %q to be set to %q; got %q instead", headerKey, "bar", r.Header.Get(headerKey))
 			}
-		case 4:
-			var a []struct {
-				Labels map[string]string `json:"labels"`
-			}
-			if err := json.NewDecoder(r.Body).Decode(&a); err != nil {
-				t.Fatalf("can not unmarshal data into alert %s", err)
-			}
-			if len(a) != 1 {
-				t.Fatalf("expected 1 alert in array got %d", len(a))
-			}
 		}
 	})
 	srv := httptest.NewServer(mux)
@@ -178,20 +168,7 @@ func TestAlertManager_Send(t *testing.T) {
 		t.Fatalf("unexpected error %s", err)
 	}

-	if err := am.Send(context.Background(), []Alert{
-		{
-			Name:   "alert1",
-			Labels: map[string]string{"rule": "test"},
-		},
-		{
-			Name:   "alert2",
-			Labels: map[string]string{},
-		},
-	}, map[string]string{}); err != nil {
-		t.Fatalf("unexpected error %s", err)
-	}
-
-	if c != 4 {
-		t.Fatalf("expected 4 calls(count from zero) to server got %d", c)
+	if c != 3 {
+		t.Fatalf("expected 3 calls(count from zero) to server got %d", c)
 	}
 }
--- a/app/vmalert/rule/group.go
+++ b/app/vmalert/rule/group.go
@@ -443,8 +443,8 @@ func (g *Group) Start(ctx context.Context, nts func() []notifier.Notifier, rw re
 }

 // UpdateWith inserts new group to updateCh
-func (g *Group) UpdateWith(newGroup *Group) {
-	g.updateCh <- newGroup
+func (g *Group) UpdateWith(new *Group) {
+	g.updateCh <- new
 }

 // DeepCopy returns a deep copy of group
--- a/app/vmauth/auth_config.go
+++ b/app/vmauth/auth_config.go
@@ -7,13 +7,11 @@ import (
 	"flag"
 	"fmt"
 	"math"
-	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"regexp"
 	"sort"
-	"strconv"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -350,7 +348,6 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 	hostToAddrs := make(map[string][]string)
 	for _, bu := range up.busOriginal {
 		host := bu.Hostname()
-		port := bu.Port()
 		if hostToAddrs[host] != nil {
 			// ips for the given host have been already discovered
 			continue
@@ -367,11 +364,7 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 			} else {
 				resolvedAddrs = make([]string, len(addrs))
 				for i, addr := range addrs {
-					hostPort := port
-					if hostPort == "" && addr.Port > 0 {
-						hostPort = strconv.FormatUint(uint64(addr.Port), 10)
-					}
-					resolvedAddrs[i] = net.JoinHostPort(addr.Target, hostPort)
+					resolvedAddrs[i] = fmt.Sprintf("%s:%d", addr.Target, addr.Port)
 				}
 			}
 		} else {
@@ -382,7 +375,7 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 			} else {
 				resolvedAddrs = make([]string, len(addrs))
 				for i, addr := range addrs {
-					resolvedAddrs[i] = net.JoinHostPort(addr.String(), port)
+					resolvedAddrs[i] = addr.String()
 				}
 			}
 		}
@@ -396,9 +389,17 @@ func (up *URLPrefix) discoverBackendAddrsIfNeeded() {
 	var busNew []*backendURL
 	for _, bu := range up.busOriginal {
 		host := bu.Hostname()
+		port := bu.Port()
 		for _, addr := range hostToAddrs[host] {
 			buCopy := *bu
 			buCopy.Host = addr
+			if port != "" {
+				if n := strings.IndexByte(buCopy.Host, ':'); n >= 0 {
+					// Drop the discovered port and substitute it the port specified in bu.
+					buCopy.Host = buCopy.Host[:n]
+				}
+				buCopy.Host += ":" + port
+			}
 			busNew = append(busNew, &backendURL{
 				url: &buCopy,
 			})
--- a/app/vmauth/auth_config_test.go
+++ b/app/vmauth/auth_config_test.go
@@ -3,14 +3,12 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"net"
 	"net/url"
 	"testing"

 	"gopkg.in/yaml.v2"

 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil"
 )

 func TestParseAuthConfigFailure(t *testing.T) {
@@ -801,75 +799,6 @@ func TestBrokenBackend(t *testing.T) {
 	}
 }

-func TestDiscoverBackendIPsWithIPV6(t *testing.T) {
-	f := func(actualUrl, expectedUrl string) {
-		t.Helper()
-		up := mustParseURL(actualUrl)
-		up.discoverBackendIPs = true
-		up.loadBalancingPolicy = "least_loaded"
-
-		up.discoverBackendAddrsIfNeeded()
-		pbus := up.bus.Load()
-		bus := *pbus
-
-		if len(bus) != 1 {
-			t.Fatalf("expected url list to be of size 1; got %d instead", len(bus))
-		}
-
-		got := bus[0].url.Host
-		if got != expectedUrl {
-			t.Fatalf(`expected url to be %q; got %q instead`, expectedUrl, bus[0].url.Host)
-		}
-	}
-
-	// Discover backendURL with SRV hostnames
-	customResolver := &fakeResolver{
-		Resolver: &net.Resolver{},
-		// SRV records must return hostname
-		// not an IP address
-		lookupSRVResults: map[string][]*net.SRV{
-			"_vmselect._tcp.selectwithport.": {
-				{
-					Target: "vmselect.local",
-					Port:   8481,
-				},
-			},
-			"_vmselect._tcp.selectwoport.": {
-				{
-					Target: "vmselect.local",
-				},
-			},
-		},
-		lookupIPAddrResults: map[string][]net.IPAddr{
-			"vminsert.local": {
-				{
-					IP: net.ParseIP("10.0.10.13"),
-				},
-			},
-			"ipv6.vminsert.local": {
-				{
-					IP: net.ParseIP("2607:f8b0:400a:80b::200e"),
-				},
-			},
-		},
-	}
-	origResolver := netutil.Resolver
-	netutil.Resolver = customResolver
-	defer func() {
-		netutil.Resolver = origResolver
-	}()
-	f("http://srv+_vmselect._tcp.selectwithport.:8080", "vmselect.local:8080")
-	f("http://srv+_vmselect._tcp.selectwithport.:", "vmselect.local:8481")
-	f("http://srv+_vmselect._tcp.selectwoport.:8080", "vmselect.local:8080")
-	f("http://srv+_vmselect._tcp.selectwoport.", "vmselect.local:")
-
-	f("http://vminsert.local:8080", "10.0.10.13:8080")
-	f("http://vminsert.local", "10.0.10.13:")
-	f("http://ipv6.vminsert.local:8080", "[2607:f8b0:400a:80b::200e]:8080")
-	f("http://ipv6.vminsert.local", "[2607:f8b0:400a:80b::200e]:")
-
-}
-
 func getRegexs(paths []string) []*Regex {
 	var sps []*Regex
 	for _, path := range paths {
--- a/app/vmauth/main.go
+++ b/app/vmauth/main.go
@@ -216,7 +216,8 @@ func processRequest(w http.ResponseWriter, r *http.Request, ui *UserInfo) {
 		isDefault = true
 	}

-	rtb := newReadTrackingBody(r.Body, maxRequestBodySizeToRetry.IntN())
+	rtb := getReadTrackingBody(r.Body, maxRequestBodySizeToRetry.IntN())
+	defer putReadTrackingBody(rtb)
 	r.Body = rtb

 	maxAttempts := up.getBackendsCount()
@@ -552,11 +553,22 @@ type readTrackingBody struct {
 	bufComplete bool
 }

-func newReadTrackingBody(r io.ReadCloser, maxBodySize int) *readTrackingBody {
-	// do not use sync.Pool there
-	// since http.RoundTrip may still use request body after return
-	// See this issue for details https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8051
-	rtb := &readTrackingBody{}
+func (rtb *readTrackingBody) reset() {
+	rtb.maxBodySize = 0
+	rtb.r = nil
+	rtb.buf = rtb.buf[:0]
+	rtb.readBuf = nil
+	rtb.cannotRetry = false
+	rtb.bufComplete = false
+}
+
+func getReadTrackingBody(r io.ReadCloser, maxBodySize int) *readTrackingBody {
+	v := readTrackingBodyPool.Get()
+	if v == nil {
+		v = &readTrackingBody{}
+	}
+	rtb := v.(*readTrackingBody)
+
 	if maxBodySize < 0 {
 		maxBodySize = 0
 	}
@@ -579,6 +591,13 @@ func (r *zeroReader) Close() error {
 	return nil
 }

+func putReadTrackingBody(rtb *readTrackingBody) {
+	rtb.reset()
+	readTrackingBodyPool.Put(rtb)
+}
+
+var readTrackingBodyPool sync.Pool
+
 // Read implements io.Reader interface.
 func (rtb *readTrackingBody) Read(p []byte) (int, error) {
 	if len(rtb.readBuf) > 0 {
--- a/app/vmauth/main_test.go
+++ b/app/vmauth/main_test.go
@@ -181,7 +181,7 @@ unauthorized_user:
 	}
 	responseExpected = `
 statusCode=401
-Expected to receive non-empty authKey when -reloadAuthKey is set`
+The provided authKey doesn't match -reloadAuthKey`
 	f(cfgStr, requestURL, backendHandler, responseExpected)
 	if err := reloadAuthKey.Set(origAuthKey); err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -531,7 +531,8 @@ func TestReadTrackingBody_RetrySuccess(t *testing.T) {
 	f := func(s string, maxBodySize int) {
 		t.Helper()

-		rtb := newReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		rtb := getReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		defer putReadTrackingBody(rtb)

 		if !rtb.canRetry() {
 			t.Fatalf("canRetry() must return true before reading anything")
@@ -566,7 +567,8 @@ func TestReadTrackingBody_RetrySuccessPartialRead(t *testing.T) {
 		t.Helper()

 		// Check the case with partial read
-		rtb := newReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		rtb := getReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		defer putReadTrackingBody(rtb)

 		for i := 0; i < len(s); i++ {
 			buf := make([]byte, i)
@@ -615,7 +617,8 @@ func TestReadTrackingBody_RetryFailureTooBigBody(t *testing.T) {
 	f := func(s string, maxBodySize int) {
 		t.Helper()

-		rtb := newReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		rtb := getReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		defer putReadTrackingBody(rtb)

 		if !rtb.canRetry() {
 			t.Fatalf("canRetry() must return true before reading anything")
@@ -664,7 +667,8 @@ func TestReadTrackingBody_RetryFailureZeroOrNegativeMaxBodySize(t *testing.T) {
 	f := func(s string, maxBodySize int) {
 		t.Helper()

-		rtb := newReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		rtb := getReadTrackingBody(io.NopCloser(bytes.NewBufferString(s)), maxBodySize)
+		defer putReadTrackingBody(rtb)

 		if !rtb.canRetry() {
 			t.Fatalf("canRetry() must return true before reading anything")
--- a/app/vmctl/prometheus/prometheus.go
+++ b/app/vmctl/prometheus/prometheus.go
@@ -40,15 +40,15 @@ type filter struct {
 	labelValue string
 }

-func (f filter) inRange(minV, maxV int64) bool {
+func (f filter) inRange(min, max int64) bool {
 	fmin, fmax := f.min, f.max
-	if minV == 0 {
-		fmin = minV
+	if min == 0 {
+		fmin = min
 	}
 	if fmax == 0 {
-		fmax = maxV
+		fmax = max
 	}
-	return minV <= fmax && fmin <= maxV
+	return min <= fmax && fmin <= max
 }

 // NewClient creates and validates new Client
@@ -59,13 +59,13 @@ func NewClient(cfg Config) (*Client, error) {
 		return nil, fmt.Errorf("failed to open snapshot %q: %s", cfg.Snapshot, err)
 	}
 	c := &Client{DBReadOnly: db}
-	minTime, maxTime, err := parseTime(cfg.Filter.TimeMin, cfg.Filter.TimeMax)
+	min, max, err := parseTime(cfg.Filter.TimeMin, cfg.Filter.TimeMax)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse time in filter: %s", err)
 	}
 	c.filter = filter{
-		min:        minTime,
-		max:        maxTime,
+		min:        min,
+		max:        max,
 		label:      cfg.Filter.Label,
 		labelValue: cfg.Filter.LabelValue,
 	}
--- a/app/vminsert/netstorage/insert_ctx.go
+++ b/app/vminsert/netstorage/insert_ctx.go
@@ -186,8 +186,16 @@ func (ctx *InsertCtx) GetStorageNodeIdx(at *auth.Token, labels []prompbmarshal.L
 	h := xxhash.Sum64(buf)
 	ctx.labelsBuf = buf

-	// Do not exclude unavailable storage nodes in order to properly account for rerouted rows in storageNode.push().
-	idx := ctx.snb.nodesHash.getNodeIdx(h, nil)
+	// Exclude long-broken storage nodes.
+	var excludeIdxs []int
+	if !*dropSamplesOnOverload {
+		for i := range ctx.snb.sns {
+			if ctx.snb.sns[i].isExcluded() {
+				excludeIdxs = append(excludeIdxs, i)
+			}
+		}
+	}
+	idx := ctx.snb.nodesHash.getNodeIdx(h, excludeIdxs)
 	return idx
 }

--- a/app/vminsert/netstorage/netstorage.go
+++ b/app/vminsert/netstorage/netstorage.go
@@ -31,7 +31,7 @@ var (
 	replicationFactor     = flag.Int("replicationFactor", 1, "Replication factor for the ingested data, i.e. how many copies to make among distinct -storageNode instances. "+
 		"Note that vmselect must run with -dedup.minScrapeInterval=1ms for data de-duplication when replicationFactor is greater than 1. "+
 		"Higher values for -dedup.minScrapeInterval at vmselect is OK")
-	disableRerouting      = flag.Bool("disableRerouting", true, "Whether to disable re-routing when some of vmstorage nodes accept incoming data at slower speed compared to other storage nodes. Disabled re-routing limits the ingestion rate by the slowest vmstorage node. On the other side, disabled re-routing minimizes the number of active time series in the cluster during rolling restarts and during spikes in series churn rate. See also -disableReroutingOnUnavailable and -dropSamplesOnOverload")
+	_                     = flag.Bool("disableRerouting", true, "This option is deprecated and has no effect. See also -disableReroutingOnUnavailable and -dropSamplesOnOverload.")
 	dropSamplesOnOverload = flag.Bool("dropSamplesOnOverload", false, "Whether to drop incoming samples if the destination vmstorage node is overloaded and/or unavailable. This prioritizes cluster availability over consistency, e.g. the cluster continues accepting all the ingested samples, but some of them may be dropped if vmstorage nodes are temporarily unavailable and/or overloaded. The drop of samples happens before the replication, so it's not recommended to use this flag with -replicationFactor enabled.")
 	vmstorageDialTimeout  = flag.Duration("vmstorageDialTimeout", 3*time.Second, "Timeout for establishing RPC connections from vminsert to vmstorage. "+
 		"See also -vmstorageUserTimeout")
@@ -44,6 +44,7 @@ var (
 		"On the other side, disabled re-routing minimizes the number of active time series in the cluster "+
 		"during rolling restarts and during spikes in series churn rate. "+
 		"See also -disableRerouting")
+	rerouteDelay = flag.Duration("rerouteDelay", 20*time.Second, "The maximum time the system waits for vmstorage nodes to become available before re-routing the data to other vmstorage nodes, minimum value is 1s and rounding to seconds")
 )

 var errStorageReadOnly = errors.New("storage node is read only")
@@ -52,6 +53,16 @@ func (sn *storageNode) isReady() bool {
 	return !sn.isBroken.Load() && !sn.isReadOnly.Load()
 }

+func (sn *storageNode) isExcluded() bool {
+	return (sn.isBroken.Load() && fasttime.UnixTimestamp()-sn.brokenAt.Load() > uint64(*rerouteDelay/time.Second)) || sn.isReadOnly.Load()
+}
+
+func (sn *storageNode) setBroken(isBroken bool) {
+	if !sn.isBroken.Swap(isBroken) && isBroken {
+		sn.brokenAt.Store(fasttime.UnixTimestamp())
+	}
+}
+
 // push pushes buf to sn internal bufs.
 //
 // This function doesn't block on fast path.
@@ -108,15 +119,35 @@ again:
 			sn.brCond.Wait()
 			goto again
 		}
-		sn.brLock.Unlock()

-		// The vmstorage node isn't ready for data processing. Re-route buf to healthy vmstorage nodes even if disableRerouting is set.
-		rowsProcessed, err := rerouteRowsToReadyStorageNodes(snb, sn, buf)
-		rows -= rowsProcessed
-		if err != nil {
-			return fmt.Errorf("%d rows dropped because the current vsmtorage is unavailable and %w", rows, err)
+		// Reroute buf to healthy vmstorage nodes if the current node is broken for too long.
+		timeoutAt := uint64(*rerouteDelay/time.Second) + sn.brokenAt.Load()
+		if timeoutAt <= fasttime.UnixTimestamp() || sn.isReadOnly.Load() {
+			sn.brLock.Unlock()
+
+			rowsProcessed, err := rerouteRowsToReadyStorageNodes(snb, sn, buf)
+			rows -= rowsProcessed
+			if err != nil {
+				return fmt.Errorf("%d rows dropped because the current vsmtorage is unavailable and %w", rows, err)
+			}
+
+			return nil
 		}
-		return nil
+
+		// Wait for the vmstorage node to change its state to ready, or timeout.
+		// sn.brCond.Wait() will be woken up at ~200ms intervals by the health checker.
+	waitLoop:
+		for sn.isBroken.Load() && timeoutAt > fasttime.UnixTimestamp() {
+			sn.brCond.Wait()
+
+			select {
+			case <-sn.stopCh:
+				break waitLoop
+			default:
+			}
+		}
+
+		goto again
 	}

 	if len(sn.br.buf)+len(buf) <= maxBufSizePerStorageNode {
@@ -126,17 +157,20 @@ again:
 		sn.brLock.Unlock()
 		return nil
 	}
+
 	// Slow path: the buf contents doesn't fit sn.buf, so try re-routing it to other vmstorage nodes.
-	if *disableRerouting || len(sns) == 1 {
+	if len(sns) == 1 {
 		sn.brCond.Wait()
 		goto again
 	}
 	sn.brLock.Unlock()
+
 	rowsProcessed, err := rerouteRowsToFreeStorageNodes(snb, sn, buf)
 	rows -= rowsProcessed
 	if err != nil {
 		return fmt.Errorf("%d rows dropped because the current vmstorage buf is full and %w", rows, err)
 	}
+
 	return nil
 }

@@ -194,7 +228,8 @@ func (sn *storageNode) run(snb *storageNodesBucket, snIdx int) {
 			continue
 		}
 		// Send br to replicas storage nodes starting from snIdx.
-		for !sendBufToReplicasNonblocking(snb, &br, snIdx, replicas) {
+		usedStorageNodes := make(map[*storageNode]struct{}, replicas)
+		for !trySendBufToStorages(snb, &br, snIdx, replicas, usedStorageNodes) {
 			d := timeutil.AddJitterToDuration(time.Millisecond * 200)
 			t := timerpool.Get(d)
 			select {
@@ -211,9 +246,25 @@ func (sn *storageNode) run(snb *storageNodesBucket, snIdx int) {
 	}
 }

-func sendBufToReplicasNonblocking(snb *storageNodesBucket, br *bufRows, snIdx, replicas int) bool {
-	usedStorageNodes := make(map[*storageNode]struct{}, replicas)
+func trySendBufToStorages(snb *storageNodesBucket, br *bufRows, snIdx, replicas int, usedStorageNodes map[*storageNode]struct{}) bool {
 	sns := snb.sns
+
+	// If the current storage node is broken, wait for it to be ready or timeout
+	if sns[snIdx].isBroken.Load() {
+		timeoutAt := uint64(*rerouteDelay/time.Second) + sns[snIdx].brokenAt.Load()
+		if timeoutAt > fasttime.UnixTimestamp() {
+			return false
+		}
+	}
+
+	if *dropSamplesOnOverload {
+		return tryReplicateBufToStorages(sns, br, snIdx, replicas, usedStorageNodes)
+	}
+
+	return tryReplicateBufToStoragesUntilExhausted(sns, br, snIdx, replicas, usedStorageNodes)
+}
+
+func tryReplicateBufToStoragesUntilExhausted(sns []*storageNode, br *bufRows, snIdx, replicas int, usedStorageNodes map[*storageNode]struct{}) bool {
 	for i := 0; i < replicas; i++ {
 		idx := snIdx + i
 		attempts := 0
@@ -255,6 +306,40 @@ func sendBufToReplicasNonblocking(snb *storageNodesBucket, br *bufRows, snIdx, r
 	return true
 }

+func tryReplicateBufToStorages(sns []*storageNode, br *bufRows, snIdx, replicas int, usedStorageNodes map[*storageNode]struct{}) bool {
+	previousSuccessLen := len(usedStorageNodes)
+
+	for i := 0; i < replicas; i++ {
+		idx := snIdx + i
+		for {
+			if idx >= len(sns) {
+				idx %= len(sns)
+			}
+			sn := sns[idx]
+			idx++
+			if _, ok := usedStorageNodes[sn]; ok {
+				continue
+			}
+			if !sn.sendBufRowsNonblocking(br) {
+				continue
+			}
+			usedStorageNodes[sn] = struct{}{}
+			break
+		}
+	}
+
+	if _, ok := usedStorageNodes[sns[snIdx]]; !ok {
+		cannotReplicateLogger.Warnf("cannot push %d bytes with %d rows to degraded node %s, %d/%d nodes are replicated", len(br.buf), br.rows, sns[snIdx].dialer.Addr(), len(usedStorageNodes), replicas)
+		return false
+	} else if previousSuccessLen != len(usedStorageNodes) && len(usedStorageNodes) < replicas {
+		rowsIncompletelyReplicatedTotal.Add(br.rows)
+		incompleteReplicationLogger.Warnf("dropping %d rows (%d bytes) as cannot make a copy #%d out of %d copies according to -replicationFactor=%d, since a part of storage nodes is temporarily unavailable", br.rows, len(br.buf), len(usedStorageNodes), replicas, *replicationFactor)
+		return true
+	}
+
+	return true
+}
+
 var (
 	cannotReplicateLogger       = logger.WithThrottler("cannotReplicateDataBecauseNoStorageNodes", 5*time.Second)
 	incompleteReplicationLogger = logger.WithThrottler("incompleteReplication", 5*time.Second)
@@ -270,7 +355,7 @@ func (sn *storageNode) checkHealth() {
 	}
 	bc, err := sn.dial()
 	if err != nil {
-		sn.isBroken.Store(true)
+		sn.setBroken(true)
 		sn.brCond.Broadcast()
 		if sn.lastDialErr == nil {
 			// Log the error only once.
@@ -282,7 +367,7 @@ func (sn *storageNode) checkHealth() {
 	logger.Infof("successfully dialed -storageNode=%q", sn.dialer.Addr())
 	sn.lastDialErr = nil
 	sn.bc = bc
-	sn.isBroken.Store(false)
+	sn.setBroken(false)
 	sn.brCond.Broadcast()
 }

@@ -324,7 +409,7 @@ func (sn *storageNode) sendBufRowsNonblocking(br *bufRows) bool {
 		cannotCloseStorageNodeConnLogger.Warnf("cannot close connection to storageNode %q: %s", sn.dialer.Addr(), err)
 	}
 	sn.bc = nil
-	sn.isBroken.Store(true)
+	sn.setBroken(true)
 	sn.brCond.Broadcast()
 	sn.connectionErrors.Inc()
 	return false
@@ -413,6 +498,7 @@ type storageNode struct {
 	// isBroken is set to true if the given vmstorage node is temporarily unhealthy.
 	// In this case the data is re-routed to the remaining healthy vmstorage nodes.
 	isBroken atomic.Bool
+	brokenAt atomic.Uint64

 	// isReadOnly is set to true if the given vmstorage node is read only
 	// In this case the data is re-routed to the remaining healthy vmstorage nodes.
@@ -582,6 +668,11 @@ func initStorageNodes(unsortedAddrs []string, hashSeed uint64) *storageNodesBuck
 		maxBufSizePerStorageNode = consts.MaxInsertPacketSizeForVMInsert
 	}

+	*rerouteDelay = (*rerouteDelay).Round(time.Second)
+	if *rerouteDelay < time.Second {
+		*rerouteDelay = time.Second
+	}
+
 	metrics.RegisterSet(ms)
 	var wg sync.WaitGroup
 	snb := &storageNodesBucket{
@@ -649,17 +740,6 @@ func rerouteRowsToReadyStorageNodes(snb *storageNodesBucket, snSource *storageNo
 			// re-generate idxsExclude list, since sn must be put there.
 			idxsExclude = getNotReadyStorageNodeIdxsBlocking(snb, idxsExclude[:0])
 		}
-		if *disableRerouting {
-			if !sn.sendBufMayBlock(rowBuf) {
-				return rowsProcessed, fmt.Errorf("graceful shutdown started")
-			}
-			rowsProcessed++
-			if sn != snSource {
-				snSource.rowsReroutedFromHere.Inc()
-				sn.rowsReroutedToHere.Inc()
-			}
-			continue
-		}
 	again:
 		if sn.trySendBuf(rowBuf, 1) {
 			rowsProcessed++
@@ -694,9 +774,6 @@ func rerouteRowsToReadyStorageNodes(snb *storageNodesBucket, snSource *storageNo
 // It is expected than *disableRerouting isn't set when calling this function.
 // It is expected that len(snb.sns) >= 2
 func rerouteRowsToFreeStorageNodes(snb *storageNodesBucket, snSource *storageNode, src []byte) (int, error) {
-	if *disableRerouting {
-		logger.Panicf("BUG: disableRerouting must be disabled when calling rerouteRowsToFreeStorageNodes")
-	}
 	sns := snb.sns
 	if len(sns) < 2 {
 		logger.Panicf("BUG: the number of storage nodes is too small for calling rerouteRowsToFreeStorageNodes: %d", len(sns))
@@ -802,23 +879,6 @@ func (sn *storageNode) trySendBuf(buf []byte, rows int) bool {
 	return sent
 }

-func (sn *storageNode) sendBufMayBlock(buf []byte) bool {
-	sn.brLock.Lock()
-	for len(sn.br.buf)+len(buf) > maxBufSizePerStorageNode {
-		select {
-		case <-sn.stopCh:
-			sn.brLock.Unlock()
-			return false
-		default:
-		}
-		sn.brCond.Wait()
-	}
-	sn.br.buf = append(sn.br.buf, buf...)
-	sn.br.rows++
-	sn.brLock.Unlock()
-	return true
-}
-
 func (sn *storageNode) readOnlyChecker() {
 	d := timeutil.AddJitterToDuration(time.Second * 30)
 	ticker := time.NewTicker(d)
@@ -864,7 +924,7 @@ func (sn *storageNode) checkReadOnlyMode() {
 		cannotCloseStorageNodeConnLogger.Warnf("cannot close connection to storageNode %q: %s", sn.dialer.Addr(), err)
 	}
 	sn.bc = nil
-	sn.isBroken.Store(true)
+	sn.setBroken(true)
 	sn.brCond.Broadcast()
 	sn.connectionErrors.Inc()
 }
--- a/app/vmselect/graphite/aggr.go
+++ b/app/vmselect/graphite/aggr.go
@@ -98,13 +98,13 @@ func aggrMin(values []float64) float64 {
 	if pos < 0 {
 		return nan
 	}
-	minV := values[pos]
+	min := values[pos]
 	for _, v := range values[pos+1:] {
-		if !math.IsNaN(v) && v < minV {
-			minV = v
+		if !math.IsNaN(v) && v < min {
+			min = v
 		}
 	}
-	return minV
+	return min
 }

 func aggrMax(values []float64) float64 {
@@ -112,13 +112,13 @@ func aggrMax(values []float64) float64 {
 	if pos < 0 {
 		return nan
 	}
-	maxV := values[pos]
+	max := values[pos]
 	for _, v := range values[pos+1:] {
-		if !math.IsNaN(v) && v > maxV {
-			maxV = v
+		if !math.IsNaN(v) && v > max {
+			max = v
 		}
 	}
-	return maxV
+	return max
 }

 func aggrDiff(values []float64) float64 {
@@ -177,12 +177,12 @@ func aggrCount(values []float64) float64 {
 }

 func aggrRange(values []float64) float64 {
-	minV := aggrMin(values)
-	if math.IsNaN(minV) {
+	min := aggrMin(values)
+	if math.IsNaN(min) {
 		return nan
 	}
-	maxV := aggrMax(values)
-	return maxV - minV
+	max := aggrMax(values)
+	return max - min
 }

 func aggrMultiply(values []float64) float64 {
--- a/app/vmselect/graphite/transform.go
+++ b/app/vmselect/graphite/transform.go
@@ -2594,17 +2594,17 @@ func transformMinMax(ec *evalConfig, fe *graphiteql.FuncExpr) (nextSeriesFunc, e
 	}
 	f := nextSeriesConcurrentWrapper(nextSeries, func(s *series) (*series, error) {
 		values := s.Values
-		minV := aggrMin(values)
-		if math.IsNaN(minV) {
-			minV = 0
+		min := aggrMin(values)
+		if math.IsNaN(min) {
+			min = 0
 		}
-		maxV := aggrMax(values)
-		if math.IsNaN(maxV) {
-			maxV = 0
+		max := aggrMax(values)
+		if math.IsNaN(max) {
+			max = 0
 		}
-		vRange := maxV - minV
+		vRange := max - min
 		for i, v := range values {
-			v = (v - minV) / vRange
+			v = (v - min) / vRange
 			if math.IsInf(v, 0) {
 				v = 0
 			}
@@ -2975,9 +2975,9 @@ func transformRemoveAbovePercentile(ec *evalConfig, fe *graphiteql.FuncExpr) (ne
 	}
 	f := nextSeriesConcurrentWrapper(nextSeries, func(s *series) (*series, error) {
 		values := s.Values
-		maxV := aggrFunc(values)
+		max := aggrFunc(values)
 		for i, v := range values {
-			if v > maxV {
+			if v > max {
 				values[i] = nan
 			}
 		}
@@ -3035,9 +3035,9 @@ func transformRemoveBelowPercentile(ec *evalConfig, fe *graphiteql.FuncExpr) (ne
 	}
 	f := nextSeriesConcurrentWrapper(nextSeries, func(s *series) (*series, error) {
 		values := s.Values
-		minV := aggrFunc(values)
+		min := aggrFunc(values)
 		for i, v := range values {
-			if v < minV {
+			if v < min {
 				values[i] = nan
 			}
 		}
@@ -4514,11 +4514,11 @@ func transformOffsetToZero(ec *evalConfig, fe *graphiteql.FuncExpr) (nextSeriesF
 	}
 	f := nextSeriesConcurrentWrapper(nextSeries, func(s *series) (*series, error) {
 		values := s.Values
-		minV := aggrMin(values)
+		min := aggrMin(values)
 		for i, v := range values {
-			values[i] = v - minV
+			values[i] = v - min
 		}
-		s.Tags["offsetToZero"] = fmt.Sprintf("%g", minV)
+		s.Tags["offsetToZero"] = fmt.Sprintf("%g", min)
 		s.Name = fmt.Sprintf("offsetToZero(%s)", s.Name)
 		s.expr = fe
 		s.pathExpression = s.Name
@@ -4567,29 +4567,29 @@ func transformPerSecond(ec *evalConfig, fe *graphiteql.FuncExpr) (nextSeriesFunc
 	return f, nil
 }

-func nonNegativeDelta(currV, prevV, maxV, minV float64) (float64, float64) {
-	if !math.IsNaN(maxV) && currV > maxV {
+func nonNegativeDelta(curr, prev, max, min float64) (float64, float64) {
+	if !math.IsNaN(max) && curr > max {
 		return nan, nan
 	}
-	if !math.IsNaN(minV) && currV < minV {
+	if !math.IsNaN(min) && curr < min {
 		return nan, nan
 	}
-	if math.IsNaN(currV) || math.IsNaN(prevV) {
-		return nan, currV
+	if math.IsNaN(curr) || math.IsNaN(prev) {
+		return nan, curr
 	}
-	if currV >= prevV {
-		return currV - prevV, currV
+	if curr >= prev {
+		return curr - prev, curr
 	}
-	if !math.IsNaN(maxV) {
-		if math.IsNaN(minV) {
-			minV = float64(0)
+	if !math.IsNaN(max) {
+		if math.IsNaN(min) {
+			min = float64(0)
 		}
-		return maxV + 1 + currV - prevV - minV, currV
+		return max + 1 + curr - prev - min, curr
 	}
-	if !math.IsNaN(minV) {
-		return currV - minV, currV
+	if !math.IsNaN(min) {
+		return curr - min, curr
 	}
-	return nan, currV
+	return nan, curr
 }

 // See https://graphite.readthedocs.io/en/stable/functions.html#graphite.render.functions.threshold
@@ -4941,8 +4941,8 @@ func transformSortByMinima(ec *evalConfig, fe *graphiteql.FuncExpr) (nextSeriesF
 	}
 	// Filter out series with all the values smaller than 0
 	f := nextSeriesConcurrentWrapper(nextSeries, func(s *series) (*series, error) {
-		maxV := aggrMax(s.Values)
-		if math.IsNaN(maxV) || maxV <= 0 {
+		max := aggrMax(s.Values)
+		if math.IsNaN(max) || max <= 0 {
 			return nil, nil
 		}
 		return s, nil
--- a/app/vmselect/main.go
+++ b/app/vmselect/main.go
@@ -52,8 +52,8 @@ var (
 		"limit is reached; see also -search.maxQueryDuration")
 	minScrapeInterval = flag.Duration("dedup.minScrapeInterval", 0, "Leave only the last sample in every time series per each discrete interval "+
 		"equal to -dedup.minScrapeInterval > 0. See https://docs.victoriametrics.com/#deduplication for details")
-	deleteAuthKey        = flagutil.NewPassword("deleteAuthKey", "authKey for metrics' deletion via /prometheus/api/v1/admin/tsdb/delete_series and /graphite/tags/delSeries. It could be passed via authKey query arg. It overrides -httpAuth.*")
-	resetCacheAuthKey    = flagutil.NewPassword("search.resetCacheAuthKey", "Optional authKey for resetting rollup cache via /internal/resetRollupResultCache call. It could be passed via authKey query arg. It overrides -httpAuth.*")
+	deleteAuthKey        = flagutil.NewPassword("deleteAuthKey", "authKey for metrics' deletion via /prometheus/api/v1/admin/tsdb/delete_series and /graphite/tags/delSeries")
+	resetCacheAuthKey    = flagutil.NewPassword("search.resetCacheAuthKey", "Optional authKey for resetting rollup cache via /internal/resetRollupResultCache call")
 	logSlowQueryDuration = flag.Duration("search.logSlowQueryDuration", 5*time.Second, "Log queries with execution time exceeding this value. Zero disables slow query logging. "+
 		"See also -search.logQueryMemoryUsage")
 	vmalertProxyURL = flag.String("vmalert.proxyURL", "", "Optional URL for proxying requests to vmalert. For example, if -vmalert.proxyURL=http://vmalert:8880 , then alerting API requests such as /api/v1/rules from Grafana will be proxied to http://vmalert:8880/api/v1/rules")
@@ -63,10 +63,6 @@ var (

 	clusternativeListenAddr = flag.String("clusternativeListenAddr", "", "TCP address to listen for requests from other vmselect nodes in multi-level cluster setup. "+
 		"See https://docs.victoriametrics.com/cluster-victoriametrics/#multi-level-cluster-setup . Usually :8401 should be set to match default vmstorage port for vmselect. Disabled work if empty")
-	maxMemoryPerQuery = flagutil.NewBytes("search.maxMemoryPerQuery", 0, "The maximum amounts of memory a single query may consume. "+
-		"Queries requiring more memory are rejected. The total memory limit for concurrently executed queries can be estimated "+
-		"as -search.maxMemoryPerQuery multiplied by -search.maxConcurrentRequests . "+
-		"See also -search.logQueryMemoryUsage")
 )

 var slowQueries = metrics.NewCounter(`vm_slow_queries_total`)
@@ -120,10 +116,6 @@ func main() {
 		netstorage.InitTmpBlocksDir("")
 		promql.InitRollupResultCache("")
 	}
-
-	promql.SetMaxMemoryPerQuery(maxMemoryPerQuery.N)
-	netstorage.SetMaxMemoryUsagePerQuery(maxMemoryPerQuery.N)
-
 	concurrencyLimitCh = make(chan struct{}, *maxConcurrentRequests)
 	initVMAlertProxy()
 	var vmselectapiServer *vmselectapi.Server
--- a/app/vmselect/netstorage/memory_limiter.go
+++ b/app/vmselect/netstorage/memory_limiter.go
@@ -1,73 +0,0 @@
-package netstorage
-
-import (
-	"fmt"
-	"sync"
-)
-
-var (
-	maxMemoryUsagePerQuery int64
-)
-
-// getMaxMemoryUsagePerQuery returns the maximum memory usage per query.
-func getMaxMemoryUsagePerQuery() int64 {
-	return maxMemoryUsagePerQuery
-}
-
-// SetMaxMemoryUsagePerQuery sets the maximum memory usage per query.
-func SetMaxMemoryUsagePerQuery(v int64) {
-	maxMemoryUsagePerQuery = v
-}
-
-// memoryLimiter tracks and limits memory usage for operations
-type memoryLimiter struct {
-	maxSize uint64
-
-	mu    sync.Mutex
-	usage uint64
-}
-
-func newMemoryLimiter() *memoryLimiter {
-	maxSize := uint64(getMaxMemoryUsagePerQuery())
-	return &memoryLimiter{
-		maxSize: maxSize,
-	}
-}
-
-func (ml *memoryLimiter) AddBytes(n uint64) error {
-	if ml.maxSize <= 0 {
-		return nil
-	}
-
-	ml.mu.Lock()
-	ok := n <= ml.maxSize && ml.maxSize-n >= ml.usage
-	if ok {
-		ml.usage += n
-	}
-	ml.mu.Unlock()
-	if !ok {
-		return &limitExceededErr{
-			err: fmt.Errorf("cannot allocate %d bytes; max allowed memory usage is %d bytes", n, ml.maxSize),
-		}
-	}
-
-	return nil
-}
-
-// AddStrings accounts for and limits memory usage of string slices
-func (ml *memoryLimiter) AddStrings(v []string) error {
-	if len(v) == 0 {
-		return nil
-	}
-
-	// Account for:
-	// - Slice header (24 bytes)
-	// - String headers (16 bytes each)
-	// - String data
-	overhead := uint64(24 + (16 * len(v)))
-	dataSize := uint64(0)
-	for _, s := range v {
-		dataSize += uint64(len(s))
-	}
-	return ml.AddBytes(overhead + dataSize)
-}
--- a/app/vmselect/netstorage/netstorage.go
+++ b/app/vmselect/netstorage/netstorage.go
@@ -906,14 +906,10 @@ func LabelNames(qt *querytracer.Tracer, denyPartialResponse bool, sq *storage.Se
 		return nil, false, err
 	}
 	sns := getStorageNodes()
-	ml := newMemoryLimiter()
 	snr := startStorageNodesRequest(qt, sns, denyPartialResponse, func(qt *querytracer.Tracer, _ uint, sn *storageNode) any {
 		return execSearchQuery(qt, sq, func(qt *querytracer.Tracer, requestData []byte, _ storage.TenantToken) any {
 			sn.labelNamesRequests.Inc()
 			labelNames, err := sn.getLabelNames(qt, requestData, maxLabelNames, deadline)
-			if err == nil {
-				err = ml.AddStrings(labelNames)
-			}
 			if err != nil {
 				sn.labelNamesErrors.Inc()
 				err = fmt.Errorf("cannot get labels from vmstorage %s: %w", sn.connPool.Addr(), err)
@@ -1027,14 +1023,14 @@ func LabelValues(qt *querytracer.Tracer, denyPartialResponse bool, labelName str
 		case "vm_project_id":
 			idx = 1
 		default:
-			logger.Fatalf("BUG: unexpected labelName=%q", labelName)
+			logger.Fatalf("BUG: unexpected labeName=%q", labelName)
 		}

 		labelValues := make([]string, 0, len(tenants))
 		for _, t := range tenants {
 			s := strings.Split(t, ":")
 			if len(s) != 2 {
-				logger.Panicf("BUG: unexpected tenant received from storage: %q", t)
+				logger.Fatalf("BUG: unexpected tenant received from storage: %q", t)
 			}

 			labelValues = append(labelValues, s[idx])
@@ -1053,15 +1049,11 @@ func LabelValues(qt *querytracer.Tracer, denyPartialResponse bool, labelName str
 	if err != nil {
 		return nil, false, err
 	}
-	ml := newMemoryLimiter()
 	sns := getStorageNodes()
 	snr := startStorageNodesRequest(qt, sns, denyPartialResponse, func(qt *querytracer.Tracer, _ uint, sn *storageNode) any {
 		return execSearchQuery(qt, sq, func(qt *querytracer.Tracer, requestData []byte, _ storage.TenantToken) any {
 			sn.labelValuesRequests.Inc()
 			labelValues, err := sn.getLabelValues(qt, labelName, requestData, maxLabelValues, deadline)
-			if err == nil {
-				err = ml.AddStrings(labelValues)
-			}
 			if err != nil {
 				sn.labelValuesErrors.Inc()
 				err = fmt.Errorf("cannot get label values from vmstorage %s: %w", sn.connPool.Addr(), err)
@@ -1202,14 +1194,10 @@ func TagValueSuffixes(qt *querytracer.Tracer, accountID, projectID uint32, denyP
 		suffixes []string
 		err      error
 	}
-	ml := newMemoryLimiter()
 	sns := getStorageNodes()
 	snr := startStorageNodesRequest(qt, sns, denyPartialResponse, func(qt *querytracer.Tracer, _ uint, sn *storageNode) any {
 		sn.tagValueSuffixesRequests.Inc()
 		suffixes, err := sn.getTagValueSuffixes(qt, accountID, projectID, tr, tagKey, tagValuePrefix, delimiter, maxSuffixes, deadline)
-		if err == nil {
-			err = ml.AddStrings(suffixes)
-		}
 		if err != nil {
 			sn.tagValueSuffixesErrors.Inc()
 			err = fmt.Errorf("cannot get tag value suffixes for timeRange=%s, tagKey=%q, tagValuePrefix=%q, delimiter=%c from vmstorage %s: %w",
@@ -1707,15 +1695,11 @@ func SearchMetricNames(qt *querytracer.Tracer, denyPartialResponse bool, sq *sto
 	if err != nil {
 		return nil, false, err
 	}
-	ml := newMemoryLimiter()
 	sns := getStorageNodes()
 	snr := startStorageNodesRequest(qt, sns, denyPartialResponse, func(qt *querytracer.Tracer, _ uint, sn *storageNode) any {
 		return execSearchQuery(qt, sq, func(qt *querytracer.Tracer, requestData []byte, t storage.TenantToken) any {
 			sn.searchMetricNamesRequests.Inc()
 			metricNames, err := sn.processSearchMetricNames(qt, requestData, deadline)
-			if err == nil {
-				err = ml.AddStrings(metricNames)
-			}
 			if sq.IsMultiTenant {
 				// TODO: (@f41gh7) this function could produce duplicate labels
 				// if original metricName already have tenant labels
@@ -1967,10 +1951,8 @@ func populateSqTenantTokensIfNeeded(sq *storage.SearchQuery) error {
 type storageNodesRequest struct {
 	denyPartialResponse bool
 	resultsCh           chan rpcResult
-	qt                  *querytracer.Tracer
-	// query tracers to storageAddresses mapping
-	qts map[*querytracer.Tracer]string
-	sns []*storageNode
+	qts                 map[*querytracer.Tracer]struct{}
+	sns                 []*storageNode
 }

 type rpcResult struct {
@@ -1983,21 +1965,15 @@ func startStorageNodesRequest(qt *querytracer.Tracer, sns []*storageNode, denyPa
 	f func(qt *querytracer.Tracer, workerID uint, sn *storageNode) any,
 ) *storageNodesRequest {
 	resultsCh := make(chan rpcResult, len(sns))
-	qts := make(map[*querytracer.Tracer]string, len(sns))
+	qts := make(map[*querytracer.Tracer]struct{}, len(sns))
 	for idx, sn := range sns {
-		// Do not use qt.NewChild.
-		// StorageNodesRequest may be finished before goroutine returns.
-		// Caller must register tracker manually with finishQueryTracer after goroutine returns result.
-		// It ensures that tracker is no longer referenced by any concurrent goroutines.
-		//
-		// See this issue: https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8114
-		qtOrphan := querytracer.NewOrphan(qt, "rpc at vmstorage %s", sn.connPool.Addr())
-		qts[qtOrphan] = sn.connPool.Addr()
+		qtChild := qt.NewChild("rpc at vmstorage %s", sn.connPool.Addr())
+		qts[qtChild] = struct{}{}
 		go func(workerID uint, sn *storageNode) {
-			data := f(qtOrphan, workerID, sn)
+			data := f(qtChild, workerID, sn)
 			resultsCh <- rpcResult{
 				data:  data,
-				qt:    qtOrphan,
+				qt:    qtChild,
 				group: sn.group,
 			}
 		}(uint(idx), sn)
@@ -2005,21 +1981,14 @@ func startStorageNodesRequest(qt *querytracer.Tracer, sns []*storageNode, denyPa
 	return &storageNodesRequest{
 		denyPartialResponse: denyPartialResponse,
 		resultsCh:           resultsCh,
-		qt:                  qt,
 		qts:                 qts,
 		sns:                 sns,
 	}
 }

 func (snr *storageNodesRequest) finishQueryTracers(msg string) {
-	for qt, storageAddr := range snr.qts {
-		// since qt cannot be used concurrently,
-		// replace child still referenced by concurrent storageNode goroutine
-		// with local child that belongs to current goroutine.
-		// Add reason msg why it was done.
-		cancelledQt := snr.qt.NewChild("rpc at vmstorage: %s: %s", storageAddr, msg)
-		cancelledQt.Done()
-		delete(snr.qts, qt)
+	for qt := range snr.qts {
+		snr.finishQueryTracer(qt, msg)
 	}
 }

@@ -2030,7 +1999,6 @@ func (snr *storageNodesRequest) finishQueryTracer(qt *querytracer.Tracer, msg st
 		qt.Donef("%s", msg)
 	}
 	delete(snr.qts, qt)
-	snr.qt.AddChild(qt)
 }

 func (snr *storageNodesRequest) collectAllResults(f func(result any) error) error {
--- a/app/vmselect/prometheus/prometheus.go
+++ b/app/vmselect/prometheus/prometheus.go
@@ -507,15 +507,10 @@ func DeleteHandler(startTime time.Time, at *auth.Token, r *http.Request) error {
 	if err != nil {
 		return err
 	}
-	cp.deadline = searchutils.GetDeadlineForDelete(r, startTime)
-
 	if !cp.IsDefaultTimeRange() {
 		return fmt.Errorf("start=%d and end=%d args aren't supported. Remove these args from the query in order to delete all the matching metrics", cp.start, cp.end)
 	}
-	sq, err := getSearchQuery(nil, at, cp, *maxDeleteSeries)
-	if err != nil {
-		return err
-	}
+	sq := storage.NewSearchQuery(at.AccountID, at.ProjectID, cp.start, cp.end, cp.filterss, *maxDeleteSeries)
 	deletedCount, err := netstorage.DeleteSeries(nil, sq, cp.deadline)
 	if err != nil {
 		return fmt.Errorf("cannot delete time series: %w", err)
@@ -758,9 +753,7 @@ var labelsDuration = metrics.NewSummary(`vm_request_duration_seconds{path="/api/
 // SeriesCountHandler processes /api/v1/series/count request.
 func SeriesCountHandler(startTime time.Time, at *auth.Token, w http.ResponseWriter, r *http.Request) error {
 	defer seriesCountDuration.UpdateDuration(startTime)
-	if at == nil {
-		return fmt.Errorf("multi-tenant request to /api/v1/series/count is not supported")
-	}
+
 	deadline := searchutils.GetDeadlineForStatusRequest(r, startTime)
 	denyPartialResponse := httputils.GetDenyPartialResponse(r)
 	n, isPartial, err := netstorage.SeriesCount(nil, at.AccountID, at.ProjectID, denyPartialResponse, deadline)
--- a/app/vmselect/promql/aggr.go
+++ b/app/vmselect/promql/aggr.go
@@ -295,13 +295,13 @@ func aggrFuncMin(tss []*timeseries) []*timeseries {
 	}
 	dst := tss[0]
 	for i := range dst.Values {
-		minV := dst.Values[i]
+		min := dst.Values[i]
 		for _, ts := range tss {
-			if math.IsNaN(minV) || ts.Values[i] < minV {
-				minV = ts.Values[i]
+			if math.IsNaN(min) || ts.Values[i] < min {
+				min = ts.Values[i]
 			}
 		}
-		dst.Values[i] = minV
+		dst.Values[i] = min
 	}
 	return tss[:1]
 }
@@ -313,13 +313,13 @@ func aggrFuncMax(tss []*timeseries) []*timeseries {
 	}
 	dst := tss[0]
 	for i := range dst.Values {
-		maxV := dst.Values[i]
+		max := dst.Values[i]
 		for _, ts := range tss {
-			if math.IsNaN(maxV) || ts.Values[i] > maxV {
-				maxV = ts.Values[i]
+			if math.IsNaN(max) || ts.Values[i] > max {
+				max = ts.Values[i]
 			}
 		}
-		dst.Values[i] = maxV
+		dst.Values[i] = max
 	}
 	return tss[:1]
 }
@@ -793,7 +793,7 @@ func fillNaNsAtIdx(idx int, k float64, tss []*timeseries) {
 	}
 }

-func getIntK(k float64, maxV int) int {
+func getIntK(k float64, max int) int {
 	if math.IsNaN(k) {
 		return 0
 	}
@@ -801,38 +801,38 @@ func getIntK(k float64, maxV int) int {
 	if kn < 0 {
 		return 0
 	}
-	if kn > maxV {
-		return maxV
+	if kn > max {
+		return max
 	}
 	return kn
 }

 func minValue(values []float64) float64 {
-	minV := nan
-	for len(values) > 0 && math.IsNaN(minV) {
-		minV = values[0]
+	min := nan
+	for len(values) > 0 && math.IsNaN(min) {
+		min = values[0]
 		values = values[1:]
 	}
 	for _, v := range values {
-		if !math.IsNaN(v) && v < minV {
-			minV = v
+		if !math.IsNaN(v) && v < min {
+			min = v
 		}
 	}
-	return minV
+	return min
 }

 func maxValue(values []float64) float64 {
-	maxV := nan
-	for len(values) > 0 && math.IsNaN(maxV) {
-		maxV = values[0]
+	max := nan
+	for len(values) > 0 && math.IsNaN(max) {
+		max = values[0]
 		values = values[1:]
 	}
 	for _, v := range values {
-		if !math.IsNaN(v) && v > maxV {
-			maxV = v
+		if !math.IsNaN(v) && v > max {
+			max = v
 		}
 	}
-	return maxV
+	return max
 }

 func avgValue(values []float64) float64 {
--- a/app/vmselect/promql/eval.go
+++ b/app/vmselect/promql/eval.go
@@ -36,7 +36,10 @@ var (
 		"See https://docs.victoriametrics.com/#backfilling . See also -search.resetRollupResultCacheOnStartup")
 	maxPointsSubqueryPerTimeseries = flag.Int("search.maxPointsSubqueryPerTimeseries", 100e3, "The maximum number of points per series, which can be generated by subquery. "+
 		"See https://valyala.medium.com/prometheus-subqueries-in-victoriametrics-9b1492b720b3")
-
+	maxMemoryPerQuery = flagutil.NewBytes("search.maxMemoryPerQuery", 0, "The maximum amounts of memory a single query may consume. "+
+		"Queries requiring more memory are rejected. The total memory limit for concurrently executed queries can be estimated "+
+		"as -search.maxMemoryPerQuery multiplied by -search.maxConcurrentRequests . "+
+		"See also -search.logQueryMemoryUsage")
 	logQueryMemoryUsage = flagutil.NewBytes("search.logQueryMemoryUsage", 0, "Log query and increment vm_memory_intensive_queries_total metric each time "+
 		"the query requires more memory than specified by this flag. "+
 		"This may help detecting and optimizing heavy queries. Query logging is disabled by default. "+
@@ -49,20 +52,6 @@ var (
 		"A larger value makes the pushed-down filter more complex but fewer time series will be returned. This flag is useful when selective label contains numerous values, for example `instance`, and storage resources are abundant.")
 )

-var (
-	maxMemoryPerQuery int64
-)
-
-// SetMaxMemoryPerQuery sets the maximum memory allowed per query.
-func SetMaxMemoryPerQuery(v int64) {
-	maxMemoryPerQuery = v
-}
-
-// getMaxMemoryPerQuery returns the maximum memory allowed per query.
-func getMaxMemoryPerQuery() int64 {
-	return maxMemoryPerQuery
-}
-
 // The minimum number of points per timeseries for enabling time rounding.
 // This improves cache hit ratio for frequently requested queries over
 // big time ranges.
@@ -1804,7 +1793,7 @@ func evalRollupFuncNoCache(qt *querytracer.Tracer, ec *EvalConfig, funcName stri
 			"the query selects %d time series and generates %d points across all the time series; try reducing the number of selected time series",
 			ec.QuotedRemoteAddr, requestURI, expr.AppendString(nil), rollupMemorySize, maxMemory, timeseriesLen*len(rcs), rollupPoints)
 	}
-	if maxMemory := int64(getMaxMemoryPerQuery()); maxMemory > 0 && rollupMemorySize > maxMemory {
+	if maxMemory := int64(maxMemoryPerQuery.N); maxMemory > 0 && rollupMemorySize > maxMemory {
 		rss.Cancel()
 		err := fmt.Errorf("not enough memory for processing %s, which returns %d data points across %d time series with %d points in each time series "+
 			"according to -search.maxMemoryPerQuery=%d; requested memory: %d bytes; "+
@@ -1997,10 +1986,6 @@ func evalNumber(ec *EvalConfig, n float64) []*timeseries {
 	for i := range timestamps {
 		values[i] = n
 	}
-	if !ec.IsMultiTenant {
-		ts.MetricName.AccountID = ec.AuthTokens[0].AccountID
-		ts.MetricName.ProjectID = ec.AuthTokens[0].ProjectID
-	}
 	ts.Values = values
 	ts.Timestamps = timestamps
 	return []*timeseries{&ts}
--- a/app/vmselect/promql/rollup.go
+++ b/app/vmselect/promql/rollup.go
@@ -374,8 +374,8 @@ func getRollupConfigs(funcName string, rf rollupFunc, expr metricsql.Expr, start
 	preFunc := func(_ []float64, _ []int64) {}
 	funcName = strings.ToLower(funcName)
 	if rollupFuncsRemoveCounterResets[funcName] {
-		preFunc = func(values []float64, timestamps []int64) {
-			removeCounterResets(values, timestamps, lookbackDelta)
+		preFunc = func(values []float64, _ []int64) {
+			removeCounterResets(values)
 		}
 	}
 	samplesScannedPerCall := rollupFuncsSamplesScannedPerCall[funcName]
@@ -487,8 +487,8 @@ func getRollupConfigs(funcName string, rf rollupFunc, expr metricsql.Expr, start
 		for _, aggrFuncName := range aggrFuncNames {
 			if rollupFuncsRemoveCounterResets[aggrFuncName] {
 				// There is no need to save the previous preFunc, since it is either empty or the same.
-				preFunc = func(values []float64, timestamps []int64) {
-					removeCounterResets(values, timestamps, lookbackDelta)
+				preFunc = func(values []float64, _ []int64) {
+					removeCounterResets(values)
 				}
 			}
 			rf := rollupAggrFuncs[aggrFuncName]
@@ -521,8 +521,7 @@ type rollupFuncArg struct {
 	// Timestamps for values.
 	timestamps []int64

-	// Real value preceding values.
-	// Is populated if preceding value is within the -search.maxStalenessInterval (rc.LookbackDelta).
+	// Real value preceding values without restrictions on staleness interval.
 	realPrevValue float64

 	// Real value which goes after values.
@@ -770,18 +769,10 @@ func (rc *rollupConfig) doInternal(dstValues []float64, tsm *timeseriesMap, valu
 		}
 		rfa.values = values[i:j]
 		rfa.timestamps = timestamps[i:j]
-		rfa.realPrevValue = nan
 		if i > 0 {
-			prevValue, prevTimestamp := values[i-1], timestamps[i-1]
-			// set realPrevValue if rc.LookbackDelta == 0
-			// or if distance between datapoint in prev interval and beginning of this interval
-			// doesn't exceed LookbackDelta.
-			// https://github.com/VictoriaMetrics/VictoriaMetrics/pull/1381
-			// https://github.com/VictoriaMetrics/VictoriaMetrics/issues/894
-			// https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8045
-			if rc.LookbackDelta == 0 || (tStart-prevTimestamp) < rc.LookbackDelta {
-				rfa.realPrevValue = prevValue
-			}
+			rfa.realPrevValue = values[i-1]
+		} else {
+			rfa.realPrevValue = nan
 		}
 		if j < len(values) {
 			rfa.realNextValue = values[j]
@@ -905,7 +896,7 @@ func getMaxPrevInterval(scrapeInterval int64) int64 {
 	return scrapeInterval + scrapeInterval/8
 }

-func removeCounterResets(values []float64, timestamps []int64, maxStalenessInterval int64) {
+func removeCounterResets(values []float64) {
 	// There is no need in handling NaNs here, since they are impossible
 	// on values from vmstorage.
 	if len(values) == 0 {
@@ -924,16 +915,6 @@ func removeCounterResets(values []float64, timestamps []int64, maxStalenessInter
 				correction += prevValue
 			}
 		}
-		if i > 0 && maxStalenessInterval > 0 {
-			gap := timestamps[i] - timestamps[i-1]
-			if gap > maxStalenessInterval {
-				// reset correction if gap between samples exceeds staleness interval
-				// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8072
-				correction = 0
-				prevValue = v
-				continue
-			}
-		}
 		prevValue = v
 		values[i] = v + correction
 		// Check again, there could be precision error in float operations,
@@ -1706,9 +1687,9 @@ func rollupRateOverSum(rfa *rollupFuncArg) float64 {
 }

 func rollupRange(rfa *rollupFuncArg) float64 {
-	maxV := rollupMax(rfa)
-	minV := rollupMin(rfa)
-	return maxV - minV
+	max := rollupMax(rfa)
+	min := rollupMin(rfa)
+	return max - min
 }

 func rollupSum2(rfa *rollupFuncArg) float64 {
@@ -2216,38 +2197,38 @@ func rollupClose(rfa *rollupFuncArg) float64 {

 func rollupHigh(rfa *rollupFuncArg) float64 {
 	values := getCandlestickValues(rfa)
-	maxV := getFirstValueForCandlestick(rfa)
-	if math.IsNaN(maxV) {
+	max := getFirstValueForCandlestick(rfa)
+	if math.IsNaN(max) {
 		if len(values) == 0 {
 			return nan
 		}
-		maxV = values[0]
+		max = values[0]
 		values = values[1:]
 	}
 	for _, v := range values {
-		if v > maxV {
-			maxV = v
+		if v > max {
+			max = v
 		}
 	}
-	return maxV
+	return max
 }

 func rollupLow(rfa *rollupFuncArg) float64 {
 	values := getCandlestickValues(rfa)
-	minV := getFirstValueForCandlestick(rfa)
-	if math.IsNaN(minV) {
+	min := getFirstValueForCandlestick(rfa)
+	if math.IsNaN(min) {
 		if len(values) == 0 {
 			return nan
 		}
-		minV = values[0]
+		min = values[0]
 		values = values[1:]
 	}
 	for _, v := range values {
-		if v < minV {
-			minV = v
+		if v < min {
+			min = v
 		}
 	}
-	return minV
+	return min
 }

 func rollupModeOverTime(rfa *rollupFuncArg) float64 {
--- a/app/vmselect/promql/rollup_test.go
+++ b/app/vmselect/promql/rollup_test.go
@@ -5,8 +5,6 @@ import (
 	"testing"

 	"github.com/VictoriaMetrics/metricsql"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
 )

 var (
@@ -117,49 +115,31 @@ func TestRollupIderivDuplicateTimestamps(t *testing.T) {
 }

 func TestRemoveCounterResets(t *testing.T) {
-	removeCounterResets(nil, nil, 0)
+	removeCounterResets(nil)

 	values := append([]float64{}, testValues...)
-	timestamps := append([]int64{}, testTimestamps...)
-	removeCounterResets(values, timestamps, 0)
+	removeCounterResets(values)
 	valuesExpected := []float64{123, 157, 167, 188, 221, 255, 320, 332, 364, 396, 398, 398}
 	testRowsEqual(t, values, testTimestamps, valuesExpected, testTimestamps)

 	// removeCounterResets doesn't expect negative values, so it doesn't work properly with them.
 	values = []float64{-100, -200, -300, -400}
-	timestampsExpected := []int64{0, 1, 2, 3}
-	removeCounterResets(values, timestampsExpected, 0)
+	removeCounterResets(values)
 	valuesExpected = []float64{-100, -100, -100, -100}
+	timestampsExpected := []int64{0, 1, 2, 3}
 	testRowsEqual(t, values, timestampsExpected, valuesExpected, timestampsExpected)

 	// verify how partial counter reset is handled.
 	// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2787
 	values = []float64{100, 95, 120, 119, 139, 50}
-	timestampsExpected = []int64{0, 1, 2, 3, 4, 5}
-	removeCounterResets(values, timestampsExpected, 0)
+	removeCounterResets(values)
 	valuesExpected = []float64{100, 100, 125, 125, 145, 195}
+	timestampsExpected = []int64{0, 1, 2, 3, 4, 5}
 	testRowsEqual(t, values, timestampsExpected, valuesExpected, timestampsExpected)

-	// verify that staleness interval is respected during resets
-	// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8072
-	values = []float64{10, 12, 14, 4, 6, 8, 6, 8, 4, 6}
-	timestamps = []int64{10, 20, 30, 60, 70, 80, 90, 100, 120, 130}
-	valuesExpected = []float64{10, 12, 14, 4, 6, 8, 14, 16, 4, 6}
-	removeCounterResets(values, timestamps, 10)
-	testRowsEqual(t, values, timestamps, valuesExpected, timestamps)
-
-	// verify that staleness is respected if there was no counter reset
-	// but correction was made previously
-	values = []float64{10, 12, 2, 4}
-	timestamps = []int64{10, 20, 30, 60}
-	valuesExpected = []float64{10, 12, 14, 4}
-	removeCounterResets(values, timestamps, 10)
-	testRowsEqual(t, values, timestamps, valuesExpected, timestamps)
-
 	// verify results always increase monotonically with possible float operations precision error
 	values = []float64{34.094223, 2.7518, 2.140669, 0.044878, 1.887095, 2.546569, 2.490149, 0.045, 0.035684, 0.062454, 0.058296}
-	timestampsExpected = []int64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
-	removeCounterResets(values, timestampsExpected, 0)
+	removeCounterResets(values)
 	var prev float64
 	for i, v := range values {
 		if v < prev {
@@ -184,7 +164,7 @@ func TestDeltaValues(t *testing.T) {

 	// remove counter resets
 	values = append([]float64{}, testValues...)
-	removeCounterResets(values, testTimestamps, 0)
+	removeCounterResets(values)
 	deltaValues(values)
 	valuesExpected = []float64{34, 10, 21, 33, 34, 65, 12, 32, 32, 2, 0, 0}
 	testRowsEqual(t, values, testTimestamps, valuesExpected, testTimestamps)
@@ -206,7 +186,7 @@ func TestDerivValues(t *testing.T) {

 	// remove counter resets
 	values = append([]float64{}, testValues...)
-	removeCounterResets(values, testTimestamps, 0)
+	removeCounterResets(values)
 	derivValues(values, testTimestamps)
 	valuesExpected = []float64{3400, 1111.111111111111, 1750, 2538.4615384615386, 3090.909090909091, 3611.1111111111113,
 		6000, 1882.3529411764705, 1777.7777777777778, 400, 0, 0}
@@ -237,7 +217,7 @@ func testRollupFunc(t *testing.T, funcName string, args []any, vExpected float64
 	rfa.timestamps = append(rfa.timestamps, testTimestamps...)
 	rfa.window = rfa.timestamps[len(rfa.timestamps)-1] - rfa.timestamps[0]
 	if rollupFuncsRemoveCounterResets[funcName] {
-		removeCounterResets(rfa.values, rfa.timestamps, 0)
+		removeCounterResets(rfa.values)
 	}
 	for i := 0; i < 5; i++ {
 		v := rf(&rfa)
@@ -1607,229 +1587,3 @@ func TestRollupDelta(t *testing.T) {
 	f(1, nan, nan, nil, 0)
 	f(100, nan, nan, nil, 0)
 }
-
-func TestRollupDeltaWithStaleness(t *testing.T) {
-	// there is a gap between samples in the dataset below
-	timestamps := []int64{0, 15000, 30000, 70000}
-	values := []float64{1, 1, 1, 1}
-
-	// if step > gap, then delta will always respect value before gap
-	t.Run("step>gap", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                70000,
-			Step:               45000,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 7 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0}
-		timestampsExpected := []int64{0, 45e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-	// even if LookbackDelta < gap
-	t.Run("step>gap;LookbackDelta<gap", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                70000,
-			Step:               45000,
-			LookbackDelta:      10e3,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 7 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0}
-		timestampsExpected := []int64{0, 45e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	// if step < gap and LookbackDelta==0 then delta will always respect value before gap
-	// as LookbackDelta=0 ignores staleness
-	t.Run("step<gap;LookbackDelta=0", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                70000,
-			Step:               10000,
-			LookbackDelta:      0,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 8 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0, 0, 0, 0, 0, 0, 0}
-		timestampsExpected := []int64{0, 10e3, 20e3, 30e3, 40e3, 50e3, 60e3, 70e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	// if step < gap and LookbackDelta>0 then delta will respect value before gap
-	// only if it is not stale according to LookbackDelta
-	t.Run("step<gap;LookbackDelta>0", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                70000,
-			Step:               10000,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-			LookbackDelta:      30e3,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 8 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0, 0, 0, 0, 0, 0, 1}
-		timestampsExpected := []int64{0, 10e3, 20e3, 30e3, 40e3, 50e3, 60e3, 70e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	// there is a staleness marker between samples in the dataset below
-	timestamps = []int64{0, 10000, 20000, 30000, 40000}
-	values = []float64{1, 1, 1, decimal.StaleNaN, 1}
-
-	t.Run("staleness marker", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                40000,
-			Step:               10000,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 10 {
-			t.Fatalf("expecting 10 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0, 0, nan, 1}
-		timestampsExpected := []int64{0, 10e3, 20e3, 30e3, 40e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-}
-
-func TestRollupIncreasePureWithStaleness(t *testing.T) {
-	// there is a gap between samples in the dataset below
-	timestamps := []int64{0, 15000, 30000, 70000}
-	values := []float64{1, 1, 1, 1}
-
-	// if step > gap, then delta will always respect value before gap
-	t.Run("step>gap", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupIncreasePure,
-			Start:              0,
-			End:                70000,
-			Step:               45000,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 7 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0}
-		timestampsExpected := []int64{0, 45e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-	// even if LookbackDelta < gap
-	t.Run("step>gap;LookbackDelta<gap", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupIncreasePure,
-			Start:              0,
-			End:                70000,
-			Step:               45000,
-			LookbackDelta:      10e3,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 7 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0}
-		timestampsExpected := []int64{0, 45e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	// if step < gap and LookbackDelta==0 then delta will always respect value before gap
-	// as LookbackDelta=0 ignores staleness
-	t.Run("step<gap;LookbackDelta=0", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupIncreasePure,
-			Start:              0,
-			End:                70000,
-			Step:               10000,
-			LookbackDelta:      0,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 8 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0, 0, 0, 0, 0, 0, 0}
-		timestampsExpected := []int64{0, 10e3, 20e3, 30e3, 40e3, 50e3, 60e3, 70e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	// if step < gap and LookbackDelta>0 then delta will respect value before gap
-	// only if it is not stale according to LookbackDelta
-	t.Run("step<gap;LookbackDelta>0", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupIncreasePure,
-			Start:              0,
-			End:                70000,
-			Step:               10000,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-			LookbackDelta:      30e3,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 8 {
-			t.Fatalf("expecting 8 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0, 0, 0, 0, 0, 0, 1}
-		timestampsExpected := []int64{0, 10e3, 20e3, 30e3, 40e3, 50e3, 60e3, 70e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	// there is a staleness marker between samples in the dataset below
-	timestamps = []int64{0, 10000, 20000, 30000, 40000}
-	values = []float64{1, 1, 1, decimal.StaleNaN, 1}
-
-	t.Run("staleness marker", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupIncreasePure,
-			Start:              0,
-			End:                40000,
-			Step:               10000,
-			Window:             0,
-			MaxPointsPerSeries: 1e4,
-		}
-		rc.Timestamps = rc.getTimestamps()
-		gotValues, samplesScanned := rc.Do(nil, values, timestamps)
-		if samplesScanned != 10 {
-			t.Fatalf("expecting 10 samplesScanned from rollupConfig.Do; got %d", samplesScanned)
-		}
-		valuesExpected := []float64{1, 0, 0, nan, 1}
-		timestampsExpected := []int64{0, 10e3, 20e3, 30e3, 40e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-}
--- a/app/vmselect/searchutils/searchutils.go
+++ b/app/vmselect/searchutils/searchutils.go
@@ -15,7 +15,6 @@ import (

 var (
 	maxExportDuration        = flag.Duration("search.maxExportDuration", time.Hour*24*30, "The maximum duration for /api/v1/export call")
-	maxDeleteDuration        = flag.Duration("search.maxDeleteDuration", time.Minute*5, "The maximum duration for /api/v1/admin/tsdb/delete_series call")
 	maxQueryDuration         = flag.Duration("search.maxQueryDuration", time.Second*30, "The maximum duration for query execution. It can be overridden to a smaller value on a per-query basis via 'timeout' query arg")
 	maxStatusRequestDuration = flag.Duration("search.maxStatusRequestDuration", time.Minute*5, "The maximum duration for /api/v1/status/* requests")
 	maxLabelsAPIDuration     = flag.Duration("search.maxLabelsAPIDuration", time.Second*5, "The maximum duration for /api/v1/labels, /api/v1/label/.../values and /api/v1/series requests. "+
@@ -59,12 +58,6 @@ func GetDeadlineForLabelsAPI(r *http.Request, startTime time.Time) Deadline {
 	return getDeadlineWithMaxDuration(r, startTime, dMax, "-search.maxLabelsAPIDuration")
 }

-// GetDeadlineForDelete returns deadline for the given request to /api/v1/admin/tsdb/delete_series.
-func GetDeadlineForDelete(r *http.Request, startTime time.Time) Deadline {
-	dMax := maxDeleteDuration.Milliseconds()
-	return getDeadlineWithMaxDuration(r, startTime, dMax, "-search.maxDeleteDuration")
-}
-
 func getDeadlineWithMaxDuration(r *http.Request, startTime time.Time, dMax int64, flagHint string) Deadline {
 	d, err := httputils.GetDuration(r, "timeout", 0)
 	if err != nil {
--- a/app/vmselect/vmui/asset-manifest.json
+++ b/app/vmselect/vmui/asset-manifest.json
@@ -1,13 +1,13 @@
 {
  "files": {
-    "main.css": "./static/css/main.af583aad.css",
-    "main.js": "./static/js/main.1413b18d.js",
+    "main.css": "./static/css/main.876c56b7.css",
+    "main.js": "./static/js/main.caf36c39.js",
    "static/js/685.f772060c.chunk.js": "./static/js/685.f772060c.chunk.js",
    "static/media/MetricsQL.md": "./static/media/MetricsQL.a00044c91d9781cf8557.md",
    "index.html": "./index.html"
  },
  "entrypoints": [
-    "static/css/main.af583aad.css",
-    "static/js/main.1413b18d.js"
+    "static/css/main.876c56b7.css",
+    "static/js/main.caf36c39.js"
  ]
 }
--- a/app/vmselect/vmui/index.html
+++ b/app/vmselect/vmui/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.svg"/><link rel="apple-touch-icon" href="./favicon.svg"/><link rel="mask-icon" href="./favicon.svg" color="#000000"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=5"/><meta name="theme-color" content="#000000"/><meta name="description" content="Explore and troubleshoot your VictoriaMetrics data"/><link rel="manifest" href="./manifest.json"/><title>vmui</title><script src="./dashboards/index.js" type="module"></script><meta name="twitter:card" content="summary"><meta name="twitter:title" content="UI for VictoriaMetrics"><meta name="twitter:site" content="@https://victoriametrics.com/"><meta name="twitter:description" content="Explore and troubleshoot your VictoriaMetrics data"><meta name="twitter:image" content="./preview.jpg"><meta property="og:type" content="website"><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 defer="defer" src="./static/js/main.1413b18d.js"></script><link href="./static/css/main.af583aad.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.svg"/><link rel="apple-touch-icon" href="./favicon.svg"/><link rel="mask-icon" href="./favicon.svg" color="#000000"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=5"/><meta name="theme-color" content="#000000"/><meta name="description" content="Explore and troubleshoot your VictoriaMetrics data"/><link rel="manifest" href="./manifest.json"/><title>vmui</title><script src="./dashboards/index.js" type="module"></script><meta name="twitter:card" content="summary"><meta name="twitter:title" content="UI for VictoriaMetrics"><meta name="twitter:site" content="@https://victoriametrics.com/"><meta name="twitter:description" content="Explore and troubleshoot your VictoriaMetrics data"><meta name="twitter:image" content="./preview.jpg"><meta property="og:type" content="website"><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 defer="defer" src="./static/js/main.caf36c39.js"></script><link href="./static/css/main.876c56b7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
--- a/app/vmselect/vmui/static/css/main.876c56b7.css
+++ b/app/vmselect/vmui/static/css/main.876c56b7.css
--- a/app/vmselect/vmui/static/css/main.af583aad.css
+++ b/app/vmselect/vmui/static/css/main.af583aad.css
--- a/app/vmselect/vmui/static/js/main.1413b18d.js
+++ b/app/vmselect/vmui/static/js/main.1413b18d.js
--- a/app/vmselect/vmui/static/js/main.caf36c39.js
+++ b/app/vmselect/vmui/static/js/main.caf36c39.js
--- a/app/vmselect/vmui/static/js/main.caf36c39.js.LICENSE.txt
+++ b/app/vmselect/vmui/static/js/main.caf36c39.js.LICENSE.txt
--- a/app/vmstorage/main.go
+++ b/app/vmstorage/main.go
@@ -69,19 +69,12 @@ var (

 	minFreeDiskSpaceBytes = flagutil.NewBytes("storage.minFreeDiskSpaceBytes", 10e6, "The minimum free disk space at -storageDataPath after which the storage stops accepting new data")

-	finalDedupScheduleInterval = flag.Duration("storage.finalDedupScheduleCheckInterval", time.Hour, "The interval for checking when final deduplication process should be started."+
-		"Storage unconditionally adds 25% jitter to the interval value on each check evaluation."+
-		" Changing the interval to the bigger values may delay downsampling, deduplication for historical data."+
-		" See also https://docs.victoriametrics.com/#deduplication")
-
 	cacheSizeStorageTSID = flagutil.NewBytes("storage.cacheSizeStorageTSID", 0, "Overrides max size for storage/tsid cache. "+
 		"See https://docs.victoriametrics.com/single-server-victoriametrics/#cache-tuning")
 	cacheSizeIndexDBIndexBlocks = flagutil.NewBytes("storage.cacheSizeIndexDBIndexBlocks", 0, "Overrides max size for indexdb/indexBlocks cache. "+
 		"See https://docs.victoriametrics.com/single-server-victoriametrics/#cache-tuning")
 	cacheSizeIndexDBDataBlocks = flagutil.NewBytes("storage.cacheSizeIndexDBDataBlocks", 0, "Overrides max size for indexdb/dataBlocks cache. "+
 		"See https://docs.victoriametrics.com/single-server-victoriametrics/#cache-tuning")
-	cacheSizeIndexDBDataBlocksSparse = flagutil.NewBytes("storage.cacheSizeIndexDBDataBlocksSparse", 0, "Overrides max size for indexdb/dataBlocksSparse cache. "+
-		"See https://docs.victoriametrics.com/single-server-victoriametrics/#cache-tuning")
 	cacheSizeIndexDBTagFilters = flagutil.NewBytes("storage.cacheSizeIndexDBTagFilters", 0, "Overrides max size for indexdb/tagFiltersToMetricIDs cache. "+
 		"See https://docs.victoriametrics.com/single-server-victoriametrics/#cache-tuning")
 )
@@ -110,13 +103,8 @@ func main() {
 	storage.SetFreeDiskSpaceLimit(minFreeDiskSpaceBytes.N)
 	storage.SetTSIDCacheSize(cacheSizeStorageTSID.IntN())
 	storage.SetTagFiltersCacheSize(cacheSizeIndexDBTagFilters.IntN())
-	if *finalDedupScheduleInterval < time.Hour {
-		logger.Fatalf("-storage.finalDedupScheduleCheckInterval cannot be smaller than 1 hour; got %s", *finalDedupScheduleInterval)
-	}
-	storage.SetFinalDedupScheduleInterval(*finalDedupScheduleInterval)
 	mergeset.SetIndexBlocksCacheSize(cacheSizeIndexDBIndexBlocks.IntN())
 	mergeset.SetDataBlocksCacheSize(cacheSizeIndexDBDataBlocks.IntN())
-	mergeset.SetDataBlocksSparseCacheSize(cacheSizeIndexDBDataBlocksSparse.IntN())

 	if retentionPeriod.Duration() < 24*time.Hour {
 		logger.Fatalf("-retentionPeriod cannot be smaller than a day; got %s", retentionPeriod)
@@ -530,7 +518,6 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="storage/next_day_metric_ids"}`, m.NextDayMetricIDCacheSize)
 	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="storage/indexBlocks"}`, tm.IndexBlocksCacheSize)
 	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="indexdb/dataBlocks"}`, idbm.DataBlocksCacheSize)
-	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="indexdb/dataBlocksSparse"}`, idbm.DataBlocksSparseCacheSize)
 	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="indexdb/indexBlocks"}`, idbm.IndexBlocksCacheSize)
 	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="indexdb/tagFiltersToMetricIDs"}`, idbm.TagFiltersToMetricIDsCacheSize)
 	metrics.WriteGaugeUint64(w, `vm_cache_entries{type="storage/regexps"}`, uint64(storage.RegexpCacheSize()))
@@ -542,7 +529,6 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="storage/metricName"}`, m.MetricNameCacheSizeBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="storage/indexBlocks"}`, tm.IndexBlocksCacheSizeBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="indexdb/dataBlocks"}`, idbm.DataBlocksCacheSizeBytes)
-	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="indexdb/dataBlocksSparse"}`, idbm.DataBlocksSparseCacheSizeBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="indexdb/indexBlocks"}`, idbm.IndexBlocksCacheSizeBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="storage/date_metricID"}`, m.DateMetricIDCacheSizeBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_bytes{type="storage/hour_metric_ids"}`, m.HourMetricIDCacheSizeBytes)
@@ -557,7 +543,6 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="storage/metricName"}`, m.MetricNameCacheSizeMaxBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="storage/indexBlocks"}`, tm.IndexBlocksCacheSizeMaxBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="indexdb/dataBlocks"}`, idbm.DataBlocksCacheSizeMaxBytes)
-	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="indexdb/dataBlocksSparse"}`, idbm.DataBlocksSparseCacheSizeMaxBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="indexdb/indexBlocks"}`, idbm.IndexBlocksCacheSizeMaxBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="indexdb/tagFiltersToMetricIDs"}`, idbm.TagFiltersToMetricIDsCacheSizeMaxBytes)
 	metrics.WriteGaugeUint64(w, `vm_cache_size_max_bytes{type="storage/regexps"}`, uint64(storage.RegexpCacheMaxSizeBytes()))
@@ -568,7 +553,6 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="storage/metricName"}`, m.MetricNameCacheRequests)
 	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="storage/indexBlocks"}`, tm.IndexBlocksCacheRequests)
 	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="indexdb/dataBlocks"}`, idbm.DataBlocksCacheRequests)
-	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="indexdb/dataBlocksSparse"}`, idbm.DataBlocksSparseCacheRequests)
 	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="indexdb/indexBlocks"}`, idbm.IndexBlocksCacheRequests)
 	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="indexdb/tagFiltersToMetricIDs"}`, idbm.TagFiltersToMetricIDsCacheRequests)
 	metrics.WriteCounterUint64(w, `vm_cache_requests_total{type="storage/regexps"}`, storage.RegexpCacheRequests())
@@ -579,7 +563,6 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="storage/metricName"}`, m.MetricNameCacheMisses)
 	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="storage/indexBlocks"}`, tm.IndexBlocksCacheMisses)
 	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="indexdb/dataBlocks"}`, idbm.DataBlocksCacheMisses)
-	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="indexdb/dataBlocksSparse"}`, idbm.DataBlocksSparseCacheMisses)
 	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="indexdb/indexBlocks"}`, idbm.IndexBlocksCacheMisses)
 	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="indexdb/tagFiltersToMetricIDs"}`, idbm.TagFiltersToMetricIDsCacheMisses)
 	metrics.WriteCounterUint64(w, `vm_cache_misses_total{type="storage/regexps"}`, storage.RegexpCacheMisses())
--- a/app/vmui/Dockerfile-web
+++ b/app/vmui/Dockerfile-web
@@ -1,4 +1,4 @@
-FROM golang:1.23.5 AS build-web-stage
+FROM golang:1.23.4 AS build-web-stage
 COPY build /build

 WORKDIR /build
@@ -6,7 +6,7 @@ COPY web/ /build/
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o web-amd64 github.com/VictoriMetrics/vmui/ && \
    GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -o web-windows github.com/VictoriMetrics/vmui/

-FROM alpine:3.21.2
+FROM alpine:3.21.0
 USER root

 COPY --from=build-web-stage /build/web-amd64 /app/web
--- a/app/vmui/packages/vmui/src/api/types.ts
+++ b/app/vmui/packages/vmui/src/api/types.ts
@@ -1,6 +1,3 @@
-import uPlot from "uplot";
-import { ReactNode } from "react";
-
 export interface MetricBase {
  group: number;
  metric: {
@@ -9,13 +6,13 @@ export interface MetricBase {
 }

 export interface MetricResult extends MetricBase {
-  values: [number, string][];
+  values: [number, string][]
 }


 export interface InstantMetricResult extends MetricBase {
-  value?: [number, string];
-  values?: [number, string][];
+  value?: [number, string]
+  values?: [number, string][]
 }

 export interface ExportMetricResult extends MetricBase {
@@ -47,23 +44,9 @@ export interface LogHits {
  timestamps: string[];
  values: number[];
  total?: number;
-  fields: { [key: string]: string; };
-  _isOther: boolean;
-}
-
-export interface LegendLogHits {
-  label: string;
-  total: number;
-  totalHits: number;
-  isOther: boolean;
-  fields: { [key: string]: string; };
-  stroke?: uPlot.Series.Stroke;
-}
-
-export interface LegendLogHitsMenu {
-  title: string;
-  icon?: ReactNode;
-  handler?: () => void;
+  fields: {
+    [key: string]: string;
+  };
 }

 export interface ReportMetaData {
@@ -73,8 +56,3 @@ export interface ReportMetaData {
  comment: string;
  params: Record<string, string>;
 }
-
-export interface LogsFiledValues {
-  value: string;
-  hits: number;
-}
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsChart.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsChart.tsx
@@ -1,23 +1,22 @@
-import React, { FC, useCallback, useMemo, useRef, useState } from "preact/compat";
+import React, { FC, useMemo, useRef, useState } from "preact/compat";
 import "./style.scss";
 import "uplot/dist/uPlot.min.css";
 import useElementSize from "../../../hooks/useElementSize";
 import uPlot, { AlignedData } from "uplot";
 import { useEffect } from "react";
-import useBarHitsOptions, { getLabelFromLogHit } from "./hooks/useBarHitsOptions";
+import useBarHitsOptions from "./hooks/useBarHitsOptions";
 import BarHitsTooltip from "./BarHitsTooltip/BarHitsTooltip";
 import { TimeParams } from "../../../types";
 import usePlotScale from "../../../hooks/uplot/usePlotScale";
 import useReadyChart from "../../../hooks/uplot/useReadyChart";
 import useZoomChart from "../../../hooks/uplot/useZoomChart";
 import classNames from "classnames";
-import { LegendLogHits, LogHits } from "../../../api/types";
+import { LogHits } from "../../../api/types";
 import { addSeries, delSeries, setBand } from "../../../utils/uplot";
 import { GraphOptions, GRAPH_STYLES } from "./types";
 import BarHitsOptions from "./BarHitsOptions/BarHitsOptions";
 import stack from "../../../utils/uplot/stack";
 import BarHitsLegend from "./BarHitsLegend/BarHitsLegend";
-import { calculateTotalHits, sortLogHits } from "../../../utils/logs";

 interface Props {
  logHits: LogHits[];
@@ -58,29 +57,6 @@ const BarHitsChart: FC<Props> = ({ logHits, data: _data, period, setPeriod, onAp
    graphOptions
  });

-  const prepareLegend = useCallback((hits: LogHits[], totalHits: number): LegendLogHits[] => {
-    return hits.map((hit) => {
-      const label = getLabelFromLogHit(hit);
-
-      const legendItem: LegendLogHits = {
-        label,
-        isOther: hit._isOther,
-        fields: hit.fields,
-        total: hit.total || 0,
-        totalHits,
-        stroke: series.find((s) => s.label === label)?.stroke,
-      };
-
-      return legendItem;
-    }).sort(sortLogHits("total"));
-  }, [series]);
-
-
-  const legendDetails: LegendLogHits[] = useMemo(() => {
-    const totalHits = calculateTotalHits(logHits);
-    return prepareLegend(logHits, totalHits);
-  }, [logHits, prepareLegend]);
-
  useEffect(() => {
    if (!uPlotInst) return;
    delSeries(uPlotInst);
@@ -145,7 +121,6 @@ const BarHitsChart: FC<Props> = ({ logHits, data: _data, period, setPeriod, onAp
        <BarHitsLegend
          uPlotInst={uPlotInst}
          onApplyFilter={onApplyFilter}
-          legendDetails={legendDetails}
        />
      )}
    </div>
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsLegend/BarHitsLegend.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsLegend/BarHitsLegend.tsx
@@ -1,53 +1,83 @@
-import React, { FC, useEffect, useState } from "preact/compat";
+import React, { FC, useCallback, useEffect, useState } from "preact/compat";
 import uPlot, { Series } from "uplot";
 import "./style.scss";
 import "../../Line/Legend/style.scss";
-import BarHitsLegendItem from "./BarHitsLegendItem";
-import { LegendLogHits } from "../../../../api/types";
+import classNames from "classnames";
+import { MouseEvent } from "react";
+import { isMacOs } from "../../../../utils/detect-device";
+import Tooltip from "../../../Main/Tooltip/Tooltip";
+import { getStreamPairs } from "../../../../utils/logs";

 interface Props {
  uPlotInst: uPlot;
-  legendDetails: LegendLogHits[];
  onApplyFilter: (value: string) => void;
 }

-const BarHitsLegend: FC<Props> = ({ uPlotInst, legendDetails, onApplyFilter }) => {
+const BarHitsLegend: FC<Props> = ({ uPlotInst, onApplyFilter }) => {
  const [series, setSeries] = useState<Series[]>([]);
-  const totalHits = legendDetails[0]?.totalHits || 0;
+  const [pairs, setPairs] = useState<string[][]>([]);

-  const getSeries = () => {
-    return uPlotInst.series.filter(s => s.scale !== "x");
-  };
-
-  const handleRedrawGraph = () => {
-    uPlotInst.redraw();
-    setSeries(getSeries());
-  };
-
-  useEffect(() => {
-    setSeries(getSeries());
+  const updateSeries = useCallback(() => {
+    const series = uPlotInst.series.filter(s => s.scale !== "x");
+    setSeries(series);
+    setPairs(series.map(s => getStreamPairs(s.label || "")));
  }, [uPlotInst]);

+  const handleClickByValue = (value: string) => (e: MouseEvent<HTMLDivElement>) => {
+    const metaKey = e.metaKey || e.ctrlKey;
+    if (!metaKey) return;
+    onApplyFilter(`{${value}}` || "");
+    updateSeries();
+    uPlotInst.redraw();
+  };
+
+  const handleClickByStream = (target: Series) => (e: MouseEvent<HTMLDivElement>) => {
+    const metaKey = e.metaKey || e.ctrlKey;
+    if (metaKey) return;
+    target.show = !target.show;
+    updateSeries();
+    uPlotInst.redraw();
+  };
+
+  useEffect(updateSeries, [uPlotInst]);
+
  return (
    <div className="vm-bar-hits-legend">
-      {legendDetails.map((legend) => (
-        <BarHitsLegendItem
-          key={legend.label}
-          legend={legend}
-          series={series}
-          onRedrawGraph={handleRedrawGraph}
-          onApplyFilter={onApplyFilter}
-        />
+      {series.map((s, i) => (
+        <Tooltip
+          key={s.label}
+          title={(
+            <ul className="vm-bar-hits-legend-info">
+              <li>Click to {s.show ? "hide" : "show"} the _stream.</li>
+              <li>{isMacOs() ? "Cmd" : "Ctrl"} + Click to filter by the _stream.</li>
+            </ul>
+          )}
+        >
+          <div
+            className={classNames({
+              "vm-bar-hits-legend-item": true,
+              "vm-bar-hits-legend-item_hide": !s.show,
+            })}
+            onClick={handleClickByStream(s)}
+          >
+            <div
+              className="vm-bar-hits-legend-item__marker"
+              style={{ backgroundColor: `${(s?.stroke as () => string)?.()}` }}
+            />
+            <div className="vm-bar-hits-legend-item-pairs">
+              {pairs[i].map(value => (
+                <span
+                  className="vm-bar-hits-legend-item-pairs__value"
+                  key={value}
+                  onClick={handleClickByValue(value)}
+                >
+                  {value}
+                </span>
+              ))}
+            </div>
+          </div>
+        </Tooltip>
      ))}
-      <div className="vm-bar-hits-legend-info">
-        <div>
-          Total hits: <b>{totalHits.toLocaleString("en-US")}</b>
-        </div>
-        <div>
-          <code>L-Click</code> toggles visibility.&nbsp;
-          <code>R-Click</code> opens menu.
-        </div>
-      </div>
    </div>
  );
 };
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsLegend/BarHitsLegendItem.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsLegend/BarHitsLegendItem.tsx
@@ -1,92 +0,0 @@
-import React, { FC, useMemo, useRef, useState } from "preact/compat";
-import classNames from "classnames";
-import { Series } from "uplot";
-import { MouseEvent } from "react";
-import { LegendLogHits } from "../../../../api/types";
-import { getStreamPairs } from "../../../../utils/logs";
-import { formatNumberShort } from "../../../../utils/math";
-import Popper from "../../../Main/Popper/Popper";
-import useBoolean from "../../../../hooks/useBoolean";
-import LegendHitsMenu from "../LegendHitsMenu/LegendHitsMenu";
-
-interface Props {
-  legend: LegendLogHits;
-  series: Series[];
-  onRedrawGraph: () => void;
-  onApplyFilter: (value: string) => void;
-}
-
-const BarHitsLegendItem: FC<Props> = ({ legend, series, onRedrawGraph, onApplyFilter }) => {
-  const {
-    value: openContextMenu,
-    setTrue: handleOpenContextMenu,
-    setFalse: handleCloseContextMenu,
-  } = useBoolean(false);
-
-  const legendRef = useRef<HTMLDivElement>(null);
-  const [clickPosition, setClickPosition] = useState<{ top: number; left: number } | null>(null);
-
-  const targetSeries = useMemo(() => series.find(s => s.label === legend.label), [series]);
-
-  const fields = useMemo(() => getStreamPairs(legend.label), [legend.label]);
-
-  const label = fields.join(", ");
-  const totalShortFormatted = formatNumberShort(legend.total);
-
-  const handleClickByStream = (e: MouseEvent<HTMLDivElement>) => {
-    if (!targetSeries) return;
-
-    if (e.metaKey || e.ctrlKey) {
-      targetSeries.show = !targetSeries.show;
-    } else {
-      const isOnlyTargetVisible = series.every(s => s === targetSeries || !s.show);
-      series.forEach(s => {
-        s.show = isOnlyTargetVisible || (s === targetSeries);
-      });
-    }
-
-    onRedrawGraph();
-  };
-
-  const handleContextMenu = (e: MouseEvent<HTMLDivElement>) => {
-    e.preventDefault();
-    setClickPosition({ top: e.clientY, left: e.clientX });
-    handleOpenContextMenu();
-  };
-
-  return (
-    <div
-      ref={legendRef}
-      className={classNames({
-        "vm-bar-hits-legend-item": true,
-        "vm-bar-hits-legend-item_other": legend.isOther,
-        "vm-bar-hits-legend-item_hide": !targetSeries?.show,
-      })}
-      onClick={handleClickByStream}
-      onContextMenu={handleContextMenu}
-    >
-      <div
-        className="vm-bar-hits-legend-item__marker"
-        style={{ backgroundColor: `${legend.stroke}` }}
-      />
-      <div className="vm-bar-hits-legend-item__label">{label}</div>
-      <span className="vm-bar-hits-legend-item__total">({totalShortFormatted})</span>
-      <Popper
-        placement="fixed"
-        open={openContextMenu}
-        buttonRef={legendRef}
-        placementPosition={clickPosition}
-        onClose={handleCloseContextMenu}
-      >
-        <LegendHitsMenu
-          legend={legend}
-          fields={fields}
-          onApplyFilter={onApplyFilter}
-          onClose={handleCloseContextMenu}
-        />
-      </Popper>
-    </div>
-  );
-};
-
-export default BarHitsLegendItem;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsLegend/style.scss
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsLegend/style.scss
@@ -3,16 +3,16 @@
 .vm-bar-hits-legend {
  display: flex;
  flex-wrap: wrap;
+  gap: $padding-small;
  padding: 0 $padding-small $padding-small;
-  color: $color-text;

  &-item {
-    max-width: 50%;
-    display: flex;
+    display: grid;
+    grid-template-columns: auto 1fr;
    align-items: center;
    gap: $padding-small;
-    font-size: $font-size-small;
-    padding: $padding-small $padding-global;
+    font-size: 12px;
+    padding: 0 $padding-small;
    border-radius: $border-radius-small;
    cursor: pointer;
    transition: 0.2s;
@@ -27,44 +27,34 @@
    }

    &__marker {
-      min-width: 14px;
-      max-width: 14px;
+      width: 14px;
      height: 14px;
      border: $color-background-block;
    }

-    &__label {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
+    &-pairs {
+      display: flex;
+      gap: $padding-small;

-    &__total {
-      color: $color-text-secondary;
-      font-style: italic;
-      grid-column: 2;
+      &__value {
+        padding: $padding-small 0;
+
+        &:hover {
+          text-decoration: underline;
+        }
+
+        &:after {
+          content: ",";
+        }
+
+        &:last-child:after {
+          content: "";
+        }
+      }
    }
  }

  &-info {
-    flex-grow: 1;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding-top: $padding-small;
-    color: $color-text-secondary;
-    font-size: $font-size-small;
-
-    code {
-      display: inline-block;
-      padding: calc($padding-small / 2) $padding-small;
-      font-size: $font-size-small;
-      text-align: center;
-      background-color: $color-background-body;
-      background-repeat: repeat-x;
-      border: $border-divider;
-      border-radius: 4px;
-    }
+    list-style-position: inside;
  }
 }
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/BarHitsOptions.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/BarHitsOptions.tsx
@@ -5,6 +5,7 @@ import "./style.scss";
 import useStateSearchParams from "../../../../hooks/useStateSearchParams";
 import { useSearchParams } from "react-router-dom";
 import Button from "../../../Main/Button/Button";
+import classNames from "classnames";
 import { SettingsIcon, VisibilityIcon, VisibilityOffIcon } from "../../../Main/Icons";
 import Tooltip from "../../../Main/Tooltip/Tooltip";
 import Popper from "../../../Main/Popper/Popper";
@@ -23,20 +24,27 @@ const BarHitsOptions: FC<Props> = ({ onChange }) => {
    setFalse: handleCloseOptions,
  } = useBoolean(false);

+  const [graphStyle, setGraphStyle] = useStateSearchParams(GRAPH_STYLES.LINE_STEPPED, "graph");
  const [stacked, setStacked] = useStateSearchParams(false, "stacked");
-  const [fill, setFill] = useStateSearchParams("true", "fill");
+  const [fill, setFill] = useStateSearchParams(false, "fill");
  const [hideChart, setHideChart] = useStateSearchParams(false, "hide_chart");

  const options: GraphOptions = useMemo(() => ({
-    graphStyle: GRAPH_STYLES.BAR,
+    graphStyle,
    stacked,
-    fill: fill === "true",
+    fill,
    hideChart,
-  }), [stacked, fill, hideChart]);
+  }), [graphStyle, stacked, fill, hideChart]);
+
+  const handleChangeGraphStyle = (val: string) => () => {
+    setGraphStyle(val as GRAPH_STYLES);
+    searchParams.set("graph", val);
+    setSearchParams(searchParams);
+  };

  const handleChangeFill = (val: boolean) => {
-    setFill(`${val}`);
-    searchParams.set("fill", `${val}`);
+    setFill(val);
+    val ? searchParams.set("fill", "true") : searchParams.delete("fill");
    setSearchParams(searchParams);
  };

@@ -89,6 +97,21 @@ const BarHitsOptions: FC<Props> = ({ onChange }) => {
        title={"Graph settings"}
      >
        <div className="vm-bar-hits-options-settings">
+          <div className="vm-bar-hits-options-settings-item vm-bar-hits-options-settings-item_list">
+            <p className="vm-bar-hits-options-settings-item__title">Graph style:</p>
+            {Object.values(GRAPH_STYLES).map(style => (
+              <div
+                key={style}
+                className={classNames({
+                  "vm-list-item": true,
+                  "vm-list-item_active": graphStyle === style,
+                })}
+                onClick={handleChangeGraphStyle(style)}
+              >
+                {style}
+              </div>
+            ))}
+          </div>
          <div className="vm-bar-hits-options-settings-item">
            <Switch
              label={"Stacked"}
@@ -99,7 +122,7 @@ const BarHitsOptions: FC<Props> = ({ onChange }) => {
          <div className="vm-bar-hits-options-settings-item">
            <Switch
              label={"Fill"}
-              value={fill === "true"}
+              value={fill}
              onChange={handleChangeFill}
            />
          </div>
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/style.scss
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/style.scss
@@ -11,12 +11,12 @@
  &-settings {
    display: grid;
    align-items: flex-start;
-    min-width: 200px;
    gap: $padding-global;
-    padding-bottom: $padding-global;
+    min-width: 200px;

    &-item {
-      padding: 0 $padding-global;
+      border-bottom: $border-divider;
+      padding: 0 $padding-global $padding-global;

      &_list {
        padding: 0;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsTooltip/BarHitsTooltip.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsTooltip/BarHitsTooltip.tsx
@@ -5,7 +5,6 @@ import { DATE_TIME_FORMAT } from "../../../../constants/date";
 import classNames from "classnames";
 import "./style.scss";
 import "../../ChartTooltip/style.scss";
-import { sortLogHits } from "../../../../utils/logs";

 interface Props {
  data: AlignedData;
@@ -27,7 +26,7 @@ const BarHitsTooltip: FC<Props> = ({ data, focusDataIdx, uPlotInst }) => {
    const tooltipItems = values.map((value, i) => {
      const targetSeries = series[i + 1];
      const stroke = (targetSeries?.stroke as () => string)?.();
-      const label = targetSeries?.label;
+      const label = targetSeries?.label || "other";
      const show = targetSeries?.show;
      return {
        label,
@@ -35,7 +34,7 @@ const BarHitsTooltip: FC<Props> = ({ data, focusDataIdx, uPlotInst }) => {
        value,
        show
      };
-    }).filter(item => item.value > 0 && item.show).sort(sortLogHits("value"));
+    }).filter(item => item.value > 0 && item.show).sort((a, b) => b.value - a.value);

    const point = {
      top: tooltipItems[0] ? uPlotInst?.valToPos?.(tooltipItems[0].value, "y") || 0 : 0,
@@ -105,19 +104,16 @@ const BarHitsTooltip: FC<Props> = ({ data, focusDataIdx, uPlotInst }) => {
              className="vm-chart-tooltip-data__marker"
              style={{ background: item.stroke }}
            />
-            <p className="vm-bar-hits-tooltip-item">
-              <span className="vm-bar-hits-tooltip-item__label">{item.label}</span>
-              <span>{item.value.toLocaleString("en-US")}</span>
+            <p>
+              {item.label}: <b>{item.value}</b>
            </p>
          </div>
        ))}
      </div>
      {tooltipData.values.length > 1 && (
        <div className="vm-chart-tooltip-data">
-          <span/>
-          <p className="vm-bar-hits-tooltip-item">
-            <span className="vm-bar-hits-tooltip-item__label">Total</span>
-            <span>{tooltipData.total.toLocaleString("en-US")}</span>
+          <p>
+              Total records: <b>{tooltipData.total}</b>
          </p>
        </div>
      )}
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsTooltip/style.scss
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsTooltip/style.scss
@@ -9,19 +9,4 @@
    opacity: 1;
    pointer-events: auto;
  }
-
-  &-item {
-    display: grid;
-    grid-template-columns: 1fr auto;
-    align-items: center;
-    gap: $padding-global;
-    max-width: 100%;
-
-    &__label {
-      display: inline-block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
 }
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenu.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenu.tsx
@@ -1,50 +0,0 @@
-import React, { FC } from "preact/compat";
-import "./style.scss";
-import { LegendLogHits } from "../../../../api/types";
-import LegendHitsMenuStats from "./LegendHitsMenuStats";
-import LegendHitsMenuBase from "./LegendHitsMenuBase";
-import LegendHitsMenuRow from "./LegendHitsMenuRow";
-import LegendHitsMenuFields from "./LegendHitsMenuFields";
-import { LOGS_LIMIT_HITS } from "../../../../constants/logs";
-
-const otherDescription = `aggregated results for fields not in the top ${LOGS_LIMIT_HITS}`;
-
-interface Props {
-  legend: LegendLogHits;
-  fields: string[];
-  onApplyFilter: (value: string) => void;
-  onClose: () => void;
-}
-
-const LegendHitsMenu: FC<Props> = ({ legend, fields, onApplyFilter, onClose }) => {
-  return (
-    <div className="vm-legend-hits-menu">
-      <div className="vm-legend-hits-menu-section">
-        <LegendHitsMenuRow
-          className="vm-legend-hits-menu-row_info"
-          title={legend.isOther ? otherDescription : legend.label}
-        />
-      </div>
-
-      {!legend.isOther && (
-        <LegendHitsMenuBase
-          legend={legend}
-          onApplyFilter={onApplyFilter}
-          onClose={onClose}
-        />
-      )}
-
-      {!legend.isOther && (
-        <LegendHitsMenuFields
-          fields={fields}
-          onApplyFilter={onApplyFilter}
-          onClose={onClose}
-        />
-      )}
-
-      <LegendHitsMenuStats legend={legend}/>
-    </div>
-  );
-};
-
-export default LegendHitsMenu;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuBase.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuBase.tsx
@@ -1,64 +0,0 @@
-import React, { FC } from "preact/compat";
-import LegendHitsMenuRow from "./LegendHitsMenuRow";
-import useCopyToClipboard from "../../../../hooks/useCopyToClipboard";
-import { CopyIcon, FilterIcon, FilterOffIcon } from "../../../Main/Icons";
-import { LegendLogHits, LegendLogHitsMenu } from "../../../../api/types";
-import { LOGS_GROUP_BY } from "../../../../constants/logs";
-
-interface Props {
-  legend: LegendLogHits;
-  onApplyFilter: (value: string) => void;
-  onClose: () => void;
-}
-
-const LegendHitsMenuBase: FC<Props> = ({ legend, onApplyFilter, onClose }) => {
-  const copyToClipboard = useCopyToClipboard();
-
-  const handleAddStreamToFilter = () => {
-    onApplyFilter(`${LOGS_GROUP_BY}: ${legend.label}`);
-    onClose();
-  };
-
-  const handleExcludeStreamToFilter = () => {
-    onApplyFilter(`(NOT ${LOGS_GROUP_BY}: ${legend.label})`);
-    onClose();
-  };
-
-  const handlerCopyLabel = async () => {
-    await copyToClipboard(legend.label, `${legend.label} has been copied`);
-    onClose();
-  };
-
-  const options: LegendLogHitsMenu[] = [
-    {
-      title: `Copy ${LOGS_GROUP_BY} name`,
-      icon: <CopyIcon/>,
-      handler: handlerCopyLabel,
-    },
-    {
-      title: `Add ${LOGS_GROUP_BY} to filter`,
-      icon: <FilterIcon/>,
-      handler: handleAddStreamToFilter,
-    },
-    {
-      title: `Exclude ${LOGS_GROUP_BY} to filter`,
-      icon: <FilterOffIcon/>,
-      handler: handleExcludeStreamToFilter,
-    }
-  ];
-
-  return (
-    <div className="vm-legend-hits-menu-section">
-      {options.map(({ icon, title, handler }) => (
-        <LegendHitsMenuRow
-          key={title}
-          iconStart={icon}
-          title={title}
-          handler={handler}
-        />
-      ))}
-    </div>
-  );
-};
-
-export default LegendHitsMenuBase;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuFields.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuFields.tsx
@@ -1,74 +0,0 @@
-import React, { FC, useMemo } from "preact/compat";
-import LegendHitsMenuRow from "./LegendHitsMenuRow";
-import { CopyIcon, FilterIcon, FilterOffIcon } from "../../../Main/Icons";
-import { convertToFieldFilter } from "../../../../utils/logs";
-import { LegendLogHitsMenu } from "../../../../api/types";
-import useCopyToClipboard from "../../../../hooks/useCopyToClipboard";
-
-interface Props {
-  fields: string[];
-  onApplyFilter: (value: string) => void;
-  onClose: () => void;
-}
-
-const LegendHitsMenuFields: FC<Props> = ({ fields, onApplyFilter, onClose }) => {
-  const copyToClipboard = useCopyToClipboard();
-
-  const handleCopy = (field: string) => async () => {
-    await copyToClipboard(field, `${field} has been copied`);
-    onClose();
-  };
-
-  const handleAddToFilter = (field: string) => () => {
-    onApplyFilter(field);
-    onClose();
-  };
-
-  const handleExcludeToFilter = (field: string) => () => {
-    onApplyFilter(`-${field}`);
-    onClose();
-  };
-
-  const generateFieldMenu = (field: string): LegendLogHitsMenu[] => {
-    return [
-      {
-        title: "Copy",
-        icon: <CopyIcon/>,
-        handler: handleCopy(field),
-      },
-      {
-        title: "Add to filter",
-        icon: <FilterIcon/>,
-        handler: handleAddToFilter(field),
-      },
-      {
-        title: "Exclude to filter",
-        icon: <FilterOffIcon/>,
-        handler: handleExcludeToFilter(field),
-      }
-    ];
-  };
-
-  const fieldsWithMenu: LegendLogHitsMenu[] = useMemo(() => {
-    return fields.map(field => {
-      const title = convertToFieldFilter(field);
-      return {
-        title,
-        submenu: generateFieldMenu(title),
-      };
-    });
-  }, [fields]);
-
-  return (
-    <div className="vm-legend-hits-menu-section">
-      {fieldsWithMenu?.map((field) => (
-        <LegendHitsMenuRow
-          key={field.title}
-          {...field}
-        />
-      ))}
-    </div>
-  );
-};
-
-export default LegendHitsMenuFields;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuRow.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuRow.tsx
@@ -1,116 +0,0 @@
-import React, { FC, useRef, useState } from "preact/compat";
-import classNames from "classnames";
-import { ReactNode, useEffect } from "react";
-import Tooltip from "../../../Main/Tooltip/Tooltip";
-import { LegendLogHitsMenu } from "../../../../api/types";
-import { ArrowDropDownIcon } from "../../../Main/Icons";
-import useClickOutside from "../../../../hooks/useClickOutside";
-
-interface Props {
-  title: string | ReactNode;
-  handler?: () => void;
-  iconStart?: ReactNode;
-  iconEnd?: ReactNode;
-  className?: string;
-  submenu?: LegendLogHitsMenu[];
-}
-
-const LegendHitsMenuRow: FC<Props> = ({ title, handler, iconStart, iconEnd, className, submenu }) => {
-  const containerRef = useRef<HTMLDivElement>(null);
-  const titleRef = useRef<HTMLDivElement>(null);
-  const submenuRef = useRef<HTMLDivElement>(null);
-
-  const [isOverflownTitle, setIsOverflownTitle] = useState(false);
-
-  const [openSubmenu, setOpenSubmenu] = useState(false);
-  const [posSubmenuLeft, setPosSubmenuLeft] = useState(false);
-  const hasSubmenu = !!submenu?.length;
-
-  const handleToggleContextMenu = () => {
-    setOpenSubmenu(prev => !prev);
-  };
-
-  const handleCloseContextMenu = () => {
-    setOpenSubmenu(false);
-  };
-
-  const handleClick = () => {
-    handler && handler();
-    hasSubmenu && handleToggleContextMenu();
-  };
-
-
-  useEffect(() => {
-    if (!titleRef.current) return;
-    setIsOverflownTitle(titleRef.current.scrollWidth > titleRef.current.clientWidth);
-  }, [title, titleRef]);
-
-  useEffect(() => {
-    requestAnimationFrame(() => {
-      if (!openSubmenu || !submenuRef.current) {
-        setPosSubmenuLeft(false);
-        return;
-      }
-
-      const { left, width } = submenuRef.current.getBoundingClientRect();
-      setPosSubmenuLeft(left + width > window.innerWidth);
-    });
-  }, [submenuRef, openSubmenu]);
-
-  useClickOutside(containerRef, handleCloseContextMenu);
-
-  const titleContent = (
-    <div
-      ref={titleRef}
-      className="vm-legend-hits-menu-row__title"
-    >
-      {title}
-    </div>
-  );
-
-  return (
-    <div
-      ref={containerRef}
-      className={classNames({
-        "vm-legend-hits-menu-row": true,
-        "vm-legend-hits-menu-row_interactive": !!handler || hasSubmenu,
-        [`${className}`]: className
-      })}
-      onClick={handleClick}
-    >
-      {iconStart && <div className="vm-legend-hits-menu-row__icon">{iconStart}</div>}
-      {isOverflownTitle ? (<Tooltip title={title}>{titleContent}</Tooltip>) : titleContent}
-      {iconEnd && !hasSubmenu && <div className="vm-legend-hits-menu-row__icon">{iconEnd}</div>}
-
-      {hasSubmenu && (
-        <div className="vm-legend-hits-menu-row__icon vm-legend-hits-menu-row__icon_drop">
-          <ArrowDropDownIcon/>
-        </div>
-      )}
-
-      {openSubmenu && submenu && (
-        <div
-          ref={submenuRef}
-          className={classNames({
-            "vm-legend-hits-menu": true,
-            "vm-legend-hits-menu_submenu": true,
-            "vm-legend-hits-menu_submenu_left": posSubmenuLeft
-          })}
-        >
-          <div className="vm-legend-hits-menu-section">
-            {submenu.map(({ icon, title, handler }) => (
-              <LegendHitsMenuRow
-                key={title}
-                iconStart={icon}
-                title={title}
-                handler={handler}
-              />
-            ))}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default LegendHitsMenuRow;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuStats.tsx
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/LegendHitsMenuStats.tsx
@@ -1,23 +0,0 @@
-import React, { FC } from "preact/compat";
-import { LegendLogHits } from "../../../../api/types";
-
-interface Props {
-  legend: LegendLogHits;
-}
-
-const LegendHitsMenuStats: FC<Props> = ({ legend }) => {
-  const totalFormatted = legend.total.toLocaleString("en-US");
-  const percentage = Math.round((legend.total / legend.totalHits) * 100);
-
-  return (
-    <div className="vm-legend-hits-menu-section">
-      <div className="vm-legend-hits-menu-row">
-        <div className="vm-legend-hits-menu-row__title">
-          Total: {totalFormatted} ({percentage}%)
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default LegendHitsMenuStats;
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/style.scss
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/LegendHitsMenu/style.scss
@@ -1,178 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-legend-hits-menu {
-  min-width: 160px;
-  z-index: 1;
-
-  &_submenu {
-    position: absolute;
-    top: calc(-1 * $padding-small);
-    background-color: $color-background-block;
-    left: calc(100% + ($padding-small / 2));
-    box-shadow: $box-shadow-popper;
-    border-radius: $border-radius-small;
-    animation: vm-submenu-show 150ms cubic-bezier(0.280, 0.840, 0.2, 1);
-    transform-origin: top left;
-
-    &_left {
-      left: auto;
-      right: calc(100% + ($padding-small / 2));
-      transform-origin: top right;
-    }
-  }
-
-  &-section {
-    border-bottom: $border-divider;
-
-    &:last-child {
-      border-bottom: none;
-    }
-  }
-
-  &-row {
-    position: relative;
-    display: flex;
-    gap: $padding-small;
-    align-items: center;
-    justify-content: flex-start;
-    padding: 0 $padding-global;
-    transition: background-color 0.3s;
-    color: $color-text;
-
-    &_interactive {
-      cursor: pointer;
-
-      &:hover {
-        background-color: rgba(0, 0, 0, 0.05);
-      }
-    }
-
-    &_info {
-      font-size: $font-size-small;
-      font-weight: 500;
-      padding-block: $padding-small;
-    }
-
-    &_info &__icon {
-      color: $color-info;
-    }
-
-    &__icon {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 14px;
-      height: 14px;
-
-      &_drop {
-        transform: rotate(-90deg);
-      }
-    }
-
-    &__title {
-      flex-grow: 1;
-      padding: $padding-global 0;
-      position: relative;
-      max-width: 400px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-  &-other-list {
-    width: 80vw;
-    height: 80vh;
-    overflow: auto;
-
-    &__search {
-      position: sticky;
-      top: 0;
-      padding: $padding-small 0;
-      background-color: $color-background-block;
-      border-bottom: $border-divider;
-      z-index: 2;
-    }
-
-    &-row {
-      border-bottom: $border-divider;
-
-      &_header {
-        border-bottom: none;
-        position: sticky;
-        top: 65px;
-        background-color: $color-background-block;
-        z-index: 1;
-        width: 100%;
-
-        &:after {
-          content: '';
-          position: absolute;
-          bottom: 0;
-          left: 0;
-          width: 100%;
-          height: 1px;
-          border-bottom: $border-divider;
-        }
-      }
-    }
-
-    &-cell {
-      padding: calc($padding-small / 2) 0;
-      text-align: left;
-
-      &_header {
-        padding: $padding-small;
-        font-weight: 500;
-      }
-
-      &_number {
-        padding: $padding-small;
-        text-align: right;
-        font-variant-numeric: tabular-nums;
-      }
-
-      &_fields {
-        width: 100%;
-      }
-    }
-
-    &-fields {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      justify-content: flex-start;
-
-      &__field {
-        padding: calc($padding-small / 2) $padding-small;
-        border-radius: $border-radius-small;
-        transition: background-color 0.3s;
-
-        &:hover {
-          background-color: $color-hover-black;
-        }
-
-        &:not(:last-child) {
-          &:after {
-            content: ',';
-          }
-        }
-      }
-    }
-
-    &-actions {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-}
-
-@keyframes vm-submenu-show {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
--- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/hooks/useBarHitsOptions.ts
+++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/hooks/useBarHitsOptions.ts
@@ -36,14 +36,6 @@ interface UseGetBarHitsOptionsArgs {
  graphOptions: GraphOptions;
 }

-export const OTHER_HITS_LABEL = "other";
-
-export const getLabelFromLogHit = (logHit: LogHits) => {
-  if (logHit?._isOther) return OTHER_HITS_LABEL;
-  const fields = Object.values(logHit?.fields || {});
-  return fields.map((value) => value || "\"\"").join(", ");
-};
-
 const useBarHitsOptions = ({
  data,
  logHits,
@@ -67,12 +59,12 @@ const useBarHitsOptions = ({
    let colorN = 0;
    return data.map((_d, i) => {
      if (i === 0) return {}; // 0 index is xAxis(timestamps)
-      const target = logHits?.[i - 1];
-      const label = getLabelFromLogHit(target);
-      const color = getCssVariable(target?._isOther ? "color-log-hits-bar-0" : seriesColors[colorN]);
-      if (!target?._isOther) colorN++;
+      const fields = Object.values(logHits?.[i - 1]?.fields || {});
+      const label = fields.map((value) => value || "\"\"").join(", ");
+      const color = getCssVariable(label ? seriesColors[colorN] : "color-log-hits-bar-0");
+      if (label) colorN++;
      return {
-        label,
+        label: label || "other",
        width: strokeWidth[graphOptions.graphStyle],
        spanGaps: true,
        stroke: color,
--- a/app/vmui/packages/vmui/src/components/Chart/ChartTooltip/style.scss
+++ b/app/vmui/packages/vmui/src/components/Chart/ChartTooltip/style.scss
@@ -32,11 +32,6 @@ $chart-tooltip-y: -1 * ($padding-global + $chart-tooltip-half-icon);
    max-width: calc(100vw/3);
  }

-  &_hits &-data {
-    display: grid;
-    grid-template-columns: $font-size 1fr;
-  }
-
  &_sticky {
    pointer-events: auto;
    z-index: 99;
@@ -95,8 +90,6 @@ $chart-tooltip-y: -1 * ($padding-global + $chart-tooltip-half-icon);
    }

    &__marker {
-      min-width: $font-size;
-      max-width: $font-size;
      width: $font-size;
      height: $font-size;
      border: 1px solid rgba($color-white, 0.5);
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/LogsQueryEditorAutocomplete.tsx
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/LogsQueryEditorAutocomplete.tsx
@@ -1,154 +0,0 @@
-import React, { FC, useCallback, useEffect, useMemo, useState } from "preact/compat";
-import Autocomplete, { AutocompleteOptions } from "../../../Main/Autocomplete/Autocomplete";
-import { AUTOCOMPLETE_LIMITS } from "../../../../constants/queryAutocomplete";
-import { QueryEditorAutocompleteProps } from "../QueryEditor";
-import { getContextData, splitLogicalParts } from "./parser";
-import { ContextType, LogicalPart, LogicalPartType } from "./types";
-import { useFetchLogsQLOptions } from "./useFetchLogsQLOptions";
-import { pipeList } from "./pipes";
-
-const LogsQueryEditorAutocomplete: FC<QueryEditorAutocompleteProps> = ({
-  value,
-  anchorEl,
-  caretPosition,
-  hasHelperText,
-  onSelect,
-  onFoundOptions
-}) => {
-  const [offsetPos, setOffsetPos] = useState({ top: 0, left: 0 });
-
-  const fullValue = useMemo(() => {
-    if (caretPosition[0] !== caretPosition[1]) return { valueBeforeCursor: value, valueAfterCursor: "" };
-    const valueBeforeCursor = value.substring(0, caretPosition[0]);
-    const valueAfterCursor = value.substring(caretPosition[1]);
-    return { valueBeforeCursor, valueAfterCursor };
-  }, [value, caretPosition]);
-
-  const logicalParts = useMemo(() => {
-    return splitLogicalParts(value);
-  }, [value]);
-
-  const contextData = useMemo(() => {
-    if (caretPosition[0] !== caretPosition[1]) return;
-    const part = logicalParts.find(p => caretPosition[0] >= p.position[0] && caretPosition[0] <= p.position[1]);
-    if (!part) return;
-    const cursorStartPosition = caretPosition[0] - part.position[0];
-    return {
-      ...part,
-      ...getContextData(part, cursorStartPosition)
-    };
-  }, [logicalParts, caretPosition]);
-
-  const { fieldNames, fieldValues, loading } = useFetchLogsQLOptions(contextData);
-
-  const options = useMemo(() => {
-    switch (contextData?.contextType) {
-      case ContextType.FilterName:
-      case ContextType.FilterUnknown:
-        return fieldNames;
-      case ContextType.FilterValue:
-        return fieldValues;
-      case ContextType.PipeName:
-        return pipeList;
-      default:
-        return [];
-    }
-  }, [contextData, fieldNames, fieldValues]);
-
-  const getUpdatedValue = (insertValue: string, logicalParts: LogicalPart[], id?: number) => {
-    return logicalParts.reduce((acc, part) => {
-      const value = part.id === id ? insertValue : part.value;
-      const separator = part.type === LogicalPartType.Pipe ? " | " : " ";
-      return `${acc}${separator}${value}`;
-    }, "").trim();
-  };
-
-  const getModifyInsert = (insert: string, contextType: ContextType, value = "", insertType?: string) => {
-    let modifiedInsert = insert;
-
-    if (insertType === ContextType.FilterName) {
-      modifiedInsert += ":";
-    } else if (contextType === ContextType.FilterValue) {
-      const insertWithQuotes = value.startsWith("_stream:") ? modifiedInsert : `"${modifiedInsert}"`;
-      modifiedInsert = `${contextData?.filterName || ""}:${insertWithQuotes}`;
-    }
-
-    return modifiedInsert;
-  };
-
-  const handleSelect = useCallback((insert: string, item: AutocompleteOptions) => {
-    const {
-      id,
-      contextType = ContextType.FilterUnknown,
-      value = "",
-      position = [0, 0]
-    } = contextData || {};
-
-    const insertValue = getModifyInsert(insert, contextType, value, item.type);
-    const newValue = getUpdatedValue(insertValue, logicalParts, id);
-    const updatedPosition = (position[0] || 1) + insertValue.length + (item.type === ContextType.PipeName ? 1 : 0);
-
-    onSelect(newValue, updatedPosition);
-  }, [contextData, logicalParts]);
-
-
-  useEffect(() => {
-    if (!anchorEl.current) {
-      setOffsetPos({ top: 0, left: 0 });
-      return;
-    }
-
-    const element = anchorEl.current.querySelector("textarea") || anchorEl.current;
-    const style = window.getComputedStyle(element);
-    const fontSize = `${style.getPropertyValue("font-size")}`;
-    const fontFamily = `${style.getPropertyValue("font-family")}`;
-    const lineHeight = parseInt(`${style.getPropertyValue("line-height")}`);
-
-    const span = document.createElement("div");
-    span.style.font = `${fontSize} ${fontFamily}`;
-    span.style.padding = style.getPropertyValue("padding");
-    span.style.lineHeight = `${lineHeight}px`;
-    span.style.width = `${element.offsetWidth}px`;
-    span.style.maxWidth = `${element.offsetWidth}px`;
-    span.style.whiteSpace = style.getPropertyValue("white-space");
-    span.style.overflowWrap = style.getPropertyValue("overflow-wrap");
-
-    const marker = document.createElement("span");
-    span.appendChild(document.createTextNode(fullValue.valueBeforeCursor || ""));
-    span.appendChild(marker);
-    span.appendChild(document.createTextNode(fullValue.valueAfterCursor || ""));
-    document.body.appendChild(span);
-
-    const spanRect = span.getBoundingClientRect();
-    const markerRect = marker.getBoundingClientRect();
-
-    const leftOffset = markerRect.left - spanRect.left;
-    const topOffset = markerRect.bottom - spanRect.bottom - (hasHelperText ? lineHeight : 0);
-    setOffsetPos({ top: topOffset, left: leftOffset });
-
-    span.remove();
-    marker.remove();
-  }, [anchorEl, caretPosition, hasHelperText, fullValue]);
-
-  return (
-    <>
-      <Autocomplete
-        loading={loading}
-        disabledFullScreen
-        value={contextData?.valueContext || ""}
-        options={options}
-        anchor={anchorEl}
-        minLength={0}
-        offset={offsetPos}
-        onSelect={handleSelect}
-        onFoundOptions={onFoundOptions}
-        maxDisplayResults={{
-          limit: AUTOCOMPLETE_LIMITS.displayResults,
-          message: "Please, specify the query more precisely."
-        }}
-      />
-    </>
-  );
-};
-
-export default LogsQueryEditorAutocomplete;
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/parser.ts
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/parser.ts
@@ -1,117 +0,0 @@
-import { ContextData, ContextType, LogicalPart, LogicalPartPosition, LogicalPartType } from "./types";
-import { pipeList } from "./pipes";
-
-const BUILDER_OPERATORS = ["AND", "OR", "NOT"];
-const PIPE_NAMES = pipeList.map(p => p.value);
-
-export const splitLogicalParts = (expr: string) => {
-  // Replace spaces around the colon (:) with just the colon, removing the spaces
-  const input = expr; //.replace(/\s*:\s*/g, ":");
-  const parts: LogicalPart[] = [];
-  let currentPart = "";
-  let isPipePart = false;
-
-  const quotes = ["'", "\"", "`"];
-  let insideQuotes = false;
-  let expectedQuote = "";
-
-  const openBrackets = ["(", "[", "{"];
-  const closeBrackets = [")", "]", "}"];
-  const brackets = [...openBrackets, ...closeBrackets];
-  let insideBrackets = 0;
-
-  let startIndex = 0;
-
-  for (let i = 0; i < input.length; i++) {
-    const char = input[i];
-
-    // Check if the current character is a quote
-    if (quotes.includes(char)) {
-      const isClosedQuote: boolean = insideQuotes && (char === expectedQuote);
-      insideQuotes = !isClosedQuote;
-      expectedQuote = isClosedQuote ? "" : char;
-    }
-
-    // Check if the current character is a bracket
-    if (!insideQuotes && brackets.includes(char)) {
-      const dir = openBrackets.includes(char) ? 1 : -1;
-      insideBrackets += dir;
-    }
-
-    // Check if the current character is a pipe
-    if ((!insideQuotes && !insideBrackets && char === "|")) {
-      isPipePart = true;
-      const countStartSpaces = currentPart.match(/^ */)?.[0].length || 0;
-      const countEndSpaces = currentPart.match(/ *$/)?.[0].length || 0;
-      pushPart(currentPart, true, [startIndex + countStartSpaces, i - countEndSpaces - 1], parts);
-      currentPart = "";
-      startIndex = i + 1;
-      continue;
-    }
-
-    // Check if the current character is a space
-    if (!isPipePart && !insideQuotes && !insideBrackets && char === " ") {
-      const nextStr = input.slice(i).replace(/^\s*/, "");
-      const prevStr = input.slice(0, i).replace(/\s*$/, "");
-      if (!nextStr.startsWith(":") && !prevStr.endsWith(":")) {
-        pushPart(currentPart, false, [startIndex, i - 1], parts);
-        currentPart = "";
-        startIndex = i + 1;
-        continue;
-      }
-    }
-
-    currentPart += char;
-  }
-
-  // push the last part
-  pushPart(currentPart, isPipePart, [startIndex, input.length], parts);
-
-  return parts;
-};
-
-const pushPart = (currentPart: string, isPipePart: boolean, position: LogicalPartPosition, parts: LogicalPart[]) => {
-  const trimmedPart = currentPart.trim();
-  if (!trimmedPart) return;
-  const isOperator = BUILDER_OPERATORS.includes(trimmedPart.toUpperCase());
-  parts.push({
-    id: parts.length,
-    value: trimmedPart,
-    position,
-    type: isPipePart
-      ? LogicalPartType.Pipe
-      : isOperator ? LogicalPartType.Operator : LogicalPartType.Filter,
-  });
-};
-
-export const getContextData = (part: LogicalPart, cursorPos: number) => {
-  const valueBeforeCursor = part.value.substring(0, cursorPos);
-  const valueAfterCursor = part.value.substring(cursorPos);
-
-  const metaData: ContextData = {
-    valueBeforeCursor,
-    valueAfterCursor,
-    valueContext: part.value,
-    contextType: ContextType.Unknown,
-  };
-
-  if (part.type === LogicalPartType.Filter) {
-    const noColon = !valueBeforeCursor.includes(":") && !valueAfterCursor.includes(":");
-    if (noColon) {
-      metaData.contextType = ContextType.FilterUnknown;
-    } else if (valueBeforeCursor.includes(":")) {
-      const [filterName, filterValue] = valueBeforeCursor.split(":");
-      metaData.contextType = ContextType.FilterValue;
-      metaData.filterName = filterName;
-      metaData.valueContext = filterValue;
-    } else {
-      metaData.contextType = ContextType.FilterName;
-    }
-  } else if (part.type === LogicalPartType.Pipe) {
-    const valueStartWithPipe = PIPE_NAMES.some(p => part.value.startsWith(p));
-    metaData.contextType = valueStartWithPipe ? ContextType.PipeValue : ContextType.PipeName;
-  }
-
-  metaData.valueContext = metaData.valueContext.replace(/^["']|["']$/g, "");
-  return metaData;
-};
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/pipes.tsx
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/pipes.tsx
@@ -1,130 +0,0 @@
-import React from "react";
-import { ContextType } from "./types";
-import { FunctionIcon } from "../../../Main/Icons";
-
-const docsUrl = "https://docs.victoriametrics.com/victorialogs/logsql";
-const classLink = "vm-link vm-link_colored";
-
-const prepareDescription = (text: string): string => {
-  const replaceClass = `$1 target="_blank" class="${classLink}" $2`;
-  const replaceHref = `$1 $2${docsUrl}#`;
-  return text
-    .replace(/(<a) (href=")#/gm, replaceHref)
-    .replace(/(<a) (href="[^"]+")/gm, replaceClass);
-};
-
-export const pipeList = [
-  {
-    "value": "copy",
-    "description": "<a href=\"#copy-pipe\"><code>copy</code></a> copies <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "delete",
-    "description": "<a href=\"#delete-pipe\"><code>delete</code></a> deletes <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "drop_empty_fields",
-    "description": "<a href=\"#drop_empty_fields-pipe\"><code>drop_empty_fields</code></a> drops <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a> with empty values."
-  },
-  {
-    "value": "extract",
-    "description": "<a href=\"#extract-pipe\"><code>extract</code></a> extracts the specified text into the given log fields."
-  },
-  {
-    "value": "extract_regexp",
-    "description": "<a href=\"#extract_regexp-pipe\"><code>extract_regexp</code></a> extracts the specified text into the given log fields via <a href=\"https://github.com/google/re2/wiki/Syntax\" rel=\"external\" target=\"_blank\">RE2 regular expressions</a>."
-  },
-  {
-    "value": "field_names",
-    "description": "<a href=\"#field_names-pipe\"><code>field_names</code></a> returns all the names of <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "field_values",
-    "description": "<a href=\"#field_values-pipe\"><code>field_values</code></a> returns all the values for the given <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log field</a>."
-  },
-  {
-    "value": "fields",
-    "description": "<a href=\"#fields-pipe\"><code>fields</code></a> selects the given set of <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "filter",
-    "description": "<a href=\"#filter-pipe\"><code>filter</code></a> applies additional <a href=\"#filters\">filters</a> to results."
-  },
-  {
-    "value": "format",
-    "description": "<a href=\"#format-pipe\"><code>format</code></a> formats output field from input <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "limit",
-    "description": "<a href=\"#limit-pipe\"><code>limit</code></a> limits the number selected logs."
-  },
-  {
-    "value": "math",
-    "description": "<a href=\"#math-pipe\"><code>math</code></a> performs mathematical calculations over <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "offset",
-    "description": "<a href=\"#offset-pipe\"><code>offset</code></a> skips the given number of selected logs."
-  },
-  {
-    "value": "pack_json",
-    "description": "<a href=\"#pack_json-pipe\"><code>pack_json</code></a> packs <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a> into JSON object."
-  },
-  {
-    "value": "pack_logfmt",
-    "description": "<a href=\"#pack_logfmt-pipe\"><code>pack_logfmt</code></a> packs <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a> into <a href=\"https://brandur.org/logfmt\" rel=\"external\" target=\"_blank\">logfmt</a> message."
-  },
-  {
-    "value": "rename",
-    "description": "<a href=\"#rename-pipe\"><code>rename</code></a> renames <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "replace",
-    "description": "<a href=\"#replace-pipe\"><code>replace</code></a> replaces substrings in the specified <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "replace_regexp",
-    "description": "<a href=\"#replace_regexp-pipe\"><code>replace_regexp</code></a> updates <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a> with regular expressions."
-  },
-  {
-    "value": "sort",
-    "description": "<a href=\"#sort-pipe\"><code>sort</code></a> sorts logs by the given <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">fields</a>."
-  },
-  {
-    "value": "stats",
-    "description": "<a href=\"#stats-pipe\"><code>stats</code></a> calculates various stats over the selected logs."
-  },
-  {
-    "value": "stream_context",
-    "description": "<a href=\"#stream_context-pipe\"><code>stream_context</code></a> allows selecting surrounding logs in front and after the matching logs\nper each <a href=\"/victorialogs/keyconcepts/#stream-fields\">log stream</a>."
-  },
-  {
-    "value": "top",
-    "description": "<a href=\"#top-pipe\"><code>top</code></a> returns top <code>N</code> field sets with the maximum number of matching logs."
-  },
-  {
-    "value": "uniq",
-    "description": "<a href=\"#uniq-pipe\"><code>uniq</code></a> returns unique log entires."
-  },
-  {
-    "value": "unpack_json",
-    "description": "<a href=\"#unpack_json-pipe\"><code>unpack_json</code></a> unpacks JSON messages from <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "unpack_logfmt",
-    "description": "<a href=\"#unpack_logfmt-pipe\"><code>unpack_logfmt</code></a> unpacks <a href=\"https://brandur.org/logfmt\" rel=\"external\" target=\"_blank\">logfmt</a> messages from <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "unpack_syslog",
-    "description": "<a href=\"#unpack_syslog-pipe\"><code>unpack_syslog</code></a> unpacks <a href=\"https://en.wikipedia.org/wiki/Syslog\" rel=\"external\" target=\"_blank\">syslog</a> messages from <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  },
-  {
-    "value": "unroll",
-    "description": "<a href=\"#unroll-pipe\"><code>unroll</code></a> unrolls JSON arrays from <a href=\"https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model\">log fields</a>."
-  }
-].map(item => ({
-  ...item,
-  type: ContextType.PipeName,
-  icon: <FunctionIcon/>,
-  description: prepareDescription(item.description),
-}));
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/types.ts
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/types.ts
@@ -1,31 +0,0 @@
-export enum LogicalPartType {
-  Filter = "Filter",
-  Pipe = "Pipe",
-  Operator = "Operator",
-}
-
-export type LogicalPartPosition = [start: number, end: number];
-
-export interface LogicalPart {
-  id: number;
-  value: string;
-  type: LogicalPartType;
-  position: LogicalPartPosition;
-}
-
-export interface ContextData {
-  valueBeforeCursor: string;
-  valueAfterCursor: string;
-  contextType: ContextType;
-  valueContext: string;
-  filterName?: string;
-}
-
-export enum ContextType {
-  FilterName = "FilterName",
-  FilterUnknown = "FilterUnknown",
-  FilterValue = "FilterValue",
-  PipeName = "Pipes",
-  PipeValue = "PipeValue",
-  Unknown = "Unknown",
-}
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/useFetchLogsQLOptions.tsx
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/LogsQL/useFetchLogsQLOptions.tsx
@@ -1,137 +0,0 @@
-import React, { useEffect, useState, useRef, Dispatch, SetStateAction } from "preact/compat";
-import dayjs from "dayjs";
-import { ContextData, ContextType } from "./types";
-import { FunctionIcon, LabelIcon, MetricIcon, ValueIcon } from "../../../Main/Icons";
-import { AutocompleteOptions } from "../../../Main/Autocomplete/Autocomplete";
-import { useAppState } from "../../../../state/common/StateContext";
-import { useTimeState } from "../../../../state/time/TimeStateContext";
-import { useCallback } from "react";
-import { AUTOCOMPLETE_LIMITS } from "../../../../constants/queryAutocomplete";
-import { LogsFiledValues } from "../../../../api/types";
-import { useLogsDispatch, useLogsState } from "../../../../state/logsPanel/LogsStateContext";
-
-type FetchDataArgs = {
-  urlSuffix: string;
-  setter: Dispatch<SetStateAction<AutocompleteOptions[]>>
-  type: ContextType;
-  params?: URLSearchParams;
-}
-
-const icons = {
-  [ContextType.FilterName]: <MetricIcon/>,
-  [ContextType.FilterUnknown]: <MetricIcon/>,
-  [ContextType.FilterValue]: <ValueIcon/>,
-  [ContextType.PipeName]: <FunctionIcon/>,
-  [ContextType.PipeValue]: <LabelIcon/>,
-  [ContextType.Unknown]: <ValueIcon/>
-};
-
-export const useFetchLogsQLOptions = (contextData?: ContextData) => {
-  const { serverUrl } = useAppState();
-  const { period: { start, end } } = useTimeState();
-  const { autocompleteCache } = useLogsState();
-  const dispatch = useLogsDispatch();
-
-  const [loading, setLoading] = useState(false);
-
-  const [fieldNames, setFieldNames] = useState<AutocompleteOptions[]>([]);
-  const [fieldValues, setFieldValues] = useState<AutocompleteOptions[]>([]);
-
-  const abortControllerRef = useRef(new AbortController());
-
-  const getQueryParams = useCallback((params?: Record<string, string>) => {
-    const startDay = dayjs(start * 1000).startOf("day").valueOf() / 1000;
-    const endDay = dayjs(end * 1000).endOf("day").valueOf() / 1000;
-
-    return new URLSearchParams({
-      ...(params || {}),
-      limit: `${AUTOCOMPLETE_LIMITS.queryLimit}`,
-      start: `${startDay}`,
-      end: `${endDay}`
-    });
-  }, [start, end]);
-
-  const processData = (values: LogsFiledValues[], type: ContextType): AutocompleteOptions[] => {
-    return values.map(v => ({
-      value: v.value,
-      type: `${type}`,
-      icon: icons[type]
-    }));
-  };
-
-  const fetchData = async ({ urlSuffix, setter, type, params }: FetchDataArgs) => {
-    // if (!value && type === TypeData.metric) return;
-    abortControllerRef.current.abort();
-    abortControllerRef.current = new AbortController();
-    const { signal } = abortControllerRef.current;
-    const key = `${urlSuffix}?${params?.toString()}`;
-    setLoading(true);
-    try {
-      const cachedData = autocompleteCache.get(key);
-      if (cachedData) {
-        setter(processData(cachedData, type));
-        setLoading(false);
-        return;
-      }
-      const response = await fetch(`${serverUrl}/select/logsql/${urlSuffix}?${params}`, { signal });
-      if (response.ok) {
-        const data = await response.json();
-        const value = (data?.values || []) as LogsFiledValues[];
-        setter(value ? processData(value, type) : []);
-        dispatch({ type: "SET_AUTOCOMPLETE_CACHE", payload: { key, value } });
-      }
-      setLoading(false);
-    } catch (e) {
-      if (e instanceof Error && e.name !== "AbortError") {
-        dispatch({ type: "SET_AUTOCOMPLETE_CACHE", payload: { key, value: [] } });
-        setLoading(false);
-        console.error(e);
-      }
-    }
-  };
-
-  // fetch field names
-  useEffect(() => {
-    const validContexts = [ContextType.FilterName, ContextType.FilterUnknown];
-    const isInvalidContext = !validContexts.includes(contextData?.contextType || ContextType.Unknown);
-    if (!serverUrl || isInvalidContext) {
-      return;
-    }
-
-    setFieldNames([]);
-
-    fetchData({
-      urlSuffix: "field_names",
-      setter: setFieldNames,
-      type: ContextType.FilterName,
-      params: getQueryParams({ query: "*" })
-    });
-
-    return () => abortControllerRef.current?.abort();
-  }, [serverUrl, contextData]);
-
-  // fetch field values
-  useEffect(() => {
-    const isInvalidContext = contextData?.contextType !== ContextType.FilterValue;
-    if (!serverUrl || isInvalidContext || !contextData?.filterName) {
-      return;
-    }
-
-    setFieldValues([]);
-
-    fetchData({
-      urlSuffix: "field_values",
-      setter: setFieldValues,
-      type: ContextType.FilterValue,
-      params: getQueryParams({ query: "*", field: contextData.filterName })
-    });
-
-    return () => abortControllerRef.current?.abort();
-  }, [serverUrl, contextData]);
-
-  return {
-    fieldNames,
-    fieldValues,
-    loading,
-  };
-};
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/QueryEditor.tsx
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/QueryEditor.tsx
@@ -2,6 +2,7 @@ import React, { FC, useEffect, useRef, useState } from "preact/compat";
 import { KeyboardEvent } from "react";
 import { ErrorTypes } from "../../../types";
 import TextField from "../../Main/TextField/TextField";
+import QueryEditorAutocomplete from "./QueryEditorAutocomplete";
 import "./style.scss";
 import { QueryStats } from "../../../api/types";
 import { partialWarning, seriesFetchedWarning } from "./warningText";
@@ -10,16 +11,6 @@ import useDeviceDetect from "../../../hooks/useDeviceDetect";
 import { useQueryState } from "../../../state/query/QueryStateContext";
 import debounce from "lodash.debounce";

-export interface QueryEditorAutocompleteProps {
-  value: string;
-  anchorEl: React.RefObject<HTMLInputElement>;
-  caretPosition: [number, number]; // [start, end]
-  hasHelperText: boolean;
-  includeFunctions: boolean;
-  onSelect: (val: string, caretPosition: number) => void;
-  onFoundOptions: (val: AutocompleteOptions[]) => void;
-}
-
 export interface QueryEditorProps {
  onChange: (query: string) => void;
  onEnter: () => void;
@@ -28,7 +19,6 @@ export interface QueryEditorProps {
  value: string;
  oneLiner?: boolean;
  autocomplete: boolean;
-  autocompleteEl?: FC<QueryEditorAutocompleteProps>;
  error?: ErrorTypes | string;
  stats?: QueryStats;
  label: string;
@@ -43,7 +33,6 @@ const QueryEditor: FC<QueryEditorProps> = ({
  onArrowUp,
  onArrowDown,
  autocomplete,
-  autocompleteEl: AutocompleteEl,
  error,
  stats,
  label,
@@ -58,7 +47,7 @@ const QueryEditor: FC<QueryEditorProps> = ({
  const [caretPositionInput, setCaretPositionInput] = useState<[number, number]>([0, 0]);
  const autocompleteAnchorEl = useRef<HTMLInputElement>(null);

-  const [showAutocomplete, setShowAutocomplete] = useState(!!AutocompleteEl);
+  const [showAutocomplete, setShowAutocomplete] = useState(autocomplete);
  const debouncedSetShowAutocomplete = useRef(debounce(setShowAutocomplete, 500)).current;

  const warning = [
@@ -124,7 +113,7 @@ const QueryEditor: FC<QueryEditorProps> = ({
  };

  useEffect(() => {
-    setOpenAutocomplete(!!AutocompleteEl && autocompleteQuick);
+    setOpenAutocomplete(autocomplete);
  }, [autocompleteQuick]);

  useEffect(() => {
@@ -151,8 +140,8 @@ const QueryEditor: FC<QueryEditorProps> = ({
        inputmode={"search"}
        caretPosition={caretPositionInput}
      />
-      {showAutocomplete && autocomplete && AutocompleteEl && (
-        <AutocompleteEl
+      {showAutocomplete && autocomplete && (
+        <QueryEditorAutocomplete
          value={value}
          anchorEl={autocompleteAnchorEl}
          caretPosition={caretPositionAutocomplete}
--- a/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/QueryEditorAutocomplete.tsx
+++ b/app/vmui/packages/vmui/src/components/Configurators/QueryEditor/QueryEditorAutocomplete.tsx
@@ -1,11 +1,20 @@
 import React, { FC, useState, useEffect, useMemo, useCallback } from "preact/compat";
-import Autocomplete from "../../Main/Autocomplete/Autocomplete";
+import Autocomplete, { AutocompleteOptions } from "../../Main/Autocomplete/Autocomplete";
 import { useFetchQueryOptions } from "../../../hooks/useFetchQueryOptions";
 import { escapeRegexp, hasUnclosedQuotes } from "../../../utils/regexp";
 import useGetMetricsQL from "../../../hooks/useGetMetricsQL";
 import { QueryContextType } from "../../../types";
 import { AUTOCOMPLETE_LIMITS } from "../../../constants/queryAutocomplete";
-import { QueryEditorAutocompleteProps } from "./QueryEditor";
+
+interface QueryEditorAutocompleteProps {
+  value: string;
+  anchorEl: React.RefObject<HTMLElement>;
+  caretPosition: [number, number]; // [start, end]
+  hasHelperText: boolean;
+  includeFunctions: boolean;
+  onSelect: (val: string, caretPosition: number) => void;
+  onFoundOptions: (val: AutocompleteOptions[]) => void;
+}

 const QueryEditorAutocomplete: FC<QueryEditorAutocompleteProps> = ({
  value,
--- a/app/vmui/packages/vmui/src/components/LogsConfigurators/GroupLogsConfigurators/GroupLogsConfigurators.tsx
+++ b/app/vmui/packages/vmui/src/components/LogsConfigurators/GroupLogsConfigurators/GroupLogsConfigurators.tsx
@@ -1,246 +0,0 @@
-import React, { FC, useMemo, useState } from "preact/compat";
-import useBoolean from "../../../hooks/useBoolean";
-import { RestartIcon, SettingsIcon } from "../../Main/Icons";
-import Button from "../../Main/Button/Button";
-import Modal from "../../Main/Modal/Modal";
-import Tooltip from "../../Main/Tooltip/Tooltip";
-import { Logs } from "../../../api/types";
-import Select from "../../Main/Select/Select";
-import { useSearchParams } from "react-router-dom";
-import "./style.scss";
-import Switch from "../../Main/Switch/Switch";
-import TextField from "../../Main/TextField/TextField";
-import dayjs from "dayjs";
-import Hyperlink from "../../Main/Hyperlink/Hyperlink";
-import {
-  LOGS_DISPLAY_FIELDS,
-  LOGS_GROUP_BY,
-  LOGS_DATE_FORMAT,
-  LOGS_URL_PARAMS,
-  WITHOUT_GROUPING
-} from "../../../constants/logs";
-
-const {
-  GROUP_BY,
-  NO_WRAP_LINES,
-  COMPACT_GROUP_HEADER,
-  DISPLAY_FIELDS,
-  DATE_FORMAT
-} = LOGS_URL_PARAMS;
-
-const title = "Group view settings";
-
-interface Props {
-  logs: Logs[];
-}
-
-const GroupLogsConfigurators: FC<Props> = ({ logs }) => {
-  const [searchParams, setSearchParams] = useSearchParams();
-
-  const groupBy = searchParams.get(GROUP_BY) || LOGS_GROUP_BY;
-  const noWrapLines = searchParams.get(NO_WRAP_LINES) === "true";
-  const compactGroupHeader = searchParams.get(COMPACT_GROUP_HEADER) === "true";
-  const displayFieldsString = searchParams.get(DISPLAY_FIELDS) || "";
-  const displayFields = displayFieldsString ? displayFieldsString.split(",") : [];
-
-  const [dateFormat, setDateFormat] = useState(searchParams.get(DATE_FORMAT) || LOGS_DATE_FORMAT);
-  const [errorFormat, setErrorFormat] = useState("");
-
-  const isGroupChanged = groupBy !== LOGS_GROUP_BY;
-  const isDisplayFieldsChanged = displayFields.length > 0;
-  const isTimeChanged = searchParams.get(DATE_FORMAT) !== LOGS_DATE_FORMAT;
-  const hasChanges = [
-    isGroupChanged,
-    isDisplayFieldsChanged,
-    noWrapLines,
-    compactGroupHeader,
-    isTimeChanged
-  ].some(Boolean);
-
-  const logsKeys = useMemo(() => {
-    const excludeKeys = ["_msg", "_time"];
-    const uniqKeys = Array.from(new Set(logs.map(l => Object.keys(l)).flat()));
-    return uniqKeys.filter(k => !excludeKeys.includes(k));
-  }, [logs]);
-
-  const {
-    value: openModal,
-    toggle: toggleOpen,
-    setFalse: handleClose,
-  } = useBoolean(false);
-
-  const handleSelectGroupBy = (key: string) => {
-    searchParams.set(GROUP_BY, key);
-    setSearchParams(searchParams);
-  };
-
-  const handleSelectDisplayField = (value: string) => {
-    const prev = displayFields;
-    const newDisplayFields = prev.includes(value) ? prev.filter(v => v !== value) : [...prev, value];
-    searchParams.set(DISPLAY_FIELDS, newDisplayFields.join(","));
-    setSearchParams(searchParams);
-  };
-
-  const handleResetDisplayFields = () => {
-    searchParams.delete(DISPLAY_FIELDS);
-    setSearchParams(searchParams);
-  };
-
-  const toggleWrapLines = () => {
-    searchParams.set(NO_WRAP_LINES, String(!noWrapLines));
-    setSearchParams(searchParams);
-  };
-
-  const toggleCompactGroupHeader = () => {
-    searchParams.set(COMPACT_GROUP_HEADER, String(!compactGroupHeader));
-    setSearchParams(searchParams);
-  };
-
-  const handleChangeDateFormat = (format: string) => {
-    const date = new Date();
-    if (!dayjs(date, format, true).isValid()) {
-      setErrorFormat("Invalid date format");
-    }
-    setDateFormat(format);
-  };
-
-  const handleSaveAndClose = () => {
-    searchParams.set(DATE_FORMAT, dateFormat);
-    setSearchParams(searchParams);
-    handleClose();
-  };
-
-  const tooltipContent = () => {
-    if (!hasChanges) return title;
-    return (
-      <div className="vm-group-logs-configurator__tooltip">
-        <p>{title}</p>
-        <hr/>
-        <ul>
-          {isGroupChanged && <li>Group by <code>{`"${groupBy}"`}</code></li>}
-          {isDisplayFieldsChanged && <li>Display fields: {displayFields.length || 1}</li>}
-          {noWrapLines && <li>Single-line text is enabled</li>}
-          {compactGroupHeader && <li>Compact group header is enabled</li>}
-          {isTimeChanged && <li>Date format: <code>{dateFormat}</code></li>}
-        </ul>
-      </div>
-    );
-  };
-
-  return (
-    <>
-      <div className="vm-group-logs-configurator-button">
-        <Tooltip title={tooltipContent()}>
-          <Button
-            variant="text"
-            startIcon={<SettingsIcon/>}
-            onClick={toggleOpen}
-            ariaLabel={title}
-          />
-        </Tooltip>
-        {hasChanges && <span className="vm-group-logs-configurator-button__marker"/>}
-      </div>
-      {openModal && (
-        <Modal
-          title={title}
-          onClose={handleSaveAndClose}
-        >
-          <div className="vm-group-logs-configurator">
-            <div className="vm-group-logs-configurator-item">
-              <Select
-                value={groupBy}
-                list={[WITHOUT_GROUPING, ...logsKeys]}
-                label="Group by field"
-                placeholder="Group by field"
-                onChange={handleSelectGroupBy}
-                searchable
-              />
-              <Tooltip title={"Reset grouping"}>
-                <Button
-                  variant="text"
-                  color="primary"
-                  startIcon={<RestartIcon/>}
-                  onClick={() => handleSelectGroupBy(LOGS_GROUP_BY)}
-                />
-              </Tooltip>
-              <span className="vm-group-logs-configurator-item__info">
-                Select a field to group logs by (default: <code>{LOGS_GROUP_BY}</code>).
-              </span>
-            </div>
-
-            <div className="vm-group-logs-configurator-item">
-              <Select
-                value={displayFields}
-                list={logsKeys}
-                label="Display fields"
-                placeholder="Display fields"
-                onChange={handleSelectDisplayField}
-                searchable
-              />
-              <Tooltip title={"Clear fields"}>
-                <Button
-                  variant="text"
-                  color="primary"
-                  startIcon={<RestartIcon/>}
-                  onClick={handleResetDisplayFields}
-                />
-              </Tooltip>
-              <span className="vm-group-logs-configurator-item__info">
-                Select fields to display instead of the message (default: <code>{LOGS_DISPLAY_FIELDS}</code>).
-              </span>
-            </div>
-
-            <div className="vm-group-logs-configurator-item">
-              <TextField
-                autofocus
-                label="Date format"
-                value={dateFormat}
-                onChange={handleChangeDateFormat}
-                error={errorFormat}
-              />
-              <Tooltip title={"Reset format"}>
-                <Button
-                  variant="text"
-                  color="primary"
-                  startIcon={<RestartIcon/>}
-                  onClick={() => setDateFormat(LOGS_DATE_FORMAT)}
-                />
-              </Tooltip>
-              <span className="vm-group-logs-configurator-item__info vm-group-logs-configurator-item__info_input">
-                Set the date format (e.g., <code>YYYY-MM-DD HH:mm:ss</code>).
-                Learn more in <Hyperlink
-                  href="https://day.js.org/docs/en/display/format"
-                >this documentation</Hyperlink>. <br/>
-                Your current date format: <code>{dayjs().format(dateFormat || LOGS_DATE_FORMAT)}</code>
-              </span>
-            </div>
-
-            <div className="vm-group-logs-configurator-item">
-              <Switch
-                value={noWrapLines}
-                onChange={toggleWrapLines}
-                label="Single-line message"
-              />
-              <span className="vm-group-logs-configurator-item__info">
-                Displays message in a single line and truncates it with an ellipsis if it exceeds the available space
-              </span>
-            </div>
-
-            <div className="vm-group-logs-configurator-item">
-              <Switch
-                value={compactGroupHeader}
-                onChange={toggleCompactGroupHeader}
-                label="Compact group header"
-              />
-              <span className="vm-group-logs-configurator-item__info">
-                Shows group headers in one line with a &quot;+N more&quot; badge for extra fields.
-              </span>
-            </div>
-          </div>
-        </Modal>
-      )}
-    </>
-  );
-};
-
-export default GroupLogsConfigurators;
--- a/app/vmui/packages/vmui/src/components/LogsConfigurators/GroupLogsConfigurators/style.scss
+++ b/app/vmui/packages/vmui/src/components/LogsConfigurators/GroupLogsConfigurators/style.scss
@@ -1,48 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-group-logs-configurator {
-  display: grid;
-  gap: calc($padding-large * 2);
-  padding: $padding-global 0;
-  width: 600px;
-
-  &-item {
-    display: grid;
-    grid-template-columns: 1fr 31px;
-    align-items: center;
-    justify-content: stretch;
-    gap: 0 $padding-small;
-
-    &__info {
-      margin-top: $padding-small;
-      grid-column: 1/span 2;
-      font-size: $font-size-small;
-      color: $color-text-secondary;
-      line-height: 130%;
-
-      &_input {
-        margin-top: 0;
-      }
-    }
-  }
-
-  &-button {
-    position: relative;
-
-    &__marker {
-      position: absolute;
-      top: 6px;
-      left: 6px;
-      width: 5px;
-      height: 5px;
-      border-radius: 50%;
-      background-color: $color-secondary;
-    }
-  }
-
-  &__tooltip {
-    ul {
-      list-style-position: inside;
-    }
-  }
-}
--- a/app/vmui/packages/vmui/src/components/Main/Accordion/Accordion.tsx
+++ b/app/vmui/packages/vmui/src/components/Main/Accordion/Accordion.tsx
@@ -30,10 +30,6 @@ const Accordion: FC<AccordionProps> = ({
    onChange && onChange(isOpen);
  }, [isOpen]);

-  useEffect(() => {
-    setIsOpen(defaultExpanded);
-  }, [defaultExpanded]);
-
  return (
    <>
      <header
--- a/app/vmui/packages/vmui/src/components/Main/Autocomplete/Autocomplete.tsx
+++ b/app/vmui/packages/vmui/src/components/Main/Autocomplete/Autocomplete.tsx
@@ -28,7 +28,7 @@ interface AutocompleteProps {
  offset?: {top: number, left: number}
  maxDisplayResults?: {limit: number, message?: string}
  loading?: boolean;
-  onSelect: (val: string, item: AutocompleteOptions) => void
+  onSelect: (val: string) => void
  onOpenAutocomplete?: (val: boolean) => void
  onFoundOptions?: (val: AutocompleteOptions[]) => void
  onChangeWrapperRef?: (elementRef: React.RefObject<HTMLElement>) => void
@@ -97,9 +97,9 @@ const Autocomplete: FC<AutocompleteProps> = ({
    return noOptionsText && !foundOptions.length;
  }, [noOptionsText,foundOptions]);

-  const createHandlerSelect = (item: AutocompleteOptions) => () => {
+  const createHandlerSelect = (item: string) => () => {
    if (disabled) return;
-    onSelect(item.value, item);
+    onSelect(item);
    if (!selected) handleCloseAutocomplete();
  };

@@ -141,7 +141,7 @@ const Autocomplete: FC<AutocompleteProps> = ({

    if (key === "Enter") {
      const item = foundOptions[focusOption.index];
-      item && onSelect(item.value, item);
+      item && onSelect(item.value);
      if (!selected) handleCloseAutocomplete();
    }

@@ -206,7 +206,7 @@ const Autocomplete: FC<AutocompleteProps> = ({
            })}
            id={`$autocomplete$${option.value}`}
            key={`${i}${option.value}`}
-            onClick={createHandlerSelect(option)}
+            onClick={createHandlerSelect(option.value)}
            onMouseEnter={createHandlerMouseEnter(i)}
            onMouseLeave={handlerMouseLeave}
          >
--- a/app/vmui/packages/vmui/src/components/Main/Icons/index.tsx
+++ b/app/vmui/packages/vmui/src/components/Main/Icons/index.tsx
@@ -581,45 +581,3 @@ export const CommentIcon = () => (
    ></path>
  </svg>
 );
-
-export const FilterIcon = () => (
-  <svg
-    viewBox="0 0 24 24"
-    fill="currentColor"
-  >
-    <path
-      d="M4.25 5.61C6.27 8.2 10 13 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-6s3.72-4.8 5.74-7.39c.51-.66.04-1.61-.79-1.61H5.04c-.83 0-1.3.95-.79 1.61"
-    ></path>
-  </svg>
-);
-
-export const FilterOffIcon = () => (
-  <svg
-    viewBox="0 0 24 24"
-    fill="currentColor"
-  >
-    <path
-      d="M19.79 5.61C20.3 4.95 19.83 4 19 4H6.83l7.97 7.97zM2.81 2.81 1.39 4.22 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-2.17l5.78 5.78 1.41-1.41z"
-    ></path>
-  </svg>
-);
-
-export const OpenNewIcon = () => (
-  <svg
-    viewBox="0 0 24 24"
-    fill="currentColor"
-  >
-    <path
-      d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z"
-    ></path>
-  </svg>
-);
-
-export const ModalIcon = () => (
-  <svg
-    viewBox="0 0 24 24"
-    fill="currentColor"
-  >
-    <path d="M19 4H5c-1.11 0-2 .9-2 2v12c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.89-2-2-2m0 14H5V8h14z"></path>
-  </svg>
-);
--- a/app/vmui/packages/vmui/src/components/Main/Modal/Modal.tsx
+++ b/app/vmui/packages/vmui/src/components/Main/Modal/Modal.tsx
@@ -67,11 +67,11 @@ const Modal: FC<ModalProps> = ({
      })}
      onMouseDown={onClose}
    >
-      <div
-        className="vm-modal-content"
-        onMouseDown={handleMouseDown}
-      >
-        <div className="vm-modal-content-header">
+      <div className="vm-modal-content">
+        <div
+          className="vm-modal-content-header"
+          onMouseDown={handleMouseDown}
+        >
          {title && (
            <div className="vm-modal-content-header__title">
              {title}
@@ -91,6 +91,7 @@ const Modal: FC<ModalProps> = ({
        {/* tabIndex to fix Ctrl-A */}
        <div
          className="vm-modal-content-body"
+          onMouseDown={handleMouseDown}
          tabIndex={0}
        >
          {children}
--- a/app/vmui/packages/vmui/src/components/Main/Popper/Popper.tsx
+++ b/app/vmui/packages/vmui/src/components/Main/Popper/Popper.tsx
@@ -15,10 +15,9 @@ interface PopperProps {
  open: boolean
  onClose: () => void
  buttonRef: React.RefObject<HTMLElement>
-  placement?: "bottom-right" | "bottom-left" | "top-left" | "top-right" | "fixed"
-  placementPosition?: { top: number, left: number } | null
+  placement?: "bottom-right" | "bottom-left" | "top-left" | "top-right"
  animation?: string
-  offset?: { top: number, left: number }
+  offset?: {top: number, left: number}
  clickOutside?: boolean,
  fullWidth?: boolean
  title?: string
@@ -30,7 +29,6 @@ const Popper: FC<PopperProps> = ({
  children,
  buttonRef,
  placement = "bottom-left",
-  placementPosition,
  open = false,
  onClose,
  offset = { top: 6, left: 0 },
@@ -94,18 +92,13 @@ const Popper: FC<PopperProps> = ({
    if (needAlignRight) position.left = buttonPos.right - popperSize.width;
    if (needAlignTop) position.top = buttonPos.top - popperSize.height - offsetTop;

-    if (placement === "fixed" && placementPosition) {
-      position.top = Math.max(placementPosition.top + offset.top, 0);
-      position.left = Math.max(placementPosition.left + offset.left, 0);
-      return position;
-    }
-
    const { innerWidth, innerHeight } = window;
+    const margin = 20;

-    const isOverflowBottom = (position.top + popperSize.height) > innerHeight;
-    const isOverflowTop = (position.top) < 0;
-    const isOverflowRight = (position.left + popperSize.width) > innerWidth;
-    const isOverflowLeft = (position.left) < 0;
+    const isOverflowBottom = (position.top + popperSize.height + margin) > innerHeight;
+    const isOverflowTop = (position.top - margin) < 0;
+    const isOverflowRight = (position.left + popperSize.width + margin) > innerWidth;
+    const isOverflowLeft = (position.left - margin) < 0;

    if (isOverflowBottom) position.top = buttonPos.top - popperSize.height - offsetTop;
    if (isOverflowTop) position.top = buttonPos.height + buttonPos.top + offsetTop;
@@ -113,11 +106,11 @@ const Popper: FC<PopperProps> = ({
    if (isOverflowLeft) position.left = buttonPos.left + offsetLeft;

    if (fullWidth) position.width = `${buttonPos.width}px`;
-    if (position.top < 0) position.top = 0;
-    if (position.left < 0) position.left = 0;
+    if (position.top < 0) position.top = 20;
+    if (position.left < 0) position.left = 20;

    return position;
-  }, [buttonRef, placement, isOpen, children, fullWidth]);
+  },[buttonRef, placement, isOpen, children, fullWidth]);

  const handleClickClose = (e: ReactMouseEvent<HTMLButtonElement, MouseEvent>) => {
    e.stopPropagation();
@@ -138,10 +131,10 @@ const Popper: FC<PopperProps> = ({
    if (!popperRef.current || !isOpen || (isMobile && !disabledFullScreen)) return;
    const { right, width } = popperRef.current.getBoundingClientRect();
    if (right > window.innerWidth) {
-      const left = window.innerWidth - width;
-      popperRef.current.style.left = `${left}px`;
+      const left = window.innerWidth - 20 - width;
+      popperRef.current.style.left = left < window.innerWidth ? "0" : `${left}px`;
    }
-  }, [isOpen, popperRef, placementPosition]);
+  }, [isOpen, popperRef]);

  const handlePopstate = useCallback(() => {
    if (isOpen && isMobile && !disabledFullScreen) {
--- a/app/vmui/packages/vmui/src/components/Main/Popper/style.scss
+++ b/app/vmui/packages/vmui/src/components/Main/Popper/style.scss
@@ -11,7 +11,7 @@
  border-radius: $border-radius-small;

  &_open {
-    z-index: 100;
+    z-index: 101;
    opacity: 1;
    transform-origin: top center;
    animation: vm-slider 150ms cubic-bezier(0.280, 0.840, 0.420, 1.1);
--- a/app/vmui/packages/vmui/src/components/Main/Select/style.scss
+++ b/app/vmui/packages/vmui/src/components/Main/Select/style.scss
@@ -33,9 +33,9 @@
        align-items: center;
        justify-content: center;
        background-color: $color-hover-black;
-        padding: 2px 2px 2px $padding-small;
+        padding: 2px 2px 2px 6px;
        border-radius: $border-radius-small;
-        font-size: $font-size-small;
+        font-size: $font-size;
        line-height: $font-size;
        max-width: 100%;

--- a/app/vmui/packages/vmui/src/components/Table/TableSettings/TableSettings.tsx
+++ b/app/vmui/packages/vmui/src/components/Table/TableSettings/TableSettings.tsx
@@ -11,7 +11,7 @@ import useBoolean from "../../../hooks/useBoolean";
 import TextField from "../../Main/TextField/TextField";
 import { KeyboardEvent, useState } from "react";
 import Modal from "../../Main/Modal/Modal";
-import { useSearchParams } from "react-router-dom";
+import { getFromStorage, removeFromStorage, saveToStorage } from "../../../utils/storage";

 const title = "Table settings";

@@ -30,8 +30,6 @@ const TableSettings: FC<TableSettingsProps> = ({
  onChangeColumns,
  toggleTableCompact
 }) => {
-  const [searchParams, setSearchParams] = useSearchParams();
-
  const buttonRef = useRef<HTMLDivElement>(null);

  const {
@@ -40,6 +38,11 @@ const TableSettings: FC<TableSettingsProps> = ({
    setFalse: handleClose,
  } = useBoolean(false);

+  const {
+    value: saveColumns,
+    toggle: toggleSaveColumns,
+  } = useBoolean(Boolean(getFromStorage("TABLE_COLUMNS")));
+
  const [searchColumn, setSearchColumn] = useState("");
  const [indexFocusItem, setIndexFocusItem] = useState(-1);

@@ -57,34 +60,15 @@ const TableSettings: FC<TableSettingsProps> = ({
    return filteredColumns.every(col => selectedColumns.includes(col));
  }, [selectedColumns, filteredColumns]);

-  const handleChangeDisplayColumns = (displayColumns: string[]) => {
-    onChangeColumns(displayColumns);
-
-    const updatedParams = new URLSearchParams(searchParams.toString());
-    const isAllCheck = displayColumns.length === columns.length;
-
-    if (isAllCheck) {
-      updatedParams.delete("columns");
-    } else {
-      updatedParams.set("columns", displayColumns.map(encodeURIComponent).join(","));
-    }
-
-    setSearchParams(updatedParams);
-  };
-
  const handleChange = (key: string) => {
-    const displayColumns = selectedColumns.includes(key)
-      ? selectedColumns.filter(col => col !== key)
-      : [...selectedColumns, key];
-
-    handleChangeDisplayColumns(displayColumns);
+    onChangeColumns(selectedColumns.includes(key) ? selectedColumns.filter(col => col !== key) : [...selectedColumns, key]);
  };

  const toggleAllColumns = () => {
    if (isAllChecked) {
-      handleChangeDisplayColumns(selectedColumns.filter(col => !filteredColumns.includes(col)));
+      onChangeColumns(selectedColumns.filter(col => !filteredColumns.includes(col)));
    } else {
-      handleChangeDisplayColumns(filteredColumns);
+      onChangeColumns(filteredColumns);
    }
  };

@@ -111,16 +95,22 @@ const TableSettings: FC<TableSettingsProps> = ({
  };

  useEffect(() => {
-    if (arrayEquals(columns, selectedColumns) || searchParams.has("columns")) return;
+    if (arrayEquals(columns, selectedColumns) || saveColumns) return;
    onChangeColumns(columns);
  }, [columns]);

  useEffect(() => {
-    const hasColumns = searchParams.has("columns");
-    if (!hasColumns) return;
-    const columnsParam = searchParams.get("columns") || "";
-    const columnsArray = columnsParam.split(",").map(decodeURIComponent).filter(Boolean);
-    onChangeColumns(columnsArray);
+    if (!saveColumns) {
+      removeFromStorage(["TABLE_COLUMNS"]);
+    } else if (selectedColumns.length) {
+      saveToStorage("TABLE_COLUMNS", selectedColumns.join(","));
+    }
+  }, [saveColumns, selectedColumns]);
+
+  useEffect(() => {
+    const saveColumns = getFromStorage("TABLE_COLUMNS") as string;
+    if (!saveColumns) return;
+    onChangeColumns(saveColumns.split(","));
  }, []);

  return (
@@ -193,6 +183,19 @@ const TableSettings: FC<TableSettingsProps> = ({
                  </div>
                ))}
              </div>
+              <div className="vm-table-settings-modal-preserve">
+                <Checkbox
+                  checked={saveColumns}
+                  onChange={toggleSaveColumns}
+                  label={"Preserve column settings"}
+                  disabled={tableCompact}
+                  color={"primary"}
+                />
+                <p className="vm-table-settings-modal-preserve__info">
+                  This label indicates that when the checkbox is activated,
+                  the current column configurations will not be reset.
+                </p>
+              </div>
            </div>
          </div>
          <div className="vm-table-settings-modal-section">
--- a/app/vmui/packages/vmui/src/components/Table/TableSettings/style.scss
+++ b/app/vmui/packages/vmui/src/components/Table/TableSettings/style.scss
@@ -3,7 +3,6 @@
 .vm-table-settings {
  &-modal {
    .vm-modal-content-body {
-      min-width: clamp(300px, 600px, 90vw);
      padding: 0;
    }

@@ -84,5 +83,16 @@
        }
      }
    }
+
+    &-preserve {
+      padding: $padding-global;
+
+      &__info {
+        padding-top: $padding-small;
+        font-size: $font-size-small;
+        color: $color-text-secondary;
+        line-height: 130%;
+      }
+    }
  }
 }
--- a/app/vmui/packages/vmui/src/constants/logs.ts
+++ b/app/vmui/packages/vmui/src/constants/logs.ts
@@ -1,22 +1,2 @@
-import { DATE_TIME_FORMAT } from "./date";
-
 export const LOGS_ENTRIES_LIMIT = 50;
 export const LOGS_BARS_VIEW = 100;
-export const LOGS_LIMIT_HITS = 5;
-
-// "Ungrouped" is a string that is used as a value for the "groupBy" parameter.
-export const WITHOUT_GROUPING = "Ungrouped";
-
-// Default values for the logs configurators.
-export const LOGS_GROUP_BY = "_stream";
-export const LOGS_DISPLAY_FIELDS = "_msg";
-export const LOGS_DATE_FORMAT = `${DATE_TIME_FORMAT}.SSS`;
-
-// URL parameters for the logs page.
-export const LOGS_URL_PARAMS = {
-  GROUP_BY: "groupBy",
-  DISPLAY_FIELDS: "displayFields",
-  NO_WRAP_LINES: "noWrapLines",
-  COMPACT_GROUP_HEADER: "compactGroupHeader",
-  DATE_FORMAT: "dateFormat",
-};
--- a/app/vmui/packages/vmui/src/hooks/useClickOutside.ts
+++ b/app/vmui/packages/vmui/src/hooks/useClickOutside.ts
@@ -20,7 +20,7 @@ const useClickOutside = <T extends HTMLElement = HTMLElement>(
    handler(event); // Call the handler only if the click is outside of the element passed.
  }, [ref, handler]);

-  useEventListener("mouseup", listener);
+  useEventListener("mousedown", listener);
  useEventListener("touchstart", listener);
 };

--- a/app/vmui/packages/vmui/src/pages/CustomPanel/QueryConfigurator/QueryConfigurator.tsx
+++ b/app/vmui/packages/vmui/src/pages/CustomPanel/QueryConfigurator/QueryConfigurator.tsx
@@ -25,7 +25,6 @@ import { QueryStats } from "../../../api/types";
 import { usePrettifyQuery } from "./hooks/usePrettifyQuery";
 import QueryHistory from "../QueryHistory/QueryHistory";
 import AnomalyConfig from "../../../components/ExploreAnomaly/AnomalyConfig";
-import QueryEditorAutocomplete from "../../../components/Configurators/QueryEditor/QueryEditorAutocomplete";

 export interface QueryConfiguratorProps {
  queryErrors: string[];
@@ -217,7 +216,6 @@ const QueryConfigurator: FC<QueryConfiguratorProps> = ({
          <QueryEditor
            value={stateQuery[i]}
            autocomplete={!hideButtons?.autocomplete && (autocomplete || autocompleteQuick)}
-            autocompleteEl={QueryEditorAutocomplete}
            error={queryErrors[i]}
            stats={stats[i]}
            onArrowUp={createHandlerArrow(-1, i)}
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogs.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogs.tsx
@@ -69,7 +69,7 @@ const ExploreLogs: FC = () => {
  };

  const handleApplyFilter = (val: string) => {
-    setQuery(prev => `${val} AND (${prev})`);
+    setQuery(prev => `_stream: ${val === "other" ? "{}" : val} AND (${prev})`);
    setIsUpdatingQuery(true);
  };

--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogsHeader/ExploreLogsHeader.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogsHeader/ExploreLogsHeader.tsx
@@ -6,9 +6,6 @@ import useDeviceDetect from "../../../hooks/useDeviceDetect";
 import Button from "../../../components/Main/Button/Button";
 import QueryEditor from "../../../components/Configurators/QueryEditor/QueryEditor";
 import TextField from "../../../components/Main/TextField/TextField";
-import LogsQueryEditorAutocomplete from "../../../components/Configurators/QueryEditor/LogsQL/LogsQueryEditorAutocomplete";
-import { useQueryDispatch, useQueryState } from "../../../state/query/QueryStateContext";
-import Switch from "../../../components/Main/Switch/Switch";

 export interface ExploreLogHeaderProps {
  query: string;
@@ -30,8 +27,6 @@ const ExploreLogsHeader: FC<ExploreLogHeaderProps> = ({
  onRun,
 }) => {
  const { isMobile } = useDeviceDetect();
-  const { autocomplete } = useQueryState();
-  const queryDispatch = useQueryDispatch();

  const [errorLimit, setErrorLimit] = useState("");
  const [limitInput, setLimitInput] = useState(limit);
@@ -47,10 +42,6 @@ const ExploreLogsHeader: FC<ExploreLogHeaderProps> = ({
    }
  };

-  const onChangeAutocomplete = () => {
-    queryDispatch({ type: "TOGGLE_AUTOCOMPLETE" });
-  };
-
  useEffect(() => {
    setLimitInput(limit);
  }, [limit]);
@@ -66,8 +57,7 @@ const ExploreLogsHeader: FC<ExploreLogHeaderProps> = ({
      <div className="vm-explore-logs-header-top">
        <QueryEditor
          value={query}
-          autocomplete={autocomplete}
-          autocompleteEl={LogsQueryEditorAutocomplete}
+          autocomplete={false}
          onArrowUp={() => null}
          onArrowDown={() => null}
          onEnter={onRun}
@@ -85,14 +75,7 @@ const ExploreLogsHeader: FC<ExploreLogHeaderProps> = ({
        />
      </div>
      <div className="vm-explore-logs-header-bottom">
-        <div className="vm-explore-logs-header-bottom-contols">
-          <Switch
-            label={"Autocomplete"}
-            value={autocomplete}
-            onChange={onChangeAutocomplete}
-            fullWidth={isMobile}
-          />
-        </div>
+        <div className="vm-explore-logs-header-bottom-contols"></div>
        <div className="vm-explore-logs-header-bottom-helpful">
          <a
            className="vm-link vm-link_with-icon"
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogsHeader/style.scss
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/ExploreLogsHeader/style.scss
@@ -26,9 +26,6 @@
    }

    &-contols {
-      display: flex;
-      align-items: center;
-      justify-content: flex-start;
      flex-grow: 1;
    }

--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogs.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogs.tsx
@@ -1,19 +1,24 @@
-import React, { FC, useCallback, useEffect, useMemo } from "preact/compat";
-import { useState } from "react";
+import React, { FC, useCallback, useEffect, useMemo, useRef } from "preact/compat";
+import { MouseEvent, useState } from "react";
 import "./style.scss";
 import { Logs } from "../../../api/types";
 import Accordion from "../../../components/Main/Accordion/Accordion";
 import { groupByMultipleKeys } from "../../../utils/array";
 import Tooltip from "../../../components/Main/Tooltip/Tooltip";
+import useCopyToClipboard from "../../../hooks/useCopyToClipboard";
 import GroupLogsItem from "./GroupLogsItem";
+import { useAppState } from "../../../state/common/StateContext";
+import classNames from "classnames";
 import Button from "../../../components/Main/Button/Button";
-import { CollapseIcon, ExpandIcon } from "../../../components/Main/Icons";
+import { CollapseIcon, ExpandIcon, StorageIcon } from "../../../components/Main/Icons";
+import Popper from "../../../components/Main/Popper/Popper";
+import TextField from "../../../components/Main/TextField/TextField";
+import useBoolean from "../../../hooks/useBoolean";
+import useStateSearchParams from "../../../hooks/useStateSearchParams";
 import { useSearchParams } from "react-router-dom";
 import { getStreamPairs } from "../../../utils/logs";
-import GroupLogsConfigurators
-  from "../../../components/LogsConfigurators/GroupLogsConfigurators/GroupLogsConfigurators";
-import GroupLogsHeader from "./GroupLogsHeader";
-import { LOGS_DISPLAY_FIELDS, LOGS_GROUP_BY, LOGS_URL_PARAMS, WITHOUT_GROUPING } from "../../../constants/logs";
+
+const WITHOUT_GROUPING = "No Grouping";

 interface Props {
  logs: Logs[];
@@ -21,31 +26,73 @@ interface Props {
 }

 const GroupLogs: FC<Props> = ({ logs, settingsRef }) => {
-  const [searchParams] = useSearchParams();
+  const { isDarkTheme } = useAppState();
+  const copyToClipboard = useCopyToClipboard();
+  const [searchParams, setSearchParams] = useSearchParams();

  const [expandGroups, setExpandGroups] = useState<boolean[]>([]);
+  const [groupBy, setGroupBy] = useStateSearchParams("_stream", "groupBy");
+  const [copied, setCopied] = useState<string | null>(null);
+  const [searchKey, setSearchKey] = useState("");
+  const optionsButtonRef = useRef<HTMLDivElement>(null);

-  const groupBy = searchParams.get(LOGS_URL_PARAMS.GROUP_BY) || LOGS_GROUP_BY;
-  const displayFieldsString = searchParams.get(LOGS_URL_PARAMS.DISPLAY_FIELDS) || LOGS_DISPLAY_FIELDS;
-  const displayFields = displayFieldsString.split(",");
+  const {
+    value: openOptions,
+    toggle: toggleOpenOptions,
+    setFalse: handleCloseOptions,
+  } = useBoolean(false);

  const expandAll = useMemo(() => expandGroups.every(Boolean), [expandGroups]);

+  const logsKeys = useMemo(() => {
+    const excludeKeys = ["_msg", "_time"];
+    const uniqKeys = Array.from(new Set(logs.map(l => Object.keys(l)).flat()));
+    return [WITHOUT_GROUPING, ...uniqKeys.filter(k => !excludeKeys.includes(k))];
+  }, [logs]);
+
+  const filteredLogsKeys = useMemo(() => {
+    if (!searchKey) return logsKeys;
+    try {
+      const regexp = new RegExp(searchKey, "i");
+      return logsKeys.filter(item => regexp.test(item))
+        .sort((a, b) => (a.match(regexp)?.index || 0) - (b.match(regexp)?.index || 0));
+    } catch (e) {
+      return [];
+    }
+  }, [logsKeys, searchKey]);
+
  const groupData = useMemo(() => {
    return groupByMultipleKeys(logs, [groupBy]).map((item) => {
      const streamValue = item.values[0]?.[groupBy] || "";
      const pairs = getStreamPairs(streamValue);
      // values sorting by time
-      const values = item.values.sort((a, b) => new Date(b._time).getTime() - new Date(a._time).getTime());
+      const values = item.values.sort((a,b) => new Date(b._time).getTime() - new Date(a._time).getTime());
      return {
        keys: item.keys,
        keysString: item.keys.join(""),
        values,
        pairs,
      };
-    }).sort((a, b) => b.values.length - a.values.length); // groups sorting
+    }).sort((a, b) => a.keysString.localeCompare(b.keysString)); // groups sorting
  }, [logs, groupBy]);

+  const handleClickByPair = (value: string) => async (e: MouseEvent<HTMLDivElement>) => {
+    e.stopPropagation();
+    const isKeyValue = /(.+)?=(".+")/.test(value);
+    const copyValue = isKeyValue ? `${value.replace(/=/, ": ")}` : `${groupBy}: "${value}"`;
+    const isCopied = await copyToClipboard(copyValue);
+    if (isCopied) {
+      setCopied(value);
+    }
+  };
+
+  const handleSelectGroupBy = (key: string) => () => {
+    setGroupBy(key);
+    searchParams.set("groupBy", key);
+    setSearchParams(searchParams);
+    handleCloseOptions();
+  };
+
  const handleToggleExpandAll = useCallback(() => {
    setExpandGroups(new Array(groupData.length).fill(!expandAll));
  }, [expandAll, groupData.length]);
@@ -58,6 +105,11 @@ const GroupLogs: FC<Props> = ({ logs, settingsRef }) => {
    });
  }, []);

+  useEffect(() => {
+    if (copied === null) return;
+    const timeout = setTimeout(() => setCopied(null), 2000);
+    return () => clearTimeout(timeout);
+  }, [copied]);

  useEffect(() => {
    setExpandGroups(new Array(groupData.length).fill(true));
@@ -72,16 +124,38 @@ const GroupLogs: FC<Props> = ({ logs, settingsRef }) => {
            key={item.keysString}
          >
            <Accordion
+              key={String(expandGroups[i])}
              defaultExpanded={expandGroups[i]}
              onChange={handleChangeExpand(i)}
-              title={groupBy !== WITHOUT_GROUPING && <GroupLogsHeader group={item}/>}
+              title={groupBy !== WITHOUT_GROUPING && (
+                <div className="vm-group-logs-section-keys">
+                  <span className="vm-group-logs-section-keys__title">Group by <code>{groupBy}</code>:</span>
+                  {item.pairs.map((pair) => (
+                    <Tooltip
+                      title={copied === pair ? "Copied" : "Copy to clipboard"}
+                      key={`${item.keysString}_${pair}`}
+                      placement={"top-center"}
+                    >
+                      <div
+                        className={classNames({
+                          "vm-group-logs-section-keys__pair": true,
+                          "vm-group-logs-section-keys__pair_dark": isDarkTheme
+                        })}
+                        onClick={handleClickByPair(pair)}
+                      >
+                        {pair}
+                      </div>
+                    </Tooltip>
+                  ))}
+                  <span className="vm-group-logs-section-keys__count">{item.values.length} entries</span>
+                </div>
+              )}
            >
              <div className="vm-group-logs-section-rows">
                {item.values.map((value) => (
                  <GroupLogsItem
                    key={`${value._msg}${value._time}`}
                    log={value}
-                    displayFields={displayFields}
                  />
                ))}
              </div>
@@ -101,7 +175,47 @@ const GroupLogs: FC<Props> = ({ logs, settingsRef }) => {
              ariaLabel={expandAll ? "Collapse All" : "Expand All"}
            />
          </Tooltip>
-          <GroupLogsConfigurators logs={logs}/>
+          <Tooltip title={"Group by"}>
+            <div ref={optionsButtonRef}>
+              <Button
+                variant="text"
+                startIcon={<StorageIcon/>}
+                onClick={toggleOpenOptions}
+                ariaLabel={"Group by"}
+              />
+            </div>
+          </Tooltip>
+          {
+            <Popper
+              open={openOptions}
+              placement="bottom-right"
+              onClose={handleCloseOptions}
+              buttonRef={optionsButtonRef}
+            >
+              <div className="vm-list vm-group-logs-header-keys">
+                <div className="vm-group-logs-header-keys__search">
+                  <TextField
+                    label="Search key"
+                    value={searchKey}
+                    onChange={setSearchKey}
+                    type="search"
+                  />
+                </div>
+                {filteredLogsKeys.map(id => (
+                  <div
+                    className={classNames({
+                      "vm-list-item": true,
+                      "vm-list-item_active": id === groupBy
+                    })}
+                    key={id}
+                    onClick={handleSelectGroupBy(id)}
+                  >
+                    {id}
+                  </div>
+                ))}
+              </div>
+            </Popper>
+          }
        </div>
      ), settingsRef.current)}
    </>
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsFieldRow.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsFieldRow.tsx
@@ -1,10 +1,8 @@
 import React, { FC, memo, useCallback, useEffect, useState } from "preact/compat";
 import Tooltip from "../../../components/Main/Tooltip/Tooltip";
 import Button from "../../../components/Main/Button/Button";
-import { CopyIcon, StorageIcon, VisibilityIcon } from "../../../components/Main/Icons";
+import { CopyIcon } from "../../../components/Main/Icons";
 import useCopyToClipboard from "../../../hooks/useCopyToClipboard";
-import { useSearchParams } from "react-router-dom";
-import { LOGS_GROUP_BY, LOGS_URL_PARAMS } from "../../../constants/logs";

 interface Props {
  field: string;
@@ -13,17 +11,8 @@ interface Props {

 const GroupLogsFieldRow: FC<Props> = ({ field, value }) => {
  const copyToClipboard = useCopyToClipboard();
-  const [searchParams, setSearchParams] = useSearchParams();
-
  const [copied, setCopied] = useState<boolean>(false);

-  const groupBy = searchParams.get(LOGS_URL_PARAMS.GROUP_BY) || LOGS_GROUP_BY;
-  const displayFieldsString = searchParams.get(LOGS_URL_PARAMS.DISPLAY_FIELDS) || "";
-  const displayFields = displayFieldsString ? displayFieldsString.split(",") : [];
-
-  const isSelectedField = displayFields.includes(field);
-  const isGroupByField = groupBy === field;
-
  const handleCopy = useCallback(async () => {
    if (copied) return;
    try {
@@ -34,18 +23,6 @@ const GroupLogsFieldRow: FC<Props> = ({ field, value }) => {
    }
  }, [copied, copyToClipboard]);

-  const handleSelectDisplayField = () => {
-    const prev = displayFields;
-    const newDisplayFields = prev.includes(field) ? prev.filter(v => v !== field) : [...prev, field];
-    searchParams.set(LOGS_URL_PARAMS.DISPLAY_FIELDS, newDisplayFields.join(","));
-    setSearchParams(searchParams);
-  };
-
-  const handleSelectGroupBy = () => {
-    isGroupByField ? searchParams.delete(LOGS_URL_PARAMS.GROUP_BY) : searchParams.set(LOGS_URL_PARAMS.GROUP_BY, field);
-    setSearchParams(searchParams);
-  };
-
  useEffect(() => {
    if (copied === null) return;
    const timeout = setTimeout(() => setCopied(false), 2000);
@@ -58,7 +35,6 @@ const GroupLogsFieldRow: FC<Props> = ({ field, value }) => {
        <div className="vm-group-logs-row-fields-item-controls__wrapper">
          <Tooltip title={copied ? "Copied" : "Copy to clipboard"}>
            <Button
-              className="vm-group-logs-row-fields-item-controls__button"
              variant="text"
              color="gray"
              size="small"
@@ -67,34 +43,6 @@ const GroupLogsFieldRow: FC<Props> = ({ field, value }) => {
              ariaLabel="copy to clipboard"
            />
          </Tooltip>
-          <Tooltip
-            key={`${field}_${isSelectedField}_${isGroupByField}`}
-            title={isSelectedField ? "Hide this field" : "Show this field instead of the message"}
-          >
-            <Button
-              className="vm-group-logs-row-fields-item-controls__button"
-              variant="text"
-              color={isSelectedField ? "secondary" : "gray"}
-              size="small"
-              startIcon={isSelectedField ? <VisibilityIcon/> : <VisibilityIcon/>}
-              onClick={handleSelectDisplayField}
-              ariaLabel="copy to clipboard"
-            />
-          </Tooltip>
-          <Tooltip
-            key={`${field}_${isSelectedField}_${isGroupByField}`}
-            title={isGroupByField ? "Ungroup this field" : "Group by this field"}
-          >
-            <Button
-              className="vm-group-logs-row-fields-item-controls__button"
-              variant="text"
-              color={isGroupByField ? "secondary" : "gray"}
-              size="small"
-              startIcon={<StorageIcon/>}
-              onClick={handleSelectGroupBy}
-              ariaLabel="copy to clipboard"
-            />
-          </Tooltip>
        </div>
      </td>
      <td className="vm-group-logs-row-fields-item__key">{field}</td>
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsHeader.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsHeader.tsx
@@ -1,127 +0,0 @@
-import React, { FC, useCallback, useEffect, useRef } from "preact/compat";
-import classNames from "classnames";
-import { useSearchParams } from "react-router-dom";
-import { MouseEvent, useState } from "react";
-import { useAppState } from "../../../state/common/StateContext";
-import { Logs } from "../../../api/types";
-import useEventListener from "../../../hooks/useEventListener";
-import Popper from "../../../components/Main/Popper/Popper";
-import useBoolean from "../../../hooks/useBoolean";
-import GroupLogsHeaderItem from "./GroupLogsHeaderItem";
-import { LOGS_GROUP_BY, LOGS_URL_PARAMS } from "../../../constants/logs";
-
-interface Props {
-  group: {
-    keys: string[]
-    keysString: string
-    values: Logs[]
-    pairs: string[]
-  };
-}
-
-const GroupLogsHeader: FC<Props> = ({ group }) => {
-  const { isDarkTheme } = useAppState();
-  const [searchParams] = useSearchParams();
-
-  const containerRef = useRef<HTMLDivElement>(null);
-  const moreRef = useRef<HTMLDivElement>(null);
-
-  const {
-    value: openMore,
-    toggle: handleToggleMore,
-    setFalse: handleCloseMore,
-  } = useBoolean(false);
-
-  const [hideParisCount, setHideParisCount] = useState<number>(0);
-
-  const groupBy = searchParams.get(LOGS_URL_PARAMS.GROUP_BY) || LOGS_GROUP_BY;
-  const compactGroupHeader = searchParams.get(LOGS_URL_PARAMS.COMPACT_GROUP_HEADER) === "true";
-
-  const pairs = group.pairs;
-  const hideAboveIndex = pairs.length - hideParisCount - 1;
-
-  const handleClickMore = (e: MouseEvent<HTMLDivElement>) => {
-    e.stopPropagation();
-    handleToggleMore();
-  };
-
-  const calcVisiblePairsCount = useCallback(() => {
-    if (!compactGroupHeader || !containerRef.current) {
-      setHideParisCount(0);
-      return;
-    }
-
-    const container = containerRef.current;
-    const containerSize = container.getBoundingClientRect();
-    const selector = ".vm-group-logs-section-keys__pair:not(.vm-group-logs-section-keys__pair_more)";
-    const children = Array.from(container.querySelectorAll(selector));
-    let count = 0;
-
-    for (const child of children) {
-      const { right } = (child as HTMLElement).getBoundingClientRect();
-
-      if ((right + 220) > containerSize.width) {
-        count++;
-      }
-    }
-
-    setHideParisCount(count);
-  }, [compactGroupHeader, containerRef]);
-
-  useEffect(calcVisiblePairsCount, [group.pairs, compactGroupHeader, containerRef]);
-
-  useEventListener("resize", calcVisiblePairsCount);
-
-  return (
-    <div
-      className={classNames({
-        "vm-group-logs-section-keys": true,
-        "vm-group-logs-section-keys_compact": compactGroupHeader,
-      })}
-      ref={containerRef}
-    >
-      <span className="vm-group-logs-section-keys__title">Group by <code>{groupBy}</code>:</span>
-      {pairs.map((pair, i) => (
-        <GroupLogsHeaderItem
-          key={`${group.keysString}_${pair}`}
-          pair={pair}
-          isHide={hideParisCount ? i > hideAboveIndex : false}
-        />
-      ))}
-      {hideParisCount > 0 && (
-        <>
-          <div
-            className={classNames({
-              "vm-group-logs-section-keys__pair": true,
-              "vm-group-logs-section-keys__pair_more": true,
-              "vm-group-logs-section-keys__pair_dark": isDarkTheme
-            })}
-            ref={moreRef}
-            onClick={handleClickMore}
-          >
-            +{hideParisCount} more
-          </div>
-          <Popper
-            open={openMore}
-            buttonRef={moreRef}
-            placement="bottom-left"
-            onClose={handleCloseMore}
-          >
-            <div className="vm-group-logs-section-keys vm-group-logs-section-keys_popper">
-              {pairs.slice(hideAboveIndex + 1).map((pair) => (
-                <GroupLogsHeaderItem
-                  key={`${group.keysString}_${pair}`}
-                  pair={pair}
-                />
-              ))}
-            </div>
-          </Popper>
-        </>
-      )}
-      <span className="vm-group-logs-section-keys__count">{group.values.length} entries</span>
-    </div>
-  )
-  ;
-};
-
-export default GroupLogsHeader;
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsHeaderItem.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsHeaderItem.tsx
@@ -1,59 +0,0 @@
-import React, { FC, useEffect } from "preact/compat";
-import { useAppState } from "../../../state/common/StateContext";
-import Tooltip from "../../../components/Main/Tooltip/Tooltip";
-import classNames from "classnames";
-import { MouseEvent, useState } from "react";
-import useCopyToClipboard from "../../../hooks/useCopyToClipboard";
-import { useSearchParams } from "react-router-dom";
-import { LOGS_GROUP_BY, LOGS_URL_PARAMS } from "../../../constants/logs";
-import { convertToFieldFilter } from "../../../utils/logs";
-
-interface Props {
-  pair: string;
-  isHide?: boolean;
-}
-
-const GroupLogsHeaderItem: FC<Props> = ({ pair, isHide }) => {
-  const { isDarkTheme } = useAppState();
-  const copyToClipboard = useCopyToClipboard();
-  const [searchParams] = useSearchParams();
-
-  const [copied, setCopied] = useState<string | null>(null);
-
-  const groupBy = searchParams.get(LOGS_URL_PARAMS.GROUP_BY) || LOGS_GROUP_BY;
-
-  const handleClickByPair = (value: string) => async (e: MouseEvent<HTMLDivElement>) => {
-    e.stopPropagation();
-    const copyValue = convertToFieldFilter(value, groupBy);
-    const isCopied = await copyToClipboard(copyValue);
-    if (isCopied) {
-      setCopied(value);
-    }
-  };
-
-  useEffect(() => {
-    if (copied === null) return;
-    const timeout = setTimeout(() => setCopied(null), 2000);
-    return () => clearTimeout(timeout);
-  }, [copied]);
-
-  return (
-    <Tooltip
-      title={copied === pair ? "Copied" : "Copy to clipboard"}
-      placement={"top-center"}
-    >
-      <div
-        className={classNames({
-          "vm-group-logs-section-keys__pair": true,
-          "vm-group-logs-section-keys__pair_hide": isHide,
-          "vm-group-logs-section-keys__pair_dark": isDarkTheme
-        })}
-        onClick={handleClickByPair(pair)}
-      >
-        {pair}
-      </div>
-    </Tooltip>
-  );
-};
-
-export default GroupLogsHeaderItem;
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsItem.tsx
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/GroupLogsItem.tsx
@@ -6,34 +6,28 @@ import { ArrowDownIcon } from "../../../components/Main/Icons";
 import classNames from "classnames";
 import { useLogsState } from "../../../state/logsPanel/LogsStateContext";
 import dayjs from "dayjs";
+import { DATE_TIME_FORMAT } from "../../../constants/date";
 import { useTimeState } from "../../../state/time/TimeStateContext";
 import GroupLogsFieldRow from "./GroupLogsFieldRow";
 import { marked } from "marked";
-import { useSearchParams } from "react-router-dom";
-import { LOGS_DATE_FORMAT, LOGS_URL_PARAMS } from "../../../constants/logs";

 interface Props {
  log: Logs;
-  displayFields?: string[];
 }

-const GroupLogsItem: FC<Props> = ({ log, displayFields = ["_msg"] }) => {
+const GroupLogsItem: FC<Props> = ({ log }) => {
  const {
    value: isOpenFields,
    toggle: toggleOpenFields,
  } = useBoolean(false);

-  const [searchParams] = useSearchParams();
  const { markdownParsing } = useLogsState();
  const { timezone } = useTimeState();

-  const noWrapLines = searchParams.get(LOGS_URL_PARAMS.NO_WRAP_LINES) === "true";
-  const dateFormat = searchParams.get(LOGS_URL_PARAMS.DATE_FORMAT) || LOGS_DATE_FORMAT;
-
  const formattedTime = useMemo(() => {
    if (!log._time) return "";
-    return dayjs(log._time).tz().format(dateFormat);
-  }, [log._time, timezone, dateFormat]);
+    return dayjs(log._time).tz().format(`${DATE_TIME_FORMAT}.SSS`);
+  }, [log._time, timezone]);

  const formattedMarkdown = useMemo(() => {
    if (!markdownParsing || !log._msg) return "";
@@ -44,14 +38,6 @@ const GroupLogsItem: FC<Props> = ({ log, displayFields = ["_msg"] }) => {
  const hasFields = fields.length > 0;

  const displayMessage = useMemo(() => {
-    if (displayFields.length) {
-      return displayFields.filter(field => log[field]).map((field, i) => (
-        <span
-          className="vm-group-logs-row-content__sub-msg"
-          key={field + i}
-        >{log[field]}</span>
-      ));
-    }
    if (log._msg) return log._msg;
    if (!hasFields) return;
    const dataObject = fields.reduce<{ [key: string]: string }>((obj, [key, value]) => {
@@ -59,7 +45,7 @@ const GroupLogsItem: FC<Props> = ({ log, displayFields = ["_msg"] }) => {
      return obj;
    }, {});
    return JSON.stringify(dataObject);
-  }, [log, fields, hasFields, displayFields]);
+  }, [log, fields, hasFields]);

  return (
    <div className="vm-group-logs-row">
@@ -90,8 +76,7 @@ const GroupLogsItem: FC<Props> = ({ log, displayFields = ["_msg"] }) => {
          className={classNames({
            "vm-group-logs-row-content__msg": true,
            "vm-group-logs-row-content__msg_empty-msg": !log._msg,
-            "vm-group-logs-row-content__msg_missing": !displayMessage,
-            "vm-group-logs-row-content__msg_single-line": noWrapLines,
+            "vm-group-logs-row-content__msg_missing": !displayMessage
          })}
          dangerouslySetInnerHTML={(markdownParsing && formattedMarkdown) ? { __html: formattedMarkdown } : undefined}
        >
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/style.scss
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/GroupLogs/style.scss
@@ -1,7 +1,5 @@
@use "src/styles/variables" as *;

-$font-size-logs: var(--font-size-logs, $font-size-small);
-
 .vm-group-logs {
  margin-top: calc(-1 * $padding-medium);

@@ -21,44 +19,22 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
  }

  &-section {
-    border-bottom: $border-divider;
-
    &-keys {
-      position: relative;
      display: flex;
      align-items: center;
      flex-wrap: wrap;
      gap: $padding-small;
-      padding: $padding-small 120px $padding-small 0;
-      font-size: $font-size-logs;
-
-      &_compact {
-        flex-wrap: nowrap;
-        overflow: hidden;
-      }
-
-      &_popper {
-        display: flex;
-        flex-wrap: nowrap;
-        flex-direction: column;
-        align-items: flex-start;
-        justify-content: flex-start;
-        padding: $padding-global;
-        max-height: 400px;
-        overflow: auto;
-      }
+      border-bottom: $border-divider;
+      padding: $padding-small 0;

      &__title {
        font-weight: bold;
-        white-space: nowrap;

        code {
          font-family: monospace;
-
          &:before {
            content: "\"";
          }
-
          &:after {
            content: "\"";
          }
@@ -66,35 +42,19 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
      }

      &__count {
-        position: absolute;
-        top: auto;
-        right: 0;
        flex-grow: 1;
        text-align: right;
-        font-size: $font-size-logs;
+        font-size: $font-size-small;
        color: $color-text-secondary;
        padding-right: calc($padding-large * 3);
      }

      &__pair {
-        order: 0;
        padding: calc($padding-global / 2) $padding-global;
        background-color: lighten($color-tropical-blue, 6%);
        color: darken($color-dodger-blue, 20%);
        border-radius: $border-radius-medium;
        transition: background-color 0.3s ease-in, transform 0.1s ease-in, opacity 0.3s ease-in;
-        white-space: nowrap;
-
-        &_hide {
-          order: 2;
-          visibility: hidden;
-          opacity: 0;
-          pointer-events: none;
-        }
-
-        &_more {
-          order: 1;
-        }

        &:hover {
          background-color: $color-tropical-blue;
@@ -124,19 +84,13 @@ $font-size-logs: var(--font-size-logs, $font-size-small);

  &-row {
    position: relative;
-
-    &:last-child {
-      margin-bottom: $padding-small;
-    }
+    border-bottom: $border-divider;

    &-content {
      position: relative;
      display: grid;
-      grid-template-columns: auto max-content 1fr;
-      padding: calc($padding-small / 4) 0;
-      font-size: $font-size-logs;
-      font-variant-numeric: tabular-nums;
-      line-height: 1.3;
+      grid-template-columns: auto minmax(180px, max-content) 1fr;
+      padding: $padding-global 0;
      cursor: pointer;
      transition: background-color 0.2s ease-in;

@@ -162,7 +116,8 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
        display: flex;
        align-items: flex-start;
        justify-content: flex-end;
-        padding: 0 $padding-global 0 $padding-small;
+        margin-right: $padding-small;
+        line-height: 1;
        white-space: nowrap;

        &_missing {
@@ -175,12 +130,7 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
      &__msg {
        font-family: $font-family-monospace;
        overflow-wrap: anywhere;
-
-        &_single-line {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
+        line-height: 1.1;

        &_empty-msg {
          overflow: hidden;
@@ -208,7 +158,7 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
          border-radius: $border-radius-small;
          tab-size: 4;
          font-variant-ligatures: none;
-          margin: calc($padding-small / 4) 0;
+          margin: calc($padding-small/4) 0;
        }

        p {
@@ -221,7 +171,7 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
        }

        code {
-          font-size: $font-size-logs;
+          font-size: $font-size-small;
          padding: calc($padding-small / 4) calc($padding-small / 2);
        }

@@ -244,35 +194,25 @@ $font-size-logs: var(--font-size-logs, $font-size-small);

        blockquote {
          border-left: 4px solid $color-hover-black;
-          margin: calc($padding-small / 2) $padding-small;
-          padding: calc($padding-small / 2) $padding-small;
+          margin: calc($padding-small/2) $padding-small;
+          padding: calc($padding-small/2) $padding-small;
        }

        ul, ol {
          list-style-position: inside;
        }
-
        /* end styles for markdown */
      }
-
-      &__sub-msg {
-        padding-right: $padding-global;
-      }
    }

    &-fields {
-      position: relative;
      grid-row: 2;
      padding: $padding-small 0;
-      margin: $padding-small 0 $padding-small calc($padding-global * 2);
+      margin-bottom: $padding-small;
      border: $border-divider;
      border-radius: $border-radius-small;
      overflow: auto;
      max-height: 300px;
-      resize: vertical;
-      font-family: $font-family-monospace;
-      font-size: $font-size-logs;
-      font-variant-numeric: tabular-nums;

      &-item {
        border-radius: $border-radius-small;
@@ -283,26 +223,19 @@ $font-size-logs: var(--font-size-logs, $font-size-small);
        }

        &-controls {
-          padding: 0 calc($padding-small / 2);
+          padding: 0;

          &__wrapper {
            display: flex;
            align-items: center;
            justify-content: center;
          }
-
-          &__button.vm-button_small {
-            width: 22px;
-            height: 22px;
-            min-height: 22px;
-          }
        }

        &__key,
        &__value {
          vertical-align: top;
-          line-height: $font-size;
-          padding: calc($padding-small / 2);
+          padding: calc($padding-small / 2) $padding-global;
        }

        &__key {
--- a/app/vmui/packages/vmui/src/pages/ExploreLogs/hooks/useFetchLogHits.ts
+++ b/app/vmui/packages/vmui/src/pages/ExploreLogs/hooks/useFetchLogHits.ts
@@ -4,8 +4,6 @@ import { ErrorTypes, TimeParams } from "../../../types";
 import { LogHits } from "../../../api/types";
 import { useSearchParams } from "react-router-dom";
 import { getHitsTimeParams } from "../../../utils/logs";
-import { LOGS_GROUP_BY, LOGS_LIMIT_HITS } from "../../../constants/logs";
-import { isEmptyObject } from "../../../utils/object";

 export const useFetchLogHits = (server: string, query: string) => {
  const [searchParams] = useSearchParams();
@@ -32,12 +30,46 @@ export const useFetchLogHits = (server: string, query: string) => {
        step: `${step}ms`,
        start: start.toISOString(),
        end: end.toISOString(),
-        fields_limit: `${LOGS_LIMIT_HITS}`,
-        field: LOGS_GROUP_BY,
+        field: "_stream" // In the future, this field can be made configurable
+
      })
    };
  };

+  const accumulateHits = (resultHit: LogHits, hit: LogHits) => {
+    resultHit.total = (resultHit.total || 0) + (hit.total || 0);
+    hit.timestamps.forEach((timestamp, i) => {
+      const index = resultHit.timestamps.findIndex(t => t === timestamp);
+      if (index === -1) {
+        resultHit.timestamps.push(timestamp);
+        resultHit.values.push(hit.values[i]);
+      } else {
+        resultHit.values[index] += hit.values[i];
+      }
+    });
+    return resultHit;
+  };
+
+  const getHitsWithTop = (hits: LogHits[]) => {
+    const topN = 5;
+    const defaultHit = { fields: {}, timestamps: [], values: [], total: 0 };
+
+    const hitsByTotal = hits.sort((a, b) => (b.total || 0) - (a.total || 0));
+    const result = [];
+
+    const otherHits: LogHits = hitsByTotal.slice(topN).reduce(accumulateHits, defaultHit);
+    if (otherHits.total) {
+      result.push(otherHits);
+    }
+
+    const topHits: LogHits[] = hitsByTotal.slice(0, topN);
+    if (topHits.length) {
+      result.push(...topHits);
+    }
+
+    return result;
+  };
+
  const fetchLogHits = useCallback(async (period: TimeParams) => {
    abortControllerRef.current.abort();
    abortControllerRef.current = new AbortController();
@@ -66,7 +98,7 @@ export const useFetchLogHits = (server: string, query: string) => {
        setError(error);
      }

-      setLogHits(hits.map(hit => ({ ...hit, _isOther: isEmptyObject(hit.fields) })));
+      setLogHits(!hits ? [] : getHitsWithTop(hits));
    } catch (e) {
      if (e instanceof Error && e.name !== "AbortError") {
        setError(String(e));
--- a/app/vmui/packages/vmui/src/state/logsPanel/reducer.ts
+++ b/app/vmui/packages/vmui/src/state/logsPanel/reducer.ts
@@ -1,20 +1,15 @@
 import { getFromStorage, saveToStorage } from "../../utils/storage";
-import { LogsFiledValues } from "../../api/types";
-import { AUTOCOMPLETE_LIMITS } from "../../constants/queryAutocomplete";

 export interface LogsState {
  markdownParsing: boolean;
-  autocompleteCache: Map<string, LogsFiledValues[]>;
 }

 export type LogsAction =
  | { type: "SET_MARKDOWN_PARSING", payload: boolean }
-  | { type: "SET_AUTOCOMPLETE_CACHE", payload: { key: string, value: LogsFiledValues[] } }


 export const initialLogsState: LogsState = {
  markdownParsing: getFromStorage("LOGS_MARKDOWN") === "true",
-  autocompleteCache: new Map<string, LogsFiledValues[]>(),
 };

 export function reducer(state: LogsState, action: LogsAction): LogsState {
@@ -25,18 +20,6 @@ export function reducer(state: LogsState, action: LogsAction): LogsState {
        ...state,
        markdownParsing: action.payload
      };
-    case "SET_AUTOCOMPLETE_CACHE": {
-      if (state.autocompleteCache.size >= AUTOCOMPLETE_LIMITS.cacheLimit) {
-        const firstKey = state.autocompleteCache.keys().next().value;
-        state.autocompleteCache.delete(firstKey);
-      }
-      state.autocompleteCache.set(action.payload.key, action.payload.value);
-
-      return {
-        ...state,
-        autocompleteCache: state.autocompleteCache,
-      };
-    }
    default:
      throw new Error();
  }
--- a/app/vmui/packages/vmui/src/utils/logs.ts
+++ b/app/vmui/packages/vmui/src/utils/logs.ts
@@ -1,8 +1,6 @@
 import { TimeParams } from "../types";
 import dayjs from "dayjs";
-import { LOGS_BARS_VIEW, LOGS_GROUP_BY } from "../constants/logs";
-import { LogHits } from "../api/types";
-import { OTHER_HITS_LABEL } from "../components/Chart/BarHitsChart/hooks/useBarHitsOptions";
+import { LOGS_BARS_VIEW } from "../constants/logs";

 export const getStreamPairs = (value: string): string[] => {
  const pairs = /^{.+}$/.test(value) ? value.slice(1, -1).split(",") : [value];
@@ -16,27 +14,3 @@ export const getHitsTimeParams = (period: TimeParams) => {
  const step = Math.ceil(totalSeconds / LOGS_BARS_VIEW) || 1;
  return { start, end, step };
 };
-
-export const convertToFieldFilter = (value: string, field = LOGS_GROUP_BY) => {
-  const isKeyValue = /(.+)?=(".+")/.test(value);
-
-  if (isKeyValue) {
-    return value.replace(/=/, ": ");
-  }
-
-  return `${field}: "${value}"`;
-};
-
-export const calculateTotalHits = (hits: LogHits[]): number => {
-  return hits.reduce((acc, item) => acc + (item.total || 0), 0);
-};
-
-export const sortLogHits = <T extends { label?: string }>(key: keyof T) => (a: T, b: T): number => {
-  if (a.label === OTHER_HITS_LABEL) return 1;
-  if (b.label === OTHER_HITS_LABEL) return -1;
-
-  const aValue = a[key] as unknown as number;
-  const bValue = b[key] as unknown as number;
-
-  return bValue - aValue;
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
func25	3d86b1409f	convention	2025-01-15 10:36:49 +07:00
func25	6ed3a2fc10	new dropSamplesOnOverload rerouting	2025-01-15 10:31:11 +07:00
func25	ecda474534	delay sending bufs from broken node to other nodes	2025-01-09 22:08:38 +07:00
func25	26e8edb6d7	optimize	2025-01-09 21:41:15 +07:00
func25	e46bdd946b	optimize	2025-01-09 21:16:42 +07:00
func25	824add0766	testing	2025-01-06 17:43:41 +07:00
func25	863f85c843	readonly nodes will be excluded immediately	2025-01-06 15:00:38 +07:00
func25	a64bb1a5e0	remove unused func	2025-01-06 15:00:38 +07:00
func25	69dd4759d1	fix setBroken	2025-01-06 15:00:38 +07:00
func25	f440f2375f	drop disableRerouting, add rerouteDelay flag	2025-01-06 15:00:38 +07:00