docs/release-guide: add a note about versioning in helm charts and ansible

Signed-off-by: Zakhar Bessarab <z.bessarab@victoriametrics.com>

.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

LICENSE

@@ -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.

Makefile

@@ -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`

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)">

app/vlinsert/datadog/datadog.go

@@ -14,7 +14,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vlinsert/insertutils"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vlstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logstorage"
@@ -22,11 +21,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/writeconcurrencylimiter"
 )
 
-var (
-	datadogStreamFields = flagutil.NewArrayString("datadog.streamFields", "Datadog tags to be used as stream fields.")
-	datadogIgnoreFields = flagutil.NewArrayString("datadog.ignoreFields", "Datadog tags to ignore.")
-)
-
 var parserPool fastjson.ParserPool
 
 // RequestHandler processes Datadog insert requests
@@ -85,13 +79,6 @@ func datadogLogsIngestion(w http.ResponseWriter, r *http.Request) bool {
 		return true
 	}
 
-	if len(cp.StreamFields) == 0 {
-		cp.StreamFields = *datadogStreamFields
-	}
-	if len(cp.IgnoreFields) == 0 {
-		cp.IgnoreFields = *datadogIgnoreFields
-	}
-
 	if err := vlstorage.CanWriteData(); err != nil {
 		httpserver.Errorf(w, r, "%s", err)
 		return true
@@ -118,70 +105,6 @@ var (
 	v2LogsRequestDuration = metrics.NewHistogram(`vl_http_request_duration_seconds{path="/insert/datadog/api/v2/logs"}`)
 )
 
-// datadog message field has two formats:
-//   - regular log message with string text
-//   - nested json format for serverless plugins
-//     which has folowing format:
-//     {"message": {"message": "text","lamdba": {"arn": "string","requestID": "string"}, "timestamp": int64} }
-//
-// See https://github.com/DataDog/datadog-lambda-extension/blob/28b90c7e4e985b72d60b5f5a5147c69c7ac693c4/bottlecap/src/logs/lambda/mod.rs#L24
-func appendMsgFields(fields []logstorage.Field, v *fastjson.Value) ([]logstorage.Field, error) {
-	switch v.Type() {
-	case fastjson.TypeString:
-		val := v.GetStringBytes()
-		fields = append(fields, logstorage.Field{
-			Name:  "_msg",
-			Value: bytesutil.ToUnsafeString(val),
-		})
-	case fastjson.TypeObject:
-		var firstErr error
-		v.GetObject().Visit(func(k []byte, v *fastjson.Value) {
-			if firstErr != nil {
-				return
-			}
-			switch bytesutil.ToUnsafeString(k) {
-			case "message":
-				val := v.GetStringBytes()
-				fields = append(fields, logstorage.Field{
-					Name:  "_msg",
-					Value: bytesutil.ToUnsafeString(val),
-				})
-			case "status":
-				val := v.GetStringBytes()
-				fields = append(fields, logstorage.Field{
-					Name:  "status",
-					Value: bytesutil.ToUnsafeString(val),
-				})
-			case "lamdba":
-				obj, err := v.Object()
-				if err != nil {
-					firstErr = err
-					firstErr = fmt.Errorf("unexpected lambda value type for %q:%q; want object", k, v)
-					return
-				}
-				obj.Visit(func(k []byte, v *fastjson.Value) {
-					if firstErr != nil {
-						return
-					}
-					val, err := v.StringBytes()
-					if err != nil {
-						firstErr = fmt.Errorf("unexpected lambda label value type for %q:%q; want string", k, v)
-						return
-					}
-					fields = append(fields, logstorage.Field{
-						Name:  bytesutil.ToUnsafeString(k),
-						Value: bytesutil.ToUnsafeString(val),
-					})
-				})
-
-			}
-		})
-	default:
-		return fields, fmt.Errorf("unsupported message type %q", v.Type().String())
-	}
-	return fields, nil
-}
-
 // readLogsRequest parses data according to DataDog logs format
 // https://docs.datadoghq.com/api/latest/logs/#send-logs
 func readLogsRequest(ts int64, data []byte, lmp insertutils.LogMessageProcessor) error {
@@ -206,27 +129,19 @@ func readLogsRequest(ts int64, data []byte, lmp insertutils.LogMessageProcessor)
 			if err != nil {
 				return
 			}
-			switch bytesutil.ToUnsafeString(k) {
+			val, e := v.StringBytes()
+			if e != nil {
+				err = fmt.Errorf("unexpected label value type for %q:%q; want string", k, v)
+				return
+			}
+			switch string(k) {
 			case "message":
-				fields, err = appendMsgFields(fields, v)
-				if err != nil {
-					return
-				}
-			case "timestamp":
-				val, e := v.Int64()
-				if e != nil {
-					err = fmt.Errorf("failed to parse timestamp for %q:%q", k, v)
-				}
-				if val > 0 {
-					ts = val * 1e6
-				}
+				fields = append(fields, logstorage.Field{
+					Name:  "_msg",
+					Value: bytesutil.ToUnsafeString(val),
+				})
 			case "ddtags":
 				// https://docs.datadoghq.com/getting_started/tagging/
-				val, e := v.StringBytes()
-				if e != nil {
-					err = fmt.Errorf("unexpected label value type for %q:%q; want string", k, v)
-					return
-				}
 				var pair []byte
 				idx := 0
 				for idx >= 0 {
@@ -253,20 +168,12 @@ func readLogsRequest(ts int64, data []byte, lmp insertutils.LogMessageProcessor)
 					}
 				}
 			default:
-				val, e := v.StringBytes()
-				if e != nil {
-					err = fmt.Errorf("unexpected label value type for %q:%q; want string", k, v)
-					return
-				}
 				fields = append(fields, logstorage.Field{
 					Name:  bytesutil.ToUnsafeString(k),
 					Value: bytesutil.ToUnsafeString(val),
 				})
 			}
 		})
-		if err != nil {
-			return err
-		}
 		lmp.AddRow(ts, fields, nil)
 		fields = fields[:0]
 	}

app/vlinsert/datadog/datadog_test.go

@@ -54,12 +54,6 @@ func TestReadLogsRequestSuccess(t *testing.T) {
 			"hostname":"127.0.0.1",
 			"message":"bar",
 			"service":"test"
-		}, {
-			"ddsource":"nginx",
-                        "ddtags":"tag1:value1,tag2:value2",
-                        "hostname":"127.0.0.1",
-                        "message":{"message": "nested"},
-                        "service":"test"
 		}, {
 			"ddsource":"nginx",
 			"ddtags":"tag1:value1,tag2:value2",
@@ -92,9 +86,8 @@ func TestReadLogsRequestSuccess(t *testing.T) {
                         "service":"test"
 		}
 	]`
