CHANGELOG.md: cut v1.108.0 release

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/victoria-metrics/main.go

@@ -14,7 +14,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/promql"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmstorage"
 	"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"
@@ -40,20 +39,9 @@ var (
 		"The saved data survives unclean shutdowns such as OOM crash, hardware reset, SIGKILL, etc. "+
 		"Bigger intervals may help increase the lifetime of flash storage with limited write cycles (e.g. Raspberry PI). "+
 		"Smaller intervals increase disk IO load. Minimum supported value is 1s")
-	maxIngestionRate = flag.Int("maxIngestionRate", 0, "The maximum number of samples vmsingle can receive per second. Data ingestion is paused when the limit is exceeded. "+
-		"By default there are no limits on samples ingestion rate.")
 )
 
 func main() {
-	// VictoriaMetrics 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
@@ -88,7 +76,6 @@ func main() {
 	storage.SetDataFlushInterval(*inmemoryDataFlushInterval)
 	vmstorage.Init(promql.ResetRollupResultCacheIfNeeded)
 	vmselect.Init()
-	vminsertcommon.StartIngestionRateLimiter(*maxIngestionRate)
 	vminsert.Init()
 
 	startSelfScraper()
@@ -110,7 +97,6 @@ func main() {
 	}
 	logger.Infof("successfully shut down the webservice in %.3f seconds", time.Since(startTime).Seconds())
 	vminsert.Stop()
-	vminsertcommon.StopIngestionRateLimiter()
 
 	vmstorage.Stop()
 	vmselect.Stop()

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/main.go

@@ -1,7 +1,6 @@
 package vlinsert
 
 import (
-	"fmt"
 	"net/http"
 	"strings"
 
@@ -35,15 +34,9 @@ func RequestHandler(w http.ResponseWriter, r *http.Request) bool {
 	path = strings.TrimPrefix(path, "/insert")
 	path = strings.ReplaceAll(path, "//", "/")
 
-	switch path {
-	case "/jsonline":
+	if path == "/jsonline" {
 		jsonline.RequestHandler(w, r)
 		return true
-	case "/ready":
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(200)
-		fmt.Fprintf(w, `{"status":"ok"}`)
-		return true
 	}
 	switch {
 	case strings.HasPrefix(path, "/elasticsearch/"):

app/vlselect/logsql/logsql.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"math"
 	"net/http"
-	"regexp"
 	"slices"
 	"sort"
 	"strconv"
@@ -14,7 +13,6 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/metrics"
-	"github.com/valyala/fastjson"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vlstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
@@ -50,10 +48,9 @@ func ProcessFacetsRequest(ctx context.Context, w http.ResponseWriter, r *http.Re
 		httpserver.Errorf(w, r, "%s", err)
 		return
 	}
-	keepConstFields := httputils.GetBool(r, "keep_const_fields")
 
 	q.DropAllPipes()
-	q.AddFacetsPipe(limit, maxValuesPerField, maxValueLen, keepConstFields)
+	q.AddFacetsPipe(limit, maxValuesPerField, maxValueLen)
 
 	var mLock sync.Mutex
 	m := make(map[string][]facetEntry)
@@ -1095,20 +1092,18 @@ func parseCommonArgs(r *http.Request) (*logstorage.Query, []logstorage.TenantID,
 	}
 
 	// Parse optional extra_filters
-	extraFiltersStr := r.FormValue("extra_filters")
-	extraFilters, err := parseExtraFilters(extraFiltersStr)
+	extraFilters, err := getExtraFilters(r, "extra_filters")
 	if err != nil {
 		return nil, nil, err
 	}
 	q.AddExtraFilters(extraFilters)
 
 	// Parse optional extra_stream_filters
-	extraStreamFiltersStr := r.FormValue("extra_stream_filters")
-	extraStreamFilters, err := parseExtraStreamFilters(extraStreamFiltersStr)
+	extraStreamFilters, err := getExtraFilters(r, "extra_stream_filters")
 	if err != nil {
 		return nil, nil, err
 	}
-	q.AddExtraFilters(extraStreamFilters)
+	q.AddExtraStreamFilters(extraStreamFilters)
 
 	return q, tenantIDs, nil
 }
@@ -1126,114 +1121,15 @@ func getTimeNsec(r *http.Request, argName string) (int64, bool, error) {
 	return nsecs, true, nil
 }
 
-func parseExtraFilters(s string) (*logstorage.Filter, error) {
+func getExtraFilters(r *http.Request, argName string) ([]logstorage.Field, error) {
+	s := r.FormValue(argName)
 	if s == "" {
 		return nil, nil
 	}
-	if !strings.HasPrefix(s, `{"`) {
-		return logstorage.ParseFilter(s)
-	}
 
-	// Extra filters in the form {"field":"value",...}.
-	kvs, err := parseExtraFiltersJSON(s)
-	if err != nil {
-		return nil, err
+	var p logstorage.JSONParser
+	if err := p.ParseLogMessage([]byte(s)); err != nil {
+		return nil, fmt.Errorf("cannot parse %s: %w", argName, err)
 	}
-
-	filters := make([]string, len(kvs))
-	for i, kv := range kvs {
-		if len(kv.values) == 1 {
-			filters[i] = fmt.Sprintf("%q:=%q", kv.key, kv.values[0])
-		} else {
-			orValues := make([]string, len(kv.values))
-			for j, v := range kv.values {
-				orValues[j] = fmt.Sprintf("%q", v)
-			}
-			filters[i] = fmt.Sprintf("%q:in(%s)", kv.key, strings.Join(orValues, ","))
-		}
-	}
-	s = strings.Join(filters, " ")
-	return logstorage.ParseFilter(s)
-}
-
-func parseExtraStreamFilters(s string) (*logstorage.Filter, error) {
-	if s == "" {
-		return nil, nil
-	}
-	if !strings.HasPrefix(s, `{"`) {
-		return logstorage.ParseFilter(s)
-	}
-
-	// Extra stream filters in the form {"field":"value",...}.
-	kvs, err := parseExtraFiltersJSON(s)
-	if err != nil {
-		return nil, err
-	}
-
-	filters := make([]string, len(kvs))
-	for i, kv := range kvs {
-		if len(kv.values) == 1 {
-			filters[i] = fmt.Sprintf("%q=%q", kv.key, kv.values[0])
-		} else {
-			orValues := make([]string, len(kv.values))
-			for j, v := range kv.values {
-				orValues[j] = regexp.QuoteMeta(v)
-			}
-			filters[i] = fmt.Sprintf("%q=~%q", kv.key, strings.Join(orValues, "|"))
-		}
-	}
-	s = "{" + strings.Join(filters, ",") + "}"
-	return logstorage.ParseFilter(s)
-}
-
-type extraFilter struct {
-	key    string
-	values []string
-}
-
-func parseExtraFiltersJSON(s string) ([]extraFilter, error) {
-	v, err := fastjson.Parse(s)
-	if err != nil {
-		return nil, err
-	}
-	o := v.GetObject()
-
-	var errOuter error
-	var filters []extraFilter
-	o.Visit(func(k []byte, v *fastjson.Value) {
-		if errOuter != nil {
-			return
-		}
-		switch v.Type() {
-		case fastjson.TypeString:
-			filters = append(filters, extraFilter{
-				key:    string(k),
-				values: []string{string(v.GetStringBytes())},
-			})
-		case fastjson.TypeArray:
-			a := v.GetArray()
-			if len(a) == 0 {
-				return
-			}
-			orValues := make([]string, len(a))
-			for i, av := range a {
-				ov, err := av.StringBytes()
-				if err != nil {
-					errOuter = fmt.Errorf("cannot obtain string item at the array for key %q; item: %s", k, av)
-					return
-				}
-				orValues[i] = string(ov)
-			}
-			filters = append(filters, extraFilter{
-				key:    string(k),
-				values: orValues,
-			})
-		default:
-			errOuter = fmt.Errorf("unexpected type of value for key %q: %s; value: %s", k, v.Type(), v)
-		}
-	})
-	if errOuter != nil {
-		return nil, errOuter
-	}
-	return filters, nil
+	return p.Fields, nil
 }

app/vlselect/logsql/logsql_test.go

@@ -1,103 +0,0 @@
-package logsql
-
-import (
-	"testing"
-)
-
-func TestParseExtraFilters_Success(t *testing.T) {
-	f := func(s, resultExpected string) {
-		t.Helper()
-
-		f, err := parseExtraFilters(s)
-		if err != nil {
-			t.Fatalf("unexpected error in parseExtraFilters: %s", err)
-		}
-		result := f.String()
-		if result != resultExpected {
-			t.Fatalf("unexpected result\ngot\n%s\nwant\n%s", result, resultExpected)
-		}
-	}
-
-	f("", "")
-
-	// JSON string
-	f(`{"foo":"bar"}`, `foo:=bar`)
-	f(`{"foo":["bar","baz"]}`, `foo:in(bar,baz)`)
-	f(`{"z":"=b ","c":["d","e,"],"a":[],"_msg":"x"}`, `z:="=b " c:in(d,"e,") =x`)
-
-	// LogsQL filter
-	f(`foobar`, `foobar`)
-	f(`foo:bar`, `foo:bar`)
-	f(`foo:(bar or baz) error _time:5m {"foo"=bar,baz="z"}`, `(foo:bar or foo:baz) error _time:5m {foo="bar",baz="z"}`)
-}
-
-func TestParseExtraFilters_Failure(t *testing.T) {
-	f := func(s string) {
-		t.Helper()
-
-		_, err := parseExtraFilters(s)
-		if err == nil {
-			t.Fatalf("expecting non-nil error")
-		}
-	}
-
-	// Invalid JSON
-	f(`{"foo"}`)
-	f(`[1,2]`)
-	f(`{"foo":[1]}`)
-
-	// Invliad LogsQL filter
-	f(`foo:(bar`)
-
-	// excess pipe
-	f(`foo | count()`)
-}
-
-func TestParseExtraStreamFilters_Success(t *testing.T) {
-	f := func(s, resultExpected string) {
-		t.Helper()
-
-		f, err := parseExtraStreamFilters(s)
-		if err != nil {
-			t.Fatalf("unexpected error in parseExtraStreamFilters: %s", err)
-		}
-		result := f.String()
-		if result != resultExpected {
-			t.Fatalf("unexpected result;\ngot\n%s\nwant\n%s", result, resultExpected)
-		}
-	}
-
-	f("", "")
-
-	// JSON string
-	f(`{"foo":"bar"}`, `{foo="bar"}`)
-	f(`{"foo":["bar","baz"]}`, `{foo=~"bar|baz"}`)
-	f(`{"z":"b","c":["d","e|\""],"a":[],"_msg":"x"}`, `{z="b",c=~"d|e\\|\"",_msg="x"}`)
-
-	// LogsQL filter
-	f(`foobar`, `foobar`)
-	f(`foo:bar`, `foo:bar`)
-	f(`foo:(bar or baz) error _time:5m {"foo"=bar,baz="z"}`, `(foo:bar or foo:baz) error _time:5m {foo="bar",baz="z"}`)
-}
-
-func TestParseExtraStreamFilters_Failure(t *testing.T) {
-	f := func(s string) {
-		t.Helper()
-
-		_, err := parseExtraStreamFilters(s)
-		if err == nil {
-			t.Fatalf("expecting non-nil error")
-		}
-	}
-
-	// Invalid JSON
-	f(`{"foo"}`)
-	f(`[1,2]`)
-	f(`{"foo":[1]}`)
-
-	// Invliad LogsQL filter
-	f(`foo:(bar`)
-
-	// excess pipe
-	f(`foo | count()`)
-}

app/vlselect/vmui/asset-manifest.json

@@ -1,13 +1,13 @@
 {
   "files": {
-    "main.css": "./static/css/main.fa83344e.css",
-    "main.js": "./static/js/main.8ad2bc1f.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.fa83344e.css",
-    "static/js/main.8ad2bc1f.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.8ad2bc1f.js"></script><link href="./static/css/main.fa83344e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!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/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/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

@@ -213,7 +213,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
@@ -668,13 +668,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/vminsert/common/insert_ctx.go

@@ -4,48 +4,16 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/ratelimiter"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/slicesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeserieslimits"
 )
 
-// StartIngestionRateLimiter starts ingestion rate limiter.
-//
-// Ingestion rate limiter must be started before Init() call.
-//
-// StopIngestionRateLimiter must be called before Stop() call in order to unblock all the callers
-// to ingestion rate limiter. Otherwise deadlock may occur at Stop() call.
-func StartIngestionRateLimiter(maxIngestionRate int) {
-	if maxIngestionRate <= 0 {
-		return
-	}
-	ingestionRateLimitReached := metrics.NewCounter(`vm_max_ingestion_rate_limit_reached_total`)
-	ingestionRateLimiterStopCh = make(chan struct{})
-	ingestionRateLimiter = ratelimiter.New(int64(maxIngestionRate), ingestionRateLimitReached, ingestionRateLimiterStopCh)
-}
-
-// StopIngestionRateLimiter stops ingestion rate limiter.
-func StopIngestionRateLimiter() {
-	if ingestionRateLimiterStopCh == nil {
-		return
-	}
-	close(ingestionRateLimiterStopCh)
-	ingestionRateLimiterStopCh = nil
-}
-
-var (
-	ingestionRateLimiter       *ratelimiter.RateLimiter
-	ingestionRateLimiterStopCh chan struct{}
-)
-
 // InsertCtx contains common bits for data points insertion.
 type InsertCtx struct {
 	Labels sortedLabels
@@ -111,9 +79,18 @@ func (ctx *InsertCtx) TryPrepareLabels(hasRelabeling bool) bool {
 }
 
 // WriteDataPoint writes (timestamp, value) with the given prefix and labels into ctx buffer.
+func (ctx *InsertCtx) WriteDataPoint(prefix []byte, hasRelabeling bool, labels []prompbmarshal.Label, timestamp int64, value float64) error {
+	if !ctx.TryPrepareLabels(hasRelabeling) {
+		return nil
+	}
+	metricNameRaw := ctx.marshalMetricNameRaw(prefix, labels)
+	return ctx.addRow(metricNameRaw, timestamp, value)
+}
+
+// WriteDataPointUnchecked writes (timestamp, value) with the given prefix and labels into ctx buffer.
 //
 // caller should invoke TryPrepareLabels before using this function if needed
-func (ctx *InsertCtx) WriteDataPoint(prefix []byte, labels []prompbmarshal.Label, timestamp int64, value float64) error {
+func (ctx *InsertCtx) WriteDataPointUnchecked(prefix []byte, labels []prompbmarshal.Label, timestamp int64, value float64) error {
 	metricNameRaw := ctx.marshalMetricNameRaw(prefix, labels)
 	return ctx.addRow(metricNameRaw, timestamp, value)
 }
@@ -204,12 +181,9 @@ func (ctx *InsertCtx) FlushBufs() error {
 		}
 		matchIdxsPool.Put(matchIdxs)
 	}
-	ingestionRateLimiter.Register(len(ctx.mrs))
-
 	// There is no need in limiting the number of concurrent calls to vmstorage.AddRows() here,
 	// since the number of concurrent FlushBufs() calls should be already limited via writeconcurrencylimiter
 	// used at every stream.Parse() call under lib/protoparser/*
-
 	err := vmstorage.AddRows(ctx.mrs)
 	ctx.Reset(0)
 	if err == nil {

app/vminsert/common/streamaggr.go

@@ -267,7 +267,7 @@ func pushAggregateSeries(tss []prompbmarshal.TimeSeries) {
 			ctx.AddLabel(name, label.Value)
 		}
 		value := ts.Samples[0].Value
-		if err := ctx.WriteDataPoint(nil, ctx.Labels, currentTimestamp, value); err != nil {
+		if err := ctx.WriteDataPointUnchecked(nil, ctx.Labels, currentTimestamp, value); err != nil {
 			logger.Errorf("cannot store aggregate series: %s", err)
 			// Do not continue pushing the remaining samples, since it is likely they will return the same error.
 			return

app/vminsert/csvimport/request_handler.go

@@ -46,10 +46,7 @@ func insertRows(rows []parser.Row, extraLabels []prompbmarshal.Label) error {
 			label := &extraLabels[j]
 			ctx.AddLabel(label.Name, label.Value)
 		}
-		if !ctx.TryPrepareLabels(hasRelabeling) {
-			continue
-		}
-		if err := ctx.WriteDataPoint(nil, ctx.Labels, r.Timestamp, r.Value); err != nil {
+		if err := ctx.WriteDataPoint(nil, hasRelabeling, ctx.Labels, r.Timestamp, r.Value); err != nil {
 			return err
 		}
 	}

app/vminsert/graphite/request_handler.go

@@ -36,10 +36,7 @@ func insertRows(rows []parser.Row) error {
 			tag := &r.Tags[j]
 			ctx.AddLabel(tag.Key, tag.Value)
 		}
-		if !ctx.TryPrepareLabels(hasRelabeling) {
-			continue
-		}
-		if err := ctx.WriteDataPoint(nil, ctx.Labels, r.Timestamp, r.Value); err != nil {
+		if err := ctx.WriteDataPoint(nil, hasRelabeling, ctx.Labels, r.Timestamp, r.Value); err != nil {
 			return err
 		}
 	}

app/vminsert/influx/request_handler.go

@@ -14,7 +14,6 @@ import (
 	parser "github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/influx/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timeserieslimits"
 	"github.com/VictoriaMetrics/metrics"
 )
 
@@ -70,7 +69,6 @@ func insertRows(db string, rows []parser.Row, extraLabels []prompbmarshal.Label)
 	ic.Reset(rowsLen)
 	rowsTotal := 0
 	hasRelabeling := relabel.HasRelabeling()
-	hasLimitsEnabled := timeserieslimits.Enabled()
 	for i := range rows {
 		r := &rows[i]
 		rowsTotal += len(r.Fields)
@@ -110,23 +108,12 @@ func insertRows(db string, rows []parser.Row, extraLabels []prompbmarshal.Label)
 				metricGroup := bytesutil.ToUnsafeString(ctx.metricGroupBuf)
 				ic.Labels = append(ic.Labels[:0], ctx.originLabels...)
 				ic.AddLabel("", metricGroup)
-				if !ic.TryPrepareLabels(true) {
-					continue
-				}
-				if err := ic.WriteDataPoint(nil, ic.Labels, r.Timestamp, f.Value); err != nil {
+				if err := ic.WriteDataPoint(nil, true, ic.Labels, r.Timestamp, f.Value); err != nil {
 					return err
 				}
 			}
 		} 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
-				}
-			}
 			ctx.metricNameBuf = storage.MarshalMetricNameRaw(ctx.metricNameBuf[:0], ic.Labels)
 			labelsLen := len(ic.Labels)
 			for j := range r.Fields {
@@ -137,12 +124,7 @@ func insertRows(db string, rows []parser.Row, extraLabels []prompbmarshal.Label)
 				metricGroup := bytesutil.ToUnsafeString(ctx.metricGroupBuf)
 				ic.Labels = ic.Labels[:labelsLen]
 				ic.AddLabel("", metricGroup)
-				if hasLimitsEnabled {
-					if timeserieslimits.IsExceeding(ic.Labels[len(ic.Labels)-1:]) {
-						continue
-					}
-				}
-				if err := ic.WriteDataPoint(ctx.metricNameBuf, ic.Labels[len(ic.Labels)-1:], r.Timestamp, f.Value); err != nil {
+				if err := ic.WriteDataPoint(ctx.metricNameBuf, false, ic.Labels[len(ic.Labels)-1:], r.Timestamp, f.Value); err != nil {
 					return err
 				}
 			}

app/vminsert/native/request_handler.go

@@ -68,7 +68,7 @@ func insertRows(block *stream.Block, extraLabels []prompbmarshal.Label) error {
 		timestamp := timestamps[j]
 		// TODO: @f41gh7 looks like it's better to use WriteDataPointExt
 		// since metricName never changes inside insertRows call
-		if err := ic.WriteDataPoint(ctx.metricNameBuf, ic.Labels, timestamp, value); err != nil {
+		if err := ic.WriteDataPointUnchecked(ctx.metricNameBuf, ic.Labels, timestamp, value); err != nil {
 			return err
 		}
 	}

app/vminsert/newrelic/request_handler.go

@@ -58,10 +58,7 @@ func insertRows(rows []newrelic.Row, extraLabels []prompbmarshal.Label) error {
 				label := &extraLabels[k]
 				ctx.AddLabel(label.Name, label.Value)
 			}
-			if !ctx.TryPrepareLabels(hasRelabeling) {
-				continue
-			}
-			if err := ctx.WriteDataPoint(nil, ctx.Labels, r.Timestamp, s.Value); err != nil {
+			if err := ctx.WriteDataPoint(nil, hasRelabeling, ctx.Labels, r.Timestamp, s.Value); err != nil {
 				return err
 			}
 		}

app/vminsert/opentsdb/request_handler.go

@@ -36,10 +36,7 @@ func insertRows(rows []parser.Row) error {
 			tag := &r.Tags[j]
 			ctx.AddLabel(tag.Key, tag.Value)
 		}
-		if !ctx.TryPrepareLabels(hasRelabeling) {
-			continue
-		}
-		if err := ctx.WriteDataPoint(nil, ctx.Labels, r.Timestamp, r.Value); err != nil {
+		if err := ctx.WriteDataPoint(nil, hasRelabeling, ctx.Labels, r.Timestamp, r.Value); err != nil {
 			return err
 		}
 	}

app/vminsert/opentsdbhttp/request_handler.go

@@ -54,10 +54,7 @@ func insertRows(rows []parser.Row, extraLabels []prompbmarshal.Label) error {
 			label := &extraLabels[j]
 			ctx.AddLabel(label.Name, label.Value)
 		}
-		if !ctx.TryPrepareLabels(hasRelabeling) {
-			continue
-		}
-		if err := ctx.WriteDataPoint(nil, ctx.Labels, r.Timestamp, r.Value); err != nil {
+		if err := ctx.WriteDataPoint(nil, hasRelabeling, ctx.Labels, r.Timestamp, r.Value); err != nil {
 			return err
 		}
 	}

app/vminsert/prometheusimport/request_handler.go

@@ -54,10 +54,7 @@ func insertRows(rows []parser.Row, extraLabels []prompbmarshal.Label) error {
 			label := &extraLabels[j]
 			ctx.AddLabel(label.Name, label.Value)
 		}
-		if !ctx.TryPrepareLabels(hasRelabeling) {
-			continue
-		}
-		if err := ctx.WriteDataPoint(nil, ctx.Labels, r.Timestamp, r.Value); err != nil {
+		if err := ctx.WriteDataPoint(nil, hasRelabeling, ctx.Labels, r.Timestamp, r.Value); err != nil {
 			return err
 		}
 	}

app/vminsert/vmimport/request_handler.go

@@ -69,7 +69,7 @@ func insertRows(rows []parser.Row, extraLabels []prompbmarshal.Label) error {
 		}
 		for j, value := range values {
 			timestamp := timestamps[j]
-			if err := ic.WriteDataPoint(ctx.metricNameBuf, nil, timestamp, value); err != nil {
+			if err := ic.WriteDataPointUnchecked(ctx.metricNameBuf, nil, timestamp, value); err != nil {
 				return err
 			}
 		}

app/vmselect/promql/eval.go

@@ -46,8 +46,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.
@@ -584,7 +582,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.

app/vmselect/promql/exec.go

@@ -6,6 +6,8 @@ import (
 	"math"
 	"sort"
 	"strings"
+	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
@@ -14,6 +16,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+	"github.com/VictoriaMetrics/metrics"
 	"github.com/VictoriaMetrics/metricsql"
 )
 
@@ -267,7 +270,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 {
@@ -281,7 +284,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
@@ -325,3 +328,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

@@ -699,13 +699,8 @@ func (rc *rollupConfig) doInternal(dstValues []float64, tsm *timeseriesMap, valu
 	// Extend dstValues in order to remove mallocs below.
 	dstValues = decimal.ExtendFloat64sCapacity(dstValues, len(rc.Timestamps))
 
-	// Use step as the scrape interval for instant queries (when start == end).
-	maxPrevInterval := rc.Step
-	if rc.Start < rc.End {
-		scrapeInterval := getScrapeInterval(timestamps, rc.Step)
-		maxPrevInterval = getMaxPrevInterval(scrapeInterval)
-	}
-
+	scrapeInterval := getScrapeInterval(timestamps, rc.Step)
+	maxPrevInterval := getMaxPrevInterval(scrapeInterval)
 	if rc.LookbackDelta > 0 && maxPrevInterval > rc.LookbackDelta {
 		maxPrevInterval = rc.LookbackDelta
 	}

app/vmselect/vmui/asset-manifest.json

@@ -1,13 +1,13 @@
 {
   "files": {
     "main.css": "./static/css/main.876c56b7.css",
-    "main.js": "./static/js/main.caf36c39.js",
+    "main.js": "./static/js/main.59602c15.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.876c56b7.css",
-    "static/js/main.caf36c39.js"
+    "static/js/main.59602c15.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.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>
+<!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.59602c15.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/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,
@@ -54,11 +43,10 @@ const QueryEditor: FC<QueryEditorProps> = ({
   const { isMobile } = useDeviceDetect();
 
   const [openAutocomplete, setOpenAutocomplete] = useState(false);
-  const [caretPositionAutocomplete, setCaretPositionAutocomplete] = useState<[number, number]>([0, 0]);
-  const [caretPositionInput, setCaretPositionInput] = useState<[number, number]>([0, 0]);
+  const [caretPosition, setCaretPosition] = 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 = [
@@ -78,7 +66,7 @@ const QueryEditor: FC<QueryEditorProps> = ({
 
   const handleSelect = (val: string, caretPosition: number) => {
     onChange(val);
-    setCaretPositionInput([caretPosition, caretPosition]);
+    setCaretPosition([caretPosition, caretPosition]);
   };
 
   const handleKeyDown = (e: KeyboardEvent) => {
@@ -120,17 +108,17 @@ const QueryEditor: FC<QueryEditorProps> = ({
   };
 
   const handleChangeCaret = (val: [number, number]) => {
-    setCaretPositionAutocomplete(prev => prev[0] === val[0] && prev[1] === val[1] ? prev : val);
+    setCaretPosition(prev => prev[0] === val[0] && prev[1] === val[1] ? prev : val);
   };
 
   useEffect(() => {
-    setOpenAutocomplete(!!AutocompleteEl);
+    setOpenAutocomplete(autocomplete);
   }, [autocompleteQuick]);
 
   useEffect(() => {
     setShowAutocomplete(false);
     debouncedSetShowAutocomplete(true);
-  }, [caretPositionAutocomplete]);
+  }, [caretPosition]);
 
   return (
     <div
@@ -149,13 +137,13 @@ const QueryEditor: FC<QueryEditorProps> = ({
         onChangeCaret={handleChangeCaret}
         disabled={disabled}
         inputmode={"search"}
-        caretPosition={caretPositionInput}
+        caretPosition={caretPosition}
       />
-      {showAutocomplete && autocomplete && AutocompleteEl && (
-        <AutocompleteEl
+      {showAutocomplete && autocomplete && (
+        <QueryEditorAutocomplete
           value={value}
           anchorEl={autocompleteAnchorEl}
-          caretPosition={caretPositionAutocomplete}
+          caretPosition={caretPosition}
           hasHelperText={Boolean(warning || error)}
           includeFunctions={includeFunctions}
           onSelect={handleSelect}

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/Main/TextField/TextField.tsx

@@ -1,6 +1,7 @@
 import React, {
   FC,
   useEffect,
+  useState,
   useRef,
   useMemo,
   FormEvent,
@@ -64,6 +65,7 @@ const TextField: FC<TextFieldProps> = ({
   const inputRef = useRef<HTMLInputElement>(null);
   const textareaRef = useRef<HTMLTextAreaElement>(null);
   const fieldRef = useMemo(() => type === "textarea" ? textareaRef : inputRef, [type]);
+  const [selectionPos, setSelectionPos] = useState<[start: number, end: number]>([0, 0]);
 
   const inputClasses = classNames({
     "vm-text-field__input": true,
@@ -75,9 +77,8 @@ const TextField: FC<TextFieldProps> = ({
   });
 
   const updateCaretPosition = (target: HTMLInputElement | HTMLTextAreaElement) => {
-    if (!onChangeCaret) return;
     const { selectionStart, selectionEnd } = target;
-    onChangeCaret && onChangeCaret([selectionStart || 0, selectionEnd || 0]);
+    setSelectionPos([selectionStart || 0, selectionEnd || 0]);
   };
 
   const handleMouseUp = (e: MouseEvent<HTMLInputElement | HTMLTextAreaElement>) => {
@@ -126,6 +127,14 @@ const TextField: FC<TextFieldProps> = ({
     fieldRef?.current?.focus && fieldRef.current.focus();
   }, [fieldRef, autofocus]);
 
+  useEffect(() => {
+    onChangeCaret && onChangeCaret(selectionPos);
+  }, [selectionPos]);
+
+  useEffect(() => {
+    setSelectionRange(selectionPos);
+  }, [value]);
+
   useEffect(() => {
     caretPosition && setSelectionRange(caretPosition);
   }, [caretPosition]);

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
@@ -153,7 +133,7 @@ func NewSample(t *testing.T, timeStr string, value float64) *Sample {
 	if err != nil {
 		t.Fatalf("could not parse RFC3339 time %q: %v", timeStr, err)
 	}
-	return &Sample{parsedTime.UnixMilli(), value}
+	return &Sample{parsedTime.Unix(), value}
 }
 
 // UnmarshalJSON populates the sample fields from a JSON string.
@@ -169,7 +149,7 @@ func (s *Sample) UnmarshalJSON(b []byte) error {
 	if got, want := len(raw), 2; got != want {
 		return fmt.Errorf("unexpected number of fields: got %d, want %d (raw sample: %s)", got, want, string(b))
 	}
-	s.Timestamp = int64(ts * 1000)
+	s.Timestamp = int64(ts)
 	var err error
 	s.Value, err = strconv.ParseFloat(v, 64)
 	if err != nil {

apptest/testcase.go

@@ -134,21 +134,8 @@ func (c *vmcluster) ForceFlush(t *testing.T) {
 	}
 }
 
-// MustStartDefaultCluster starts a typical cluster configuration with default
-// flags.
-func (tc *TestCase) MustStartDefaultCluster() PrometheusWriteQuerier {
-	tc.t.Helper()
-
-	return tc.MustStartCluster(&ClusterOptions{
-		Vmstorage1Instance: "vmstorage1",
-		Vmstorage2Instance: "vmstorage2",
-		VminsertInstance:   "vminsert",
-		VmselectInstance:   "vmselect",
-	})
-}
-
-// ClusterOptions holds the params for simple cluster configuration suitable for
-// most tests.
+// MustStartDefaultCluster is a typical cluster configuration suitable for most
+// tests.
 //
 // The cluster consists of two vmstorages, one vminsert and one vmselect, no
 // data replication.
@@ -158,42 +145,23 @@ func (tc *TestCase) MustStartDefaultCluster() PrometheusWriteQuerier {
 // vmselect) but instead just need a typical cluster configuration to verify
 // some business logic (such as API surface, or MetricsQL). Such cluster
 // tests usually come paired with corresponding vmsingle tests.
-type ClusterOptions struct {
-	Vmstorage1Instance string
-	Vmstorage1Flags    []string
-	Vmstorage2Instance string
-	Vmstorage2Flags    []string
-	VminsertInstance   string
-	VminsertFlags      []string
-	VmselectInstance   string
-	VmselectFlags      []string
-}
-
-// MustStartCluster starts a typical cluster configuration with custom flags.
-func (tc *TestCase) MustStartCluster(opts *ClusterOptions) PrometheusWriteQuerier {
+func (tc *TestCase) MustStartDefaultCluster() PrometheusWriteQuerier {
 	tc.t.Helper()
 
-	opts.Vmstorage1Flags = append(opts.Vmstorage1Flags, []string{
-		"-storageDataPath=" + tc.Dir() + "/" + opts.Vmstorage1Instance,
+	vmstorage1 := tc.MustStartVmstorage("vmstorage-1", []string{
+		"-storageDataPath=" + tc.Dir() + "/vmstorage-1",
 		"-retentionPeriod=100y",
-	}...)
-	vmstorage1 := tc.MustStartVmstorage(opts.Vmstorage1Instance, opts.Vmstorage1Flags)
-
-	opts.Vmstorage2Flags = append(opts.Vmstorage2Flags, []string{
-		"-storageDataPath=" + tc.Dir() + "/" + opts.Vmstorage2Instance,
+	})
+	vmstorage2 := tc.MustStartVmstorage("vmstorage-2", []string{
+		"-storageDataPath=" + tc.Dir() + "/vmstorage-2",
 		"-retentionPeriod=100y",
-	}...)
-	vmstorage2 := tc.MustStartVmstorage(opts.Vmstorage2Instance, opts.Vmstorage2Flags)
-
-	opts.VminsertFlags = append(opts.VminsertFlags, []string{
+	})
+	vminsert := tc.MustStartVminsert("vminsert", []string{
 		"-storageNode=" + vmstorage1.VminsertAddr() + "," + vmstorage2.VminsertAddr(),
-	}...)
-	vminsert := tc.MustStartVminsert(opts.VminsertInstance, opts.VminsertFlags)
-
-	opts.VmselectFlags = append(opts.VmselectFlags, []string{
+	})
+	vmselect := tc.MustStartVmselect("vmselect", []string{
 		"-storageNode=" + vmstorage1.VmselectAddr() + "," + vmstorage2.VmselectAddr(),
-	}...)
-	vmselect := tc.MustStartVmselect(opts.VmselectInstance, opts.VmselectFlags)
+	})
 
 	return &vmcluster{vminsert, vmselect, []*Vmstorage{vmstorage1, vmstorage2}}
 }

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"
 
+	"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
@@ -31,7 +30,7 @@ var docData = []string{
 // TestSingleKeyConceptsQuery verifies cases from https://docs.victoriametrics.com/keyconcepts/#query-data
 // for vm-single.
 func TestSingleKeyConceptsQuery(t *testing.T) {
-	tc := at.NewTestCase(t)
+	tc := apptest.NewTestCase(t)
 	defer tc.Stop()
 
 	sut := tc.MustStartDefaultVmsingle()
@@ -42,7 +41,7 @@ func TestSingleKeyConceptsQuery(t *testing.T) {
 // TestClusterKeyConceptsQueryData verifies cases from https://docs.victoriametrics.com/keyconcepts/#query-data
 // for vm-cluster.
 func TestClusterKeyConceptsQueryData(t *testing.T) {
-	tc := at.NewTestCase(t)
+	tc := apptest.NewTestCase(t)
 	defer tc.Stop()
 
 	sut := tc.MustStartDefaultCluster()
@@ -50,11 +49,11 @@ func TestClusterKeyConceptsQueryData(t *testing.T) {
 	testKeyConceptsQueryData(t, sut)
 }
 
-// testKeyConceptsQueryData verifies cases from https://docs.victoriametrics.com/keyconcepts/#query-data
-func testKeyConceptsQueryData(t *testing.T, sut at.PrometheusWriteQuerier) {
+// testClusterKeyConceptsQuery verifies cases from https://docs.victoriametrics.com/keyconcepts/#query-data
+func testKeyConceptsQueryData(t *testing.T, sut apptest.PrometheusWriteQuerier) {
 
 	// Insert example data from documentation.
-	sut.PrometheusAPIV1ImportPrometheus(t, docData, at.QueryOpts{})
+	sut.PrometheusAPIV1ImportPrometheus(t, docData, apptest.QueryOpts{})
 	sut.ForceFlush(t)
 
 	testInstantQuery(t, sut)
@@ -65,14 +64,14 @@ func testKeyConceptsQueryData(t *testing.T, sut at.PrometheusWriteQuerier) {
 // testInstantQuery verifies the statements made in the `Instant query` section
 // of the VictoriaMetrics documentation. See:
 // https://docs.victoriametrics.com/keyconcepts/#instant-query
-func testInstantQuery(t *testing.T, q at.PrometheusQuerier) {
+func testInstantQuery(t *testing.T, q apptest.PrometheusQuerier) {
 	// Get the value of the foo_bar time series at 2022-05-10T08:03:00Z with the
 	// step of 5m and timeout 5s. There is no sample at exactly this timestamp.
 	// Therefore, VictoriaMetrics will search for the nearest sample within the
 	// [time-5m..time] interval.
-	got := q.PrometheusAPIV1Query(t, "foo_bar", at.QueryOpts{Time: "2022-05-10T08:03:00.000Z", Step: "5m"})
-	want := at.NewPrometheusAPIV1QueryResponse(t, `{"data":{"result":[{"metric":{"__name__":"foo_bar"},"value":[1652169780,"3"]}]}}`)
-	opt := cmpopts.IgnoreFields(at.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
+	got := q.PrometheusAPIV1Query(t, "foo_bar", apptest.QueryOpts{Time: "2022-05-10T08:03:00.000Z", Step: "5m"})
+	want := apptest.NewPrometheusAPIV1QueryResponse(t, `{"data":{"result":[{"metric":{"__name__":"foo_bar"},"value":[1652169780,"3"]}]}}`)
+	opt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
 	if diff := cmp.Diff(want, got, opt); diff != "" {
 		t.Errorf("unexpected response (-want, +got):\n%s", diff)
 	}
@@ -82,7 +81,7 @@ func testInstantQuery(t *testing.T, q at.PrometheusQuerier) {
 	// Therefore, VictoriaMetrics will search for the nearest sample within the
 	// [time-1m..time] interval. Since the nearest sample is 2m away and the
 	// step is 1m, then the VictoriaMetrics must return empty response.
-	got = q.PrometheusAPIV1Query(t, "foo_bar", at.QueryOpts{Time: "2022-05-10T08:18:00.000Z", Step: "1m"})
+	got = q.PrometheusAPIV1Query(t, "foo_bar", apptest.QueryOpts{Time: "2022-05-10T08:18:00.000Z", Step: "1m"})
 	if len(got.Data.Result) > 0 {
 		t.Errorf("unexpected response: got non-empty result, want empty result:\n%v", got)
 	}
@@ -91,14 +90,14 @@ func testInstantQuery(t *testing.T, q at.PrometheusQuerier) {
 // testRangeQuery verifies the statements made in the `Range query` section of
 // the VictoriaMetrics documentation. See:
 // https://docs.victoriametrics.com/keyconcepts/#range-query
-func testRangeQuery(t *testing.T, q at.PrometheusQuerier) {
-	f := func(start, end, step string, wantSamples []*at.Sample) {
+func testRangeQuery(t *testing.T, q apptest.PrometheusQuerier) {
+	f := func(start, end, step string, wantSamples []*apptest.Sample) {
 		t.Helper()
 
-		got := q.PrometheusAPIV1QueryRange(t, "foo_bar", at.QueryOpts{Start: start, End: end, Step: step})
-		want := at.NewPrometheusAPIV1QueryResponse(t, `{"data": {"result": [{"metric": {"__name__": "foo_bar"}, "values": []}]}}`)
+		got := q.PrometheusAPIV1QueryRange(t, "foo_bar", apptest.QueryOpts{Start: start, End: end, Step: step})
+		want := apptest.NewPrometheusAPIV1QueryResponse(t, `{"data": {"result": [{"metric": {"__name__": "foo_bar"}, "values": []}]}}`)
 		want.Data.Result[0].Samples = wantSamples
-		opt := cmpopts.IgnoreFields(at.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
+		opt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
 		if diff := cmp.Diff(want, got, opt); diff != "" {
 			t.Errorf("unexpected response (-want, +got):\n%s", diff)
 		}
@@ -107,68 +106,66 @@ func testRangeQuery(t *testing.T, q at.PrometheusQuerier) {
 	// Verify the statement that the query result for
 	// [2022-05-10T07:59:00Z..2022-05-10T08:17:00Z] time range and 1m step will
 	// contain 17 points.
-	f("2022-05-10T07:59:00.000Z", "2022-05-10T08:17:00.000Z", "1m", []*at.Sample{
+	f("2022-05-10T07:59:00.000Z", "2022-05-10T08:17:00.000Z", "1m", []*apptest.Sample{
 		// Sample for 2022-05-10T07:59:00Z is missing because the time series has
 		// samples only starting from 8:00.
-		at.NewSample(t, "2022-05-10T08:00:00Z", 1),
-		at.NewSample(t, "2022-05-10T08:01:00Z", 2),
-		at.NewSample(t, "2022-05-10T08:02:00Z", 3),
-		at.NewSample(t, "2022-05-10T08:03:00Z", 3),
-		at.NewSample(t, "2022-05-10T08:04:00Z", 5),
-		at.NewSample(t, "2022-05-10T08:05:00Z", 5),
-		at.NewSample(t, "2022-05-10T08:06:00Z", 5.5),
-		at.NewSample(t, "2022-05-10T08:07:00Z", 5.5),
-		at.NewSample(t, "2022-05-10T08:08:00Z", 4),
-		at.NewSample(t, "2022-05-10T08:09:00Z", 4),
+		apptest.NewSample(t, "2022-05-10T08:00:00Z", 1),
+		apptest.NewSample(t, "2022-05-10T08:01:00Z", 2),
+		apptest.NewSample(t, "2022-05-10T08:02:00Z", 3),
+		apptest.NewSample(t, "2022-05-10T08:03:00Z", 3),
+		apptest.NewSample(t, "2022-05-10T08:04:00Z", 5),
+		apptest.NewSample(t, "2022-05-10T08:05:00Z", 5),
+		apptest.NewSample(t, "2022-05-10T08:06:00Z", 5.5),
+		apptest.NewSample(t, "2022-05-10T08:07:00Z", 5.5),
+		apptest.NewSample(t, "2022-05-10T08:08:00Z", 4),
+		apptest.NewSample(t, "2022-05-10T08:09:00Z", 4),
 		// Sample for 2022-05-10T08:10:00Z is missing because there is no sample
 		// within the [8:10 - 1m .. 8:10] interval.
-		at.NewSample(t, "2022-05-10T08:11:00Z", 3.5),
-		at.NewSample(t, "2022-05-10T08:12:00Z", 3.25),
-		at.NewSample(t, "2022-05-10T08:13:00Z", 3),
-		at.NewSample(t, "2022-05-10T08:14:00Z", 2),
-		at.NewSample(t, "2022-05-10T08:15:00Z", 1),
-		at.NewSample(t, "2022-05-10T08:16:00Z", 4),
-		at.NewSample(t, "2022-05-10T08:17:00Z", 4),
+		apptest.NewSample(t, "2022-05-10T08:11:00Z", 3.5),
+		apptest.NewSample(t, "2022-05-10T08:12:00Z", 3.25),
+		apptest.NewSample(t, "2022-05-10T08:13:00Z", 3),
+		apptest.NewSample(t, "2022-05-10T08:14:00Z", 2),
+		apptest.NewSample(t, "2022-05-10T08:15:00Z", 1),
+		apptest.NewSample(t, "2022-05-10T08:16:00Z", 4),
+		apptest.NewSample(t, "2022-05-10T08:17:00Z", 4),
 	})
 
 	// Verify the statement that a query is executed at start, start+step,
 	// start+2*step, …, step+N*step timestamps, where N is the whole number
 	// of steps that fit between start and end.
-	f("2022-05-10T08:00:01.000Z", "2022-05-10T08:02:00.000Z", "1m", []*at.Sample{
-		at.NewSample(t, "2022-05-10T08:00:01Z", 1),
-		at.NewSample(t, "2022-05-10T08:01:01Z", 2),
+	f("2022-05-10T08:00:01.000Z", "2022-05-10T08:02:00.000Z", "1m", []*apptest.Sample{
+		apptest.NewSample(t, "2022-05-10T08:00:01Z", 1),
+		apptest.NewSample(t, "2022-05-10T08:01:01Z", 2),
 	})
 
 	// Verify the statement that a query is executed at start, start+step,
 	// start+2*step, …, end timestamps, when end = start + N*step.
-	f("2022-05-10T08:00:00.000Z", "2022-05-10T08:02:00.000Z", "1m", []*at.Sample{
-		at.NewSample(t, "2022-05-10T08:00:00Z", 1),
-		at.NewSample(t, "2022-05-10T08:01:00Z", 2),
-		at.NewSample(t, "2022-05-10T08:02:00Z", 3),
+	f("2022-05-10T08:00:00.000Z", "2022-05-10T08:02:00.000Z", "1m", []*apptest.Sample{
+		apptest.NewSample(t, "2022-05-10T08:00:00Z", 1),
+		apptest.NewSample(t, "2022-05-10T08:01:00Z", 2),
+		apptest.NewSample(t, "2022-05-10T08:02:00Z", 3),
 	})
 
 	// If the step isn’t set, then it defaults to 5m (5 minutes).
-	f("2022-05-10T07:59:00.000Z", "2022-05-10T08:17:00.000Z", "", []*at.Sample{
+	f("2022-05-10T07:59:00.000Z", "2022-05-10T08:17:00.000Z", "", []*apptest.Sample{
 		// Sample for 2022-05-10T07:59:00Z is missing because the time series has
 		// samples only starting from 8:00.
-		at.NewSample(t, "2022-05-10T08:04:00Z", 5),
-		at.NewSample(t, "2022-05-10T08:09:00Z", 4),
-		at.NewSample(t, "2022-05-10T08:14:00Z", 2),
+		apptest.NewSample(t, "2022-05-10T08:04:00Z", 5),
+		apptest.NewSample(t, "2022-05-10T08:09:00Z", 4),
+		apptest.NewSample(t, "2022-05-10T08:14:00Z", 2),
 	})
 }
 
 // testRangeQueryIsEquivalentToManyInstantQueries verifies the statement made in
 // the `Range query` section of the VictoriaMetrics documentation that a range
 // query is actually an instant query executed 1 + (start-end)/step times on the
-// time range from start to end. The only difference is that instant queries
-// will not procude ephemeral points.
-//
-// See: https://docs.victoriametrics.com/keyconcepts/#range-query
-func testRangeQueryIsEquivalentToManyInstantQueries(t *testing.T, q at.PrometheusQuerier) {
-	f := func(timestamp string, want *at.Sample) {
+// time range from start to end. See:
+// https://docs.victoriametrics.com/keyconcepts/#range-query
+func testRangeQueryIsEquivalentToManyInstantQueries(t *testing.T, q apptest.PrometheusQuerier) {
+	f := func(timestamp string, want *apptest.Sample) {
 		t.Helper()
 
-		gotInstant := q.PrometheusAPIV1Query(t, "foo_bar", at.QueryOpts{Time: timestamp, Step: "1m"})
+		gotInstant := q.PrometheusAPIV1Query(t, "foo_bar", apptest.QueryOpts{Time: timestamp, Step: "1m"})
 		if want == nil {
 			if got, want := len(gotInstant.Data.Result), 0; got != want {
 				t.Errorf("unexpected instant result size: got %d, want %d", got, want)
@@ -181,7 +178,7 @@ func testRangeQueryIsEquivalentToManyInstantQueries(t *testing.T, q at.Prometheu
 		}
 	}
 
-	rangeRes := q.PrometheusAPIV1QueryRange(t, "foo_bar", at.QueryOpts{
+	rangeRes := q.PrometheusAPIV1QueryRange(t, "foo_bar", apptest.QueryOpts{
 		Start: "2022-05-10T07:59:00.000Z",
 		End:   "2022-05-10T08:17:00.000Z",
 		Step:  "1m",
@@ -192,13 +189,13 @@ func testRangeQueryIsEquivalentToManyInstantQueries(t *testing.T, q at.Prometheu
 	f("2022-05-10T08:00:00.000Z", rangeSamples[0])
 	f("2022-05-10T08:01:00.000Z", rangeSamples[1])
 	f("2022-05-10T08:02:00.000Z", rangeSamples[2])
-	f("2022-05-10T08:03:00.000Z", nil)
+	f("2022-05-10T08:03:00.000Z", rangeSamples[3])
 	f("2022-05-10T08:04:00.000Z", rangeSamples[4])
-	f("2022-05-10T08:05:00.000Z", nil)
+	f("2022-05-10T08:05:00.000Z", rangeSamples[5])
 	f("2022-05-10T08:06:00.000Z", rangeSamples[6])
 	f("2022-05-10T08:07:00.000Z", rangeSamples[7])
 	f("2022-05-10T08:08:00.000Z", rangeSamples[8])
-	f("2022-05-10T08:09:00.000Z", nil)
+	f("2022-05-10T08:09:00.000Z", rangeSamples[9])
 	f("2022-05-10T08:10:00.000Z", nil)
 	f("2022-05-10T08:11:00.000Z", rangeSamples[10])
 	f("2022-05-10T08:12:00.000Z", rangeSamples[11])
@@ -206,164 +203,5 @@ func testRangeQueryIsEquivalentToManyInstantQueries(t *testing.T, q at.Prometheu
 	f("2022-05-10T08:14:00.000Z", rangeSamples[13])
 	f("2022-05-10T08:15:00.000Z", rangeSamples[14])
 	f("2022-05-10T08:16:00.000Z", rangeSamples[15])
-	f("2022-05-10T08:17:00.000Z", nil)
-}
-
-func TestSingleMillisecondPrecisionInInstantQueries(t *testing.T) {
-	tc := at.NewTestCase(t)
-	defer tc.Stop()
-
-	sut := tc.MustStartDefaultVmsingle()
-
-	testMillisecondPrecisionInInstantQueries(tc, sut)
-}
-
-func TestClusterMillisecondPrecisionInInstantQueries(t *testing.T) {
-	tc := at.NewTestCase(t)
-	defer tc.Stop()
-
-	sut := tc.MustStartDefaultCluster()
-
-	testMillisecondPrecisionInInstantQueries(tc, sut)
-}
-
-func testMillisecondPrecisionInInstantQueries(tc *at.TestCase, sut at.PrometheusWriteQuerier) {
-	t := tc.T()
-
-	type opts struct {
-		query       string
-		qtime       string
-		step        string
-		wantMetric  map[string]string
-		wantSample  *at.Sample
-		wantSamples []*at.Sample
-	}
-	f := func(sut at.PrometheusQuerier, opts *opts) {
-		t.Helper()
-		wantResult := []*at.QueryResult{}
-		if opts.wantMetric != nil && (opts.wantSample != nil || len(opts.wantSamples) > 0) {
-			wantResult = append(wantResult, &at.QueryResult{
-				Metric:  opts.wantMetric,
-				Sample:  opts.wantSample,
-				Samples: opts.wantSamples,
-			})
-		}
-		tc.Assert(&at.AssertOptions{
-			Msg: "unexpected /api/v1/query response",
-			Got: func() any {
-				return sut.PrometheusAPIV1Query(t, opts.query, at.QueryOpts{
-					Time: opts.qtime,
-					Step: opts.step,
-				})
-			},
-			Want: &at.PrometheusAPIV1QueryResponse{Data: &at.QueryData{Result: wantResult}},
-			CmpOpts: []cmp.Option{
-				cmpopts.IgnoreFields(at.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType"),
-			},
-		})
-	}
-
-	sut.PrometheusAPIV1ImportPrometheus(t, []string{
-		`series1{label="foo"} 10 1707123456700`, // 2024-02-05T08:57:36.700Z
-		`series1{label="foo"} 20 1707123456800`, // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	sut.ForceFlush(t)
-
-	// Verify that both points were created correctly. Fetch both points by
-	// passing a duration into the instant query: the difference between the two
-	// timestamps, plus 1ms (to include both points), so 101ms:
-	f(sut, &opts{
-		query:      "series1[101ms]",
-		qtime:      "1707123456800", // 2024-02-05T08:57:36.800Z
-		wantMetric: map[string]string{"__name__": "series1", "label": "foo"},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-			{Timestamp: 1707123456800, Value: 20},
-		},
-	})
-
-	// Search the first point at its own timestamp with step 1ms.
-	f(sut, &opts{
-		query:      "series1",
-		qtime:      "1707123456700", // 2024-02-05T08:57:36.700Z
-		step:       "1ms",
-		wantMetric: map[string]string{"__name__": "series1", "label": "foo"},
-		wantSample: &at.Sample{Timestamp: 1707123456700, Value: 10},
-	})
-
-	// Search the first point at 1ms past its own timestamp.
-	// Expect empty result because the search interval (qtime-step, qtime]
-	// excludes the timestamp of the first point.
-	f(sut, &opts{
-		query: "series1",
-		qtime: "1707123456701", // 2024-02-05T08:57:36.701Z
-		step:  "1ms",
-	})
-
-	// Fetch the last point at its timestamp with step 1ms.
-	f(sut, &opts{
-		query:      "series1",
-		qtime:      "1707123456800", // 2024-02-05T08:57:36.800Z
-		step:       "1ms",
-		wantMetric: map[string]string{"__name__": "series1", "label": "foo"},
-		wantSample: &at.Sample{Timestamp: 1707123456800, Value: 20},
-	})
-
-	// Fetch the last point at its timestamp with step 1ms.
-	// Expect empty result because the search interval (qtime-step, qtime]
-	// excludes the timestamp of the first point.
-	f(sut, &opts{
-		query: "series1",
-		qtime: "1707123456801", // 2024-02-05T08:57:36.801Z
-		step:  "1ms",
-		// wantMetric: map[string]string{"__name__": "series1", "label": "foo"},
-		// wantSample: &at.Sample{Timestamp: 1707123456801, Value: 20},
-	})
-
-	// Insert samples with different dates. The difference in ms between the two
-	// timestamps is 4236579304.
-	sut.PrometheusAPIV1ImportPrometheus(t, []string{
-		`series2{label="foo"} 10 1638564958042`, // 2021-12-03T20:55:58.042Z
-		`series2{label="foo"} 20 1642801537346`, // 2022-01-21T21:45:37.346Z
-	}, at.QueryOpts{})
-	sut.ForceFlush(t)
-
-	// Both Prometheus and VictoriaMetrics exclude the leftmost millisecond,
-	// thus the following queries must return only one sample.
-	f(sut, &opts{
-		query:      "series2[4236579304ms]",
-		qtime:      "1642801537346",
-		step:       "1ms",
-		wantMetric: map[string]string{"__name__": "series2", "label": "foo"},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1642801537346, Value: 20},
-		},
-	})
-	f(sut, &opts{
-		query:      "count_over_time(series2[4236579304ms])",
-		qtime:      "1642801537346", // 2022-01-21T21:45:37.346Z
-		step:       "1ms",
-		wantMetric: map[string]string{"label": "foo"},
-		wantSample: &at.Sample{Timestamp: 1642801537346, Value: 1},
-	})
-
-	// Adding 1ms to the duration (4236579305ms) causes queries to return 2
-	// samples.
-	f(sut, &opts{
-		query:      "series2[4236579305ms]",
-		qtime:      "1642801537346",
-		step:       "1ms",
-		wantMetric: map[string]string{"__name__": "series2", "label": "foo"},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1638564958042, Value: 10}, // 2021-12-03T20:55:58.042Z
-			{Timestamp: 1642801537346, Value: 20},
-		},
-	})
-	f(sut, &opts{
-		query:      "count_over_time(series2[4236579305ms])",
-		qtime:      "1642801537346", // 2022-01-21T21:45:37.346Z
-		step:       "1ms",
-		wantMetric: map[string]string{"label": "foo"},
-		wantSample: &at.Sample{Timestamp: 1642801537346, Value: 2},
-	})
+	f("2022-05-10T08:17:00.000Z", rangeSamples[16])
 }

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/tests/relabeling_test.go

@@ -1,204 +0,0 @@
-package tests
-
-import (
-	"fmt"
-	"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 TestSingleIngestionWithRelabeling(t *testing.T) {
-	tc := at.NewTestCase(t)
-	defer tc.Stop()
-	const relabelFileName = "relabel_config.yaml"
-	relabelingRules := `
-# add 4 labels in order to call memory allocation
-- replacement: value1
-  target_label: label1
-- replacement: value2
-  target_label: label2
-- replacement: value3
-  target_label: label3
-- replacement: value4
-  target_label: label4
-
-# drop specific timeseries by name prefix
-- action: drop
-  if: '{__name__=~"^must_drop.+"}'
-
-# strip prefix from metric name
-# and write it into special label
-- source_labels: [__name__]
-  regex: '^(.+)_(.+)'
-  replacement: $1
-  target_label: ingestion_protocol
-- source_labels: [__name__]
-  regex: '^(.+)_(.+)'
-  replacement: $2
-  target_label: __name__
-  `
-	relabelFilePath := fmt.Sprintf("%s/%s", t.TempDir(), relabelFileName)
-	if err := os.WriteFile(relabelFilePath, []byte(relabelingRules), os.ModePerm); err != nil {
-		t.Fatalf("cannot create file=%q: %s", relabelFilePath, err)
-	}
-	sut := tc.MustStartVmsingle("relabeling-ingest",
-		[]string{fmt.Sprintf(`-relabelConfig=%s`, relabelFilePath),
-			`-retentionPeriod=100y`})
-
-	type opts struct {
-		query       string
-		qtime       string
-		step        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 /api/v1/query response",
-			Got: func() any {
-				return sut.PrometheusAPIV1Query(t, opts.query, at.QueryOpts{
-					Time: opts.qtime,
-					Step: opts.step,
-				})
-			},
-			Want: &at.PrometheusAPIV1QueryResponse{Data: &at.QueryData{Result: wantResult}},
-			CmpOpts: []cmp.Option{
-				cmpopts.IgnoreFields(at.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType"),
-			},
-		})
-	}
-
-	sut.PrometheusAPIV1ImportPrometheus(t, []string{
-		`importprometheus_series{label="foo"} 10 1707123456700`, // 2024-02-05T08:57:36.700Z
-		`must_drop_series{label="foo"} 20 1707123456800`,        // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	sut.ForceFlush(t)
-	f(sut, &opts{
-		query: `{label="foo"}[120ms]`,
-		qtime: "1707123456800", // 2024-02-05T08:57:36.800Z
-		wantMetrics: []map[string]string{
-			{
-				"__name__":           "series",
-				"label":              "foo",
-				"label1":             "value1",
-				"label2":             "value2",
-				"label3":             "value3",
-				"label4":             "value4",
-				"ingestion_protocol": "importprometheus",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-		},
-	})
-
-	// write influx with multi field set series1 and series2 in order to test
-	// memory optimisation at vminsert side
-	sut.InfluxWrite(t, []string{
-		`influxline,label=foo1 series1=10,series2=30 1707123456700`, // 2024-02-05T08:57:36.700Z
-		`must_drop,label=foo1 series1=20,series2=40 1707123456800`,  // 2024-02-05T08:57:36.800Z
-	}, at.QueryOpts{})
-	sut.ForceFlush(t)
-	f(sut, &opts{
-		query: `{label="foo1"}[120ms]`,
-		qtime: "1707123456800", // 2024-02-05T08:57:36.800Z
-		wantMetrics: []map[string]string{
-			{
-				"__name__":           "series1",
-				"label":              "foo1",
-				"label1":             "value1",
-				"label2":             "value2",
-				"label3":             "value3",
-				"label4":             "value4",
-				"ingestion_protocol": "influxline",
-			},
-			{
-				"__name__":           "series2",
-				"label":              "foo1",
-				"label1":             "value1",
-				"label2":             "value2",
-				"label3":             "value3",
-				"label4":             "value4",
-				"ingestion_protocol": "influxline"},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10},
-			{Timestamp: 1707123456700, Value: 30},
-		},
-	})
-
-	pbData := []pb.TimeSeries{
-		{
-			Labels: []pb.Label{
-				{
-					Name:  "__name__",
-					Value: "prometheusrw_series",
-				},
-				{
-					Name:  "label",
-					Value: "foo2",
-				},
-			},
-			Samples: []pb.Sample{
-				{
-					Value:     10,
-					Timestamp: 1707123456700, // 2024-02-05T08:57:36.700Z
-
-				},
-			},
-		},
-		{
-			Labels: []pb.Label{
-				{
-					Name:  "__name__",
-					Value: "must_drop_series",
-				},
-				{
-					Name:  "label",
-					Value: "foo2",
-				},
-			},
-			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: `{label="foo2"}[120ms]`,
-		qtime: "1707123456800", // 2024-02-05T08:57:36.800Z
-		wantMetrics: []map[string]string{
-			{
-				"__name__":           "series",
-				"label":              "foo2",
-				"label1":             "value1",
-				"label2":             "value2",
-				"label3":             "value3",
-				"label4":             "value4",
-				"ingestion_protocol": "prometheusrw",
-			},
-		},
-		wantSamples: []*at.Sample{
-			{Timestamp: 1707123456700, Value: 10}, // 2024-02-05T08:57:36.700Z
-		},
-	})
-
-}

apptest/vminsert.go

@@ -78,19 +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.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.

apptest/vmsingle.go

@@ -26,7 +26,6 @@ type Vmsingle struct {
 	forceFlushURL string
 
 	// vminsert URLs.
-	influxLineWriteURL                 string
 	prometheusAPIV1ImportPrometheusURL string
 	prometheusAPIV1WriteURL            string
 
@@ -65,7 +64,6 @@ func StartVmsingle(instance string, flags []string, cli *Client) (*Vmsingle, err
 		httpListenAddr:  stderrExtracts[1],
 
 		forceFlushURL:                      fmt.Sprintf("http://%s/internal/force_flush", stderrExtracts[1]),
-		influxLineWriteURL:                 fmt.Sprintf("http://%s/influx/write", stderrExtracts[1]),
 		prometheusAPIV1ImportPrometheusURL: fmt.Sprintf("http://%s/prometheus/api/v1/import/prometheus", stderrExtracts[1]),
 		prometheusAPIV1WriteURL:            fmt.Sprintf("http://%s/prometheus/api/v1/write", stderrExtracts[1]),
 		prometheusAPIV1ExportURL:           fmt.Sprintf("http://%s/prometheus/api/v1/export", stderrExtracts[1]),
@@ -83,18 +81,6 @@ func (app *Vmsingle) ForceFlush(t *testing.T) {
 	app.cli.Get(t, app.forceFlushURL, http.StatusOK)
 }
 
-// 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 *Vmsingle) InfluxWrite(t *testing.T, records []string, _ QueryOpts) {
-	t.Helper()
-
-	data := []byte(strings.Join(records, "\n"))
-	app.cli.Post(t, app.influxLineWriteURL, "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 vmsingle 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

cspell/package.json

@@ -11,6 +11,6 @@
     "@cspell/dict-software-terms": "^4.1.3",
     "@cspell/dict-uk-ua": "^4.0.1",
     "@cspell/dict-win32": "^2.0.3",
-    "cspell": "^8.17.1"
+    "cspell": "^8.14.2"
   }
 }

cspell/yarn.lock

@@ -1,793 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@cspell/cspell-bundled-dicts@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.17.1.tgz#61adad73f1bb1e12b182ffa04423d6052b18f0fc"
-  integrity sha512-HmkXS5uX4bk/XxsRS4Q+zRvhgRa81ddGiR2/Xfag9MIi5L5UnEJ4g21EpmIlXkMxYrTu2fp69SZFss5NfcFF9Q==
-  dependencies:
-    "@cspell/dict-ada" "^4.0.5"
-    "@cspell/dict-al" "^1.0.3"
-    "@cspell/dict-aws" "^4.0.7"
-    "@cspell/dict-bash" "^4.1.8"
-    "@cspell/dict-companies" "^3.1.8"
-    "@cspell/dict-cpp" "^6.0.2"
-    "@cspell/dict-cryptocurrencies" "^5.0.3"
-    "@cspell/dict-csharp" "^4.0.5"
-    "@cspell/dict-css" "^4.0.16"
-    "@cspell/dict-dart" "^2.2.4"
-    "@cspell/dict-django" "^4.1.3"
-    "@cspell/dict-docker" "^1.1.11"
-    "@cspell/dict-dotnet" "^5.0.8"
-    "@cspell/dict-elixir" "^4.0.6"
-    "@cspell/dict-en-common-misspellings" "^2.0.7"
-    "@cspell/dict-en-gb" "1.1.33"
-    "@cspell/dict-en_us" "^4.3.28"
-    "@cspell/dict-filetypes" "^3.0.9"
-    "@cspell/dict-flutter" "^1.0.3"
-    "@cspell/dict-fonts" "^4.0.3"
-    "@cspell/dict-fsharp" "^1.0.4"
-    "@cspell/dict-fullstack" "^3.2.3"
-    "@cspell/dict-gaming-terms" "^1.0.9"
-    "@cspell/dict-git" "^3.0.3"
-    "@cspell/dict-golang" "^6.0.17"
-    "@cspell/dict-google" "^1.0.4"
-    "@cspell/dict-haskell" "^4.0.4"
-    "@cspell/dict-html" "^4.0.10"
-    "@cspell/dict-html-symbol-entities" "^4.0.3"
-    "@cspell/dict-java" "^5.0.10"
-    "@cspell/dict-julia" "^1.0.4"
-    "@cspell/dict-k8s" "^1.0.9"
-    "@cspell/dict-latex" "^4.0.3"
-    "@cspell/dict-lorem-ipsum" "^4.0.3"
-    "@cspell/dict-lua" "^4.0.6"
-    "@cspell/dict-makefile" "^1.0.3"
-    "@cspell/dict-markdown" "^2.0.7"
-    "@cspell/dict-monkeyc" "^1.0.9"
-    "@cspell/dict-node" "^5.0.5"
-    "@cspell/dict-npm" "^5.1.17"
-    "@cspell/dict-php" "^4.0.13"
-    "@cspell/dict-powershell" "^5.0.13"
-    "@cspell/dict-public-licenses" "^2.0.11"
-    "@cspell/dict-python" "^4.2.13"
-    "@cspell/dict-r" "^2.0.4"
-    "@cspell/dict-ruby" "^5.0.7"
-    "@cspell/dict-rust" "^4.0.10"
-    "@cspell/dict-scala" "^5.0.6"
-    "@cspell/dict-software-terms" "^4.1.19"
-    "@cspell/dict-sql" "^2.1.8"
-    "@cspell/dict-svelte" "^1.0.5"
-    "@cspell/dict-swift" "^2.0.4"
-    "@cspell/dict-terraform" "^1.0.6"
-    "@cspell/dict-typescript" "^3.1.11"
-    "@cspell/dict-vue" "^3.0.3"
-
-"@cspell/cspell-json-reporter@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.17.1.tgz#c1678665f183589e5fc19a1c0933b8d362165a43"
-  integrity sha512-EV9Xkh42Xw3aORvDZfxusICX91DDbqQpYdGKBdPGuhgxWOUYYZKpLXsHCmDkhruMPo2m5gDh++/OqjLRPZofKQ==
-  dependencies:
-    "@cspell/cspell-types" "8.17.1"
-
-"@cspell/cspell-pipe@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-8.17.1.tgz#c247d4bd1c8ec43c49c46dc4458f00489e98232b"
-  integrity sha512-uhC99Ox+OH3COSgShv4fpVHiotR70dNvAOSkzRvKVRzV6IGyFnxHjmyVVPEV0dsqzVLxltwYTqFhwI+UOwm45A==
-
-"@cspell/cspell-resolver@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-resolver/-/cspell-resolver-8.17.1.tgz#6377c9c8c05c940fee675c74e31f893b7b2f38ab"
-  integrity sha512-XEK2ymTdQNgsV3ny60VkKzWskbICl4zNXh/DbxsoRXHqIRg43MXFpTNkEJ7j873EqdX7BU4opQQ+5D4stWWuhQ==
-  dependencies:
-    global-directory "^4.0.1"
-
-"@cspell/cspell-service-bus@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-service-bus/-/cspell-service-bus-8.17.1.tgz#8d6d82ea3ab0fc9d7efed8523b070e4842780bd1"
-  integrity sha512-2sFWQtMEWZ4tdz7bw0bAx4NaV1t0ynGfjpuKWdQppsJFKNb+ZPZZ6Ah1dC13AdRRMZaG194kDRFwzNvRaCgWkQ==
-
-"@cspell/cspell-types@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-8.17.1.tgz#5512030b4c2e7881a8822ab3afabbd4f5ddffb6f"
-  integrity sha512-NJbov7Jp57fh8addoxesjb8atg/APQfssCH5Q9uZuHBN06wEJDgs7fhfE48bU+RBViC9gltblsYZzZZQKzHYKg==
-
-"@cspell/dict-ada@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ada/-/dict-ada-4.0.5.tgz#c14aae2faaecbad2d99f0d701e4700a48c68ef60"
-  integrity sha512-6/RtZ/a+lhFVmrx/B7bfP7rzC4yjEYe8o74EybXcvu4Oue6J4Ey2WSYj96iuodloj1LWrkNCQyX5h4Pmcj0Iag==
-
-"@cspell/dict-al@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-al/-/dict-al-1.0.3.tgz#09e288b5ab56b126dce895d3301faf7c0dd732d6"
-  integrity sha512-V1HClwlfU/qwSq2Kt+MkqRAsonNu3mxjSCDyGRecdLGIHmh7yeEeaxqRiO/VZ4KP+eVSiSIlbwrb5YNFfxYZbw==
-
-"@cspell/dict-aws@^4.0.4", "@cspell/dict-aws@^4.0.7":
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-aws/-/dict-aws-4.0.7.tgz#f96f3b70cd52a25b895eb08e297de5a5cc3fc5b6"
-  integrity sha512-PoaPpa2NXtSkhGIMIKhsJUXB6UbtTt6Ao3x9JdU9kn7fRZkwD4RjHDGqulucIOz7KeEX/dNRafap6oK9xHe4RA==
-
-"@cspell/dict-bash@^4.1.8":
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-bash/-/dict-bash-4.1.8.tgz#26dc898e06eddea069cf1ad475ee0e867c89e632"
-  integrity sha512-I2CM2pTNthQwW069lKcrVxchJGMVQBzru2ygsHCwgidXRnJL/NTjAPOFTxN58Jc1bf7THWghfEDyKX/oyfc0yg==
-
-"@cspell/dict-companies@^3.1.8":
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-3.1.10.tgz#1351959ba14a2c1f0678dd99069240748a724aa2"
-  integrity sha512-KpRLiVDCpTkF+IjWnuYc31B0gyHVh0TSf/MDrWPobl9oYNQRWFUMACAJO9FP+kHI0jzLjTyLC1KpKwqte/88iA==
-
-"@cspell/dict-cpp@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-cpp/-/dict-cpp-6.0.2.tgz#e4549ee1bdf4b6402c0b978eb9dd3deac0eb05df"
-  integrity sha512-yw5eejWvY4bAnc6LUA44m4WsFwlmgPt2uMSnO7QViGMBDuoeopMma4z9XYvs4lSjTi8fIJs/A1YDfM9AVzb8eg==
-
-"@cspell/dict-cryptocurrencies@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.3.tgz#502f9fffcb2835a3379668ddebdc487678ce6207"
-  integrity sha512-bl5q+Mk+T3xOZ12+FG37dB30GDxStza49Rmoax95n37MTLksk9wBo1ICOlPJ6PnDUSyeuv4SIVKgRKMKkJJglA==
-
-"@cspell/dict-csharp@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-csharp/-/dict-csharp-4.0.5.tgz#c677c50be09ca5bb3a2cc0be15f3cd05141fd2f7"
-  integrity sha512-c/sFnNgtRwRJxtC3JHKkyOm+U3/sUrltFeNwml9VsxKBHVmvlg4tk4ar58PdpW9/zTlGUkWi2i85//DN1EsUCA==
-
-"@cspell/dict-css@^4.0.16":
-  version "4.0.16"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-css/-/dict-css-4.0.16.tgz#b7b87b5ea0f1157b023205bdb00070a7d231e367"
-  integrity sha512-70qu7L9z/JR6QLyJPk38fNTKitlIHnfunx0wjpWQUQ8/jGADIhMCrz6hInBjqPNdtGpYm8d1dNFyF8taEkOgrQ==
-
-"@cspell/dict-dart@^2.2.4":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dart/-/dict-dart-2.2.4.tgz#8b877161ccdc65cead912b742b71aa55099c1706"
-  integrity sha512-of/cVuUIZZK/+iqefGln8G3bVpfyN6ZtH+LyLkHMoR5tEj+2vtilGNk9ngwyR8L4lEqbKuzSkOxgfVjsXf5PsQ==
-
-"@cspell/dict-data-science@^2.0.1", "@cspell/dict-data-science@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-data-science/-/dict-data-science-2.0.5.tgz#816e9b394c2a423d14cdc9a5de5d6fc6141d3900"
-  integrity sha512-nNSILXmhSJox9/QoXICPQgm8q5PbiSQP4afpbkBqPi/u/b3K9MbNH5HvOOa6230gxcGdbZ9Argl2hY/U8siBlg==
-
-"@cspell/dict-django@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-django/-/dict-django-4.1.3.tgz#a02a4a9ef8c9f47344f2d4a0c3964bcb62069ef5"
-  integrity sha512-yBspeL3roJlO0a1vKKNaWABURuHdHZ9b1L8d3AukX0AsBy9snSggc8xCavPmSzNfeMDXbH+1lgQiYBd3IW03fg==
-
-"@cspell/dict-docker@^1.1.11":
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-docker/-/dict-docker-1.1.11.tgz#6fce86eb6d86d73f77e18d3e7b9747bad3ca98de"
-  integrity sha512-s0Yhb16/R+UT1y727ekbR/itWQF3Qz275DR1ahOa66wYtPjHUXmhM3B/LT3aPaX+hD6AWmK23v57SuyfYHUjsw==
-
-"@cspell/dict-dotnet@^5.0.8":
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-5.0.8.tgz#8a110ca302946025e0273a9940079483ec33a88a"
-  integrity sha512-MD8CmMgMEdJAIPl2Py3iqrx3B708MbCIXAuOeZ0Mzzb8YmLmiisY7QEYSZPg08D7xuwARycP0Ki+bb0GAkFSqg==
-
-"@cspell/dict-elixir@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-4.0.6.tgz#3d8965c558d8afd190356e9a900b02c546741feb"
-  integrity sha512-TfqSTxMHZ2jhiqnXlVKM0bUADtCvwKQv2XZL/DI0rx3doG8mEMS8SGPOmiyyGkHpR/pGOq18AFH3BEm4lViHIw==
-
-"@cspell/dict-en-common-misspellings@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.7.tgz#62861cc9e813c947ebd71c7a50fc720767b4b543"
-  integrity sha512-qNFo3G4wyabcwnM+hDrMYKN9vNVg/k9QkhqSlSst6pULjdvPyPs1mqz1689xO/v9t8e6sR4IKc3CgUXDMTYOpA==
-
-"@cspell/dict-en-gb@1.1.33":
-  version "1.1.33"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en-gb/-/dict-en-gb-1.1.33.tgz#7f1fd90fc364a5cb77111b5438fc9fcf9cc6da0e"
-  integrity sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==
-
-"@cspell/dict-en_us@^4.3.23", "@cspell/dict-en_us@^4.3.28":
-  version "4.3.28"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-4.3.28.tgz#41169e1ed18465e7ff367a4f4488d4cbc6cf0baa"
-  integrity sha512-BN1PME7cOl7DXRQJ92pEd1f0Xk5sqjcDfThDGkKcsgwbSOY7KnTc/czBW6Pr3WXIchIm6cT12KEfjNqx7U7Rrw==
-
-"@cspell/dict-filetypes@^3.0.9":
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-filetypes/-/dict-filetypes-3.0.9.tgz#f4d5c35c341e6c3b77c08aec00678412641e1504"
-  integrity sha512-U7ycC1cE32A5aEgwzp/iE0TVabonUFnVt+Ygbf6NsIWqEuFWZgZChC7gfztA4T1fpuj602nFdp7eOnTWKORsnQ==
-
-"@cspell/dict-flutter@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-flutter/-/dict-flutter-1.0.3.tgz#23e552209ab2238733d30ca3f2a141359756af51"
-  integrity sha512-52C9aUEU22ptpgYh6gQyIdA4MP6NPwzbEqndfgPh3Sra191/kgs7CVqXiO1qbtZa9gnYHUoVApkoxRE7mrXHfg==
-
-"@cspell/dict-fonts@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fonts/-/dict-fonts-4.0.3.tgz#abf578c10a2e7b2bd8f4374002677625288560d9"
-  integrity sha512-sPd17kV5qgYXLteuHFPn5mbp/oCHKgitNfsZLFC3W2fWEgZlhg4hK+UGig3KzrYhhvQ8wBnmZrAQm0TFKCKzsA==
-
-"@cspell/dict-fsharp@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fsharp/-/dict-fsharp-1.0.4.tgz#19a7263a61ca89cd3ec9c17537e424907b81ef38"
-  integrity sha512-G5wk0o1qyHUNi9nVgdE1h5wl5ylq7pcBjX8vhjHcO4XBq20D5eMoXjwqMo/+szKAqzJ+WV3BgAL50akLKrT9Rw==
-
-"@cspell/dict-fullstack@^3.2.0", "@cspell/dict-fullstack@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fullstack/-/dict-fullstack-3.2.3.tgz#f6fff74eff00c6759cba510168acada0619004cc"
-  integrity sha512-62PbndIyQPH11mAv0PyiyT0vbwD0AXEocPpHlCHzfb5v9SspzCCbzQ/LIBiFmyRa+q5LMW35CnSVu6OXdT+LKg==
-
-"@cspell/dict-gaming-terms@^1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.0.9.tgz#6b920386d281b89f70857e6dacea10ab89e88658"
-  integrity sha512-AVIrZt3YiUnxsUzzGYTZ1XqgtkgwGEO0LWIlEf+SiDUEVLtv4CYmmyXFQ+WXDN0pyJ0wOwDazWrP0Cu7avYQmQ==
-
-"@cspell/dict-git@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-git/-/dict-git-3.0.3.tgz#3a3805ab9902bffc9255ec48f648145b957eb30b"
-  integrity sha512-LSxB+psZ0qoj83GkyjeEH/ZViyVsGEF/A6BAo8Nqc0w0HjD2qX/QR4sfA6JHUgQ3Yi/ccxdK7xNIo67L2ScW5A==
-
-"@cspell/dict-golang@^6.0.12", "@cspell/dict-golang@^6.0.17":
-  version "6.0.17"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-golang/-/dict-golang-6.0.17.tgz#8f3c11189b869db7216cb4496514b9882d1e30a5"
-  integrity sha512-uDDLEJ/cHdLiqPw4+5BnmIo2i/TSR+uDvYd6JlBjTmjBKpOCyvUgYRztH7nv5e7virsN5WDiUWah4/ATQGz4Pw==
-
-"@cspell/dict-google@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-google/-/dict-google-1.0.4.tgz#e15a7ea2dee73800231a81840a59d3b50d49346f"
-  integrity sha512-JThUT9eiguCja1mHHLwYESgxkhk17Gv7P3b1S7ZJzXw86QyVHPrbpVoMpozHk0C9o+Ym764B7gZGKmw9uMGduQ==
-
-"@cspell/dict-haskell@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-haskell/-/dict-haskell-4.0.4.tgz#37e9cb9a7f5be337a697bcffd0a0d25e80aab50d"
-  integrity sha512-EwQsedEEnND/vY6tqRfg9y7tsnZdxNqOxLXSXTsFA6JRhUlr8Qs88iUUAfsUzWc4nNmmzQH2UbtT25ooG9x4nA==
-
-"@cspell/dict-html-symbol-entities@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.3.tgz#bf2887020ca4774413d8b1f27c9b6824ba89e9ef"
-  integrity sha512-aABXX7dMLNFdSE8aY844X4+hvfK7977sOWgZXo4MTGAmOzR8524fjbJPswIBK7GaD3+SgFZ2yP2o0CFvXDGF+A==
-
-"@cspell/dict-html@^4.0.10":
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-4.0.10.tgz#7b536b2adca4b58ed92752c9d3c7ffc724dd5991"
-  integrity sha512-I9uRAcdtHbh0wEtYZlgF0TTcgH0xaw1B54G2CW+tx4vHUwlde/+JBOfIzird4+WcMv4smZOfw+qHf7puFUbI5g==
-
-"@cspell/dict-java@^5.0.10":
-  version "5.0.10"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-java/-/dict-java-5.0.10.tgz#e6383ca645046b9f05a04a2c2e858fcc80c6fc63"
-  integrity sha512-pVNcOnmoGiNL8GSVq4WbX/Vs2FGS0Nej+1aEeGuUY9CU14X8yAVCG+oih5ZoLt1jaR8YfR8byUF8wdp4qG4XIw==
-
-"@cspell/dict-julia@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-julia/-/dict-julia-1.0.4.tgz#e478c20d742cd6857b6de41dc61a92036dafb4bc"
-  integrity sha512-bFVgNX35MD3kZRbXbJVzdnN7OuEqmQXGpdOi9jzB40TSgBTlJWA4nxeAKV4CPCZxNRUGnLH0p05T/AD7Aom9/w==
-
-"@cspell/dict-k8s@^1.0.6", "@cspell/dict-k8s@^1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-k8s/-/dict-k8s-1.0.9.tgz#e9392a002797c67ffc3e96893156cc15af3774d1"
-  integrity sha512-Q7GELSQIzo+BERl2ya/nBEnZeQC+zJP19SN1pI6gqDYraM51uYJacbbcWLYYO2Y+5joDjNt/sd/lJtLaQwoSlA==
-
-"@cspell/dict-latex@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-4.0.3.tgz#a1254c7d9c3a2d70cd6391a9f2f7694431b1b2cb"
-  integrity sha512-2KXBt9fSpymYHxHfvhUpjUFyzrmN4c4P8mwIzweLyvqntBT3k0YGZJSriOdjfUjwSygrfEwiuPI1EMrvgrOMJw==
-
-"@cspell/dict-lorem-ipsum@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.3.tgz#c5fc631d934f1daf8b10c88b795278701a2469ec"
-  integrity sha512-WFpDi/PDYHXft6p0eCXuYnn7mzMEQLVeqpO+wHSUd+kz5ADusZ4cpslAA4wUZJstF1/1kMCQCZM6HLZic9bT8A==
-
-"@cspell/dict-lua@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-lua/-/dict-lua-4.0.6.tgz#7de412bfaead794445e26d566aec222e20ad69ba"
-  integrity sha512-Jwvh1jmAd9b+SP9e1GkS2ACbqKKRo9E1f9GdjF/ijmooZuHU0hPyqvnhZzUAxO1egbnNjxS/J2T6iUtjAUK2KQ==
-
-"@cspell/dict-makefile@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-makefile/-/dict-makefile-1.0.3.tgz#08d3349bf7cbd8f5dacf8641f3d35092ca0b8b38"
-  integrity sha512-R3U0DSpvTs6qdqfyBATnePj9Q/pypkje0Nj26mQJ8TOBQutCRAJbr2ZFAeDjgRx5EAJU/+8txiyVF97fbVRViw==
-
-"@cspell/dict-markdown@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-markdown/-/dict-markdown-2.0.7.tgz#15d6f9eed6bd1b33921b4332426ff387961163f1"
-  integrity sha512-F9SGsSOokFn976DV4u/1eL4FtKQDSgJHSZ3+haPRU5ki6OEqojxKa8hhj4AUrtNFpmBaJx/WJ4YaEzWqG7hgqg==
-
-"@cspell/dict-monkeyc@^1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-monkeyc/-/dict-monkeyc-1.0.9.tgz#58b5f6f15fc7c11ce0eeffd0742fba4b39fc0b8b"
-  integrity sha512-Jvf6g5xlB4+za3ThvenYKREXTEgzx5gMUSzrAxIiPleVG4hmRb/GBSoSjtkGaibN3XxGx5x809gSTYCA/IHCpA==
-
-"@cspell/dict-node@^5.0.5":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-node/-/dict-node-5.0.5.tgz#11653612ebdd833208432e8b3cbe61bd6dd35dc3"
-  integrity sha512-7NbCS2E8ZZRZwlLrh2sA0vAk9n1kcTUiRp/Nia8YvKaItGXLfxYqD2rMQ3HpB1kEutal6hQLVic3N2Yi1X7AaA==
-
-"@cspell/dict-npm@^5.1.17":
-  version "5.1.20"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-5.1.20.tgz#5e54b428d7609267263d426d0edc9d51d53f0a6f"
-  integrity sha512-vE9pFIifCDChsVhhUDuVtnwxygOdtHNluDm+8FkgC84M6LwiUVJr/CuSOI/SCR0oI9iiFp0VvMz194B6XwMv3g==
-
-"@cspell/dict-people-names@^1.1.1":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-people-names/-/dict-people-names-1.1.4.tgz#e5a9bf51f0d6aae7f51cd1f2d2eb218f8f5bdba8"
-  integrity sha512-YgnstmeGj/FoIEX996w6SpzTHyNHNxBinwbgozciEo4KJEQkdR7K1GIvJJdRh5Bh81T7xY7PCb6l4nStCFyclA==
-
-"@cspell/dict-php@^4.0.13":
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-php/-/dict-php-4.0.13.tgz#86f1e6fb2174b2b0fa012baf86c448b2730f04f9"
-  integrity sha512-P6sREMZkhElzz/HhXAjahnICYIqB/HSGp1EhZh+Y6IhvC15AzgtDP8B8VYCIsQof6rPF1SQrFwunxOv8H1e2eg==
-
-"@cspell/dict-powershell@^5.0.13":
-  version "5.0.13"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-powershell/-/dict-powershell-5.0.13.tgz#f557aa04ee9bda4fe091308a0bcaea09ed12fa76"
-  integrity sha512-0qdj0XZIPmb77nRTynKidRJKTU0Fl+10jyLbAhFTuBWKMypVY06EaYFnwhsgsws/7nNX8MTEQuewbl9bWFAbsg==
-
-"@cspell/dict-public-licenses@^2.0.11":
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.11.tgz#37550c4e0cd445991caba528bf4ba58ce7a935c3"
-  integrity sha512-rR5KjRUSnVKdfs5G+gJ4oIvQvm8+NJ6cHWY2N+GE69/FSGWDOPHxulCzeGnQU/c6WWZMSimG9o49i9r//lUQyA==
-
-"@cspell/dict-python@^4.2.13":
-  version "4.2.13"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-4.2.13.tgz#c3dbaa7e2434c835e11540345e2168e5e685190a"
-  integrity sha512-mZIcmo9qif8LkJ6N/lqTZawcOk2kVTcuWIUOSbMcjyomO0XZ7iWz15TfONyr03Ea/l7o5ULV+MZ4vx76bAUb7w==
-  dependencies:
-    "@cspell/dict-data-science" "^2.0.5"
-
-"@cspell/dict-r@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-2.0.4.tgz#31b5abd91cc12aebfffdde4be4d2902668789311"
-  integrity sha512-cBpRsE/U0d9BRhiNRMLMH1PpWgw+N+1A2jumgt1if9nBGmQw4MUpg2u9I0xlFVhstTIdzXiLXMxP45cABuiUeQ==
-
-"@cspell/dict-ru_ru@^2.2.1":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ru_ru/-/dict-ru_ru-2.2.4.tgz#a0b4a9272ca360b1721ef999e02559dc636d4043"
-  integrity sha512-Ub5Y318ZAaFJDAPgeImcLg8ksfthGhxMHsyHGkn9Uf3g9AZUlYsabs1HwgLmh9NtqDNjMlF52S9R11GFDdaWIw==
-
-"@cspell/dict-ruby@^5.0.7":
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-5.0.7.tgz#3593a955baaffe3c5d28fb178b72fdf93c7eec71"
-  integrity sha512-4/d0hcoPzi5Alk0FmcyqlzFW9lQnZh9j07MJzPcyVO62nYJJAGKaPZL2o4qHeCS/od/ctJC5AHRdoUm0ktsw6Q==
-
-"@cspell/dict-rust@^4.0.10":
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-rust/-/dict-rust-4.0.10.tgz#8ae6eaf31a0ebce9dc8fd8dd68e5925e1d5290ee"
-  integrity sha512-6o5C8566VGTTctgcwfF3Iy7314W0oMlFFSQOadQ0OEdJ9Z9ERX/PDimrzP3LGuOrvhtEFoK8pj+BLnunNwRNrw==
-
-"@cspell/dict-scala@^5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-5.0.6.tgz#5e925def2fe6dc27ee2ad1c452941c3d6790fb6d"
-  integrity sha512-tl0YWAfjUVb4LyyE4JIMVE8DlLzb1ecHRmIWc4eT6nkyDqQgHKzdHsnusxFEFMVLIQomgSg0Zz6hJ5S1E4W4ww==
-
-"@cspell/dict-software-terms@^4.1.19", "@cspell/dict-software-terms@^4.1.3":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-4.2.0.tgz#c16e9d3326c36195dadea812bc035817054bf0c1"
-  integrity sha512-cTLTNdP9RM6nruZ01FThEFKRi7C4TPN8ndc+FpvCqis9J8iSg4Cr4YQemT/DxXoXz0527NbBPCARunxA0qIgTA==
-
-"@cspell/dict-sql@^2.1.8":
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-sql/-/dict-sql-2.1.8.tgz#45ea53b3e57fd2cc5f839f49b644aa743dac4990"
-  integrity sha512-dJRE4JV1qmXTbbGm6WIcg1knmR6K5RXnQxF4XHs5HA3LAjc/zf77F95i5LC+guOGppVF6Hdl66S2UyxT+SAF3A==
-
-"@cspell/dict-svelte@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-svelte/-/dict-svelte-1.0.5.tgz#09752e01ff6667e737566d9dfc704c8dcc9a6492"
-  integrity sha512-sseHlcXOqWE4Ner9sg8KsjxwSJ2yssoJNqFHR9liWVbDV+m7kBiUtn2EB690TihzVsEmDr/0Yxrbb5Bniz70mA==
-
-"@cspell/dict-swift@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-swift/-/dict-swift-2.0.4.tgz#bc19522418ed68cf914736b612c4e4febbf07e8d"
-  integrity sha512-CsFF0IFAbRtYNg0yZcdaYbADF5F3DsM8C4wHnZefQy8YcHP/qjAF/GdGfBFBLx+XSthYuBlo2b2XQVdz3cJZBw==
-
-"@cspell/dict-terraform@^1.0.6":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-terraform/-/dict-terraform-1.0.7.tgz#815a523c86f647cb7695d48b69e4a793c49f875e"
-  integrity sha512-Ip7tOlAt/qUVdWYyDMA7DlKMpQ6sjtrsXk4vcpqXoYpoJlzMoDce7pw+fPhHshtNOFBAZ4nOrszlLu6APuy+HQ==
-
-"@cspell/dict-typescript@^3.1.11":
-  version "3.1.11"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-3.1.11.tgz#40586f13b0337bd9cba958e0661b35888580b249"
-  integrity sha512-FwvK5sKbwrVpdw0e9+1lVTl8FPoHYvfHRuQRQz2Ql5XkC0gwPPkpoyD1zYImjIyZRoYXk3yp9j8ss4iz7A7zoQ==
-
-"@cspell/dict-uk-ua@^4.0.1":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-uk-ua/-/dict-uk-ua-4.0.4.tgz#19ecb8eaa70a363fd53a2adab0ea462f6e57e055"
-  integrity sha512-4n+ImjsKVWkcZC9O/zQY4oZ9KWm0qkyTZY5/aW1KZsP8sx0cK5IUaA/375R3i4l8SDc0WDZN8K6Wy71cggDUEA==
-
-"@cspell/dict-vue@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-vue/-/dict-vue-3.0.3.tgz#295c288f6fd363879898223202ec3be048663b98"
-  integrity sha512-akmYbrgAGumqk1xXALtDJcEcOMYBYMnkjpmGzH13Ozhq1mkPF4VgllFQlm1xYde+BUKNnzMgPEzxrL2qZllgYA==
-
-"@cspell/dict-win32@^2.0.3":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-win32/-/dict-win32-2.0.6.tgz#3edaa576906061584b470aca1b41b6d76548eeca"
-  integrity sha512-znBvliYtgXIpMW1/T/VnrvA2CwEqfJd06I57laVQsa/ST7dUeUU2kTbk4A4ICCr3eemVMPl9NQtR+t3SQu+ogQ==
-
-"@cspell/dynamic-import@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dynamic-import/-/dynamic-import-8.17.1.tgz#2b3f3325b6013a067a1a49cda8b69ae73aaed36a"
-  integrity sha512-XQtr2olYOtqbg49E+8SISd6I5DzfxmsKINDn0ZgaTFeLalnNdF3ewDU4gOEbApIzGffRa1mW9t19MsiVrznSDw==
-  dependencies:
-    "@cspell/url" "8.17.1"
-    import-meta-resolve "^4.1.0"
-
-"@cspell/filetypes@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/filetypes/-/filetypes-8.17.1.tgz#d193afc5029364334f005ff23f4c4cb80170c374"
-  integrity sha512-AxYw6j7EPYtDFAFjwybjFpMc9waXQzurfBXmEVfQ5RQRlbylujLZWwR6GnMqofeNg4oGDUpEjcAZFrgdkvMQlA==
-
-"@cspell/strong-weak-map@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/strong-weak-map/-/strong-weak-map-8.17.1.tgz#2fa88f283ef10222fad25134b5ebb54edaad985f"
-  integrity sha512-8cY3vLAKdt5gQEMM3Gr57BuQ8sun2NjYNh9qTdrctC1S9gNC7XzFghTYAfHSWR4VrOUcMFLO/izMdsc1KFvFOA==
-
-"@cspell/url@8.17.1":
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/@cspell/url/-/url-8.17.1.tgz#e7daec1597fa31b4d0a7a685e7a24a11b0c8a193"
-  integrity sha512-LMvReIndW1ckvemElfDgTt282fb2C3C/ZXfsm0pJsTV5ZmtdelCHwzmgSBmY5fDr7D66XDp8EurotSE0K6BTvw==
-
-array-timsort@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
-  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
-
-braces@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
-  dependencies:
-    fill-range "^7.1.1"
-
-callsites@^3.0.0, callsites@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-chalk-template@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/chalk-template/-/chalk-template-1.1.0.tgz#ffc55db6dd745e9394b85327c8ac8466edb7a7b1"
-  integrity sha512-T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==
-  dependencies:
-    chalk "^5.2.0"
-
-chalk@^5.2.0, chalk@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.4.1.tgz#1b48bf0963ec158dce2aacf69c093ae2dd2092d8"
-  integrity sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==
-
-clear-module@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/clear-module/-/clear-module-4.1.2.tgz#5a58a5c9f8dccf363545ad7284cad3c887352a80"
-  integrity sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==
-  dependencies:
-    parent-module "^2.0.0"
-    resolve-from "^5.0.0"
-
-commander@^12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
-  integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
-
-comment-json@^4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.5.tgz#482e085f759c2704b60bc6f97f55b8c01bc41e70"
-  integrity sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==
-  dependencies:
-    array-timsort "^1.0.3"
-    core-util-is "^1.0.3"
-    esprima "^4.0.1"
-    has-own-prop "^2.0.0"
-    repeat-string "^1.6.1"
-
-core-util-is@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cspell-config-lib@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-config-lib/-/cspell-config-lib-8.17.1.tgz#a87973b91d51bf23a2018042c25aeaaa8a4e69c0"
-  integrity sha512-x1S7QWprgUcwuwiJB1Ng0ZTBC4G50qP9qQyg/aroMkcdMsHfk26E8jUGRPNt4ftHFzS4YMhwtXuJQ9IgRUuNPA==
-  dependencies:
-    "@cspell/cspell-types" "8.17.1"
-    comment-json "^4.2.5"
-    yaml "^2.6.1"
-
-cspell-dictionary@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-dictionary/-/cspell-dictionary-8.17.1.tgz#bfc9bfdbd3720d1425260a98091acffab7b03dd5"
-  integrity sha512-zSl9l3wii+x16yc2NVZl/+CMLeLBAiuEd5YoFkOYPcbTJnfPwdjMNcj71u7wBvNJ+qwbF+kGbutEt15yHW3NBw==
-  dependencies:
-    "@cspell/cspell-pipe" "8.17.1"
-    "@cspell/cspell-types" "8.17.1"
-    cspell-trie-lib "8.17.1"
-    fast-equals "^5.0.1"
-
-cspell-gitignore@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-8.17.1.tgz#38f3213a40ba86480bb5f66a91198db6e0ef37c0"
-  integrity sha512-bk727Zf4FBCjm9Mwvyreyhgjwe+YhPQEW7PldkHiinKd+Irfez4s8GXLQb1EgV0UpvViqaqBqLmngjZdS30BTA==
-  dependencies:
-    "@cspell/url" "8.17.1"
-    cspell-glob "8.17.1"
-    cspell-io "8.17.1"
-    find-up-simple "^1.0.0"
-
-cspell-glob@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-8.17.1.tgz#23d1be46b32fb4933487e4edff347d34db446f5a"
-  integrity sha512-cUwM5auSt0RvLX7UkP2GEArJRWc85l51B1voArl+3ZIKeMZwcJpJgN3qvImtF8yRTZwYeYCs1sgsihb179q+mg==
-  dependencies:
-    "@cspell/url" "8.17.1"
-    micromatch "^4.0.8"
-
-cspell-grammar@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-grammar/-/cspell-grammar-8.17.1.tgz#8f6619fbfaebff6aeee63b13d17898b4d0c09136"
-  integrity sha512-H5tLcBuW7aUj9L0rR+FSbnWPEsWb8lWppHVidtqw9Ll1CUHWOZC9HTB2RdrhJZrsz/8DJbM2yNbok0Xt0VAfdw==
-  dependencies:
-    "@cspell/cspell-pipe" "8.17.1"
-    "@cspell/cspell-types" "8.17.1"
-
-cspell-io@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-8.17.1.tgz#b91f1cac1c64a6fa2b61a388d0dc67437fcf3ada"
-  integrity sha512-liIOsblt7oVItifzRAbuxiYrwlgw1VOqKppMxVKtYoAn2VUuuEpjCj6jLWpoTqSszR/38o7ChsHY1LHakhJZmw==
-  dependencies:
-    "@cspell/cspell-service-bus" "8.17.1"
-    "@cspell/url" "8.17.1"
-
-cspell-lib@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-8.17.1.tgz#21c76f1ea4e91c90245e55acddbf452d055a6607"
-  integrity sha512-66n83Q7bK5tnvkDH7869/pBY/65AKmZVfCOAlsbhJn3YMDbNHFCHR0d1oNMlqG+n65Aco89VGwYfXxImZY+/mA==
-  dependencies:
-    "@cspell/cspell-bundled-dicts" "8.17.1"
-    "@cspell/cspell-pipe" "8.17.1"
-    "@cspell/cspell-resolver" "8.17.1"
-    "@cspell/cspell-types" "8.17.1"
-    "@cspell/dynamic-import" "8.17.1"
-    "@cspell/filetypes" "8.17.1"
-    "@cspell/strong-weak-map" "8.17.1"
-    "@cspell/url" "8.17.1"
-    clear-module "^4.1.2"
-    comment-json "^4.2.5"
-    cspell-config-lib "8.17.1"
-    cspell-dictionary "8.17.1"
-    cspell-glob "8.17.1"
-    cspell-grammar "8.17.1"
-    cspell-io "8.17.1"
-    cspell-trie-lib "8.17.1"
-    env-paths "^3.0.0"
-    fast-equals "^5.0.1"
-    gensequence "^7.0.0"
-    import-fresh "^3.3.0"
-    resolve-from "^5.0.0"
-    vscode-languageserver-textdocument "^1.0.12"
-    vscode-uri "^3.0.8"
-    xdg-basedir "^5.1.0"
-
-cspell-trie-lib@8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-8.17.1.tgz#618e5cc671b0a24cf7ec27a9a9b834b197e17392"
-  integrity sha512-13WNa5s75VwOjlGzWprmfNbBFIfXyA7tYYrbV+LugKkznyNZJeJPojHouEudcLq3SYb2Q6tJ7qyWcuT5bR9qPA==
-  dependencies:
-    "@cspell/cspell-pipe" "8.17.1"
-    "@cspell/cspell-types" "8.17.1"
-    gensequence "^7.0.0"
-
-cspell@^8.17.1:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-8.17.1.tgz#be3c79a5b0b2e374ac0df8f921eb30ddca170110"
-  integrity sha512-D0lw8XTXrTycNzOn5DkfPJNUT00X53OgvFDm+0SzhBr1r+na8LEh3CnQ6zKYVU0fL0x8vU82vs4jmGjDho9mPg==
-  dependencies:
-    "@cspell/cspell-json-reporter" "8.17.1"
-    "@cspell/cspell-pipe" "8.17.1"
-    "@cspell/cspell-types" "8.17.1"
-    "@cspell/dynamic-import" "8.17.1"
-    "@cspell/url" "8.17.1"
-    chalk "^5.3.0"
-    chalk-template "^1.1.0"
-    commander "^12.1.0"
-    cspell-dictionary "8.17.1"
-    cspell-gitignore "8.17.1"
-    cspell-glob "8.17.1"
-    cspell-io "8.17.1"
-    cspell-lib "8.17.1"
-    fast-json-stable-stringify "^2.1.0"
-    file-entry-cache "^9.1.0"
-    get-stdin "^9.0.0"
-    semver "^7.6.3"
-    tinyglobby "^0.2.10"
-
-env-paths@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da"
-  integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==
-
-esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-fast-equals@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.0.1.tgz#a4eefe3c5d1c0d021aeed0bc10ba5e0c12ee405d"
-  integrity sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==
-
-fast-json-stable-stringify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fdir@^6.4.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
-  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
-
-file-entry-cache@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.1.0.tgz#2e66ad98ce93f49aed1b178c57b0b5741591e075"
-  integrity sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==
-  dependencies:
-    flat-cache "^5.0.0"
-
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up-simple@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-up-simple/-/find-up-simple-1.0.0.tgz#21d035fde9fdbd56c8f4d2f63f32fd93a1cfc368"
-  integrity sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==
-
-flat-cache@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-5.0.0.tgz#26c4da7b0f288b408bb2b506b2cb66c240ddf062"
-  integrity sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==
-  dependencies:
-    flatted "^3.3.1"
-    keyv "^4.5.4"
-
-flatted@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27"
-  integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
-
-gensequence@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/gensequence/-/gensequence-7.0.0.tgz#bb6aedec8ff665e3a6c42f92823121e3a6ea7718"
-  integrity sha512-47Frx13aZh01afHJTB3zTtKIlFI6vWY+MYCN9Qpew6i52rfKjnhCF/l1YlC8UmEMvvntZZ6z4PiCcmyuedR2aQ==
-
-get-stdin@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
-  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
-
-global-directory@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/global-directory/-/global-directory-4.0.1.tgz#4d7ac7cfd2cb73f304c53b8810891748df5e361e"
-  integrity sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==
-  dependencies:
-    ini "4.1.1"
-
-has-own-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
-  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
-
-import-fresh@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-meta-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#f9db8bead9fafa61adb811db77a2bf22c5399706"
-  integrity sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==
-
-ini@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
-  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
-keyv@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
-  dependencies:
-    json-buffer "3.0.1"
-
-micromatch@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
-  dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parent-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-2.0.0.tgz#fa71f88ff1a50c27e15d8ff74e0e3a9523bf8708"
-  integrity sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==
-  dependencies:
-    callsites "^3.1.0"
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-picomatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
-  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-semver@^7.6.3:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
-
-tinyglobby@^0.2.10:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.10.tgz#e712cf2dc9b95a1f5c5bbd159720e15833977a0f"
-  integrity sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==
-  dependencies:
-    fdir "^6.4.2"
-    picomatch "^4.0.2"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-vscode-languageserver-textdocument@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz#457ee04271ab38998a093c68c2342f53f6e4a631"
-  integrity sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-xdg-basedir@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-5.1.0.tgz#1efba19425e73be1bc6f2a6ceb52a3d2c884c0c9"
-  integrity sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==
-
-yaml@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
-  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==

dashboards/vm/vmagent.json

@@ -578,7 +578,7 @@
             "type": "victoriametrics-datasource",
             "uid": "$ds"
           },
-          "expr": "sum(vmagent_remotewrite_pending_data_bytes{job=~\"$job\", instance=~\"$instance\"})",
+          "expr": "sum(vm_persistentqueue_bytes_pending{job=~\"$job\", instance=~\"$instance\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"

dashboards/vm/vmalert.json

@@ -143,7 +143,7 @@
         "type": "victoriametrics-datasource",
         "uid": "$ds"
       },
-      "description": "Shows if the last configuration update was successful. \"Not OK\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
+      "description": "Shows if the last configuration update was successful. \"Not Ok\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
       "fieldConfig": {
         "defaults": {
           "mappings": [
@@ -152,7 +152,7 @@
                 "0": {
                   "color": "green",
                   "index": 0,
-                  "text": "OK"
+                  "text": "Ok"
                 }
               },
               "type": "value"
@@ -163,21 +163,11 @@
                 "result": {
                   "color": "red",
                   "index": 1,
-                  "text": "Not OK"
+                  "text": "Not Ok"
                 },
                 "to": 999999
               },
               "type": "range"
-            },
-            {
-              "options": {
-                "match": "null",
-                "result": {
-                  "index": 2,
-                  "text": "OK"
-                }
-              },
-              "type": "special"
             }
           ],
           "thresholds": {
@@ -224,7 +214,7 @@
             "uid": "$ds"
           },
           "exemplar": false,
-          "expr": "count(vmalert_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 )",
+          "expr": "count(vmalert_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 ) or 0",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -369,7 +359,6 @@
         "defaults": {
           "mappings": [],
           "min": 0,
-          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -418,7 +407,7 @@
             "uid": "$ds"
           },
           "exemplar": false,
-          "expr": "sum(increase(vmalert_alerting_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval])) + \nsum(increase(vmalert_recording_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval]))",
+          "expr": "(sum(increase(vmalert_alerting_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval])) or vector(0)) + \n(sum(increase(vmalert_recording_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval])) or vector(0))",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -437,7 +426,6 @@
         "defaults": {
           "mappings": [],
           "min": 0,
-          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -487,7 +475,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "count(vmalert_recording_rules_last_evaluation_samples{job=~\"$job\", instance=~\"$instance\"} < 1)",
+          "expr": "count(vmalert_recording_rules_last_evaluation_samples{job=~\"$job\", instance=~\"$instance\"} < 1) or 0",
           "interval": "",
           "legendFormat": "",
           "range": true,

dashboards/vm/vmauth.json

@@ -225,7 +225,7 @@
         "type": "victoriametrics-datasource",
         "uid": "$ds"
       },
-      "description": "Shows if the last configuration update was successful. \"Not OK\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
+      "description": "Shows if the last configuration update was successful. \"Not Ok\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
       "fieldConfig": {
         "defaults": {
           "mappings": [
@@ -234,7 +234,7 @@
                 "0": {
                   "color": "green",
                   "index": 0,
-                  "text": "OK"
+                  "text": "Ok"
                 }
               },
               "type": "value"
@@ -245,21 +245,11 @@
                 "result": {
                   "color": "red",
                   "index": 1,
-                  "text": "Not OK"
+                  "text": "Not Ok"
                 },
                 "to": 999999
               },
               "type": "range"
-            },
-            {
-              "options": {
-                "match": "null",
-                "result": {
-                  "index": 2,
-                  "text": "OK"
-                }
-              },
-              "type": "special"
             }
           ],
           "thresholds": {
@@ -306,7 +296,7 @@
             "uid": "$ds"
           },
           "exemplar": false,
-          "expr": "count(vmauth_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 )",
+          "expr": "count(vmauth_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 ) or 0",
           "interval": "",
           "legendFormat": "",
           "refId": "A"

dashboards/vmagent.json

@@ -577,7 +577,7 @@
             "type": "prometheus",
             "uid": "$ds"
           },
-          "expr": "sum(vmagent_remotewrite_pending_data_bytes{job=~\"$job\", instance=~\"$instance\"})",
+          "expr": "sum(vm_persistentqueue_bytes_pending{job=~\"$job\", instance=~\"$instance\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"

dashboards/vmalert.json

@@ -142,7 +142,7 @@
         "type": "prometheus",
         "uid": "$ds"
       },
-      "description": "Shows if the last configuration update was successful. \"Not OK\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
+      "description": "Shows if the last configuration update was successful. \"Not Ok\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
       "fieldConfig": {
         "defaults": {
           "mappings": [
@@ -151,7 +151,7 @@
                 "0": {
                   "color": "green",
                   "index": 0,
-                  "text": "OK"
+                  "text": "Ok"
                 }
               },
               "type": "value"
@@ -162,21 +162,11 @@
                 "result": {
                   "color": "red",
                   "index": 1,
-                  "text": "Not OK"
+                  "text": "Not Ok"
                 },
                 "to": 999999
               },
               "type": "range"
-            },
-            {
-              "options": {
-                "match": "null",
-                "result": {
-                  "index": 2,
-                  "text": "OK"
-                }
-              },
-              "type": "special"
             }
           ],
           "thresholds": {
@@ -223,7 +213,7 @@
             "uid": "$ds"
           },
           "exemplar": false,
-          "expr": "count(vmalert_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 )",
+          "expr": "count(vmalert_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 ) or 0",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -368,7 +358,6 @@
         "defaults": {
           "mappings": [],
           "min": 0,
-          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -417,7 +406,7 @@
             "uid": "$ds"
           },
           "exemplar": false,
-          "expr": "sum(increase(vmalert_alerting_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval])) + \nsum(increase(vmalert_recording_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval]))",
+          "expr": "(sum(increase(vmalert_alerting_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval])) or vector(0)) + \n(sum(increase(vmalert_recording_rules_errors_total{job=~\"$job\", instance=~\"$instance\", group=~\"$group\", file=~\"$file\"}[$__rate_interval])) or vector(0))",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -436,7 +425,6 @@
         "defaults": {
           "mappings": [],
           "min": 0,
-          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -486,7 +474,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "count(vmalert_recording_rules_last_evaluation_samples{job=~\"$job\", instance=~\"$instance\"} < 1)",
+          "expr": "count(vmalert_recording_rules_last_evaluation_samples{job=~\"$job\", instance=~\"$instance\"} < 1) or 0",
           "interval": "",
           "legendFormat": "",
           "range": true,

dashboards/vmauth.json

@@ -224,7 +224,7 @@
         "type": "prometheus",
         "uid": "$ds"
       },
-      "description": "Shows if the last configuration update was successful. \"Not OK\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
+      "description": "Shows if the last configuration update was successful. \"Not Ok\" means there was an unsuccessful attempt to update the configuration due to some error. Check the log for details.",
       "fieldConfig": {
         "defaults": {
           "mappings": [
@@ -233,7 +233,7 @@
                 "0": {
                   "color": "green",
                   "index": 0,
-                  "text": "OK"
+                  "text": "Ok"
                 }
               },
               "type": "value"
@@ -244,21 +244,11 @@
                 "result": {
                   "color": "red",
                   "index": 1,
-                  "text": "Not OK"
+                  "text": "Not Ok"
                 },
                 "to": 999999
               },
               "type": "range"
-            },
-            {
-              "options": {
-                "match": "null",
-                "result": {
-                  "index": 2,
-                  "text": "OK"
-                }
-              },
-              "type": "special"
             }
           ],
           "thresholds": {
@@ -305,7 +295,7 @@
             "uid": "$ds"
           },
           "exemplar": false,
-          "expr": "count(vmauth_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 )",
+          "expr": "count(vmauth_config_last_reload_successful{job=~\"$job\", instance=~\"$instance\"} < 1 ) or 0",
           "interval": "",
           "legendFormat": "",
           "refId": "A"