-	rowsExpected := 7
+	rowsExpected := 6
 	resultExpected := `{"ddsource":"nginx","tag1":"value1","tag2":"value2","hostname":"127.0.0.1","_msg":"bar","service":"test"}
-{"ddsource":"nginx","tag1":"value1","tag2":"value2","hostname":"127.0.0.1","_msg":"nested","service":"test"}
 {"ddsource":"nginx","tag1":"value1","tag2":"value2","hostname":"127.0.0.1","_msg":"foobar","service":"test"}
 {"ddsource":"nginx","tag1":"value1","tag2":"value2","hostname":"127.0.0.1","_msg":"baz","service":"test"}
 {"ddsource":"nginx","tag1":"value1","tag2":"value2","hostname":"127.0.0.1","_msg":"xyz","service":"test"}

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)

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)

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)
 		}

app/vlselect/vmui/asset-manifest.json

@@ -1,12 +1,13 @@
 {
   "files": {
-    "main.css": "./static/css/main.4aacd559.css",
-    "main.js": "./static/js/main.5ce54a05.js",
+    "main.css": "./static/css/main.d05122da.css",
+    "main.js": "./static/js/main.6082e5a5.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.4aacd559.css",
-    "static/js/main.5ce54a05.js"
+    "static/css/main.d05122da.css",
+    "static/js/main.6082e5a5.js"
   ]
 }

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.5ce54a05.js"></script><link href="./static/css/main.4aacd559.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.6082e5a5.js"></script><link href="./static/css/main.d05122da.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

app/vmagent/main.go

@@ -30,7 +30,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/envflag"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
@@ -98,15 +97,6 @@ var (
 )
 
 func main() {
-	// vmagent is optimized for reduced memory allocations,
-	// so it can run with the reduced GOGC in order to reduce the used memory,
-	// while keeping CPU usage spent in GC at low levels.
-	//
-	// Some workloads may need increased GOGC values. Then such values can be set via GOGC environment variable.
-	// It is recommended increasing GOGC if go_memstats_gc_cpu_fraction metric exposed at /metrics page
-	// exceeds 0.05 for extended periods of time.
-	cgroup.SetGOGC(30)
-
 	// Write flags and help message to stdout, since it is easier to grep or pipe.
 	flag.CommandLine.SetOutput(os.Stdout)
 	flag.Usage = usage

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)
 		}

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 {

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) %},

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
 }

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)
 	}
 }

app/vmalert/rule/alerting.go

@@ -614,7 +614,7 @@ func (ar *AlertingRule) alertToTimeSeries(a *notifier.Alert, timestamp int64) []
 }
 
 func alertToTimeSeries(a *notifier.Alert, timestamp int64) prompbmarshal.TimeSeries {
-	labels := make([]prompbmarshal.Label, 0, len(a.Labels)+2)
+	var labels []prompbmarshal.Label
 	for k, v := range a.Labels {
 		labels = append(labels, prompbmarshal.Label{
 			Name:  k,
@@ -634,7 +634,7 @@ func alertToTimeSeries(a *notifier.Alert, timestamp int64) prompbmarshal.TimeSer
 // alertForToTimeSeries returns a time series that represents
 // state of active alerts, where value is time when alert become active
 func alertForToTimeSeries(a *notifier.Alert, timestamp int64) prompbmarshal.TimeSeries {
-	labels := make([]prompbmarshal.Label, 0, len(a.Labels)+1)
+	var labels []prompbmarshal.Label
 	for k, v := range a.Labels {
 		labels = append(labels, prompbmarshal.Label{
 			Name:  k,
@@ -650,24 +650,21 @@ func alertForToTimeSeries(a *notifier.Alert, timestamp int64) prompbmarshal.Time
 // for alerts which changed their state from Pending to Inactive or Firing.
 func pendingAlertStaleTimeSeries(ls map[string]string, timestamp int64, includeAlertForState bool) []prompbmarshal.TimeSeries {
 	var result []prompbmarshal.TimeSeries
-	baseLabels := make([]prompbmarshal.Label, 0, len(ls)+1)
+	var baseLabels []prompbmarshal.Label
 	for k, v := range ls {
 		baseLabels = append(baseLabels, prompbmarshal.Label{
 			Name:  k,
 			Value: v,
 		})
 	}
-
-	alertsLabels := make([]prompbmarshal.Label, 0, len(ls)+2)
-	alertsLabels = append(alertsLabels, baseLabels...)
 	// __name__ already been dropped, no need to check duplication
-	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
+	alertsLabels := append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
 	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: alertStateLabel, Value: notifier.StatePending.String()})
 	result = append(result, newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, alertsLabels))
 
 	if includeAlertForState {
-		baseLabels = append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
-		result = append(result, newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, baseLabels))
+		alertsForStateLabels := append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
+		result = append(result, newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, alertsForStateLabels))
 	}
 	return result
 }
@@ -675,25 +672,22 @@ func pendingAlertStaleTimeSeries(ls map[string]string, timestamp int64, includeA
 // firingAlertStaleTimeSeries returns stale `ALERTS` and `ALERTS_FOR_STATE` time series
 // for alerts which changed their state from Firing to Inactive.
 func firingAlertStaleTimeSeries(ls map[string]string, timestamp int64) []prompbmarshal.TimeSeries {
-	baseLabels := make([]prompbmarshal.Label, 0, len(ls)+1)
+	var baseLabels []prompbmarshal.Label
 	for k, v := range ls {
 		baseLabels = append(baseLabels, prompbmarshal.Label{
 			Name:  k,
 			Value: v,
 		})
 	}
-
-	alertsLabels := make([]prompbmarshal.Label, 0, len(ls)+2)
-	alertsLabels = append(alertsLabels, baseLabels...)
 	// __name__ already been dropped, no need to check duplication
-	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
+	alertsLabels := append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertMetricName})
 	alertsLabels = append(alertsLabels, prompbmarshal.Label{Name: alertStateLabel, Value: notifier.StateFiring.String()})
 
-	baseLabels = append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
+	alertsForStateLabels := append(baseLabels, prompbmarshal.Label{Name: "__name__", Value: alertForStateMetricName})
 
 	return []prompbmarshal.TimeSeries{
 		newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, alertsLabels),
-		newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, baseLabels),
+		newTimeSeries([]float64{decimal.StaleNaN}, []int64{timestamp}, alertsForStateLabels),
 	}
 }
 

app/vmalert/rule/alerting_test.go

@@ -252,14 +252,10 @@ func TestAlertingRule_Exec(t *testing.T) {
 	},
 		map[int][]prompbmarshal.TimeSeries{
 			0: {
-				{
-					Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "empty_labels"}, {Name: "alertstate", Value: "firing"}},
-					Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
-				},
-				{
-					Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "empty_labels"}},
-					Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
-				},
+				{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "empty_labels"}, {Name: "alertstate", Value: "firing"}},
+					Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}}},
+				{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "empty_labels"}},
+					Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}}},
 			},
 		})
 
@@ -277,34 +273,22 @@ func TestAlertingRule_Exec(t *testing.T) {
 		4: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StateInactive}}},
 	}, map[int][]prompbmarshal.TimeSeries{
 		0: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}}},
 		},
 		1: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
 		},
 		2: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "single-firing=>inactive=>firing=>inactive=>inactive"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
 		},
 	})
 
@@ -360,54 +344,34 @@ func TestAlertingRule_Exec(t *testing.T) {
 		},
 	}, map[int][]prompbmarshal.TimeSeries{
 		0: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}}},
 		},
 		1: {
 			// stale time series for foo, `firing -> inactive`
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
 			// new time series for foo1
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
 		},
 		2: {
 			// stale time series for foo1
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo1"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
 			// new time series for foo2
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo2"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo2"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo2"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "multiple-steps-firing"}, {Name: "name", Value: "foo2"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(2 * defaultStep).Unix()), Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
 		},
 	})
 
@@ -425,72 +389,50 @@ func TestAlertingRule_Exec(t *testing.T) {
 		1: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StateFiring}}},
 	}, map[int][]prompbmarshal.TimeSeries{
 		0: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}}},
 		},
 		1: {
 			// stale time series for `pending -> firing`
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "alertstate", Value: "firing"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-fired"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Add(defaultStep).Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
 		},
 	})
 
 	f(newTestAlertingRule("for-pending=>empty", time.Second), [][]datasource.Metric{
-		{metricWithLabels(t, "name", "foo", "a1", "b1", "a2", "b2", "a3", "b3")},
-		{metricWithLabels(t, "name", "foo", "a1", "b1", "a2", "b2", "a3", "b3")},
+		{metricWithLabels(t, "name", "foo")},
+		{metricWithLabels(t, "name", "foo")},
 		// empty step to delete pending alerts
 		{},
 	}, map[int][]testAlert{
-		0: {{labels: []string{"name", "foo", "a1", "b1", "a2", "b2", "a3", "b3"}, alert: &notifier.Alert{State: notifier.StatePending}}},
-		1: {{labels: []string{"name", "foo", "a1", "b1", "a2", "b2", "a3", "b3"}, alert: &notifier.Alert{State: notifier.StatePending}}},
+		0: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StatePending}}},
+		1: {{labels: []string{"name", "foo"}, alert: &notifier.Alert{State: notifier.StatePending}}},
 		2: {},
 	}, map[int][]prompbmarshal.TimeSeries{
 		0: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.UnixNano() / 1e6}}},
 		},
 		1: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: 1, Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: float64(ts.Unix()), Timestamp: ts.Add(defaultStep).UnixNano() / 1e6}}},
 		},
 		// stale time series for `pending -> inactive`
 		2: {
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
-			{
-				Labels:  []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "a1", Value: "b1"}, {Name: "a2", Value: "b2"}, {Name: "a3", Value: "b3"}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
-				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}},
-			},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertMetricName}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "alertstate", Value: "pending"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
+			{Labels: []prompbmarshal.Label{{Name: "__name__", Value: alertForStateMetricName}, {Name: "alertname", Value: "for-pending=>empty"}, {Name: "name", Value: "foo"}},
+				Samples: []prompbmarshal.Sample{{Value: decimal.StaleNaN, Timestamp: ts.Add(2*defaultStep).UnixNano() / 1e6}}},
 		},
 	})
 

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

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,
 			})

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 {

app/vmauth/main.go

@@ -207,7 +207,7 @@ func processRequest(w http.ResponseWriter, r *http.Request, ui *UserInfo) {
 			missingRouteRequests.Inc()
 			var di string
 			if ui.DumpRequestOnErrors {
-				di = debugInfo(u, r)
+				di = debugInfo(u, r.Header)
 			}
 			httpserver.Errorf(w, r, "missing route for %q%s", u.String(), di)
 			return
@@ -662,13 +662,13 @@ func (rtb *readTrackingBody) Close() error {
 	return nil
 }
 
-func debugInfo(u *url.URL, r *http.Request) string {
+func debugInfo(u *url.URL, h http.Header) string {
 	s := &strings.Builder{}
-	fmt.Fprintf(s, " (host: %q; ", r.Host)
+	fmt.Fprintf(s, " (host: %q; ", u.Host)
 	fmt.Fprintf(s, "path: %q; ", u.Path)
 	fmt.Fprintf(s, "args: %q; ", u.Query().Encode())
 	fmt.Fprint(s, "headers:")
-	_ = r.Header.WriteSubset(s, nil)
+	_ = h.WriteSubset(s, nil)
 	fmt.Fprint(s, ")")
 	return s.String()
 }

app/vmctl/influx/influx.go

@@ -180,7 +180,11 @@ func (c *Client) Explore() ([]*Series, error) {
 			log.Printf("skip measurement %q since it has no fields", s.Measurement)
 			continue
 		}
-		emptyTags := getEmptyTags(measurementTags[s.Measurement], s.LabelPairs)
+		tags, ok := measurementTags[s.Measurement]
+		if !ok {
+			return nil, fmt.Errorf("failed to find tags of measurement %s", s.Measurement)
+		}
+		emptyTags := getEmptyTags(tags, s.LabelPairs)
 		for _, field := range fields {
 			is := &Series{
 				Measurement: s.Measurement,
@@ -197,16 +201,11 @@ func (c *Client) Explore() ([]*Series, error) {
 // getEmptyTags returns tags of a measurement that are missing in a specific series.
 // Tags represent all tags of a measurement. LabelPairs represent tags of a specific series.
 func getEmptyTags(tags map[string]struct{}, LabelPairs []LabelPair) []string {
-	if len(tags) == 0 {
-		// fast path: the measurement does not contain any tag
-		return nil
-	}
-
 	labelMap := make(map[string]struct{})
 	for _, pair := range LabelPairs {
 		labelMap[pair.Name] = struct{}{}
 	}
-	var result []string
+	result := make([]string, 0, len(labelMap)-len(LabelPairs))
 	for tag := range tags {
 		if _, ok := labelMap[tag]; !ok {
 			result = append(result, tag)

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,
 	}

app/vminsert/influx/request_handler.go

@@ -125,14 +125,8 @@ func insertRows(at *auth.Token, db string, rows []parser.Row, extraLabels []prom
 				perTenantRows[*atLocal]++
 			}
 		} else {
-			// special case for optimisations below
-			// do not call TryPrepareLabels
-			// manually apply sort and limits on demand
-			ic.SortLabelsIfNeeded()
-			if hasLimitsEnabled {
-				if timeserieslimits.IsExceeding(ic.Labels) {
-					continue
-				}
+			if !ic.TryPrepareLabels(false) {
+				continue
 			}
 			atLocal := ic.GetLocalAuthToken(at)
 			ic.MetricNameBuf = storage.MarshalMetricNameRaw(ic.MetricNameBuf[:0], atLocal.AccountID, atLocal.ProjectID, ic.Labels)
@@ -147,6 +141,8 @@ func insertRows(at *auth.Token, db string, rows []parser.Row, extraLabels []prom
 				ic.Labels = ic.Labels[:labelsLen]
 				ic.AddLabel("", metricGroup)
 				if hasLimitsEnabled {
+					// special case for optimisation above
+					// check only __name__ label value limits
 					if timeserieslimits.IsExceeding(ic.Labels[len(ic.Labels)-1:]) {
 						continue
 					}

app/vminsert/netstorage/insert_ctx.go

@@ -256,6 +256,6 @@ func (ctx *InsertCtx) TryPrepareLabels(hasRelabeling bool) bool {
 	if timeserieslimits.Enabled() && timeserieslimits.IsExceeding(ctx.Labels) {
 		return false
 	}
-	ctx.SortLabelsIfNeeded()
+	ctx.sortLabelsIfNeeded()
 	return true
 }

app/vminsert/netstorage/netstorage.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"sort"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -114,7 +113,7 @@ again:
 		rowsProcessed, err := rerouteRowsToReadyStorageNodes(snb, sn, buf)
 		rows -= rowsProcessed
 		if err != nil {
-			return fmt.Errorf("%d rows dropped because the current vmstorage is unavailable and %w", rows, err)
+			return fmt.Errorf("%d rows dropped because the current vsmtorage is unavailable and %w", rows, err)
 		}
 		return nil
 	}
@@ -516,15 +515,10 @@ func MustStop() {
 	mustStopStorageNodes(snb)
 }
 
-func initStorageNodes(unsortedAddrs []string, hashSeed uint64) *storageNodesBucket {
-	if len(unsortedAddrs) == 0 {
+func initStorageNodes(addrs []string, hashSeed uint64) *storageNodesBucket {
+	if len(addrs) == 0 {
 		logger.Panicf("BUG: addrs must be non-empty")
 	}
-
-	addrs := make([]string, len(unsortedAddrs))
-	copy(addrs, unsortedAddrs)
-	sort.Strings(addrs)
-
 	ms := metrics.NewSet()
 	nodesHash := newConsistentHash(addrs, hashSeed)
 	sns := make([]*storageNode, 0, len(addrs))
@@ -691,7 +685,7 @@ func rerouteRowsToReadyStorageNodes(snb *storageNodesBucket, snSource *storageNo
 // reouteRowsToFreeStorageNodes re-routes src from snSource to other storage nodes.
 //
 // It is expected that snSource has no enough buffer for sending src.
-// It is expected than *disableRerouting isn't set when calling this function.
+// It is expected than *dsableRerouting 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 {

app/vminsert/netstorage/sort_labels.go

@@ -12,8 +12,8 @@ var sortLabels = flag.Bool("sortLabels", false, `Whether to sort labels for inco
 	`For example, if m{k1="v1",k2="v2"} may be sent as m{k2="v2",k1="v1"}. `+
 	`Enabled sorting for labels can slow down ingestion performance a bit`)
 
-// SortLabelsIfNeeded sorts labels if -sortLabels command-line flag is set
-func (ctx *InsertCtx) SortLabelsIfNeeded() {
+// sortLabelsIfNeeded sorts labels if -sortLabels command-line flag is set
+func (ctx *InsertCtx) sortLabelsIfNeeded() {
 	if *sortLabels {
 		sort.Sort(&ctx.Labels)
 	}

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 {

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

app/vmselect/prometheus/prometheus.go

@@ -54,7 +54,7 @@ var (
 	selectNodes = flagutil.NewArrayString("selectNode", "Comma-separated addresses of vmselect nodes; usage: -selectNode=vmselect-host1,...,vmselect-hostN")
 
 	maxUniqueTimeseries = flag.Int("search.maxUniqueTimeseries", 0, "The maximum number of unique time series, which can be selected during /api/v1/query and /api/v1/query_range queries. This option allows limiting memory usage. "+
-		"The limit can't exceed the explicitly set corresponding value `-search.maxUniqueTimeseries` on vmstorage side.")
+		"The limit can't exceed the corresponding -search.maxUniqueTimeseries limit on vmstorage, it can be only set to lower values.")
 	maxFederateSeries   = flag.Int("search.maxFederateSeries", 1e6, "The maximum number of time series, which can be returned from /federate. This option allows limiting memory usage")
 	maxExportSeries     = flag.Int("search.maxExportSeries", 10e6, "The maximum number of time series, which can be returned from /api/v1/export* APIs. This option allows limiting memory usage")
 	maxTSDBStatusSeries = flag.Int("search.maxTSDBStatusSeries", 10e6, "The maximum number of time series, which can be processed during the call to /api/v1/status/tsdb. This option allows limiting memory usage")
@@ -507,8 +507,6 @@ 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)
 	}

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 {

app/vmselect/promql/eval.go

@@ -48,8 +48,6 @@ var (
 		"so there is no need in spending additional CPU time on its handling. Staleness markers may exist only in data obtained from Prometheus scrape targets")
 	minWindowForInstantRollupOptimization = flag.Duration("search.minWindowForInstantRollupOptimization", time.Hour*3, "Enable cache-based optimization for repeated queries "+
 		"to /api/v1/query (aka instant queries), which contain rollup functions with lookbehind window exceeding the given value")
-	maxBinaryOpPushdownLabelValues = flag.Int("search.maxBinaryOpPushdownLabelValues", 100, "The maximum number of values for a label in the first expression that can be extracted as a common label filter and pushed down to the second expression in a binary operation. "+
-		"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.")
 )
 
 // The minimum number of points per timeseries for enabling time rounding.
@@ -603,7 +601,7 @@ func getCommonLabelFilters(tss []*timeseries) []metricsql.LabelFilter {
 				}
 				continue
 			}
-			if len(vc.values) > *maxBinaryOpPushdownLabelValues {
+			if len(vc.values) > 100 {
 				// Too many unique values found for the given tag.
 				// Do not make a filter on such values, since it may slow down
 				// search for matching time series.
@@ -1986,10 +1984,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}

app/vmselect/promql/exec.go

@@ -6,8 +6,11 @@ import (
 	"math"
 	"sort"
 	"strings"
+	"sync"
+	"sync/atomic"
 	"time"
 
+	"github.com/VictoriaMetrics/metrics"
 	"github.com/VictoriaMetrics/metricsql"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
@@ -273,7 +276,7 @@ func getReverseCmpOp(op string) string {
 }
 
 func parsePromQLWithCache(q string) (metricsql.Expr, error) {
-	pcv := parseCacheV.get(q)
+	pcv := parseCacheV.Get(q)
 	if pcv == nil {
 		e, err := metricsql.Parse(q)
 		if err == nil {
@@ -287,7 +290,7 @@ func parsePromQLWithCache(q string) (metricsql.Expr, error) {
 			e:   e,
 			err: err,
 		}
-		parseCacheV.put(q, pcv)
+		parseCacheV.Put(q, pcv)
 	}
 	if pcv.err != nil {
 		return nil, pcv.err
@@ -331,3 +334,80 @@ func escapeDots(s string) string {
 	}
 	return string(result)
 }
+
+var parseCacheV = func() *parseCache {
+	pc := &parseCache{
+		m: make(map[string]*parseCacheValue),
+	}
+	metrics.NewGauge(`vm_cache_requests_total{type="promql/parse"}`, func() float64 {
+		return float64(pc.Requests())
+	})
+	metrics.NewGauge(`vm_cache_misses_total{type="promql/parse"}`, func() float64 {
+		return float64(pc.Misses())
+	})
+	metrics.NewGauge(`vm_cache_entries{type="promql/parse"}`, func() float64 {
+		return float64(pc.Len())
+	})
+	return pc
+}()
+
+const parseCacheMaxLen = 10e3
+
+type parseCacheValue struct {
+	e   metricsql.Expr
+	err error
+}
+
+type parseCache struct {
+	requests atomic.Uint64
+	misses   atomic.Uint64
+
+	m  map[string]*parseCacheValue
+	mu sync.RWMutex
+}
+
+func (pc *parseCache) Requests() uint64 {
+	return pc.requests.Load()
+}
+
+func (pc *parseCache) Misses() uint64 {
+	return pc.misses.Load()
+}
+
+func (pc *parseCache) Len() uint64 {
+	pc.mu.RLock()
+	n := len(pc.m)
+	pc.mu.RUnlock()
+	return uint64(n)
+}
+
+func (pc *parseCache) Get(q string) *parseCacheValue {
+	pc.requests.Add(1)
+
+	pc.mu.RLock()
+	pcv := pc.m[q]
+	pc.mu.RUnlock()
+
+	if pcv == nil {
+		pc.misses.Add(1)
+	}
+	return pcv
+}
+
+func (pc *parseCache) Put(q string, pcv *parseCacheValue) {
+	pc.mu.Lock()
+	overflow := len(pc.m) - parseCacheMaxLen
+	if overflow > 0 {
+		// Remove 10% of items from the cache.
+		overflow = int(float64(len(pc.m)) * 0.1)
+		for k := range pc.m {
+			delete(pc.m, k)
+			overflow--
+			if overflow <= 0 {
+				break
+			}
+		}
+	}
+	pc.m[q] = pcv
+	pc.mu.Unlock()
+}

app/vmselect/promql/parse_cache.go

@@ -1,142 +0,0 @@
-// Cache for metricsql expressions
-// Based on the fastcache idea of locking buckets in order to avoid whole cache locks.
-// See: https://github.com/VictoriaMetrics/fastcache
-package promql
-
-import (
-	"sync"
-	"sync/atomic"
-
-	"github.com/VictoriaMetrics/metrics"
-	"github.com/VictoriaMetrics/metricsql"
-
-	xxhash "github.com/cespare/xxhash/v2"
-)
-
-var parseCacheV = func() *parseCache {
-	pc := newParseCache()
-	metrics.NewGauge(`vm_cache_requests_total{type="promql/parse"}`, func() float64 {
-		return float64(pc.requests())
-	})
-	metrics.NewGauge(`vm_cache_misses_total{type="promql/parse"}`, func() float64 {
-		return float64(pc.misses())
-	})
-	metrics.NewGauge(`vm_cache_entries{type="promql/parse"}`, func() float64 {
-		return float64(pc.len())
-	})
-	return pc
-}()
-
-const (
-	parseBucketCount = 128
-
-	parseCacheMaxLen int = 10e3
-
-	parseBucketMaxLen int = parseCacheMaxLen / parseBucketCount
-
-	parseBucketFreePercent float64 = 0.1
-)
-
-type parseCacheValue struct {
-	e   metricsql.Expr
-	err error
-}
-
-type parseBucket struct {
-	m        map[string]*parseCacheValue
-	mu       sync.RWMutex
-	requests atomic.Uint64
-	misses   atomic.Uint64
-}
-
-type parseCache struct {
-	buckets [parseBucketCount]parseBucket
-}
-
-func newParseCache() *parseCache {
-	pc := new(parseCache)
-	for i := 0; i < parseBucketCount; i++ {
-		pc.buckets[i] = newParseBucket()
-	}
-	return pc
-}
-
-func (pc *parseCache) put(q string, pcv *parseCacheValue) {
-	h := xxhash.Sum64String(q)
-	idx := h % parseBucketCount
-	pc.buckets[idx].put(q, pcv)
-}
-
-func (pc *parseCache) get(q string) *parseCacheValue {
-	h := xxhash.Sum64String(q)
-	idx := h % parseBucketCount
-	return pc.buckets[idx].get(q)
-}
-
-func (pc *parseCache) requests() uint64 {
-	var n uint64
-	for i := 0; i < parseBucketCount; i++ {
-		n += pc.buckets[i].requests.Load()
-	}
-	return n
-}
-
-func (pc *parseCache) misses() uint64 {
-	var n uint64
-	for i := 0; i < parseBucketCount; i++ {
-		n += pc.buckets[i].misses.Load()
-	}
-	return n
-}
-
-func (pc *parseCache) len() uint64 {
-	var n uint64
-	for i := 0; i < parseBucketCount; i++ {
-		n += pc.buckets[i].len()
-	}
-	return n
-}
-
-func newParseBucket() parseBucket {
-	return parseBucket{
-		m: make(map[string]*parseCacheValue, parseBucketMaxLen),
-	}
-}
-
-func (pb *parseBucket) len() uint64 {
-	pb.mu.RLock()
-	n := len(pb.m)
-	pb.mu.RUnlock()
-	return uint64(n)
-}
-
-func (pb *parseBucket) get(q string) *parseCacheValue {
-	pb.requests.Add(1)
-
-	pb.mu.RLock()
-	pcv := pb.m[q]
-	pb.mu.RUnlock()
-
-	if pcv == nil {
-		pb.misses.Add(1)
-	}
-	return pcv
-}
-
-func (pb *parseBucket) put(q string, pcv *parseCacheValue) {
-	pb.mu.Lock()
-	overflow := len(pb.m) - parseBucketMaxLen
-	if overflow > 0 {
-		// Remove parseBucketDeletePercent*100 % of items from the bucket.
-		overflow = int(float64(len(pb.m)) * parseBucketFreePercent)
-		for k := range pb.m {
-			delete(pb.m, k)
-			overflow--
-			if overflow <= 0 {
-				break
-			}
-		}
-	}
-	pb.m[q] = pcv
-	pb.mu.Unlock()
-}

app/vmselect/promql/parse_cache_test.go

@@ -1,129 +0,0 @@
-package promql
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/VictoriaMetrics/metricsql"
-)
-
-func testGetParseCacheValue(q string) *parseCacheValue {
-	e, err := metricsql.Parse(q)
-	return &parseCacheValue{
-		e:   e,
-		err: err,
-	}
-}
-
-func testGenerateQueries(items int) []string {
-	queries := make([]string, items)
-	for i := 0; i < items; i++ {
-		queries[i] = fmt.Sprintf(`node_time_seconds{instance="node%d", job="job%d"}`, i, i)
-	}
-	return queries
-}
-
-func TestParseCache(t *testing.T) {
-	pc := newParseCache()
-	if pc.len() != 0 || pc.misses() != 0 || pc.requests() != 0 {
-		t.Errorf("unexpected pc.Len()=%d, pc.Misses()=%d, pc.Requests()=%d; expected all to be zero.", pc.len(), pc.misses(), pc.requests())
-	}
-
-	q1 := `foo{bar="baz"}`
-	v1 := testGetParseCacheValue(q1)
-
-	q2 := `foo1{bar1="baz1"}`
-	v2 := testGetParseCacheValue(q2)
-
-	pc.put(q1, v1)
-	if pc.len() != 1 {
-		t.Errorf("unexpected value obtained; got %d; want %d", pc.len(), 1)
-	}
-
-	if res := pc.get(q2); res != nil {
-		t.Errorf("unexpected non-empty value obtained from cache: %d ", res)
-	}
-	if pc.len() != 1 {
-		t.Errorf("unexpected value obtained; got %d; want %d", pc.len(), 1)
-	}
-	if miss := pc.misses(); miss != 1 {
-		t.Errorf("unexpected value obtained; got %d; want %d", miss, 1)
-	}
-	if req := pc.requests(); req != 1 {
-		t.Errorf("unexpected value obtained; got %d; want %d", req, 1)
-	}
-
-	pc.put(q2, v2)
-	if pc.len() != 2 {
-		t.Errorf("unexpected value obtained; got %d; want %d", pc.len(), 2)
-	}
-
-	if res := pc.get(q1); res != v1 {
-		t.Errorf("unexpected value obtained; got %v; want %v", res, v1)
-	}
-
-	if res := pc.get(q2); res != v2 {
-		t.Errorf("unexpected value obtained; got %v; want %v", res, v2)
-	}
-
-	pc.put(q2, v2)
-	if pc.len() != 2 {
-		t.Errorf("unexpected value obtained; got %d; want %d", pc.len(), 2)
-	}
-	if miss := pc.misses(); miss != 1 {
-		t.Errorf("unexpected value obtained; got %d; want %d", miss, 1)
-	}
-	if req := pc.requests(); req != 3 {
-		t.Errorf("unexpected value obtained; got %d; want %d", req, 3)
-	}
-
-	if res := pc.get(q2); res != v2 {
-		t.Errorf("unexpected value obtained; got %v; want %v", res, v2)
-	}
-	if pc.len() != 2 {
-		t.Errorf("unexpected value obtained; got %d; want %d", pc.len(), 2)
-	}
-	if miss := pc.misses(); miss != 1 {
-		t.Errorf("unexpected value obtained; got %d; want %d", miss, 1)
-	}
-	if req := pc.requests(); req != 4 {
-		t.Errorf("unexpected value obtained; got %d; want %d", req, 4)
-	}
-}
-
-func TestParseCacheBucketOverflow(t *testing.T) {
-	b := newParseBucket()
-	var expectedLen uint64
-
-	// +2 for overflow and clean up
-	queries := testGenerateQueries(parseBucketMaxLen + 2)
-
-	// Same value for all keys
-	v := testGetParseCacheValue(queries[0])
-
-	// Fill bucket
-	for i := 0; i < parseBucketMaxLen; i++ {
-		b.put(queries[i], v)
-	}
-	expectedLen = uint64(parseBucketMaxLen)
-	if b.len() != expectedLen {
-		t.Errorf("unexpected value obtained; got %v; want %v", b.len(), expectedLen)
-	}
-
-	// Overflow bucket
-	expectedLen = uint64(parseBucketMaxLen + 1)
-	b.put(queries[parseBucketMaxLen], v)
-	if b.len() != uint64(expectedLen) {
-		t.Errorf("unexpected value obtained; got %v; want %v", b.len(), expectedLen)
-	}
-
-	// Clean up;
-	oldLen := b.len()
-	overflow := int(float64(oldLen) * parseBucketFreePercent)
-	expectedLen = oldLen - uint64(overflow) + 1 // +1 for new entry
-
-	b.put(queries[parseBucketMaxLen+1], v)
-	if b.len() != expectedLen {
-		t.Errorf("unexpected value obtained; got %v; want %v", b.len(), expectedLen)
-	}
-}

app/vmselect/promql/parse_cache_timing_test.go

@@ -1,235 +0,0 @@
-package promql
-
-import (
-	"testing"
-)
-
-func BenchmarkCachePutNoOverFlow(b *testing.B) {
-	const items int = (parseCacheMaxLen / 2)
-	pc := newParseCache()
-
-	queries := testGenerateQueries(items)
-	v := testGetParseCacheValue(queries[0])
-
-	b.ResetTimer()
-	b.ReportAllocs()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := 0; i < items; i++ {
-				pc.put(queries[i], v)
-			}
-		}
-	})
-	if pc.len() != uint64(items) {
-		b.Errorf("unexpected value obtained; got %d; want %d", pc.len(), items)
-	}
-}
-
-func BenchmarkCacheGetNoOverflow(b *testing.B) {
-	const items int = parseCacheMaxLen / 2
-	pc := newParseCache()
-
-	queries := testGenerateQueries(items)
-	v := testGetParseCacheValue(queries[0])
-
-	for i := 0; i < len(queries); i++ {
-		pc.put(queries[i], v)
-	}
-	b.ResetTimer()
-	b.ReportAllocs()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := 0; i < items; i++ {
-				if v := pc.get(queries[i]); v == nil {
-					b.Errorf("unexpected nil value obtained from cache for query: %s ", queries[i])
-				}
-			}
-		}
-	})
-}
-
-func BenchmarkCachePutGetNoOverflow(b *testing.B) {
-	const items int = parseCacheMaxLen / 2
-	pc := newParseCache()
-
-	queries := testGenerateQueries(items)
-	v := testGetParseCacheValue(queries[0])
-
-	b.ResetTimer()
-	b.ReportAllocs()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := 0; i < items; i++ {
-				pc.put(queries[i], v)
-				if res := pc.get(queries[i]); res == nil {
-					b.Errorf("unexpected nil value obtained from cache for query: %s ", queries[i])
-				}
-			}
-		}
-	})
-	if pc.len() != uint64(items) {
-		b.Errorf("unexpected value obtained; got %d; want %d", pc.len(), items)
-	}
-}
-
-func BenchmarkCachePutOverflow(b *testing.B) {
-	const items int = parseCacheMaxLen + (parseCacheMaxLen / 2)
-	c := newParseCache()
-
-	queries := testGenerateQueries(items)
-	v := testGetParseCacheValue(queries[0])
-
-	for i := 0; i < parseCacheMaxLen; i++ {
-		c.put(queries[i], v)
-	}
-
-	b.ReportAllocs()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := parseCacheMaxLen; i < items; i++ {
-				c.put(queries[i], v)
-			}
-		}
-	})
-	maxElemnts := uint64(parseCacheMaxLen + parseBucketCount)
-	if c.len() > maxElemnts {
-		b.Errorf("cache length is more than expected; got %d, expected %d", c.len(), maxElemnts)
-	}
-}
-
-func BenchmarkCachePutGetOverflow(b *testing.B) {
-	const items int = parseCacheMaxLen + (parseCacheMaxLen / 2)
-	c := newParseCache()
-
-	queries := testGenerateQueries(items)
-	v := testGetParseCacheValue(queries[0])
-
-	for i := 0; i < parseCacheMaxLen; i++ {
-		c.put(queries[i], v)
-	}
-
-	b.ReportAllocs()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := parseCacheMaxLen; i < items; i++ {
-				c.put(queries[i], v)
-				c.get(queries[i])
-			}
-		}
-	})
-	maxElemnts := uint64(parseCacheMaxLen + parseBucketCount)
-	if c.len() > maxElemnts {
-		b.Errorf("cache length is more than expected; got %d, expected %d", c.len(), maxElemnts)
-	}
-}
-
-var testSimpleQueries = []string{
-	`m{a="b"}`,
-	`{a="b"}`,
-	`m{c="d",a="b"}`,
-	`{a="b",c="d"}`,
-	`m1{a="foo"}`,
-	`m2{a="bar"}`,
-	`m1{b="foo"}`,
-	`m2{b="bar"}`,
-	`m1{a="foo",b="bar"}`,
-	`m2{b="bar",c="x"}`,
-	`{b="bar"}`,
-}
-
-func BenchmarkParsePromQLWithCacheSimple(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		for j := 0; j < len(testSimpleQueries); j++ {
-			_, err := parsePromQLWithCache(testSimpleQueries[j])
-			if err != nil {
-				b.Errorf("unexpected error: %s", err)
-			}
-		}
-	}
-}
-
-func BenchmarkParsePromQLWithCacheSimpleParallel(b *testing.B) {
-	b.ReportAllocs()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := 0; i < len(testSimpleQueries); i++ {
-				_, err := parsePromQLWithCache(testSimpleQueries[i])
-				if err != nil {
-					b.Errorf("unexpected error: %s", err)
-				}
-			}
-		}
-	})
-}
-
-var testComplexQueries = []string{
-	`sort_desc(label_set(2, "foo", "bar") * ignoring(a) (label_set(time(), "foo", "bar") or label_set(10, "foo", "qwert")))`,
-	`sum(a.b{c="d.e",x=~"a.b.+[.a]",y!~"aaa.bb|cc.dd"}) + avg_over_time(1,sum({x=~"aa.bb"}))`,
-	`sort((label_set(time() offset 100s, "foo", "bar"), label_set(time()+10, "foo", "baz") offset 50s) offset 400s)`,
-	`sort(label_map((
-			label_set(time(), "label", "v1"),
-			label_set(time()+100, "label", "v2"),
-			label_set(time()+200, "label", "v3"),
-			label_set(time()+300, "x", "y"),
-			label_set(time()+400, "label", "v4"),
-		), "label", "v1", "foo", "v2", "bar", "", "qwe", "v4", ""))`,
-	`sort(labels_equal((
-			label_set(10, "instance", "qwe", "host", "rty"),
-			label_set(20, "instance", "qwe", "host", "qwe"),
-			label_set(30, "aaa", "bbb", "instance", "foo", "host", "foo"),
-		), "instance", "host"))`,
-	`with (
-			x = (
-				label_set(time() > 1500, "foo", "123.456", "__name__", "aaa"),
-				label_set(-time(), "foo", "bar", "__name__", "bbb"),
-				label_set(-time(), "__name__", "bxs"),
-				label_set(-time(), "foo", "45", "bar", "xs"),
-			)
-		)
-		sort(x + label_value(x, "foo"))`,
-	`label_replace(
-			label_replace(
-				label_replace(time(), "__name__", "x${1}y", "foo", ".*"),
-				"xxx", "foo${1}bar(${1})", "__name__", "(.+)"),
-			"xxx", "AA$1", "xxx", "foox(.+)"
-		)`,
-	`sort_desc(union(
-			label_set(time() > 1400, "__name__", "x", "foo", "bar"),
-			label_set(time() < 1700, "__name__", "y", "foo", "baz")) default 123)`,
-	`sort(histogram_quantile(0.6,
-			label_set(90, "foo", "bar", "le", "10")
-			or label_set(100, "foo", "bar", "le", "30")
-			or label_set(300, "foo", "bar", "le", "+Inf")
-			or label_set(200, "tag", "xx", "le", "10")
-			or label_set(300, "tag", "xx", "le", "30")
-		))`,
-}
-
-func BenchmarkParsePromQLWithCacheComplex(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		for j := 0; j < len(testComplexQueries); j++ {
-			_, err := parsePromQLWithCache(testComplexQueries[j])
-			if err != nil {
-				b.Errorf("unexpected error: %s", err)
-			}
-		}
-	}
-}
-
-func BenchmarkParsePromQLWithCacheComplexParallel(b *testing.B) {
-	b.ReportAllocs()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for i := 0; i < len(testComplexQueries); i++ {
-				_, err := parsePromQLWithCache(testComplexQueries[i])
-				if err != nil {
-					b.Errorf("unexpected error: %s", err)
-				}
-			}
-		}
-	})
-}

app/vmselect/promql/rollup.go

@@ -521,8 +521,7 @@ type rollupFuncArg struct {
 	// Timestamps for values.
 	timestamps []int64
 
-	// Real value preceding values.
-	// Is populated if preceding value is within the staleness interval.
+	// Real value preceding values without restrictions on staleness interval.
 	realPrevValue float64
 
 	// Real value which goes after values.
@@ -770,12 +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]
-			if (tEnd - prevTimestamp) < maxPrevInterval {
-				rfa.realPrevValue = prevValue
-			}
+			rfa.realPrevValue = values[i-1]
+		} else {
+			rfa.realPrevValue = nan
 		}
 		if j < len(values) {
 			rfa.realNextValue = values[j]
@@ -1690,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 {
@@ -2200,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 {

app/vmselect/promql/rollup_test.go

@@ -5,8 +5,6 @@ import (
 	"testing"
 
 	"github.com/VictoriaMetrics/metricsql"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
 )
 
 var (
@@ -1589,70 +1587,3 @@ func TestRollupDelta(t *testing.T) {
 	f(1, nan, nan, nil, 0)
 	f(100, nan, nan, nil, 0)
 }
-
-func TestRollupIncreaseWithStaleness(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}
-
-	t.Run("step > gap", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                70000,
-			Step:               35000,
-			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}
-		timestampsExpected := []int64{0, 35e3, 70e3}
-		testRowsEqual(t, gotValues, rc.Timestamps, valuesExpected, timestampsExpected)
-	})
-
-	t.Run("step < gap", func(t *testing.T) {
-		rc := rollupConfig{
-			Func:               rollupDelta,
-			Start:              0,
-			End:                70000,
-			Step:               10000,
-			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, 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)
-	})
-}

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/delete 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. "+
@@ -53,12 +52,6 @@ func GetDeadlineForExport(r *http.Request, startTime time.Time) Deadline {
 	return getDeadlineWithMaxDuration(r, startTime, dMax, "-search.maxExportDuration")
 }
 
-// GetDeadlineForDelete returns deadline for the given request to /api/v1/delete.
-func GetDeadlineForDelete(r *http.Request, startTime time.Time) Deadline {
-	dMax := maxDeleteDuration.Milliseconds()
-	return getDeadlineWithMaxDuration(r, startTime, dMax, "-search.maxDeleteDuration")
-}
-
 // GetDeadlineForLabelsAPI returns deadline for the given request to /api/v1/labels, /api/v1/label/.../values or /api/v1/series
 func GetDeadlineForLabelsAPI(r *http.Request, startTime time.Time) Deadline {
 	dMax := maxLabelsAPIDuration.Milliseconds()

app/vmselect/vmui/asset-manifest.json

@@ -1,13 +1,13 @@
 {
   "files": {
-    "main.css": "./static/css/main.63479b72.css",
-    "main.js": "./static/js/main.256ee243.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.63479b72.css",
-    "static/js/main.256ee243.js"
+    "static/css/main.876c56b7.css",
+    "static/js/main.caf36c39.js"
   ]
 }

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.256ee243.js"></script><link href="./static/css/main.63479b72.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>

app/vmstorage/main.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmstorage/servers"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/envflag"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
@@ -69,33 +68,17 @@ 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")
 )
 
 func main() {
-	// vmstoage is optimized for reduced memory allocations,
-	// so it can run with the reduced GOGC in order to reduce the used memory,
-	// while keeping CPU usage spent in GC at low levels.
-	//
-	// Some workloads may need increased GOGC values. Then such values can be set via GOGC environment variable.
-	// It is recommended increasing GOGC if go_memstats_gc_cpu_fraction metric exposed at /metrics page
-	// exceeds 0.05 for extended periods of time.
-	cgroup.SetGOGC(30)
-
 	// Write flags and help message to stdout, since it is easier to grep or pipe.
 	flag.CommandLine.SetOutput(os.Stdout)
 	flag.Usage = usage
@@ -110,13 +93,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 +508,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 +519,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 +533,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 +543,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 +553,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())

app/vmstorage/servers/vmselect.go

@@ -70,7 +70,7 @@ func (api *vmstorageAPI) InitSearch(qt *querytracer.Tracer, sq *storage.SearchQu
 	if err := checkTimeRange(api.s, tr); err != nil {
 		return nil, err
 	}
-	maxMetrics := getMaxMetrics(sq.MaxMetrics)
+	maxMetrics := getMaxMetrics(sq)
 	tfss, err := api.setupTfss(qt, sq, tr, maxMetrics, deadline)
 	if err != nil {
 		return nil, err
@@ -89,7 +89,7 @@ func (api *vmstorageAPI) InitSearch(qt *querytracer.Tracer, sq *storage.SearchQu
 
 func (api *vmstorageAPI) SearchMetricNames(qt *querytracer.Tracer, sq *storage.SearchQuery, deadline uint64) ([]string, error) {
 	tr := sq.GetTimeRange()
-	maxMetrics := getMaxMetrics(sq.MaxMetrics)
+	maxMetrics := getMaxMetrics(sq)
 	tfss, err := api.setupTfss(qt, sq, tr, maxMetrics, deadline)
 	if err != nil {
 		return nil, err
@@ -102,7 +102,7 @@ func (api *vmstorageAPI) SearchMetricNames(qt *querytracer.Tracer, sq *storage.S
 
 func (api *vmstorageAPI) LabelValues(qt *querytracer.Tracer, sq *storage.SearchQuery, labelName string, maxLabelValues int, deadline uint64) ([]string, error) {
 	tr := sq.GetTimeRange()
-	maxMetrics := getMaxMetrics(sq.MaxMetrics)
+	maxMetrics := getMaxMetrics(sq)
 	tfss, err := api.setupTfss(qt, sq, tr, maxMetrics, deadline)
 	if err != nil {
 		return nil, err
@@ -125,7 +125,7 @@ func (api *vmstorageAPI) TagValueSuffixes(qt *querytracer.Tracer, accountID, pro
 
 func (api *vmstorageAPI) LabelNames(qt *querytracer.Tracer, sq *storage.SearchQuery, maxLabelNames int, deadline uint64) ([]string, error) {
 	tr := sq.GetTimeRange()
-	maxMetrics := getMaxMetrics(sq.MaxMetrics)
+	maxMetrics := getMaxMetrics(sq)
 	tfss, err := api.setupTfss(qt, sq, tr, maxMetrics, deadline)
 	if err != nil {
 		return nil, err
@@ -143,7 +143,7 @@ func (api *vmstorageAPI) Tenants(qt *querytracer.Tracer, tr storage.TimeRange, d
 
 func (api *vmstorageAPI) TSDBStatus(qt *querytracer.Tracer, sq *storage.SearchQuery, focusLabel string, topN int, deadline uint64) (*storage.TSDBStatus, error) {
 	tr := sq.GetTimeRange()
-	maxMetrics := getMaxMetrics(sq.MaxMetrics)
+	maxMetrics := getMaxMetrics(sq)
 	tfss, err := api.setupTfss(qt, sq, tr, maxMetrics, deadline)
 	if err != nil {
 		return nil, err
@@ -154,7 +154,7 @@ func (api *vmstorageAPI) TSDBStatus(qt *querytracer.Tracer, sq *storage.SearchQu
 
 func (api *vmstorageAPI) DeleteSeries(qt *querytracer.Tracer, sq *storage.SearchQuery, deadline uint64) (int, error) {
 	tr := sq.GetTimeRange()
-	maxMetrics := getMaxMetrics(sq.MaxMetrics)
+	maxMetrics := getMaxMetrics(sq)
 	tfss, err := api.setupTfss(qt, sq, tr, maxMetrics, deadline)
 	if err != nil {
 		return 0, err
@@ -253,16 +253,16 @@ func checkTimeRange(s *storage.Storage, tr storage.TimeRange) error {
 	}
 }
 
-func getMaxMetrics(searchQueryLimit int) int {
-	if searchQueryLimit <= 0 {
-		// use auto calculated maxUniqueTimeseries limit
-		return GetMaxUniqueTimeSeries()
+func getMaxMetrics(sq *storage.SearchQuery) int {
+	maxMetrics := sq.MaxMetrics
+	maxMetricsLimit := *maxUniqueTimeseries
+	if maxMetricsLimit <= 0 {
+		maxMetricsLimit = GetMaxUniqueTimeSeries()
 	}
-	// searchQueryLimit  can exceed value explicitly set to `-search.maxUniqueTimeseries`
-	if *maxUniqueTimeseries != 0 && searchQueryLimit > *maxUniqueTimeseries {
-		searchQueryLimit = *maxUniqueTimeseries
+	if maxMetrics <= 0 || maxMetrics > maxMetricsLimit {
+		maxMetrics = maxMetricsLimit
 	}
-	return searchQueryLimit
+	return maxMetrics
 }
 
 // GetMaxUniqueTimeSeries returns the max metrics limit calculated by available resources.

app/vmstorage/servers/vmselect_test.go

@@ -31,22 +31,3 @@ func TestCalculateMaxMetricsLimitByResource(t *testing.T) {
 	f(4, 0, 0)
 
 }
-
-func TestGetMaxMetrics(t *testing.T) {
-	originalMaxUniqueTimeSeries := *maxUniqueTimeseries
-	defer func() {
-		*maxUniqueTimeseries = originalMaxUniqueTimeSeries
-	}()
-	f := func(searchQueryLimit, storageMaxUniqueTimeseries, expect int) {
-		t.Helper()
-		*maxUniqueTimeseries = storageMaxUniqueTimeseries
-		maxMetrics := getMaxMetrics(searchQueryLimit)
-		if maxMetrics != expect {
-			t.Fatalf("unexpected max metrics: got %d, want %d", maxMetrics, expect)
-		}
-	}
-
-	f(0, 1e6, 1e6)
-	f(2e6, 0, 2e6)
-	f(2e6, 1e6, 1e6)
-}

app/vmui/packages/vmui/src/api/types.ts

@@ -48,16 +48,3 @@ export interface LogHits {
     [key: string]: string;
   };
 }
-
-export interface ReportMetaData {
-  id: number;
-  title: string;
-  endpoint: string;
-  comment: string;
-  params: Record<string, string>;
-}
-
-export interface LogsFiledValues {
-  value: string;
-  hits: number;
-}

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;

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;
-};

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),
-}));

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",
-}

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,
-  };
-};

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);
+    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}

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,

app/vmui/packages/vmui/src/components/ExploreMetrics/ExploreMetricsHeader/style.scss

@@ -38,10 +38,6 @@
     align-items: flex-start;
     gap: $padding-small;
 
-    ul {
-      list-style-position: inside;
-    }
-
     button {
       color: inherit;
       min-height: 29px;

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}
           >

app/vmui/packages/vmui/src/components/Main/Icons/index.tsx

@@ -570,14 +570,3 @@ export const SpinnerIcon = () => (
     </path>
   </svg>
 );
-
-export const CommentIcon = () => (
-  <svg
-    viewBox="0 0 24 24"
-    fill="currentColor"
-  >
-    <path
-      d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4zM18 14H6v-2h12zm0-3H6V9h12zm0-3H6V6h12z"
-    ></path>
-  </svg>
-);

app/vmui/packages/vmui/src/components/Main/MarkdownEditor/MarkdownEditor.tsx

@@ -1,62 +0,0 @@
-import React, { FC } from "preact/compat";
-import useBoolean from "../../../hooks/useBoolean";
-import classNames from "classnames";
-import TextField from "../TextField/TextField";
-import "./style.scss";
-import { marked } from "marked";
-
-interface Props {
-  value: string;
-  onChange: (value: string) => void;
-}
-
-const tabs = [
-  { title: "Write", value: false },
-  { title: "Preview", value: true },
-];
-
-const MarkdownEditor: FC<Props> = ({ value, onChange }) => {
-  const {
-    value: markdownPreview,
-    setTrue: setMarkdownPreviewTrue,
-    setFalse: setMarkdownPreviewFalse,
-  } = useBoolean(false);
-
-  return (
-    <div className="vm-markdown-editor">
-      <div className="vm-markdown-editor-header">
-        <div className="vm-markdown-editor-header-tabs">
-          {tabs.map(({ title, value }) => (
-            <div
-              key={title}
-              className={classNames({
-                "vm-markdown-editor-header-tabs__tab": true,
-                "vm-markdown-editor-header-tabs__tab_active": markdownPreview === value,
-              })}
-              onClick={value ? setMarkdownPreviewTrue : setMarkdownPreviewFalse}
-            >
-              {title}
-            </div>
-          ))}
-        </div>
-        <span className="vm-markdown-editor-header__info">
-          Markdown is supported
-        </span>
-      </div>
-      {markdownPreview ? (
-        <div
-          className="vm-markdown-editor-preview vm-markdown"
-          dangerouslySetInnerHTML={{ __html: marked(value) as string }}
-        />
-      ) : (
-        <TextField
-          type="textarea"
-          value={value}
-          onChange={onChange}
-        />
-      )}
-    </div>
-  );
-};
-
-export default MarkdownEditor;

app/vmui/packages/vmui/src/components/Main/MarkdownEditor/style.scss

@@ -1,75 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-markdown-editor {
-  margin-top: 6px;
-  padding: 0 6px;
-  border-radius: $border-radius-small;
-  border: $border-divider;
-  overflow: hidden;
-
-  &-header {
-    display: flex;
-    align-items: center;
-    background-color: $color-hover-black;
-    padding-right: $padding-global;
-    border-bottom: $border-divider;
-    margin: -1px -7px 6px;
-
-    &-tabs {
-      display: flex;
-
-      &__tab {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-bottom: -1px;
-        padding: $padding-small $padding-large;
-        min-height: 40px;
-        color: $color-text-secondary;
-        transition: color 0.3s;
-        cursor: pointer;
-
-        &:hover {
-          color: $color-text;
-        }
-
-        &_active {
-          position: relative;
-          color: $color-text;
-          background-color: $color-background-body;
-          border-top-right-radius: $border-radius-small;
-          border-top-left-radius: $border-radius-small;
-          z-index: 1;
-
-          &:first-child {
-            border-right: $border-divider;
-          }
-
-          &:last-child {
-            border-right: $border-divider;
-            border-left: $border-divider;
-          }
-        }
-      }
-    }
-
-    &__info {
-      margin-left: auto;
-      margin-right: 0;
-      color: $color-text-secondary;
-      font-size: $font-size-small;
-      font-weight: 500;
-    }
-  }
-
-  &-preview {
-    padding: $padding-small;
-    margin-bottom: 6px;
-  }
-
-  &-preview,
-  textarea {
-    min-height: 200px;
-    resize: vertical;
-  }
-}

app/vmui/packages/vmui/src/components/UploadJsonButtons/UploadJsonButtons.tsx

@@ -16,20 +16,17 @@ const UploadJsonButtons: FC<Props> = ({ onOpenModal, onChange }) => (
     >
       Paste JSON
     </Button>
-    <div className="vm-upload-json-buttons__upload">
-      <Button>
-        Upload Files
-      </Button>
+    <Button>
+      Upload Files
       <input
         id="json"
-        name="json"
         type="file"
         accept="application/json"
         multiple
         title=" "
         onChange={onChange}
       />
-    </div>
+    </Button>
   </div>
 );
 

app/vmui/packages/vmui/src/components/UploadJsonButtons/style.scss

@@ -6,8 +6,4 @@
   gap: $padding-global;
   align-items: center;
   justify-content: center;
-
-  &__upload {
-    position: relative;
-  }
 }

app/vmui/packages/vmui/src/pages/CustomPanel/DownloadReport/DownloadReport.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useEffect, useRef, useState } from "preact/compat";
+import React, { FC, useCallback, useEffect, useMemo, useRef, useState } from "preact/compat";
 import { DownloadIcon } from "../../../components/Main/Icons";
 import Button from "../../../components/Main/Button/Button";
 import Tooltip from "../../../components/Main/Tooltip/Tooltip";
@@ -12,65 +12,32 @@ import TextField from "../../../components/Main/TextField/TextField";
 import { useQueryState } from "../../../state/query/QueryStateContext";
 import { ErrorTypes } from "../../../types";
 import Alert from "../../../components/Main/Alert/Alert";
+import qs from "qs";
 import Popper from "../../../components/Main/Popper/Popper";
 import helperText from "./helperText";
 import { Link } from "react-router-dom";
 import router from "../../../router";
-import { parseLineToJSON } from "../../../utils/json";
-import { ExportMetricResult, ReportMetaData } from "../../../api/types";
-import { getApiEndpoint } from "../../../utils/url";
-import MarkdownEditor from "../../../components/Main/MarkdownEditor/MarkdownEditor";
-
-export enum ReportType {
-  QUERY_DATA,
-  RAW_DATA,
-}
 
 type Props = {
   fetchUrl?: string[];
-  reportType?: ReportType
 }
 
-type MetaData = {
-  id: number;
-  url: URL;
-  title: string;
-  comment: string;
-}
+const getDefaultReportName = () => `vmui_report_${dayjs().utc().format(DATE_FILENAME_FORMAT)}`;
 
-const getDefaultTitle = (type: ReportType) => {
-  switch (type) {
-    case ReportType.RAW_DATA:
-      return "Raw report";
-    default:
-      return "Report";
-  }
-};
-
-const getDefaultFilename = (title: string) => {
-  const timestamp = dayjs().utc().format(DATE_FILENAME_FORMAT);
-  return `vmui_${title.toLowerCase().replace(/ /g, "_")}_${timestamp}`;
-};
-
-const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DATA }) => {
+const DownloadReport: FC<Props> = ({ fetchUrl }) => {
   const { query } = useQueryState();
 
-  const defaultTitle = getDefaultTitle(reportType);
-  const defaultFilename = getDefaultFilename(defaultTitle);
-
-  const [title, setTitle] = useState(defaultTitle);
-  const [filename, setFilename] = useState(defaultFilename);
+  const [filename, setFilename] = useState(getDefaultReportName());
   const [comment, setComment] = useState("");
-  const [trace, setTrace] = useState(reportType === ReportType.QUERY_DATA);
+  const [trace, setTrace] = useState(true);
   const [error, setError] = useState<ErrorTypes | string>();
   const [isLoading, setIsLoading] = useState(false);
 
-  const titleRef = useRef<HTMLDivElement>(null);
   const filenameRef = useRef<HTMLDivElement>(null);
   const commentRef = useRef<HTMLDivElement>(null);
   const traceRef = useRef<HTMLDivElement>(null);
   const generateRef = useRef<HTMLDivElement>(null);
-  const helperRefs = [filenameRef, titleRef, commentRef, traceRef, generateRef];
+  const helperRefs = [filenameRef, commentRef, traceRef, generateRef];
   const [stepHelper, setStepHelper] = useState(0);
 
   const {
@@ -85,17 +52,13 @@ const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DAT
     setFalse: handleCloseHelper,
   } = useBoolean(false);
 
-  const getFetchUrlReport = useCallback(() => {
+  const fetchUrlReport = useMemo(() => {
     if (!fetchUrl) return;
-    try {
-      return fetchUrl.map((str, i) => {
-        const url = new URL(str);
-        trace ? url.searchParams.set("trace", "1") : url.searchParams.delete("trace");
-        return { id: i, url: url };
-      });
-    } catch (e) {
-      setError(String(e));
-    }
+    return fetchUrl.map((str, i) => {
+      const url = new URL(str);
+      trace ? url.searchParams.set("trace", "1") : url.searchParams.delete("trace");
+      return { id: i, url: url };
+    });
   }, [fetchUrl, trace]);
 
   const generateFile = useCallback((data: unknown) => {
@@ -105,7 +68,7 @@ const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DAT
 
     const link = document.createElement("a");
     link.href = href;
-    link.download = `${filename || defaultFilename}.json`;
+    link.download = `${filename || getDefaultReportName()}.json`;
     document.body.appendChild(link);
     link.click();
 
@@ -114,63 +77,9 @@ const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DAT
     handleClose();
   }, [filename]);
 
-  const getMetaData = ({ id, url, comment, title }: MetaData): ReportMetaData => {
-    return {
-      id,
-      title: title || defaultTitle,
-      comment,
-      endpoint: getApiEndpoint(url.pathname) || "",
-      params: Object.fromEntries(url.searchParams)
-    };
-  };
-
-  const processJsonLineResponse = async (response: Response, metaData: MetaData) => {
-    const result: { metric: { [p: string]: string }, values: number[][] }[] = [];
-    const text = await response.text();
-
-    if (response.ok) {
-      const lines = text.split("\n").filter(line => line);
-      lines.forEach((line: string) => {
-        const jsonLine = parseLineToJSON(line) as (ExportMetricResult | null);
-        if (!jsonLine) return;
-        result.push({
-          metric: jsonLine.metric,
-          values: jsonLine.values.map((value, index) => [(jsonLine.timestamps[index] / 1000), value]),
-        });
-      });
-    } else {
-      setError(String(text));
-    }
-
-    return { data: { result, resultType: "matrix" }, vmui: getMetaData(metaData) };
-  };
-
-  const processJsonResponse = async (response: Response, metaData: MetaData) => {
-    const resp = await response.json();
-
-    if (response.ok) {
-      resp.vmui = getMetaData(metaData);
-      return resp;
-    } else {
-      const errorType = resp.errorType ? `${resp.errorType}\r\n` : "";
-      setError(`${errorType}${resp?.error || resp?.message || "unknown error"}`);
-    }
-  };
-
-  const processResponse = async (response: Response, metaData: MetaData) => {
-    switch (reportType) {
-      case ReportType.RAW_DATA:
-        return await processJsonLineResponse(response, metaData);
-      default:
-        return await processJsonResponse(response, metaData);
-    }
-  };
-
   const handleGenerateReport = useCallback(async () => {
-    const fetchUrlReport = getFetchUrlReport();
-
     if (!fetchUrlReport) {
-      setError(prev => !prev ? ErrorTypes.validQuery : prev);
+      setError(ErrorTypes.validQuery);
       return;
     }
 
@@ -179,12 +88,20 @@ const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DAT
 
     try {
       const result = [];
-      for await (const fetchOps of fetchUrlReport) {
-        if (!fetchOps) continue;
-        const { url, id } = fetchOps;
+      for await (const { url, id } of fetchUrlReport) {
         const response = await fetch(url);
-        const data = await processResponse(response, { id, url, comment, title });
-        result.push(data);
+        const resp = await response.json();
+        if (response.ok) {
+          resp.vmui = {
+            id,
+            comment,
+            params: qs.parse(new URL(url).search.replace(/^\?/, ""))
+          };
+          result.push(resp);
+        } else {
+          const errorType = resp.errorType ? `${resp.errorType}\r\n` : "";
+          setError(`${errorType}${resp?.error || resp?.message || "unknown error"}`);
+        }
       }
       result.length && generateFile(result);
     } catch (e) {
@@ -194,20 +111,15 @@ const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DAT
     } finally {
       setIsLoading(false);
     }
-  }, [getFetchUrlReport, comment, generateFile, query, title]);
+  }, [fetchUrlReport, comment, generateFile, query]);
 
   const handleChangeHelp = (step: number) => () => {
-    const findNextRef = (index: number): number => {
-      const nextIndex = index + step;
-      if (helperRefs[nextIndex]?.current) return nextIndex;
-      return findNextRef(nextIndex);
-    };
-    setStepHelper(findNextRef);
+    setStepHelper(prevStep => prevStep + step);
   };
 
   useEffect(() => {
     setError("");
-    setFilename(defaultFilename);
+    setFilename(getDefaultReportName());
     setComment("");
   }, [openModal]);
 
@@ -243,41 +155,31 @@ const DownloadReport: FC<Props> = ({ fetchUrl, reportType = ReportType.QUERY_DAT
           <div className="vm-download-report">
             <div className="vm-download-report-settings">
               <div ref={filenameRef}>
-                <div className="vm-download-report-settings__title">Filename</div>
                 <TextField
+                  label="Filename"
                   value={filename}
                   onChange={setFilename}
                 />
               </div>
-              <div ref={titleRef}>
-                <div className="vm-download-report-settings__title">Report title</div>
-                <TextField
-                  value={title}
-                  onChange={setTitle}
-                />
-              </div>
               <div ref={commentRef}>
-                <div className="vm-download-report-settings__title">Comment</div>
-                <MarkdownEditor
+                <TextField
+                  type="textarea"
+                  label="Comment"
                   value={comment}
                   onChange={setComment}
                 />
               </div>
-              {reportType === ReportType.QUERY_DATA && (
-                <>
-                  <div ref={traceRef}>
-                    <Checkbox
-                      checked={trace}
-                      onChange={setTrace}
-                      label={"Include query trace"}
-                    />
-                  </div>
-                  <Alert variant="info">
-                    If confused with the query results,
-                    try viewing the raw samples for selected series in <RawQueryLink/> tab.
-                  </Alert>
-                </>
-              )}
+              <div ref={traceRef}>
+                <Checkbox
+                  checked={trace}
+                  onChange={setTrace}
+                  label={"Include query trace"}
+                />
+              </div>
+              <Alert variant="info">
+                If confused with the query results,
+                try viewing the raw samples for selected series in <RawQueryLink/> tab.
+              </Alert>
             </div>
             {error && <Alert variant="error">{error}</Alert>}
             <div className="vm-download-report__buttons">

app/vmui/packages/vmui/src/pages/CustomPanel/DownloadReport/helperText.tsx

@@ -11,18 +11,6 @@ const filename = (
   </>
 );
 
-const tittle = (
-  <>
-    <p>Title - specify the title that will be displayed on the <Link
-      to={router.queryAnalyzer}
-      target="_blank"
-      rel="noreferrer"
-      className="vm-link vm-link_underlined"
-    >{routerOptions[router.queryAnalyzer].title}</Link> page.</p>
-    <p>This helps identify your report in the interface.</p>
-  </>
-);
-
 const comment = (
   <>
     <p>Comment (optional) - add a comment to your report.</p>
@@ -51,7 +39,6 @@ const generate = (
 
 export default [
   filename,
-  tittle,
   comment,
   trace,
   generate,

app/vmui/packages/vmui/src/pages/CustomPanel/DownloadReport/style.scss

@@ -9,15 +9,10 @@
 
   &-settings {
     display: grid;
-    gap: $padding-large;
+    gap: $padding-global;
 
-    &__title {
-      display: flex;
-      align-items: center;
-      margin-right: $padding-global;
-      font-size: $font-size;
-      font-weight: 600;
-      white-space: nowrap;
+    textarea {
+      min-height: 200px;
     }
   }
 
@@ -39,7 +34,7 @@
       line-height: 1.3;
 
       p {
-        margin-bottom: calc($padding-small / 2);
+        margin-bottom: calc($padding-small/2);
       }
     }
 

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)}

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"

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;
     }
 

app/vmui/packages/vmui/src/pages/QueryAnalyzer/QueryAnalyzerInfo/QueryAnalyzerInfo.tsx

@@ -1,20 +1,13 @@
 import React, { FC, useMemo } from "preact/compat";
 import { DataAnalyzerType } from "../index";
-import {
-  ClockIcon,
-  CommentIcon,
-  InfoIcon,
-  TimelineIcon
-} from "../../../components/Main/Icons";
+import Button from "../../../components/Main/Button/Button";
+import { ClockIcon, InfoIcon, TimelineIcon } from "../../../components/Main/Icons";
+import useBoolean from "../../../hooks/useBoolean";
+import Modal from "../../../components/Main/Modal/Modal";
 import { TimeParams } from "../../../types";
 import "./style.scss";
 import dayjs from "dayjs";
 import { DATE_TIME_FORMAT } from "../../../constants/date";
-import useBoolean from "../../../hooks/useBoolean";
-import Modal from "../../../components/Main/Modal/Modal";
-import { marked } from "marked";
-import Button from "../../../components/Main/Button/Button";
-import get from "lodash.get";
 
 type Props = {
   data: DataAnalyzerType[];
@@ -22,23 +15,8 @@ type Props = {
 }
 
 const QueryAnalyzerInfo: FC<Props> = ({ data, period }) => {
-  const dataWithStats = useMemo(() => data.filter(d => d.vmui || d.stats), [data]);
-  const title = dataWithStats.find(d => d?.vmui?.title)?.vmui?.title || "Report";
-  const comment = dataWithStats.find(d => d?.vmui?.comment)?.vmui?.comment;
-
-  const table = useMemo(() => {
-    return [
-      "vmui.endpoint",
-      ...new Set(dataWithStats.flatMap(d => [
-        ...Object.keys(d.vmui?.params || []).map(key => `vmui.params.${key}`),
-        ...Object.keys(d.stats || []).map(key => `stats.${key}`),
-        "isPartial"
-      ]))
-    ].map(key => ({
-      column: key.split(".").pop(),
-      values: dataWithStats.map(data => get(data, key, "-"))
-    })).filter(({ values }) => values.length && values.every(v => v !== "-"));
-  }, [dataWithStats]);
+  const dataWithStats = useMemo(() => data.filter(d => d.stats && d.data.resultType === "matrix"), [data]);
+  const comment = useMemo(() => data.find(d => d?.vmui?.comment)?.vmui?.comment, [data]);
 
   const timeRange = useMemo(() => {
     if (!period) return "";
@@ -56,80 +34,59 @@ const QueryAnalyzerInfo: FC<Props> = ({ data, period }) => {
   return (
     <>
       <div className="vm-query-analyzer-info-header">
-        <h1 className="vm-query-analyzer-info-header__title">{title}</h1>
-        {timeRange && (
-          <div className="vm-query-analyzer-info-header__timerange">
-            <ClockIcon/> {timeRange}
-          </div>
-        )}
-        {period?.step && (
-          <div className="vm-query-analyzer-info-header__timerange">
-            <TimelineIcon/> step {period.step}
-          </div>
-        )}
-        {(comment || !!table.length) && (
-          <div className="vm-query-analyzer-info-header__info">
-            <Button
-              startIcon={<InfoIcon/>}
-              variant="outlined"
-              color="warning"
-              onClick={handleOpenModal}
-            >
-              Show stats{comment && " & comments"}
-            </Button>
-          </div>
+        <Button
+          startIcon={<InfoIcon/>}
+          variant="outlined"
+          color="warning"
+          onClick={handleOpenModal}
+        >
+            Show report info
+        </Button>
+        {period && (
+          <>
+            <div className="vm-query-analyzer-info-header__period">
+              <TimelineIcon/> step: {period.step}
+            </div>
+            <div className="vm-query-analyzer-info-header__period">
+              <ClockIcon/> {timeRange}
+            </div>
+          </>
         )}
       </div>
+
       {openModal && (
         <Modal
-          title={title}
+          title="Report info"
           onClose={handleCloseModal}
         >
-          <div className="vm-query-analyzer-info__modal">
-            {!!table.length && (
-              <div className="vm-query-analyzer-info-stats">
-                <div className="vm-query-analyzer-info-comment-header">
-                  <InfoIcon/>
-                  Stats
-                </div>
-                <table>
-                  <thead>
-                    <tr>
-                      {table.map(({ column }) => (
-                        <th key={column}>
-                          {column}
-                        </th>
-                      ))}
-                    </tr>
-                  </thead>
-
-                  <tbody>
-                    {table[0]?.values.map((_, rowIndex) => (
-                      <tr key={rowIndex}>
-                        {table.map(({ values }, j) => (
-                          <td key={j}>
-                            {values[rowIndex]}
-                          </td>
-                        ))}
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
-              </div>
-            )}
-
+          <div className="vm-query-analyzer-info">
             {comment && (
-              <div className="vm-query-analyzer-info-comment">
-                <div className="vm-query-analyzer-info-comment-header">
-                  <CommentIcon/>
-                  Comments
-                </div>
-                <div
-                  className="vm-query-analyzer-info-comment-body vm-markdown"
-                  dangerouslySetInnerHTML={{ __html: (marked(comment) as string) || comment }}
-                />
+              <div className="vm-query-analyzer-info-item vm-query-analyzer-info-item_comment">
+                <div className="vm-query-analyzer-info-item__title">Comment:</div>
+                <div className="vm-query-analyzer-info-item__text">{comment}</div>
               </div>
             )}
+            {dataWithStats.map((d, i) => (
+              <div
+                className="vm-query-analyzer-info-item"
+                key={i}
+              >
+                <div className="vm-query-analyzer-info-item__title">
+                  {dataWithStats.length > 1 ? `Query ${i + 1}:` : "Stats:"}
+                </div>
+                <div className="vm-query-analyzer-info-item__text">
+                  {Object.entries(d.stats || {}).map(([key, value]) => (
+                    <div key={key}>
+                      {key}: {value ?? "-"}
+                    </div>
+                  ))}
+                  isPartial: {String(d.isPartial ?? "-")}
+                </div>
+              </div>
+            ))}
+            <div className="vm-query-analyzer-info-type">
+              {dataWithStats[0]?.vmui?.params ? "The report was created using vmui" : "The report was created manually"}
+            </div>
           </div>
         </Modal>
       )}

app/vmui/packages/vmui/src/pages/QueryAnalyzer/QueryAnalyzerInfo/style.scss

@@ -1,115 +1,47 @@
 @use "src/styles/variables" as *;
 
-.vm-query-analyzer-info {
+.vm-query-analyzer-info-header {
+  display: flex;
+  gap: $padding-global;
 
-  &-header {
+  &__period {
     display: flex;
     align-items: center;
-    width: 100%;
-    height: 100%;
     gap: $padding-small;
-    font-size: $font-size-small;
-    background-color: $color-background-body;
-    z-index: 1;
-
-    &__title {
-      font-size: $font-size-large;
-      font-weight: 500;
-    }
-
-    &__timerange {
-      display: flex;
-      align-items: center;
-      gap: calc($padding-small / 2);
-      border: $border-divider;
-      border-radius: $border-radius-small;
-      padding: calc($padding-small / 2) $padding-small;
-      font-size: $font-size-small;
-
-      svg {
-        width: calc($font-size-small + 1px);
-        color: $color-primary;
-      }
-    }
-
-    &__info {
-      margin-left: auto;
-      margin-right: 0;
-    }
-  }
-
-  &__modal {
-    width: min(800px, 90vw);
-  }
-
-  &-comment {
-    position: relative;
-    max-width: 800px;
-    border-radius: $border-radius-medium;
     border: $border-divider;
-    font-size: $font-size-small;
+    border-radius: $border-radius-small;
+    padding: 6px $padding-global;
 
-    &-header {
-      display: grid;
-      grid-template-columns: 16px 1fr;
-      align-items: center;
-      gap: $padding-small;
-      padding: $padding-small;
-      border-bottom: $border-divider;
-      background-color: $color-hover-black;
-      font-weight: 500;
-      z-index: 1;
-
-      svg {
-        color: $color-primary;
-      }
-    }
-
-    &-body {
-      padding: $padding-small;
-      max-height: 60vh;
-      overflow: auto;
-    }
-  }
-
-  &-stats {
-    border-radius: $border-radius-medium;
-    border: $border-divider;
-    font-size: $font-size-small;
-    margin-bottom: $padding-global;
-    overflow: hidden;
-
-    table {
-      width: 100%;
-    }
-
-    td, th {
-      padding: $padding-small;
-      text-align: left;
-    }
-
-    tr {
-      border-bottom: $border-divider;
-    }
-
-    thead {
-      th {
-        font-weight: 500;
-      }
-    }
-
-    tbody {
-      tr {
-        transition: background-color 0.3s;
-
-        &:hover {
-          background-color: $color-hover-black;
-        }
-
-        &:last-child {
-          border-bottom: none;
-        }
-      }
+    svg {
+      width: calc($font-size-small + 1px);
+      color: $color-primary;
+    }
+  }
+}
+
+.vm-query-analyzer-info {
+  display: grid;
+  gap: $padding-large;
+  min-width: 300px;
+
+  &-type {
+    text-align: center;
+    font-style: italic;
+    color: $color-text-secondary;
+  }
+
+  &-item {
+    display: grid;
+    padding-bottom: $padding-large;
+    border-bottom: $border-divider;
+    line-height: 130%;
+
+    &__title {
+      font-weight: bold;
+    }
+
+    &__text {
+      white-space: pre-wrap;
     }
   }
 }

app/vmui/packages/vmui/src/pages/QueryAnalyzer/index.tsx

@@ -9,9 +9,8 @@ import useBoolean from "../../hooks/useBoolean";
 import UploadJsonButtons from "../../components/UploadJsonButtons/UploadJsonButtons";
 import JsonForm from "./JsonForm/JsonForm";
 import "../TracePage/style.scss";
-import "./style.scss";
 import QueryAnalyzerView from "./QueryAnalyzerView/QueryAnalyzerView";
-import { InstantMetricResult, MetricResult, ReportMetaData, TracingData } from "../../api/types";
+import { InstantMetricResult, MetricResult, TracingData } from "../../api/types";
 import QueryAnalyzerInfo from "./QueryAnalyzerInfo/QueryAnalyzerInfo";
 import { TimeParams } from "../../types";
 import { dateFromSeconds, formatDateToUTC, humanizeSeconds } from "../../utils/time";
@@ -22,8 +21,15 @@ export type DataAnalyzerType = {
     resultType: "vector" | "matrix";
     result: MetricResult[] | InstantMetricResult[]
   };
-  stats?: Record<string, string>;
-  vmui?: ReportMetaData;
+  stats?: {
+    seriesFetched?: string;
+    executionTimeMsec?: number
+  };
+  vmui?: {
+    id: number;
+    comment: string;
+    params: Record<string, string>;
+  };
   status: string;
   trace?: TracingData;
   isPartial?: boolean;
@@ -86,12 +92,10 @@ const QueryAnalyzer: FC = () => {
         setData(response);
       } else {
         setError("Invalid structure - JSON does not match the expected format");
-        setData([]);
       }
     } catch (e) {
       if (e instanceof Error) {
         setError(`${e.name}: ${e.message}`);
-        setData([]);
       }
     }
   };
@@ -125,16 +129,33 @@ const QueryAnalyzer: FC = () => {
   }, [files]);
 
   return (
-    <div className="vm-query-analyzer">
+    <div className="vm-trace-page">
       {hasData && (
-        <div className="vm-query-analyzer-header">
-          <QueryAnalyzerInfo
-            data={data}
-            period={period}
-          />
-          <UploadJsonButtons
-            onOpenModal={handleOpenModal}
-            onChange={handleChange}
+        <div className="vm-trace-page-header">
+          <div className="vm-trace-page-header-errors">
+            <QueryAnalyzerInfo
+              data={data}
+              period={period}
+            />
+          </div>
+          <div>
+            <UploadJsonButtons
+              onOpenModal={handleOpenModal}
+              onChange={handleChange}
+            />
+          </div>
+        </div>
+      )}
+
+      {error && (
+        <div className="vm-trace-page-header-errors-item vm-trace-page-header-errors-item_margin-bottom">
+          <Alert variant="error">{error}</Alert>
+          <Button
+            className="vm-trace-page-header-errors-item__close"
+            startIcon={<CloseIcon/>}
+            variant="text"
+            color="error"
+            onClick={handleCloseError}
           />
         </div>
       )}
@@ -164,19 +185,6 @@ const QueryAnalyzer: FC = () => {
         </div>
       )}
 
-      {error && (
-        <div className="vm-query-analyzer-error">
-          <Alert variant="error">{error}</Alert>
-          <Button
-            className="vm-query-analyzer-error__close"
-            startIcon={<CloseIcon/>}
-            variant="text"
-            color="error"
-            onClick={handleCloseError}
-          />
-        </div>
-      )}
-
       {openModal && (
         <Modal
           title="Paste JSON"

app/vmui/packages/vmui/src/pages/QueryAnalyzer/style.scss

@@ -1,29 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-query-analyzer {
-  display: flex;
-  flex-direction: column;
-
-  @media (max-width: 768px) {
-    padding: $padding-medium 0;
-  }
-
-  &-header {
-    display: grid;
-    grid-template-columns: 1fr auto;
-    gap: $padding-global;
-    margin-bottom: $padding-global;
-  }
-
-  &-error {
-    position: relative;
-    margin: $padding-global 0;
-
-    &__close {
-      position: absolute;
-      top: $padding-small;
-      right: $padding-small;
-      z-index: 2;
-    }
-  }
-}

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

@@ -7,7 +7,6 @@ import { useAppState } from "../../../state/common/StateContext";
 import { useCustomPanelState } from "../../../state/customPanel/CustomPanelStateContext";
 import { isValidHttpUrl } from "../../../utils/url";
 import { getExportDataUrl } from "../../../api/query-range";
-import { parseLineToJSON } from "../../../utils/json";
 
 interface FetchQueryParams {
   hideQuery?: number[];
@@ -25,6 +24,14 @@ interface FetchQueryReturn {
   abortFetch: () => void
 }
 
+const parseLineToJSON = (line: string): ExportMetricResult | null => {
+  try {
+    return JSON.parse(line);
+  } catch (e) {
+    return null;
+  }
+};
+
 export const useFetchExport = ({ hideQuery, showAllSeries }: FetchQueryParams): FetchQueryReturn => {
   const { query } = useQueryState();
   const { period } = useTimeState();
@@ -55,7 +62,7 @@ export const useFetchExport = ({ hideQuery, showAllSeries }: FetchQueryParams):
     }
   }, [serverUrl, period, hideQuery, reduceMemUsage]);
 
-  const fetchData = useCallback(async ({ fetchUrl, stateSeriesLimits, showAllSeries }: {
+  const fetchData = useCallback(async ( { fetchUrl, stateSeriesLimits, showAllSeries }: {
     fetchUrl: string[];
     stateSeriesLimits: SeriesLimits;
     showAllSeries?: boolean;
@@ -92,12 +99,12 @@ export const useFetchExport = ({ hideQuery, showAllSeries }: FetchQueryParams):
           const lines = text.split("\n").filter(line => line);
           const lineLimited = lines.slice(0, freeTempSize).sort();
           lineLimited.forEach((line: string) => {
-            const jsonLine = parseLineToJSON(line) as (ExportMetricResult | null);
+            const jsonLine = parseLineToJSON(line);
             if (!jsonLine) return;
             tempData.push({
               group: counter,
               metric: jsonLine.metric,
-              values: jsonLine.values.map((value, index) => [(jsonLine.timestamps[index] / 1000), value]),
+              values: jsonLine.values.map((value, index) => [(jsonLine.timestamps[index]/1000), value]),
             } as MetricBase);
           });
           totalLength += lines.length;
@@ -112,7 +119,7 @@ export const useFetchExport = ({ hideQuery, showAllSeries }: FetchQueryParams):
     } catch (e) {
       setIsLoading(false);
       if (e instanceof Error && e.name !== "AbortError") {
-        setError(String(e));
+        setError(error);
         console.error(e);
       }
     }

app/vmui/packages/vmui/src/pages/RawQueryPage/index.tsx

@@ -17,7 +17,6 @@ import { DisplayType } from "../../types";
 import Hyperlink from "../../components/Main/Hyperlink/Hyperlink";
 import { CloseIcon } from "../../components/Main/Icons";
 import Button from "../../components/Main/Button/Button";
-import DownloadReport, { ReportType } from "../CustomPanel/DownloadReport/DownloadReport";
 
 const RawSamplesLink = () => (
   <Hyperlink
@@ -66,7 +65,6 @@ const RawQueryPage: FC = () => {
     queryErrors,
     setQueryErrors,
     abortFetch,
-    fetchUrl,
   } = useFetchExport({ hideQuery, showAllSeries });
 
   const controlsRef = useRef<HTMLDivElement>(null);
@@ -108,22 +106,12 @@ const RawQueryPage: FC = () => {
       {showPageDescription && (
         <Alert variant="info">
           <div className="vm-explore-metrics-header-description">
-            <ul>
-              <li>
-                This page provides a dedicated view for querying and displaying <RawSamplesLink/> from VictoriaMetrics.
-              </li>
-              <li>
-                It expects only <TimeSeriesSelectorLink/> as a query argument.
-              </li>
-              <li>
-                Deduplication can only be disabled if it was previously enabled on the server
-                (<code>-dedup.minScrapeInterval</code>).
-              </li>
-              <li>
-                Users often assume that the <QueryDataLink/> returns data exactly as stored,
-                but data samples and timestamps may be modified by the API.
-              </li>
-            </ul>
+            <p>
+              This page provides a dedicated view for querying and displaying <RawSamplesLink/> from VictoriaMetrics.
+              It expects only <TimeSeriesSelectorLink/> as a query argument.
+              Users often assume that the <QueryDataLink/> returns data exactly as stored,
+              but data samples and timestamps may be modified by the API.
+            </p>
             <Button
               variant="text"
               size="small"
@@ -158,12 +146,6 @@ const RawQueryPage: FC = () => {
           <div className="vm-custom-panel-body-header__tabs">
             <DisplayTypeSwitch tabFilter={(tab) => (tab.value !== DisplayType.table)}/>
           </div>
-          {data && (
-            <DownloadReport
-              fetchUrl={fetchUrl}
-              reportType={ReportType.RAW_DATA}
-            />
-          )}
         </div>
         <CustomPanelTabs
           graphData={data}

app/vmui/packages/vmui/src/pages/TracePage/style.scss

@@ -61,8 +61,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    justify-content: flex-end;
-    min-height: calc(($vh * 50) - var(--scrollbar-height));
+    justify-content: center;
 
     &__text {
       margin-bottom: $padding-global;

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();
   }

app/vmui/packages/vmui/src/styles/components/markdown.scss

@@ -1,139 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-markdown {
-  display: block;
-  line-height: 1.5;
-
-  pre,
-  code {
-    font-size: 1em;
-    font-family: $font-family-monospace
-  }
-
-  pre {
-    padding: .5em;
-    line-height: 1.25;
-    overflow-x: scroll;
-  }
-
-  a,
-  a:visited {
-    color: $color-primary;
-    text-decoration: underline;
-    cursor: pointer;
-  }
-
-  body {
-    line-height: 1.85;
-  }
-
-  p {
-    font-size: 1em;
-    margin-bottom: 1.3em;
-  }
-
-  h1, h2, h3, h4, h5, h6 {
-    margin: .5em 0 0.25em;
-    font-weight: inherit;
-    line-height: 1.42;
-  }
-
-  h1 {
-    font-size: 1.8em;
-  }
-
-  h2 {
-    font-size: 1.6em;
-  }
-
-  h3 {
-    font-size: 1.4em;
-  }
-
-  h4 {
-    font-size: 1.2em;
-  }
-
-  h5 {
-    font-size: 1em;
-  }
-
-  h6 {
-    font-size: 0.8em;
-  }
-
-  small {
-    font-size: 0.8em;
-  }
-
-  img,
-  canvas,
-  iframe,
-  video,
-  svg,
-  select,
-  textarea {
-    max-width: 100%;
-  }
-
-  pre {
-    background-color: $color-hover-black;
-  }
-
-  blockquote {
-    border-left: 3px solid rgba($color-black, 0.2);
-    padding-left: 1em;
-    opacity: 0.7;
-  }
-
-  ul, ol {
-    margin: 0.3em 0;
-    list-style-position: inside;
-
-    li {
-      margin-bottom: 0.3em;
-
-      ul, ol {
-        margin-left: 1em;
-      }
-    }
-  }
-
-  input[type="checkbox"] {
-    display: none;
-  }
-
-  th,
-  td {
-    padding: 0.2em 0.4em;
-  }
-
-  hr {
-    border-top: $border-divider;
-  }
-
-  strong {
-    font-weight: bold;
-  }
-
-  em {
-    font-style: italic;
-  }
-
-  del {
-    text-decoration: line-through;
-  }
-
-  code:not(pre code) {
-    display: inline;
-    vertical-align: middle;
-    background: $color-hover-black;
-    border-radius: $border-radius-small;
-    border: $border-divider;
-    tab-size: 4;
-    font-variant-ligatures: none;
-    padding: 0.12em 0.4em;
-    font-size: 0.9em;
-    white-space: nowrap;
-  }
-}

app/vmui/packages/vmui/src/styles/reset.scss

@@ -50,6 +50,10 @@ button {
   background: none;
 }
 
+strong {
+  letter-spacing: 1px;
+}
+
 input[type='file'] {
   opacity: 0;
   cursor: pointer;

app/vmui/packages/vmui/src/styles/style.scss

@@ -10,7 +10,6 @@
 @forward "./components/table";
 @forward "./components/link";
 @forward "./components/dynamic-number";
-@forward "./components/markdown";
 
 :root {
   /* base palette */

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

@@ -1,7 +0,0 @@
-export const parseLineToJSON = (line: string) => {
-  try {
-    return JSON.parse(line);
-  } catch (e) {
-    return null;
-  }
-};

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

@@ -25,13 +25,3 @@ export const isEqualURLSearchParams = (params1: URLSearchParams, params2: URLSea
 
   return true;
 };
-
-export const getApiEndpoint = (url: string): string | null => {
-  try {
-    const match = url.match(/\/api\/v1\/[^?]+/);
-    return match ? match[0] : null;
-  } catch (error) {
-    console.error("Invalid URL:", error);
-    return null;
-  }
-};

apptest/client.go

@@ -128,7 +128,7 @@ func (app *ServesMetrics) GetMetric(t *testing.T, metricName string) float64 {
 			return res
 		}
 	}
-	t.Fatalf("metric not found: %s", metricName)
+	t.Fatalf("metic not found: %s", metricName)
 	return 0
 }
 

apptest/model.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/url"
 	"slices"
-	"sort"
 	"strconv"
 	"strings"
 	"testing"
@@ -104,25 +103,6 @@ func NewPrometheusAPIV1QueryResponse(t *testing.T, s string) *PrometheusAPIV1Que
 	return res
 }
 
-// Sort performs data.Result sort by metric labels
-func (pqr *PrometheusAPIV1QueryResponse) Sort() {
-	sort.Slice(pqr.Data.Result, func(i, j int) bool {
-		leftS := make([]string, 0, len(pqr.Data.Result[i].Metric))
-		rightS := make([]string, 0, len(pqr.Data.Result[j].Metric))
-		for k, v := range pqr.Data.Result[i].Metric {
-			leftS = append(leftS, fmt.Sprintf("%s=%s", k, v))
-		}
-		for k, v := range pqr.Data.Result[j].Metric {
-			rightS = append(rightS, fmt.Sprintf("%s=%s", k, v))
-
-		}
-		sort.Strings(leftS)
-		sort.Strings(rightS)
-		return strings.Join(leftS, ",") < strings.Join(rightS, ",")
-	})
-
-}
-
 // QueryData holds the query result along with its type.
 type QueryData struct {
 	ResultType string

apptest/tests/ingestprotocols_test.go

@@ -1,318 +0,0 @@
-package tests
-
-import (
-	"os"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
-	at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
-	pb "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
-)
-
-func TestSingleIngestionProtocols(t *testing.T) {
-	os.RemoveAll(t.Name())
-	tc := at.NewTestCase(t)
-	defer tc.Stop()
-	sut := tc.MustStartDefaultVmsingle()
-	type opts struct {
-		query       string
-		wantMetrics []map[string]string
-		wantSamples []*at.Sample
-	}
-	f := func(sut at.PrometheusQuerier, opts *opts) {
-		t.Helper()
-		wantResult := []*at.QueryResult{}
-		for idx, wm := range opts.wantMetrics {
-			wantResult = append(wantResult, &at.QueryResult{
-				Metric:  wm,
-				Samples: []*at.Sample{opts.wantSamples[idx]},
-			})
-
-		}
-		tc.Assert(&at.AssertOptions{
-			Msg: "unexpected /export query response",
-			Got: func() any {
-				got := sut.PrometheusAPIV1Export(t, opts.query, at.QueryOpts{
-					Start: "2024-02-05T08:50:00.700Z",
-					End:   "2024-02-05T09:00:00.700Z",
-				})
-				got.Sort()
-				return got
-			},
-			Want: &at.PrometheusAPIV1QueryResponse{Data: &at.QueryData{Result: wantResult}},
-			CmpOpts: []cmp.Option{
-				cmpopts.IgnoreFields(at.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType"),
-			},
-		})
-	}
-
-	// influx line format
-	sut.InfluxWrite(t, []string{
-		`influxline series1=10 1707123456700`,                                        // 2024-02-05T08:57:36.700Z
-		`influxline,label=foo1,label1=value1,label2=value2 series2=40 1707123456800`, // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	sut.ForceFlush(t)
-	f(sut, &opts{
-		query: `{__name__=~"influxline.+"}`,
-		wantMetrics: []map[string]string{
-			{
-				"__name__": "influxline_series1",
-			},
-			{
-				"__name__": "influxline_series2",
-				"label":    "foo1",
-				"label1":   "value1",
-				"label2":   "value2",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-			{Timestamp: 1707123456800, Value: 40},
-		},
-	})
-
-	// prometheus text exposition format
-	sut.PrometheusAPIV1ImportPrometheus(t, []string{
-		`importprometheus_series 10 1707123456700`,                               // 2024-02-05T08:57:36.700Z
-		`importprometheus_series2{label="foo",label1="value1"} 20 1707123456800`, // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	sut.ForceFlush(t)
-	f(sut, &opts{
-		query: `{__name__=~"importprometheus.+"}`,
-		wantMetrics: []map[string]string{
-			{
-				"__name__": "importprometheus_series",
-			},
-			{
-				"__name__": "importprometheus_series2",
-				"label":    "foo",
-				"label1":   "value1",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-			{Timestamp: 1707123456800, Value: 20},
-		},
-	})
-
-	// prometheus remote write format
-	pbData := []pb.TimeSeries{
-		{
-			Labels: []pb.Label{
-				{
-					Name:  "__name__",
-					Value: "prometheusrw_series",
-				},
-			},
-			Samples: []pb.Sample{
-				{
-					Value:     10,
-					Timestamp: 1707123456700, // 2024-02-05T08:57:36.700Z
-
-				},
-			},
-		},
-		{
-			Labels: []pb.Label{
-				{
-					Name:  "__name__",
-					Value: "prometheusrw_series2",
-				},
-				{
-					Name:  "label",
-					Value: "foo2",
-				},
-				{
-					Name:  "label1",
-					Value: "value1",
-				},
-			},
-			Samples: []pb.Sample{
-				{
-					Value:     20,
-					Timestamp: 1707123456800, // 2024-02-05T08:57:36.800Z
-				},
-			},
-		},
-	}
-	sut.PrometheusAPIV1Write(t, pbData, at.QueryOpts{})
-	sut.ForceFlush(t)
-	f(sut, &opts{
-		query: `{__name__=~"prometheusrw.+"}`,
-		wantMetrics: []map[string]string{
-			{
-				"__name__": "prometheusrw_series",
-			},
-			{
-				"__name__": "prometheusrw_series2",
-				"label":    "foo2",
-				"label1":   "value1",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10}, // 2024-02-05T08:57:36.700Z
-			{Timestamp: 1707123456800, Value: 20}, // 2024-02-05T08:57:36.700Z
-		},
-	})
-
-}
-
-func TestClusterIngestionProtocols(t *testing.T) {
-	os.RemoveAll(t.Name())
-	tc := at.NewTestCase(t)
-	defer tc.Stop()
-	vmstorage := tc.MustStartVmstorage("vmstorage", []string{
-		"-storageDataPath=" + tc.Dir() + "/vmstorage",
-		"-retentionPeriod=100y",
-	})
-	vminsert := tc.MustStartVminsert("vminsert", []string{
-		"-storageNode=" + vmstorage.VminsertAddr(),
-	})
-	vmselect := tc.MustStartVmselect("vmselect", []string{
-		"-storageNode=" + vmstorage.VmselectAddr(),
-	})
-
-	type opts struct {
-		query       string
-		wantMetrics []map[string]string
-		wantSamples []*at.Sample
-	}
-	f := func(opts *opts) {
-		t.Helper()
-		wantResult := []*at.QueryResult{}
-		for idx, wm := range opts.wantMetrics {
-			wantResult = append(wantResult, &at.QueryResult{
-				Metric:  wm,
-				Samples: []*at.Sample{opts.wantSamples[idx]},
-			})
-
-		}
-		tc.Assert(&at.AssertOptions{
-			Msg: "unexpected /export query response",
-			Got: func() any {
-				got := vmselect.PrometheusAPIV1Export(t, opts.query, at.QueryOpts{
-					Start: "2024-02-05T08:50:00.700Z",
-					End:   "2024-02-05T09:00:00.700Z",
-				})
-				got.Sort()
-				return got
-			},
-			Want: &at.PrometheusAPIV1QueryResponse{Data: &at.QueryData{Result: wantResult}},
-			CmpOpts: []cmp.Option{
-				cmpopts.IgnoreFields(at.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType"),
-			},
-		})
-	}
-
-	// prometheus text exposition format
-	vminsert.PrometheusAPIV1ImportPrometheus(t, []string{
-		`importprometheus_series 10 1707123456700`,                               // 2024-02-05T08:57:36.700Z
-		`importprometheus_series2{label="foo",label1="value1"} 20 1707123456800`, // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	vmstorage.ForceFlush(t)
-	f(&opts{
-		query: `{__name__=~"importprometheus.+"}`,
-		wantMetrics: []map[string]string{
-			{
-				"__name__": "importprometheus_series",
-			},
-			{
-				"__name__": "importprometheus_series2",
-				"label":    "foo",
-				"label1":   "value1",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-			{Timestamp: 1707123456800, Value: 20},
-		},
-	})
-
-	// influx line format
-	vminsert.InfluxWrite(t, []string{
-		`influxline series1=10 1707123456700`,                                        // 2024-02-05T08:57:36.700Z
-		`influxline,label=foo1,label1=value1,label2=value2 series2=40 1707123456800`, // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	vmstorage.ForceFlush(t)
-	f(&opts{
-		query: `{__name__=~"influxline.+"}`,
-		wantMetrics: []map[string]string{
-			{
-				"__name__": "influxline_series1",
-			},
-			{
-				"__name__": "influxline_series2",
-				"label":    "foo1",
-				"label1":   "value1",
-				"label2":   "value2",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-			{Timestamp: 1707123456800, Value: 40},
-		},
-	})
-
-	// prometheus remote write format
-	pbData := []pb.TimeSeries{
-		{
-			Labels: []pb.Label{
-				{
-					Name:  "__name__",
-					Value: "prometheusrw_series",
-				},
-			},
-			Samples: []pb.Sample{
-				{
-					Value:     10,
-					Timestamp: 1707123456700, // 2024-02-05T08:57:36.700Z
-
-				},
-			},
-		},
-		{
-			Labels: []pb.Label{
-				{
-					Name:  "__name__",
-					Value: "prometheusrw_series2",
-				},
-				{
-					Name:  "label",
-					Value: "foo2",
-				},
-				{
-					Name:  "label1",
-					Value: "value1",
-				},
-			},
-			Samples: []pb.Sample{
-				{
-					Value:     20,
-					Timestamp: 1707123456800, // 2024-02-05T08:57:36.800Z
-				},
-			},
-		},
-	}
-	vminsert.PrometheusAPIV1Write(t, pbData, at.QueryOpts{})
-	vmstorage.ForceFlush(t)
-	f(&opts{
-		query: `{__name__=~"prometheusrw.+"}`,
-		wantMetrics: []map[string]string{
-			{
-				"__name__": "prometheusrw_series",
-			},
-			{
-				"__name__": "prometheusrw_series2",
-				"label":    "foo2",
-				"label1":   "value1",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10}, // 2024-02-05T08:57:36.700Z
-			{Timestamp: 1707123456800, Value: 20}, // 2024-02-05T08:57:36.700Z
-		},
-	})
-
-}

apptest/tests/key_concepts_test.go

@@ -3,10 +3,9 @@ package tests
 import (
 	"testing"
 
+	at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-
-	at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
 )
 
 // Data used in examples in
@@ -50,7 +49,7 @@ func TestClusterKeyConceptsQueryData(t *testing.T) {
 	testKeyConceptsQueryData(t, sut)
 }
 
-// testKeyConceptsQueryData verifies cases from https://docs.victoriametrics.com/keyconcepts/#query-data
+// testClusterKeyConceptsQuery verifies cases from https://docs.victoriametrics.com/keyconcepts/#query-data
 func testKeyConceptsQueryData(t *testing.T, sut at.PrometheusWriteQuerier) {
 
 	// Insert example data from documentation.

apptest/tests/maxingestionrate_test.go

@@ -1,33 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
-)
-
-// Data used in tests
-var testData = []string{
-	"foo_bar 1.00",
-	"foo_bar 2.00",
-}
-
-func TestSingleMaxIngestionRateIncrementsMetric(t *testing.T) {
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-	sut := tc.MustStartVmsingle("vmsingle", []string{"-maxIngestionRate=1"})
-	sut.PrometheusAPIV1ImportPrometheus(t, testData, apptest.QueryOpts{})
-	if got := sut.GetMetric(t, "vm_max_ingestion_rate_limit_reached_total"); got <= 0 {
-		t.Fatalf("Unexpected vm_max_ingestion_rate_limit_reached_total: got %f, want >0", got)
-	}
-}
-
-func TestSingleMaxIngestionRateDoesNotIncrementMetric(t *testing.T) {
-	tc := apptest.NewTestCase(t)
-	defer tc.Stop()
-	sut := tc.MustStartVmsingle("vmsingle", []string{"-maxIngestionRate=15"})
-	sut.PrometheusAPIV1ImportPrometheus(t, testData, apptest.QueryOpts{})
-	if got, want := sut.GetMetric(t, "vm_max_ingestion_rate_limit_reached_total"), 0.0; got != want {
-		t.Fatalf("Unexpected vm_max_ingestion_rate_limit_reached_total: got %f, want >0", got)
-	}
-}

apptest/vminsert.go

@@ -78,21 +78,6 @@ func (app *Vminsert) ClusternativeListenAddr() string {
 	return app.clusternativeListenAddr
 }
 
-// InfluxWrite is a test helper function that inserts a
-// collection of records in Influx line format by sending a HTTP
-// POST request to /influx/write vmsingle endpoint.
-//
-// See https://docs.victoriametrics.com/url-examples/#influxwrite
-func (app *Vminsert) InfluxWrite(t *testing.T, records []string, opts QueryOpts) {
-	t.Helper()
-
-	url := fmt.Sprintf("http://%s/insert/%s/influx/write", app.httpListenAddr, opts.getTenant())
-	data := []byte(strings.Join(records, "\n"))
-	app.sendBlocking(t, len(records), func() {
-		app.cli.Post(t, url, "text/plain", data, http.StatusNoContent)
-	})
-}
-
 // PrometheusAPIV1Write is a test helper function that inserts a
 // collection of records in Prometheus remote-write format by sending a HTTP
 // POST request to /prometheus/api/v1/write vminsert endpoint.

cspell/Dockerfile

@@ -1,7 +1,12 @@
 FROM node:lts-alpine3.20
 
-WORKDIR /opt/node
-COPY yarn.lock package.json .
-RUN yarn install
-WORKDIR /vm
-ENTRYPOINT ["/opt/node/node_modules/.bin/cspell"]
+ENV PATH="/home/node/node_modules/.bin:$PATH"
+
+WORKDIR /home/node
+
+COPY package.json .
+COPY package-lock.json .
+
+RUN npm ci
+
+WORKDIR /victoriametrics

cspell/Makefile

@@ -2,27 +2,27 @@
 
 # Builds cspell image.
 cspell-install:
-	@docker build cspell -t cspell
+	@ (docker inspect cspell > /dev/null) || (docker build cspell --tag cspell)
 
 # Checks for spelling errors.
-cspell-check: CMD="--no-progress -r /vm"
-cspell-check: cspell-install cspell-run
+cspell-check: cspell-install
+	@CMD="cspell --no-progress" $(MAKE) cspell-run-command
 
 # Runs spelling error check.
 # A user facing alias to cspell-check command.
 spellcheck: cspell-check
 
 # Runs cspell container commands.
-cspell-run:
+cspell-run-command:
+	@cp cspell/cspell.json cspell.json
 	@-docker run \
-		--mount type=bind,src="$(PWD)",dst=/vm \
+		--entrypoint /bin/sh \
+		--mount type=bind,src=".",dst=/victoriametrics \
 		--rm \
-		cspell -c cspell/cspell.json "$(CMD)"
+		--tty \
+		cspell -c "$(CMD)"
+	@rm cspell.json
 
 cspell-update-deps: cspell-install
-	@-docker run \
-		--mount type=bind,src="$(PWD)",dst=/vm \
-		--entrypoint=/bin/sh \
-		--workdir=/vm/cspell \
-		--rm \
-		cspell -c "yarn install && yarn upgrade && rm -rf ./node_modules"
+	@CMD="cd /victoriametrics/cspell && npm update && rm -rf ./node_modules" $(MAKE) cspell-run-command
+

cspell/cspell.json

@@ -7,7 +7,7 @@
     {
       "addWords": true,
       "name": "custom-dict",
-      "path": "custom-dict.txt"
+      "path": "cspell/custom-dict.txt"
     }
   ],
   "dictionaries": [
@@ -50,18 +50,18 @@
     "/vm[a-zA-Z0-9-_]+/i"
   ],
   "import": [
-    "@cspell/dict-aws/cspell-ext.json",
-    "@cspell/dict-companies/cspell-ext.json",
-    "@cspell/dict-data-science/cspell-ext.json",
-    "@cspell/dict-en_us/cspell-ext.json",
-    "@cspell/dict-fullstack/cspell-ext.json",
-    "@cspell/dict-golang/cspell-ext.json",
-    "@cspell/dict-k8s/cspell-ext.json",
-    "@cspell/dict-people-names/cspell-ext.json",
-    "@cspell/dict-ru_ru/cspell-ext.json",
-    "@cspell/dict-software-terms/cspell-ext.json",
-    "@cspell/dict-uk-ua/cspell-ext.json",
-    "@cspell/dict-win32/cspell-ext.json"
+    "/home/node/node_modules/@cspell/dict-aws/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-companies/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-data-science/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-en_us/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-fullstack/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-golang/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-k8s/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-people-names/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-ru_ru/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-software-terms/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-uk-ua/cspell-ext.json",
+    "/home/node/node_modules/@cspell/dict-win32/cspell-ext.json"
   ],
   "useGitignore": true
 }

cspell/custom-dict.txt

@@ -145,5 +145,3 @@ SSZ
 DDZ
 DOKS
 iforest
-deltatocumulative
-TLSCA