clean

.github/workflows/build.yml

@@ -63,7 +63,7 @@ jobs:
 
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           cache-dependency-path: |
             go.sum

.github/workflows/check-commit-signed.yml

@@ -1,37 +0,0 @@
-name: check-commit-signed
-
-on:
-  pull_request:
-
-jobs:
-  check-commit-signed:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0  # we need full history for commit verification
-
-      - name: Check commit signatures
-        run: |
-          if [ "${{ github.event_name }}" != "pull_request" ]; then
-            echo "Not a PR event, skipping signature check"
-            exit 0
-          fi
-          
-          RANGE="${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}"
-          echo "Checking commits in PR range: $RANGE"
-          
-          if [ -z "$(git rev-list $RANGE)" ]; then
-            echo "No new commits in this PR, skipping signature check"
-            exit 0
-          fi
-          
-          unsigned=$(git log --pretty="%H %G?" $RANGE | grep -vE " (G|E)$" || true)
-          if [ -n "$unsigned" ]; then
-            echo "Found unsigned commits:"
-            echo "$unsigned"
-            exit 1
-          fi
-          
-          echo "All commits in PR are signed (G or E)"

.github/workflows/check-licenses.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: stable
           cache: false

.github/workflows/codeql-analysis-go.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Set up Go
         id: go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           cache: false
           go-version: stable

.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           cache-dependency-path: |
             go.sum
@@ -75,7 +75,7 @@ jobs:
 
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           cache-dependency-path: |
             go.sum
@@ -101,7 +101,7 @@ jobs:
 
       - name: Setup Go
         id: go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           cache-dependency-path: |
             go.sum

SECURITY.md

@@ -4,11 +4,12 @@
 
 The following versions of VictoriaMetrics receive regular security fixes:
 
-| Version                                                                        | Supported          |
-|--------------------------------------------------------------------------------|--------------------|
-| [Latest release](https://docs.victoriametrics.com/victoriametrics/changelog/)  | :white_check_mark: |
-| [LTS releases](https://docs.victoriametrics.com/victoriametrics/lts-releases/) | :white_check_mark: |
-| other releases                                                                 | :x:                |
+| Version | Supported          |
+|---------|--------------------|
+| [latest release](https://docs.victoriametrics.com/victoriametrics/changelog/) | :white_check_mark: |
+| v1.102.x [LTS line](https://docs.victoriametrics.com/victoriametrics/lts-releases/) | :white_check_mark: |
+| v1.110.x [LTS line](https://docs.victoriametrics.com/victoriametrics/lts-releases/) | :white_check_mark: |
+| other releases  | :x:                |
 
 See [this page](https://victoriametrics.com/security/) for more details.
 

app/victoria-metrics/main.go

@@ -169,7 +169,7 @@ func usage() {
 	const s = `
 victoria-metrics is a time series database and monitoring solution.
 
-See the docs at https://docs.victoriametrics.com/victoriametrics/
+See the docs at https://docs.victoriametrics.com/
 `
 	flagutil.Usage(s)
 }

app/vmagent/opentelemetry/request_handler.go

@@ -7,8 +7,8 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prommetadata"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/firehose"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/opentelemetry/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -68,7 +68,7 @@ func insertRows(at *auth.Token, tss []prompb.TimeSeries, mms []prompb.MetricMeta
 	ctx.WriteRequest.Timeseries = tssDst
 
 	var metadataTotal int
-	if prommetadata.IsEnabled() {
+	if promscrape.IsMetadataEnabled() {
 		var accountID, projectID uint32
 		if at != nil {
 			accountID = at.AccountID

app/vmagent/prometheusimport/request_handler.go

@@ -7,8 +7,8 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prommetadata"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -36,7 +36,7 @@ func InsertHandler(at *auth.Token, req *http.Request) error {
 		return err
 	}
 	encoding := req.Header.Get("Content-Encoding")
-	return stream.Parse(req.Body, defaultTimestamp, encoding, true, prommetadata.IsEnabled(), func(rows []prometheus.Row, mms []prometheus.Metadata) error {
+	return stream.Parse(req.Body, defaultTimestamp, encoding, true, promscrape.IsMetadataEnabled(), func(rows []prometheus.Row, mms []prometheus.Metadata) error {
 		return insertRows(at, rows, mms, extraLabels)
 	}, func(s string) {
 		httpserver.LogError(req, s)

app/vmagent/promremotewrite/request_handler.go

@@ -6,8 +6,8 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmagent/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prommetadata"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/promremotewrite/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/tenantmetrics"
@@ -71,7 +71,7 @@ func insertRows(at *auth.Token, timeseries []prompb.TimeSeries, mms []prompb.Met
 	ctx.WriteRequest.Timeseries = tssDst
 
 	var metadataTotal int
-	if prommetadata.IsEnabled() {
+	if promscrape.IsMetadataEnabled() {
 		var accountID, projectID uint32
 		if at != nil {
 			accountID = at.AccountID

app/vmagent/remotewrite/client_test.go

@@ -93,7 +93,10 @@ func TestParseRetryAfterHeader(t *testing.T) {
 
 // helper calculate the max possible time duration calculated by timeutil.AddJitterToDuration.
 func helper(d time.Duration) time.Duration {
-	dv := min(d/10, 10*time.Second)
+	dv := d / 10
+	if dv > 10*time.Second {
+		dv = 10 * time.Second
+	}
 
 	return d + dv
 }

app/vmalert-tool/unittest/unittest.go

@@ -34,7 +34,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 	"github.com/VictoriaMetrics/metrics"
 )
@@ -85,8 +84,7 @@ func UnitTest(files []string, disableGroupLabel bool, externalLabels []string, e
 		defer server.Close()
 	} else {
 		httpListenAddr = httpListenPort
-
-		ln, err := net.Listen(netutil.GetTCPNetwork(), fmt.Sprintf(":%s", httpListenPort))
+		ln, err := net.Listen("tcp", fmt.Sprintf(":%s", httpListenPort))
 		if err != nil {
 			logger.Fatalf("cannot listen on port %s: %v", httpListenPort, err)
 		}
@@ -132,7 +130,7 @@ func UnitTest(files []string, disableGroupLabel bool, externalLabels []string, e
 		}
 		labels[s[:n]] = s[n+1:]
 	}
-	_, err = notifier.Init(labels, externalURL)
+	_, err = notifier.Init(nil, labels, externalURL)
 	if err != nil {
 		logger.Fatalf("failed to init notifier: %v", err)
 	}

app/vmalert/config/config.go

@@ -31,7 +31,7 @@ type Group struct {
 	// EvalDelay will adjust the `time` parameter of rule evaluation requests to compensate intentional query delay from datasource.
 	// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5155
 	EvalDelay   *promutil.Duration `yaml:"eval_delay,omitempty"`
-	Limit       *int               `yaml:"limit,omitempty"`
+	Limit       int                `yaml:"limit,omitempty"`
 	Rules       []Rule             `yaml:"rules"`
 	Concurrency int                `yaml:"concurrency"`
 	// Labels is a set of label value pairs, that will be added to every rule.
@@ -91,8 +91,8 @@ func (g *Group) Validate(validateTplFn ValidateTplFn, validateExpressions bool)
 	if g.EvalOffset != nil && g.EvalDelay != nil {
 		return fmt.Errorf("eval_offset cannot be used with eval_delay")
 	}
-	if g.Limit != nil && *g.Limit < 0 {
-		return fmt.Errorf("invalid limit %d, shouldn't be less than 0", *g.Limit)
+	if g.Limit < 0 {
+		return fmt.Errorf("invalid limit %d, shouldn't be less than 0", g.Limit)
 	}
 	if g.Concurrency < 0 {
 		return fmt.Errorf("invalid concurrency %d, shouldn't be less than 0", g.Concurrency)

app/vmalert/config/config_test.go

@@ -181,10 +181,9 @@ func TestGroupValidate_Failure(t *testing.T) {
 		EvalOffset: promutil.NewDuration(2 * time.Minute),
 	}, false, "eval_offset should be smaller than interval")
 
-	limit := -1
 	f(&Group{
 		Name:  "wrong limit",
-		Limit: &limit,
+		Limit: -1,
 	}, false, "invalid limit")
 
 	f(&Group{

app/vmalert/datasource/datasource.go

@@ -132,7 +132,10 @@ func (ls Labels) String() string {
 // a=[]Label{{Name: "a", Value: "2"}},b=[]Label{{Name: "a", Value: "1"}}, return 1
 // a=[]Label{{Name: "a", Value: "1"}},b=[]Label{{Name: "a", Value: "1"}}, return 0
 func LabelCompare(a, b Labels) int {
-	l := min(len(b), len(a))
+	l := len(a)
+	if len(b) < l {
+		l = len(b)
+	}
 
 	for i := 0; i < l; i++ {
 		if a[i].Name != b[i].Name {

app/vmalert/main.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -82,7 +83,8 @@ absolute path to all .tpl files in root.
 )
 
 var (
-	extURL *url.URL
+	alertURLGeneratorFn notifier.AlertURLGenerator
+	extURL              *url.URL
 )
 
 func main() {
@@ -119,7 +121,7 @@ func main() {
 		return
 	}
 
-	err = notifier.InitAlertURLGeneratorFn(extURL, *externalAlertSource, *validateTemplates)
+	alertURLGeneratorFn, err = getAlertURLGenerator(extURL, *externalAlertSource, *validateTemplates)
 	if err != nil {
 		logger.Fatalf("failed to init `external.alert.source`: %s", err)
 	}
@@ -226,7 +228,7 @@ func newManager(ctx context.Context) (*manager, error) {
 		labels[s[:n]] = s[n+1:]
 	}
 
-	nts, err := notifier.Init(labels, *externalURL)
+	nts, err := notifier.Init(alertURLGeneratorFn, labels, *externalURL)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init notifier: %w", err)
 	}
@@ -290,6 +292,35 @@ func getHostnameAsExternalURL(addr string, isSecure bool) (*url.URL, error) {
 	return url.Parse(fmt.Sprintf("%s%s%s", schema, hname, port))
 }
 
+func getAlertURLGenerator(externalURL *url.URL, externalAlertSource string, validateTemplate bool) (notifier.AlertURLGenerator, error) {
+	if externalAlertSource == "" {
+		return func(a notifier.Alert) string {
+			gID, aID := strconv.FormatUint(a.GroupID, 10), strconv.FormatUint(a.ID, 10)
+			return fmt.Sprintf("%s/vmalert/alert?%s=%s&%s=%s", externalURL, paramGroupID, gID, paramAlertID, aID)
+		}, nil
+	}
+	if validateTemplate {
+		if err := notifier.ValidateTemplates(map[string]string{
+			"tpl": externalAlertSource,
+		}); err != nil {
+			return nil, fmt.Errorf("error validating source template %s: %w", externalAlertSource, err)
+		}
+	}
+	m := map[string]string{
+		"tpl": externalAlertSource,
+	}
+	return func(alert notifier.Alert) string {
+		qFn := func(_ string) ([]datasource.Metric, error) {
+			return nil, fmt.Errorf("`query` template isn't supported for alert source template")
+		}
+		templated, err := alert.ExecTemplate(qFn, alert.Labels, m)
+		if err != nil {
+			logger.Errorf("cannot template alert source: %s", err)
+		}
+		return fmt.Sprintf("%s/%s", externalURL, templated["tpl"])
+	}, nil
+}
+
 func usage() {
 	const s = `
 vmalert processes alerts and recording rules.

app/vmalert/main_test.go

@@ -49,6 +49,30 @@ func TestGetExternalURL(t *testing.T) {
 	}
 }
 
+func TestGetAlertURLGenerator(t *testing.T) {
+	testAlert := notifier.Alert{GroupID: 42, ID: 2, Value: 4, Labels: map[string]string{"tenant": "baz"}}
+	u, _ := url.Parse("https://victoriametrics.com/path")
+	fn, err := getAlertURLGenerator(u, "", false)
+	if err != nil {
+		t.Fatalf("unexpected error %s", err)
+	}
+	exp := fmt.Sprintf("https://victoriametrics.com/path/vmalert/alert?%s=42&%s=2", paramGroupID, paramAlertID)
+	if exp != fn(testAlert) {
+		t.Fatalf("unexpected url want %s, got %s", exp, fn(testAlert))
+	}
+	_, err = getAlertURLGenerator(nil, "foo?{{invalid}}", true)
+	if err == nil {
+		t.Fatalf("expected template validation error got nil")
+	}
+	fn, err = getAlertURLGenerator(u, "foo?query={{$value}}&ds={{ $labels.tenant }}", true)
+	if err != nil {
+		t.Fatalf("unexpected error %s", err)
+	}
+	if exp := "https://victoriametrics.com/path/foo?query=4&ds=baz"; exp != fn(testAlert) {
+		t.Fatalf("unexpected url want %s, got %s", exp, fn(testAlert))
+	}
+}
+
 func TestConfigReload(t *testing.T) {
 	originalRulePath := *rulePath
 	originalExternalURL := extURL

app/vmalert/manager.go

@@ -29,37 +29,25 @@ type manager struct {
 	groups   map[uint64]*rule.Group
 }
 
-// groupAPI generates apiGroup object from group by its ID(hash)
-func (m *manager) groupAPI(gID uint64) (*rule.ApiGroup, error) {
-	m.groupsMu.RLock()
-	defer m.groupsMu.RUnlock()
-
-	g, ok := m.groups[gID]
-	if !ok {
-		return nil, fmt.Errorf("can't find group with id %d", gID)
-	}
-	return g.ToAPI(), nil
-}
-
 // ruleAPI generates apiRule object from alert by its ID(hash)
-func (m *manager) ruleAPI(gID, rID uint64) (rule.ApiRule, error) {
+func (m *manager) ruleAPI(gID, rID uint64) (apiRule, error) {
 	m.groupsMu.RLock()
 	defer m.groupsMu.RUnlock()
 
 	g, ok := m.groups[gID]
 	if !ok {
-		return rule.ApiRule{}, fmt.Errorf("can't find group with id %d", gID)
+		return apiRule{}, fmt.Errorf("can't find group with id %d", gID)
 	}
-	for _, r := range g.Rules {
-		if r.ID() == rID {
-			return r.ToAPI(), nil
+	for _, rule := range g.Rules {
+		if rule.ID() == rID {
+			return ruleToAPI(rule), nil
 		}
 	}
-	return rule.ApiRule{}, fmt.Errorf("can't find rule with id %d in group %q", rID, g.Name)
+	return apiRule{}, fmt.Errorf("can't find rule with id %d in group %q", rID, g.Name)
 }
 
 // alertAPI generates apiAlert object from alert by its ID(hash)
-func (m *manager) alertAPI(gID, aID uint64) (*rule.ApiAlert, error) {
+func (m *manager) alertAPI(gID, aID uint64) (*apiAlert, error) {
 	m.groupsMu.RLock()
 	defer m.groupsMu.RUnlock()
 
@@ -72,7 +60,7 @@ func (m *manager) alertAPI(gID, aID uint64) (*rule.ApiAlert, error) {
 		if !ok {
 			continue
 		}
-		if apiAlert := ar.AlertToAPI(aID); apiAlert != nil {
+		if apiAlert := alertToAPI(ar, aID); apiAlert != nil {
 			return apiAlert, nil
 		}
 	}

app/vmalert/notifier/alert_test.go

@@ -20,7 +20,7 @@ func TestAlertExecTemplate(t *testing.T) {
 	)
 	extLabels["cluster"] = extCluster
 	extLabels["dc"] = extDC
-	_, err := Init(extLabels, extURL)
+	_, err := Init(nil, extLabels, extURL)
 	checkErr(t, err)
 
 	f := func(alert *Alert, annotations map[string]string, tplExpected map[string]string) {

app/vmalert/notifier/alertmanager.go

@@ -22,11 +22,10 @@ import (
 // AlertManager represents integration provider with Prometheus alert manager
 // https://github.com/prometheus/alertmanager
 type AlertManager struct {
-	addr      *url.URL
-	argFunc   AlertURLGenerator
-	client    *http.Client
-	timeout   time.Duration
-	lastError string
+	addr    *url.URL
+	argFunc AlertURLGenerator
+	client  *http.Client
+	timeout time.Duration
 
 	authCfg *promauth.Config
 	// stores already parsed RelabelConfigs object
@@ -72,10 +71,6 @@ func (am AlertManager) Addr() string {
 	return am.addr.Redacted()
 }
 
-func (am *AlertManager) LastError() string {
-	return am.lastError
-}
-
 // Send an alert or resolve message
 func (am *AlertManager) Send(ctx context.Context, alerts []Alert, headers map[string]string) error {
 	am.metrics.alertsSent.Add(len(alerts))
@@ -84,9 +79,6 @@ func (am *AlertManager) Send(ctx context.Context, alerts []Alert, headers map[st
 	am.metrics.alertsSendDuration.UpdateDuration(startTime)
 	if err != nil {
 		am.metrics.alertsSendErrors.Add(len(alerts))
-		am.lastError = err.Error()
-	} else {
-		am.lastError = ""
 	}
 	return err
 }

app/vmalert/notifier/faker.go

@@ -18,11 +18,6 @@ type FakeNotifier struct {
 // Close does nothing
 func (*FakeNotifier) Close() {}
 
-// LastError returns last error message
-func (*FakeNotifier) LastError() string {
-	return ""
-}
-
 // Addr returns ""
 func (*FakeNotifier) Addr() string { return "" }
 

app/vmalert/notifier/init.go

@@ -4,13 +4,10 @@ import (
 	"flag"
 	"fmt"
 	"net/url"
-	"strconv"
 	"strings"
 	"time"
 
-	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil"
 )
@@ -60,42 +57,6 @@ var (
 	sendTimeout = flagutil.NewArrayDuration("notifier.sendTimeout", 10*time.Second, "Timeout when sending alerts to the corresponding -notifier.url")
 )
 
-// AlertURLGeneratorFn returns a URL to the passed alert object.
-// Call InitAlertURLGeneratorFn before using this function.
-var AlertURLGeneratorFn AlertURLGenerator
-
-// InitAlertURLGeneratorFn populates AlertURLGeneratorFn
-func InitAlertURLGeneratorFn(externalURL *url.URL, externalAlertSource string, validateTemplate bool) error {
-	if externalAlertSource == "" {
-		AlertURLGeneratorFn = func(a Alert) string {
-			gID, aID := strconv.FormatUint(a.GroupID, 10), strconv.FormatUint(a.ID, 10)
-			return fmt.Sprintf("%s/vmalert/alert?%s=%s&%s=%s", externalURL, "group_id", gID, "alert_id", aID)
-		}
-		return nil
-	}
-	if validateTemplate {
-		if err := ValidateTemplates(map[string]string{
-			"tpl": externalAlertSource,
-		}); err != nil {
-			return fmt.Errorf("error validating source template %s: %w", externalAlertSource, err)
-		}
-	}
-	m := map[string]string{
-		"tpl": externalAlertSource,
-	}
-	AlertURLGeneratorFn = func(alert Alert) string {
-		qFn := func(_ string) ([]datasource.Metric, error) {
-			return nil, fmt.Errorf("`query` template isn't supported for alert source template")
-		}
-		templated, err := alert.ExecTemplate(qFn, alert.Labels, m)
-		if err != nil {
-			logger.Errorf("cannot template alert source: %s", err)
-		}
-		return fmt.Sprintf("%s/%s", externalURL, templated["tpl"])
-	}
-	return nil
-}
-
 // cw holds a configWatcher for configPath configuration file
 // configWatcher provides a list of Notifier objects discovered
 // from static config or via service discovery.
@@ -129,7 +90,7 @@ var (
 //   - configuration via file. Supports live reloads and service discovery.
 //
 // Init returns an error if both mods are used.
-func Init(extLabels map[string]string, extURL string) (func() []Notifier, error) {
+func Init(gen AlertURLGenerator, extLabels map[string]string, extURL string) (func() []Notifier, error) {
 	externalURL = extURL
 	externalLabels = extLabels
 	_, err := url.Parse(externalURL)
@@ -156,7 +117,7 @@ func Init(extLabels map[string]string, extURL string) (func() []Notifier, error)
 	}
 
 	if len(*addrs) > 0 {
-		notifiers, err := notifiersFromFlags(AlertURLGeneratorFn)
+		notifiers, err := notifiersFromFlags(gen)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create notifier from flag values: %w", err)
 		}
@@ -166,7 +127,7 @@ func Init(extLabels map[string]string, extURL string) (func() []Notifier, error)
 		return staticNotifiersFn, nil
 	}
 
-	cw, err = newWatcher(*configPath, AlertURLGeneratorFn)
+	cw, err = newWatcher(*configPath, gen)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init config watcher: %w", err)
 	}

app/vmalert/notifier/init_test.go

@@ -1,8 +1,6 @@
 package notifier
 
 import (
-	"fmt"
-	"net/url"
 	"testing"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
@@ -14,7 +12,7 @@ func TestInit(t *testing.T) {
 
 	*addrs = flagutil.ArrayString{"127.0.0.1", "127.0.0.2"}
 
-	fn, err := Init(nil, "")
+	fn, err := Init(nil, nil, "")
 	if err != nil {
 		t.Fatalf("%s", err)
 	}
@@ -54,7 +52,7 @@ func TestInitNegative(t *testing.T) {
 		*configPath = path
 		*addrs = flagutil.ArrayString{addr}
 		*blackHole = bh
-		if _, err := Init(nil, ""); err == nil {
+		if _, err := Init(nil, nil, ""); err == nil {
 			t.Fatalf("expected to get error; got nil instead")
 		}
 	}
@@ -71,7 +69,7 @@ func TestBlackHole(t *testing.T) {
 
 	*blackHole = true
 
-	fn, err := Init(nil, "")
+	fn, err := Init(nil, nil, "")
 	if err != nil {
 		t.Fatalf("%s", err)
 	}
@@ -93,30 +91,3 @@ func TestBlackHole(t *testing.T) {
 		t.Fatalf("expected to get \"blackhole\"; got %q instead", nf1.Addr())
 	}
 }
-
-func TestGetAlertURLGenerator(t *testing.T) {
-	oldAlertURLGeneratorFn := AlertURLGeneratorFn
-	defer func() { AlertURLGeneratorFn = oldAlertURLGeneratorFn }()
-
-	testAlert := Alert{GroupID: 42, ID: 2, Value: 4, Labels: map[string]string{"tenant": "baz"}}
-	u, _ := url.Parse("https://victoriametrics.com/path")
-	err := InitAlertURLGeneratorFn(u, "", false)
-	if err != nil {
-		t.Fatalf("unexpected error %s", err)
-	}
-	exp := fmt.Sprintf("https://victoriametrics.com/path/vmalert/alert?%s=42&%s=2", "group_id", "alert_id")
-	if exp != AlertURLGeneratorFn(testAlert) {
-		t.Fatalf("unexpected url want %s, got %s", exp, AlertURLGeneratorFn(testAlert))
-	}
-	err = InitAlertURLGeneratorFn(nil, "foo?{{invalid}}", true)
-	if err == nil {
-		t.Fatalf("expected template validation error got nil")
-	}
-	err = InitAlertURLGeneratorFn(u, "foo?query={{$value}}&ds={{ $labels.tenant }}", true)
-	if err != nil {
-		t.Fatalf("unexpected error %s", err)
-	}
-	if exp := "https://victoriametrics.com/path/foo?query=4&ds=baz"; exp != AlertURLGeneratorFn(testAlert) {
-		t.Fatalf("unexpected url want %s, got %s", exp, AlertURLGeneratorFn(testAlert))
-	}
-}

app/vmalert/notifier/notifier.go

@@ -10,8 +10,6 @@ type Notifier interface {
 	Send(ctx context.Context, alerts []Alert, notifierHeaders map[string]string) error
 	// Addr returns address where alerts are sent.
 	Addr() string
-	// LastError returns error, that occured during last attempt to send data
-	LastError() string
 	// Close is a destructor for the Notifier
 	Close()
 }

app/vmalert/notifier/notifier_blackhole.go

@@ -25,11 +25,6 @@ func (bh *blackHoleNotifier) Close() {
 	bh.metrics.close()
 }
 
-// LastError return last notifier's error
-func (bh *blackHoleNotifier) LastError() string {
-	return ""
-}
-
 // newBlackHoleNotifier creates a new blackHoleNotifier
 func newBlackHoleNotifier() *blackHoleNotifier {
 	address := "blackhole"

app/vmalert/notifier/web.go

@@ -1,19 +0,0 @@
-package notifier
-
-// ApiNotifier represents a Notifier configuration for WEB view
-type ApiNotifier struct {
-	// Kind is a Notifier type
-	Kind TargetType `json:"kind"`
-	// Targets is a list of Notifier targets
-	Targets []*ApiTarget `json:"targets"`
-}
-
-// ApiTarget represents a specific Notifier target for WEB view
-type ApiTarget struct {
-	// Address is a URL for sending notifications
-	Address string `json:"address"`
-	// Labels is a list of labels to add to each sent notification
-	Labels map[string]string `json:"labels"`
-	// LastError contains the error faced while sending to notifier.
-	LastError string `json:"lastError"`
-}

app/vmalert/rule/alerting.go

@@ -187,54 +187,6 @@ func (ar *AlertingRule) ID() uint64 {
 	return ar.RuleID
 }
 
-// ToAPI returns ApiRule representation of ar
-func (ar *AlertingRule) ToAPI() ApiRule {
-	state := ar.state
-	lastState := state.getLast()
-	r := ApiRule{
-		Type:              TypeAlerting,
-		DatasourceType:    ar.Type.String(),
-		Name:              ar.Name,
-		Query:             ar.Expr,
-		Duration:          ar.For.Seconds(),
-		KeepFiringFor:     ar.KeepFiringFor.Seconds(),
-		Labels:            ar.Labels,
-		Annotations:       ar.Annotations,
-		LastEvaluation:    lastState.Time,
-		EvaluationTime:    lastState.Duration.Seconds(),
-		Health:            "ok",
-		State:             "inactive",
-		Alerts:            ar.AlertsToAPI(),
-		LastSamples:       lastState.Samples,
-		LastSeriesFetched: lastState.SeriesFetched,
-		MaxUpdates:        state.size(),
-		Updates:           state.getAll(),
-		Debug:             ar.Debug,
-
-		// encode as strings to avoid rounding in JSON
-		ID:        fmt.Sprintf("%d", ar.ID()),
-		GroupID:   fmt.Sprintf("%d", ar.GroupID),
-		GroupName: ar.GroupName,
-		File:      ar.File,
-	}
-	if lastState.Err != nil {
-		r.LastError = lastState.Err.Error()
-		r.Health = "err"
-	}
-	// satisfy apiRule.State logic
-	if len(r.Alerts) > 0 {
-		r.State = notifier.StatePending.String()
-		stateFiring := notifier.StateFiring.String()
-		for _, a := range r.Alerts {
-			if a.State == stateFiring {
-				r.State = stateFiring
-				break
-			}
-		}
-	}
-	return r
-}
-
 // GetAlerts returns active alerts of rule
 func (ar *AlertingRule) GetAlerts() []*notifier.Alert {
 	ar.alertsMu.RLock()

app/vmalert/rule/group.go

@@ -2,6 +2,7 @@ package rule
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"flag"
 	"fmt"
@@ -24,10 +25,6 @@ import (
 )
 
 var (
-	ruleResultsLimit = flag.Int("rule.resultsLimit", 0, "Limits the number of alerts or recording results a single rule can produce. "+
-		"Can be overridden by the limit option under group if specified. "+
-		"If exceeded, the rule will be marked with an error and all its results will be discarded. "+
-		"0 means no limit.")
 	ruleUpdateEntriesLimit = flag.Int("rule.updateEntriesLimit", 20, "Defines the max number of rule's state updates stored in-memory. "+
 		"Rule's updates are available on rule's Details page and are used for debugging purposes. The number of stored updates can be overridden per rule via update_entries_limit param.")
 	resendDelay        = flag.Duration("rule.resendDelay", 0, "MiniMum amount of time to wait before resending an alert to notifier.")
@@ -115,6 +112,7 @@ func NewGroup(cfg config.Group, qb datasource.QuerierBuilder, defaultInterval ti
 		Name:            cfg.Name,
 		File:            cfg.File,
 		Interval:        cfg.Interval.Duration(),
+		Limit:           cfg.Limit,
 		Concurrency:     cfg.Concurrency,
 		checksum:        cfg.Checksum,
 		Params:          cfg.Params,
@@ -131,11 +129,6 @@ func NewGroup(cfg config.Group, qb datasource.QuerierBuilder, defaultInterval ti
 	if g.Interval == 0 {
 		g.Interval = defaultInterval
 	}
-	if cfg.Limit != nil {
-		g.Limit = *cfg.Limit
-	} else {
-		g.Limit = *ruleResultsLimit
-	}
 	if g.Concurrency < 1 {
 		g.Concurrency = 1
 	}
@@ -296,7 +289,7 @@ func (g *Group) InterruptEval() {
 	}
 }
 
-// Close stops the group and its rules, unregisters group metrics
+// Close stops the group and it's rules, unregisters group metrics
 func (g *Group) Close() {
 	if g.doneCh == nil {
 		return
@@ -305,6 +298,10 @@ func (g *Group) Close() {
 	g.InterruptEval()
 	<-g.finishedCh
 
+	g.closeGroupMetrics()
+}
+
+func (g *Group) closeGroupMetrics() {
 	metrics.UnregisterSet(g.metrics.set, true)
 }
 
@@ -334,7 +331,7 @@ func (g *Group) Start(ctx context.Context, nts func() []notifier.Notifier, rw re
 	defer func() { close(g.finishedCh) }()
 	evalTS := time.Now()
 	// sleep random duration to spread group rules evaluation
-	// over time to reduce the load on datasource.
+	// over time in order to reduce load on datasource.
 	if !SkipRandSleepOnGroupStart {
 		sleepBeforeStart := delayBeforeStart(evalTS, g.GetID(), g.Interval, g.EvalOffset)
 		g.infof("will start in %v", sleepBeforeStart)
@@ -475,6 +472,18 @@ func (g *Group) UpdateWith(newGroup *Group) {
 	g.updateCh <- newGroup
 }
 
+// DeepCopy returns a deep copy of group
+func (g *Group) DeepCopy() *Group {
+	g.mu.RLock()
+	data, _ := json.Marshal(g)
+	g.mu.RUnlock()
+	newG := Group{}
+	_ = json.Unmarshal(data, &newG)
+	newG.Rules = g.Rules
+	newG.id = g.id
+	return &newG
+}
+
 // if offset is specified, delayBeforeStart returns a duration to help aligning timestamp with offset;
 // otherwise, it returns a random duration between [0..interval] based on group key.
 func delayBeforeStart(ts time.Time, key uint64, interval time.Duration, offset *time.Duration) time.Duration {

app/vmalert/rule/recording.go

@@ -81,37 +81,6 @@ func (rr *RecordingRule) ID() uint64 {
 	return rr.RuleID
 }
 
-// ToAPI returns ApiRule representation of rr
-func (rr *RecordingRule) ToAPI() ApiRule {
-	state := rr.state
-	lastState := state.getLast()
-	r := ApiRule{
-		Type:              TypeRecording,
-		DatasourceType:    rr.Type.String(),
-		Name:              rr.Name,
-		Query:             rr.Expr,
-		Labels:            rr.Labels,
-		LastEvaluation:    lastState.Time,
-		EvaluationTime:    lastState.Duration.Seconds(),
-		Health:            "ok",
-		LastSamples:       lastState.Samples,
-		LastSeriesFetched: lastState.SeriesFetched,
-		MaxUpdates:        state.size(),
-		Updates:           state.getAll(),
-
-		// encode as strings to avoid rounding
-		ID:        fmt.Sprintf("%d", rr.ID()),
-		GroupID:   fmt.Sprintf("%d", rr.GroupID),
-		GroupName: rr.GroupName,
-		File:      rr.File,
-	}
-	if lastState.Err != nil {
-		r.LastError = lastState.Err.Error()
-		r.Health = "err"
-	}
-	return r
-}
-
 // NewRecordingRule creates a new RecordingRule
 func NewRecordingRule(qb datasource.QuerierBuilder, group *Group, cfg config.Rule) *RecordingRule {
 	debug := group.Debug

app/vmalert/rule/rule.go

@@ -21,8 +21,6 @@ type Rule interface {
 	// ID returns unique ID that may be used for
 	// identifying this Rule among others.
 	ID() uint64
-	// ToAPI returns ApiRule representation of Rule
-	ToAPI() ApiRule
 	// exec executes the rule with given context at the given timestamp and limit.
 	// returns an err if number of resulting time series exceeds the limit.
 	exec(ctx context.Context, ts time.Time, limit int) ([]prompb.TimeSeries, error)
@@ -70,6 +68,39 @@ type StateEntry struct {
 	Curl string `json:"curl"`
 }
 
+// GetLastEntry returns latest stateEntry of rule
+func GetLastEntry(r Rule) StateEntry {
+	if rule, ok := r.(*AlertingRule); ok {
+		return rule.state.getLast()
+	}
+	if rule, ok := r.(*RecordingRule); ok {
+		return rule.state.getLast()
+	}
+	return StateEntry{}
+}
+
+// GetRuleStateSize returns size of rule stateEntry
+func GetRuleStateSize(r Rule) int {
+	if rule, ok := r.(*AlertingRule); ok {
+		return rule.state.size()
+	}
+	if rule, ok := r.(*RecordingRule); ok {
+		return rule.state.size()
+	}
+	return 0
+}
+
+// GetAllRuleState returns rule entire stateEntries
+func GetAllRuleState(r Rule) []StateEntry {
+	if rule, ok := r.(*AlertingRule); ok {
+		return rule.state.getAll()
+	}
+	if rule, ok := r.(*RecordingRule); ok {
+		return rule.state.getAll()
+	}
+	return []StateEntry{}
+}
+
 func (s *ruleState) size() int {
 	s.RLock()
 	defer s.RUnlock()

app/vmalert/web.go

@@ -29,9 +29,7 @@ var (
 		{"api/v1/rules", "list all loaded groups and rules"},
 		{"api/v1/alerts", "list all active alerts"},
 		{"api/v1/notifiers", "list all notifiers"},
-		{fmt.Sprintf("api/v1/alert?%s=<int>&%s=<int>", rule.ParamGroupID, rule.ParamAlertID), "get alert status by group and alert ID"},
-		{fmt.Sprintf("api/v1/rule?%s=<int>&%s=<int>", rule.ParamGroupID, rule.ParamRuleID), "get rule status by group and rule ID"},
-		{fmt.Sprintf("api/v1/group?%s=<int>", rule.ParamGroupID), "get group status by group ID"},
+		{fmt.Sprintf("api/v1/alert?%s=<int>&%s=<int>", paramGroupID, paramAlertID), "get alert status by group and alert ID"},
 	}
 	systemLinks = [][2]string{
 		{"vmalert/groups", "UI"},
@@ -47,8 +45,8 @@ var (
 		{Name: "Docs", URL: "https://docs.victoriametrics.com/victoriametrics/vmalert/"},
 	}
 	ruleTypeMap = map[string]string{
-		"alert":  rule.TypeAlerting,
-		"record": rule.TypeRecording,
+		"alert":  ruleTypeAlerting,
+		"record": ruleTypeRecording,
 	}
 )
 
@@ -114,7 +112,7 @@ func (rh *requestHandler) handler(w http.ResponseWriter, r *http.Request) bool {
 	case "/rules":
 		// Grafana makes an extra request to `/rules`
 		// handler in addition to `/api/v1/rules` calls in alerts UI
-		var data []*rule.ApiGroup
+		var data []*apiGroup
 		rf, err := newRulesFilter(r)
 		if err != nil {
 			httpserver.Errorf(w, r, "%s", err)
@@ -180,14 +178,14 @@ func (rh *requestHandler) handler(w http.ResponseWriter, r *http.Request) bool {
 		w.Write(data)
 		return true
 	case "/vmalert/api/v1/rule", "/api/v1/rule":
-		apiRule, err := rh.getRule(r)
+		rule, err := rh.getRule(r)
 		if err != nil {
 			httpserver.Errorf(w, r, "%s", err)
 			return true
 		}
-		rwu := rule.ApiRuleWithUpdates{
-			ApiRule:      apiRule,
-			StateUpdates: apiRule.Updates,
+		rwu := apiRuleWithUpdates{
+			apiRule:      rule,
+			StateUpdates: rule.Updates,
 		}
 		data, err := json.Marshal(rwu)
 		if err != nil {
@@ -197,20 +195,6 @@ func (rh *requestHandler) handler(w http.ResponseWriter, r *http.Request) bool {
 		w.Header().Set("Content-Type", "application/json")
 		w.Write(data)
 		return true
-	case "/vmalert/api/v1/group", "/api/v1/group":
-		group, err := rh.getGroup(r)
-		if err != nil {
-			httpserver.Errorf(w, r, "%s", err)
-			return true
-		}
-		data, err := json.Marshal(group)
-		if err != nil {
-			httpserver.Errorf(w, r, "failed to marshal group: %s", err)
-			return true
-		}
-		w.Header().Set("Content-Type", "application/json")
-		w.Write(data)
-		return true
 	case "/-/reload":
 		if !httpserver.CheckAuthFlag(w, r, reloadAuthKey) {
 			return true
@@ -225,42 +209,30 @@ func (rh *requestHandler) handler(w http.ResponseWriter, r *http.Request) bool {
 	}
 }
 
-func (rh *requestHandler) getGroup(r *http.Request) (*rule.ApiGroup, error) {
-	groupID, err := strconv.ParseUint(r.FormValue(rule.ParamGroupID), 10, 64)
+func (rh *requestHandler) getRule(r *http.Request) (apiRule, error) {
+	groupID, err := strconv.ParseUint(r.FormValue(paramGroupID), 10, 64)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read %q param: %w", rule.ParamGroupID, err)
+		return apiRule{}, fmt.Errorf("failed to read %q param: %w", paramGroupID, err)
 	}
-	obj, err := rh.m.groupAPI(groupID)
+	ruleID, err := strconv.ParseUint(r.FormValue(paramRuleID), 10, 64)
 	if err != nil {
-		return nil, errResponse(err, http.StatusNotFound)
-	}
-	return obj, nil
-}
-
-func (rh *requestHandler) getRule(r *http.Request) (rule.ApiRule, error) {
-	groupID, err := strconv.ParseUint(r.FormValue(rule.ParamGroupID), 10, 64)
-	if err != nil {
-		return rule.ApiRule{}, fmt.Errorf("failed to read %q param: %w", rule.ParamGroupID, err)
-	}
-	ruleID, err := strconv.ParseUint(r.FormValue(rule.ParamRuleID), 10, 64)
-	if err != nil {
-		return rule.ApiRule{}, fmt.Errorf("failed to read %q param: %w", rule.ParamRuleID, err)
+		return apiRule{}, fmt.Errorf("failed to read %q param: %w", paramRuleID, err)
 	}
 	obj, err := rh.m.ruleAPI(groupID, ruleID)
 	if err != nil {
-		return rule.ApiRule{}, errResponse(err, http.StatusNotFound)
+		return apiRule{}, errResponse(err, http.StatusNotFound)
 	}
 	return obj, nil
 }
 
-func (rh *requestHandler) getAlert(r *http.Request) (*rule.ApiAlert, error) {
-	groupID, err := strconv.ParseUint(r.FormValue(rule.ParamGroupID), 10, 64)
+func (rh *requestHandler) getAlert(r *http.Request) (*apiAlert, error) {
+	groupID, err := strconv.ParseUint(r.FormValue(paramGroupID), 10, 64)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read %q param: %w", rule.ParamGroupID, err)
+		return nil, fmt.Errorf("failed to read %q param: %w", paramGroupID, err)
 	}
-	alertID, err := strconv.ParseUint(r.FormValue(rule.ParamAlertID), 10, 64)
+	alertID, err := strconv.ParseUint(r.FormValue(paramAlertID), 10, 64)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read %q param: %w", rule.ParamAlertID, err)
+		return nil, fmt.Errorf("failed to read %q param: %w", paramAlertID, err)
 	}
 	a, err := rh.m.alertAPI(groupID, alertID)
 	if err != nil {
@@ -272,7 +244,7 @@ func (rh *requestHandler) getAlert(r *http.Request) (*rule.ApiAlert, error) {
 type listGroupsResponse struct {
 	Status string `json:"status"`
 	Data   struct {
-		Groups []*rule.ApiGroup `json:"groups"`
+		Groups []*apiGroup `json:"groups"`
 	} `json:"data"`
 }
 
@@ -338,19 +310,19 @@ func (rf *rulesFilter) matchesGroup(group *rule.Group) bool {
 	return true
 }
 
-func (rh *requestHandler) groups(rf *rulesFilter) []*rule.ApiGroup {
+func (rh *requestHandler) groups(rf *rulesFilter) []*apiGroup {
 	rh.m.groupsMu.RLock()
 	defer rh.m.groupsMu.RUnlock()
 
-	groups := make([]*rule.ApiGroup, 0)
+	groups := make([]*apiGroup, 0)
 	for _, group := range rh.m.groups {
 		if !rf.matchesGroup(group) {
 			continue
 		}
-		g := group.ToAPI()
+		g := groupToAPI(group)
 		// the returned list should always be non-nil
 		// https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4221
-		filteredRules := make([]rule.ApiRule, 0)
+		filteredRules := make([]apiRule, 0)
 		for _, rule := range g.Rules {
 			if rf.ruleType != "" && rf.ruleType != rule.Type {
 				continue
@@ -378,7 +350,7 @@ func (rh *requestHandler) groups(rf *rulesFilter) []*rule.ApiGroup {
 		groups = append(groups, g)
 	}
 	// sort list of groups for deterministic output
-	slices.SortFunc(groups, func(a, b *rule.ApiGroup) int {
+	slices.SortFunc(groups, func(a, b *apiGroup) int {
 		if a.Name != b.Name {
 			return strings.Compare(a.Name, b.Name)
 		}
@@ -403,32 +375,32 @@ func (rh *requestHandler) listGroups(rf *rulesFilter) ([]byte, error) {
 type listAlertsResponse struct {
 	Status string `json:"status"`
 	Data   struct {
-		Alerts []*rule.ApiAlert `json:"alerts"`
+		Alerts []*apiAlert `json:"alerts"`
 	} `json:"data"`
 }
 
-func (rh *requestHandler) groupAlerts() []rule.GroupAlerts {
+func (rh *requestHandler) groupAlerts() []groupAlerts {
 	rh.m.groupsMu.RLock()
 	defer rh.m.groupsMu.RUnlock()
 
-	var gAlerts []rule.GroupAlerts
+	var gAlerts []groupAlerts
 	for _, g := range rh.m.groups {
-		var alerts []*rule.ApiAlert
+		var alerts []*apiAlert
 		for _, r := range g.Rules {
 			a, ok := r.(*rule.AlertingRule)
 			if !ok {
 				continue
 			}
-			alerts = append(alerts, a.AlertsToAPI()...)
+			alerts = append(alerts, ruleToAPIAlert(a)...)
 		}
 		if len(alerts) > 0 {
-			gAlerts = append(gAlerts, rule.GroupAlerts{
-				Group:  g.ToAPI(),
+			gAlerts = append(gAlerts, groupAlerts{
+				Group:  groupToAPI(g),
 				Alerts: alerts,
 			})
 		}
 	}
-	slices.SortFunc(gAlerts, func(a, b rule.GroupAlerts) int {
+	slices.SortFunc(gAlerts, func(a, b groupAlerts) int {
 		return strings.Compare(a.Group.Name, b.Group.Name)
 	})
 	return gAlerts
@@ -439,7 +411,7 @@ func (rh *requestHandler) listAlerts(rf *rulesFilter) ([]byte, error) {
 	defer rh.m.groupsMu.RUnlock()
 
 	lr := listAlertsResponse{Status: "success"}
-	lr.Data.Alerts = make([]*rule.ApiAlert, 0)
+	lr.Data.Alerts = make([]*apiAlert, 0)
 	for _, group := range rh.m.groups {
 		if !rf.matchesGroup(group) {
 			continue
@@ -449,12 +421,12 @@ func (rh *requestHandler) listAlerts(rf *rulesFilter) ([]byte, error) {
 			if !ok {
 				continue
 			}
-			lr.Data.Alerts = append(lr.Data.Alerts, a.AlertsToAPI()...)
+			lr.Data.Alerts = append(lr.Data.Alerts, ruleToAPIAlert(a)...)
 		}
 	}
 
 	// sort list of alerts for deterministic output
-	slices.SortFunc(lr.Data.Alerts, func(a, b *rule.ApiAlert) int {
+	slices.SortFunc(lr.Data.Alerts, func(a, b *apiAlert) int {
 		return strings.Compare(a.ID, b.ID)
 	})
 
@@ -471,7 +443,7 @@ func (rh *requestHandler) listAlerts(rf *rulesFilter) ([]byte, error) {
 type listNotifiersResponse struct {
 	Status string `json:"status"`
 	Data   struct {
-		Notifiers []*notifier.ApiNotifier `json:"notifiers"`
+		Notifiers []*apiNotifier `json:"notifiers"`
 	} `json:"data"`
 }
 
@@ -479,20 +451,19 @@ func (rh *requestHandler) listNotifiers() ([]byte, error) {
 	targets := notifier.GetTargets()
 
 	lr := listNotifiersResponse{Status: "success"}
-	lr.Data.Notifiers = make([]*notifier.ApiNotifier, 0)
+	lr.Data.Notifiers = make([]*apiNotifier, 0)
 	for protoName, protoTargets := range targets {
-		nr := &notifier.ApiNotifier{
-			Kind:    protoName,
-			Targets: make([]*notifier.ApiTarget, 0, len(protoTargets)),
+		notifier := &apiNotifier{
+			Kind:    string(protoName),
+			Targets: make([]*apiTarget, 0, len(protoTargets)),
 		}
 		for _, target := range protoTargets {
-			nr.Targets = append(nr.Targets, &notifier.ApiTarget{
-				Address:   target.Addr(),
-				Labels:    target.Labels.ToMap(),
-				LastError: target.LastError(),
+			notifier.Targets = append(notifier.Targets, &apiTarget{
+				Address: target.Addr(),
+				Labels:  target.Labels.ToMap(),
 			})
 		}
-		lr.Data.Notifiers = append(lr.Data.Notifiers, nr)
+		lr.Data.Notifiers = append(lr.Data.Notifiers, notifier)
 	}
 
 	b, err := json.Marshal(lr)

app/vmalert/web.qtpl

@@ -8,7 +8,6 @@
     "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/tpl"
     "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil"
     "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier"
-    "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/rule"
 ) %}
 
 {% func Controls(prefix, currentIcon, currentText string, icons, filters map[string]string, search bool) %}
@@ -94,7 +93,7 @@
     {%= tpl.Footer(r) %}
 {% endfunc %}
 
-{% func ListGroups(r *http.Request, groups []*rule.ApiGroup, filter string) %}
+{% func ListGroups(r *http.Request, groups []*apiGroup, filter string) %}
     {%code
         prefix := vmalertutil.Prefix(r.URL.Path)
         filters := map[string]string{
@@ -223,7 +222,7 @@
 {% endfunc %}
 
 
-{% func ListAlerts(r *http.Request, groupAlerts []rule.GroupAlerts) %}
+{% func ListAlerts(r *http.Request, groupAlerts []groupAlerts) %}
     {%code prefix := vmalertutil.Prefix(r.URL.Path) %}
     {%= tpl.Header(r, navItems, "Alerts", getLastConfigError()) %}
     {%= Controls(prefix, "", "", nil, nil, true) %}
@@ -232,7 +231,7 @@
              {%code
                  g := ga.Group
                  var keys []string
-                 alertsByRule := make(map[string][]*rule.ApiAlert)
+                 alertsByRule := make(map[string][]*apiAlert)
                  for _, alert := range ga.Alerts {
                      if len(alertsByRule[alert.RuleID]) < 1 {
                          keys = append(keys, alert.RuleID)
@@ -379,7 +378,7 @@
     {%= tpl.Footer(r) %}
 {% endfunc %}
 
-{% func Alert(r *http.Request, alert *rule.ApiAlert) %}
+{% func Alert(r *http.Request, alert *apiAlert) %}
     {%code prefix := vmalertutil.Prefix(r.URL.Path) %}
     {%= tpl.Header(r, navItems, "", getLastConfigError()) %}
     {%code
@@ -465,7 +464,7 @@
 {% endfunc %}
 
 
-{% func RuleDetails(r *http.Request, rule rule.ApiRule) %}
+{% func RuleDetails(r *http.Request, rule apiRule) %}
     {%code prefix := vmalertutil.Prefix(r.URL.Path) %}
     {%= tpl.Header(r, navItems, "", getLastConfigError()) %}
     {%code
@@ -650,7 +649,7 @@
 <span class="badge bg-warning text-dark" title="This firing state is kept because of `keep_firing_for`">stabilizing</span>
 {% endfunc %}
 
-{% func seriesFetchedWarn(prefix string, r rule.ApiRule) %}
+{% func seriesFetchedWarn(prefix string, r apiRule) %}
 {% if isNoMatch(r) %}
 <svg
     data-bs-toggle="tooltip"
@@ -664,7 +663,7 @@
 {% endfunc %}
 
 {%code
-  func isNoMatch (r rule.ApiRule) bool {
+  func isNoMatch (r apiRule) bool {
     return r.LastSamples == 0 && r.LastSeriesFetched != nil && *r.LastSeriesFetched == 0
   }
 %}

app/vmalert/web_test.go

@@ -25,7 +25,6 @@ func TestHandler(t *testing.T) {
 	m := &manager{groups: map[uint64]*rule.Group{}}
 	var ar *rule.AlertingRule
 	var rr *rule.RecordingRule
-	var groupIDs []uint64
 	for _, dsType := range []string{"prometheus", "", "graphite"} {
 		g := rule.NewGroup(config.Group{
 			Name:        "group",
@@ -46,9 +45,7 @@ func TestHandler(t *testing.T) {
 		ar = g.Rules[0].(*rule.AlertingRule)
 		rr = g.Rules[1].(*rule.RecordingRule)
 		g.ExecOnce(context.Background(), func() []notifier.Notifier { return nil }, nil, time.Time{})
-		id := g.CreateID()
-		m.groups[id] = g
-		groupIDs = append(groupIDs, id)
+		m.groups[g.CreateID()] = g
 	}
 	rh := &requestHandler{m: m}
 
@@ -85,22 +82,22 @@ func TestHandler(t *testing.T) {
 	})
 
 	t.Run("/vmalert/rule", func(t *testing.T) {
-		a := ar.ToAPI()
+		a := ruleToAPI(ar)
 		getResp(t, ts.URL+"/vmalert/"+a.WebLink(), nil, 200)
-		r := rr.ToAPI()
+		r := ruleToAPI(rr)
 		getResp(t, ts.URL+"/vmalert/"+r.WebLink(), nil, 200)
 	})
 	t.Run("/vmalert/alert", func(t *testing.T) {
-		alerts := ar.AlertsToAPI()
+		alerts := ruleToAPIAlert(ar)
 		for _, a := range alerts {
 			getResp(t, ts.URL+"/vmalert/"+a.WebLink(), nil, 200)
 		}
 	})
 	t.Run("/vmalert/rule?badParam", func(t *testing.T) {
-		params := fmt.Sprintf("?%s=0&%s=1", rule.ParamGroupID, rule.ParamRuleID)
+		params := fmt.Sprintf("?%s=0&%s=1", paramGroupID, paramRuleID)
 		getResp(t, ts.URL+"/vmalert/rule"+params, nil, 404)
 
-		params = fmt.Sprintf("?%s=1&%s=0", rule.ParamGroupID, rule.ParamRuleID)
+		params = fmt.Sprintf("?%s=1&%s=0", paramGroupID, paramRuleID)
 		getResp(t, ts.URL+"/vmalert/rule"+params, nil, 404)
 	})
 
@@ -127,14 +124,14 @@ func TestHandler(t *testing.T) {
 		}
 	})
 	t.Run("/api/v1/alert?alertID&groupID", func(t *testing.T) {
-		expAlert := rule.NewAlertAPI(ar, ar.GetAlerts()[0])
-		alert := &rule.ApiAlert{}
+		expAlert := newAlertAPI(ar, ar.GetAlerts()[0])
+		alert := &apiAlert{}
 		getResp(t, ts.URL+"/"+expAlert.APILink(), alert, 200)
 		if !reflect.DeepEqual(alert, expAlert) {
 			t.Fatalf("expected %v is equal to %v", alert, expAlert)
 		}
 
-		alert = &rule.ApiAlert{}
+		alert = &apiAlert{}
 		getResp(t, ts.URL+"/vmalert/"+expAlert.APILink(), alert, 200)
 		if !reflect.DeepEqual(alert, expAlert) {
 			t.Fatalf("expected %v is equal to %v", alert, expAlert)
@@ -142,16 +139,16 @@ func TestHandler(t *testing.T) {
 	})
 
 	t.Run("/api/v1/alert?badParams", func(t *testing.T) {
-		params := fmt.Sprintf("?%s=0&%s=1", rule.ParamGroupID, rule.ParamAlertID)
+		params := fmt.Sprintf("?%s=0&%s=1", paramGroupID, paramAlertID)
 		getResp(t, ts.URL+"/api/v1/alert"+params, nil, 404)
 		getResp(t, ts.URL+"/vmalert/api/v1/alert"+params, nil, 404)
 
-		params = fmt.Sprintf("?%s=1&%s=0", rule.ParamGroupID, rule.ParamAlertID)
+		params = fmt.Sprintf("?%s=1&%s=0", paramGroupID, paramAlertID)
 		getResp(t, ts.URL+"/api/v1/alert"+params, nil, 404)
 		getResp(t, ts.URL+"/vmalert/api/v1/alert"+params, nil, 404)
 
 		// bad request, alertID is missing
-		params = fmt.Sprintf("?%s=1", rule.ParamGroupID)
+		params = fmt.Sprintf("?%s=1", paramGroupID)
 		getResp(t, ts.URL+"/api/v1/alert"+params, nil, 400)
 		getResp(t, ts.URL+"/vmalert/api/v1/alert"+params, nil, 400)
 	})
@@ -170,42 +167,27 @@ func TestHandler(t *testing.T) {
 		}
 	})
 	t.Run("/api/v1/rule?ruleID&groupID", func(t *testing.T) {
-		expRule := ar.ToAPI()
-		gotRule := rule.ApiRule{}
+		expRule := ruleToAPI(ar)
+		gotRule := apiRule{}
 		getResp(t, ts.URL+"/"+expRule.APILink(), &gotRule, 200)
 
 		if expRule.ID != gotRule.ID {
 			t.Fatalf("expected to get Rule %q; got %q instead", expRule.ID, gotRule.ID)
 		}
 
-		gotRule = rule.ApiRule{}
+		gotRule = apiRule{}
 		getResp(t, ts.URL+"/vmalert/"+expRule.APILink(), &gotRule, 200)
 
 		if expRule.ID != gotRule.ID {
 			t.Fatalf("expected to get Rule %q; got %q instead", expRule.ID, gotRule.ID)
 		}
 
-		gotRuleWithUpdates := rule.ApiRuleWithUpdates{}
+		gotRuleWithUpdates := apiRuleWithUpdates{}
 		getResp(t, ts.URL+"/"+expRule.APILink(), &gotRuleWithUpdates, 200)
 		if len(gotRuleWithUpdates.StateUpdates) < 1 {
 			t.Fatalf("expected %+v to have state updates field not empty", gotRuleWithUpdates.StateUpdates)
 		}
 	})
-	t.Run("/api/v1/group?groupID", func(t *testing.T) {
-		id := groupIDs[0]
-		g := m.groups[id]
-		expGroup := g.ToAPI()
-		gotGroup := rule.ApiGroup{}
-		getResp(t, ts.URL+"/"+expGroup.APILink(), &gotGroup, 200)
-		if expGroup.ID != gotGroup.ID {
-			t.Fatalf("expected to get Group %q; got %q instead", expGroup.ID, gotGroup.ID)
-		}
-		gotGroup = rule.ApiGroup{}
-		getResp(t, ts.URL+"/vmalert/"+expGroup.APILink(), &gotGroup, 200)
-		if expGroup.ID != gotGroup.ID {
-			t.Fatalf("expected to get Group %q; got %q instead", expGroup.ID, gotGroup.ID)
-		}
-	})
 
 	t.Run("/api/v1/rules&filters", func(t *testing.T) {
 		check := func(url string, statusCode, expGroups, expRules int) {

app/vmalert/web_types.go

@@ -1,4 +1,4 @@
-package rule
+package main
 
 import (
 	"fmt"
@@ -8,28 +8,79 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier"
+	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/rule"
 )
 
 const (
 	// ParamGroupID is group id key in url parameter
-	ParamGroupID = "group_id"
+	paramGroupID = "group_id"
 	// ParamAlertID is alert id key in url parameter
-	ParamAlertID = "alert_id"
+	paramAlertID = "alert_id"
 	// ParamRuleID is rule id key in url parameter
-	ParamRuleID = "rule_id"
-
-	// TypeRecording is a RecordingRule type
-	TypeRecording = "recording"
-	// TypeAlerting is an AlertingRule type
-	TypeAlerting = "alerting"
+	paramRuleID = "rule_id"
 )
 
-// ApiGroup represents a Group for web view
-type ApiGroup struct {
+type apiNotifier struct {
+	Kind    string       `json:"kind"`
+	Targets []*apiTarget `json:"targets"`
+}
+
+type apiTarget struct {
+	Address string            `json:"address"`
+	Labels  map[string]string `json:"labels"`
+}
+
+// apiAlert represents a notifier.AlertingRule state
+// for WEB view
+// https://github.com/prometheus/compliance/blob/main/alert_generator/specification.md#get-apiv1rules
+type apiAlert struct {
+	State       string            `json:"state"`
+	Name        string            `json:"name"`
+	Value       string            `json:"value"`
+	Labels      map[string]string `json:"labels,omitempty"`
+	Annotations map[string]string `json:"annotations"`
+	ActiveAt    time.Time         `json:"activeAt"`
+
+	// Additional fields
+
+	// ID is an unique Alert's ID within a group
+	ID string `json:"id"`
+	// RuleID is an unique Rule's ID within a group
+	RuleID string `json:"rule_id"`
+	// GroupID is an unique Group's ID
+	GroupID string `json:"group_id"`
+	// Expression contains the PromQL/MetricsQL expression
+	// for Rule's evaluation
+	Expression string `json:"expression"`
+	// SourceLink contains a link to a system which should show
+	// why Alert was generated
+	SourceLink string `json:"source"`
+	// Restored shows whether Alert's state was restored on restart
+	Restored bool `json:"restored"`
+	// Stabilizing shows when firing state is kept because of
+	// `keep_firing_for` instead of real alert
+	Stabilizing bool `json:"stabilizing"`
+}
+
+// WebLink returns a link to the alert which can be used in UI.
+func (aa *apiAlert) WebLink() string {
+	return fmt.Sprintf("alert?%s=%s&%s=%s",
+		paramGroupID, aa.GroupID, paramAlertID, aa.ID)
+}
+
+// APILink returns a link to the alert's JSON representation.
+func (aa *apiAlert) APILink() string {
+	return fmt.Sprintf("api/v1/alert?%s=%s&%s=%s",
+		paramGroupID, aa.GroupID, paramAlertID, aa.ID)
+}
+
+// apiGroup represents Group for web view
+// https://github.com/prometheus/compliance/blob/main/alert_generator/specification.md#get-apiv1rules
+type apiGroup struct {
 	// Name is the group name as present in the config
 	Name string `json:"name"`
 	// Rules contains both recording and alerting rules
-	Rules []ApiRule `json:"rules"`
+	Rules []apiRule `json:"rules"`
 	// Interval is the Group's evaluation interval in float seconds as present in the file.
 	Interval float64 `json:"interval"`
 	// LastEvaluation is the timestamp of the last time the Group was executed
@@ -65,20 +116,15 @@ type ApiGroup struct {
 	NoMatch int
 }
 
-// APILink returns a link to the group's JSON representation.
-func (ag *ApiGroup) APILink() string {
-	return fmt.Sprintf("api/v1/group?%s=%s", ParamGroupID, ag.ID)
+// groupAlerts represents a group of alerts for WEB view
+type groupAlerts struct {
+	Group  *apiGroup
+	Alerts []*apiAlert
 }
 
-// GroupAlerts represents a Group with its Alerts for web view
-type GroupAlerts struct {
-	Group  *ApiGroup
-	Alerts []*ApiAlert
-}
-
-// ApiRule represents a Rule for web view
+// apiRule represents a Rule for web view
 // see https://github.com/prometheus/compliance/blob/main/alert_generator/specification.md#get-apiv1rules
-type ApiRule struct {
+type apiRule struct {
 	// State must be one of these under following scenarios
 	//  "pending": at least 1 alert in the rule in pending state and no other alert in firing ruleState.
 	//  "firing": at least 1 alert in the rule in firing state.
@@ -100,7 +146,7 @@ type ApiRule struct {
 	// LastEvaluation is the timestamp of the last time the rule was executed
 	LastEvaluation time.Time `json:"lastEvaluation"`
 	// Alerts  is the list of all the alerts in this rule that are currently pending or firing
-	Alerts []*ApiAlert `json:"alerts,omitempty"`
+	Alerts []*apiAlert `json:"alerts,omitempty"`
 	// Health is the health of rule evaluation.
 	// It MUST be one of "ok", "err", "unknown"
 	Health string `json:"health"`
@@ -131,96 +177,143 @@ type ApiRule struct {
 	// MaxUpdates is the max number of recorded ruleStateEntry objects
 	MaxUpdates int `json:"max_updates_entries"`
 	// Updates contains the ordered list of recorded ruleStateEntry objects
-	Updates []StateEntry `json:"-"`
+	Updates []rule.StateEntry `json:"-"`
 }
 
-// ApiAlert represents a notifier.AlertingRule state
-// for WEB view
-// https://github.com/prometheus/compliance/blob/main/alert_generator/specification.md#get-apiv1rules
-type ApiAlert struct {
-	State       string            `json:"state"`
-	Name        string            `json:"name"`
-	Value       string            `json:"value"`
-	Labels      map[string]string `json:"labels,omitempty"`
-	Annotations map[string]string `json:"annotations"`
-	ActiveAt    time.Time         `json:"activeAt"`
-
-	// Additional fields
-
-	// ID is an unique Alert's ID within a group
-	ID string `json:"id"`
-	// RuleID is an unique Rule's ID within a group
-	RuleID string `json:"rule_id"`
-	// GroupID is an unique Group's ID
-	GroupID string `json:"group_id"`
-	// Expression contains the PromQL/MetricsQL expression
-	// for Rule's evaluation
-	Expression string `json:"expression"`
-	// SourceLink contains a link to a system which should show
-	// why Alert was generated
-	SourceLink string `json:"source"`
-	// Restored shows whether Alert's state was restored on restart
-	Restored bool `json:"restored"`
-	// Stabilizing shows when firing state is kept because of
-	// `keep_firing_for` instead of real alert
-	Stabilizing bool `json:"stabilizing"`
-}
-
-// WebLink returns a link to the alert which can be used in UI.
-func (aa *ApiAlert) WebLink() string {
-	return fmt.Sprintf("alert?%s=%s&%s=%s",
-		ParamGroupID, aa.GroupID, ParamAlertID, aa.ID)
-}
-
-// APILink returns a link to the alert's JSON representation.
-func (aa *ApiAlert) APILink() string {
-	return fmt.Sprintf("api/v1/alert?%s=%s&%s=%s",
-		ParamGroupID, aa.GroupID, ParamAlertID, aa.ID)
-}
-
-// ApiRuleWithUpdates represents ApiRule but with extra fields for marshalling
-type ApiRuleWithUpdates struct {
-	ApiRule
+// apiRuleWithUpdates represents apiRule but with extra fields for marshalling
+type apiRuleWithUpdates struct {
+	apiRule
 	// Updates contains the ordered list of recorded ruleStateEntry objects
-	StateUpdates []StateEntry `json:"updates,omitempty"`
+	StateUpdates []rule.StateEntry `json:"updates,omitempty"`
 }
 
 // APILink returns a link to the rule's JSON representation.
-func (ar ApiRule) APILink() string {
+func (ar apiRule) APILink() string {
 	return fmt.Sprintf("api/v1/rule?%s=%s&%s=%s",
-		ParamGroupID, ar.GroupID, ParamRuleID, ar.ID)
+		paramGroupID, ar.GroupID, paramRuleID, ar.ID)
 }
 
 // WebLink returns a link to the alert which can be used in UI.
-func (ar ApiRule) WebLink() string {
+func (ar apiRule) WebLink() string {
 	return fmt.Sprintf("rule?%s=%s&%s=%s",
-		ParamGroupID, ar.GroupID, ParamRuleID, ar.ID)
+		paramGroupID, ar.GroupID, paramRuleID, ar.ID)
 }
 
-// AlertsToAPI returns list of ApiAlert objects from existing alerts
-func (ar *AlertingRule) AlertsToAPI() []*ApiAlert {
-	var alerts []*ApiAlert
+func ruleToAPI(r any) apiRule {
+	if ar, ok := r.(*rule.AlertingRule); ok {
+		return alertingToAPI(ar)
+	}
+	if rr, ok := r.(*rule.RecordingRule); ok {
+		return recordingToAPI(rr)
+	}
+	return apiRule{}
+}
+
+const (
+	ruleTypeRecording = "recording"
+	ruleTypeAlerting  = "alerting"
+)
+
+func recordingToAPI(rr *rule.RecordingRule) apiRule {
+	lastState := rule.GetLastEntry(rr)
+	r := apiRule{
+		Type:              ruleTypeRecording,
+		DatasourceType:    rr.Type.String(),
+		Name:              rr.Name,
+		Query:             rr.Expr,
+		Labels:            rr.Labels,
+		LastEvaluation:    lastState.Time,
+		EvaluationTime:    lastState.Duration.Seconds(),
+		Health:            "ok",
+		LastSamples:       lastState.Samples,
+		LastSeriesFetched: lastState.SeriesFetched,
+		MaxUpdates:        rule.GetRuleStateSize(rr),
+		Updates:           rule.GetAllRuleState(rr),
+
+		// encode as strings to avoid rounding
+		ID:        fmt.Sprintf("%d", rr.ID()),
+		GroupID:   fmt.Sprintf("%d", rr.GroupID),
+		GroupName: rr.GroupName,
+		File:      rr.File,
+	}
+	if lastState.Err != nil {
+		r.LastError = lastState.Err.Error()
+		r.Health = "err"
+	}
+	return r
+}
+
+// alertingToAPI returns Rule representation in form of apiRule
+func alertingToAPI(ar *rule.AlertingRule) apiRule {
+	lastState := rule.GetLastEntry(ar)
+	r := apiRule{
+		Type:              ruleTypeAlerting,
+		DatasourceType:    ar.Type.String(),
+		Name:              ar.Name,
+		Query:             ar.Expr,
+		Duration:          ar.For.Seconds(),
+		KeepFiringFor:     ar.KeepFiringFor.Seconds(),
+		Labels:            ar.Labels,
+		Annotations:       ar.Annotations,
+		LastEvaluation:    lastState.Time,
+		EvaluationTime:    lastState.Duration.Seconds(),
+		Health:            "ok",
+		State:             "inactive",
+		Alerts:            ruleToAPIAlert(ar),
+		LastSamples:       lastState.Samples,
+		LastSeriesFetched: lastState.SeriesFetched,
+		MaxUpdates:        rule.GetRuleStateSize(ar),
+		Updates:           rule.GetAllRuleState(ar),
+		Debug:             ar.Debug,
+
+		// encode as strings to avoid rounding in JSON
+		ID:        fmt.Sprintf("%d", ar.ID()),
+		GroupID:   fmt.Sprintf("%d", ar.GroupID),
+		GroupName: ar.GroupName,
+		File:      ar.File,
+	}
+	if lastState.Err != nil {
+		r.LastError = lastState.Err.Error()
+		r.Health = "err"
+	}
+	// satisfy apiRule.State logic
+	if len(r.Alerts) > 0 {
+		r.State = notifier.StatePending.String()
+		stateFiring := notifier.StateFiring.String()
+		for _, a := range r.Alerts {
+			if a.State == stateFiring {
+				r.State = stateFiring
+				break
+			}
+		}
+	}
+	return r
+}
+
+// ruleToAPIAlert generates list of apiAlert objects from existing alerts
+func ruleToAPIAlert(ar *rule.AlertingRule) []*apiAlert {
+	var alerts []*apiAlert
 	for _, a := range ar.GetAlerts() {
 		if a.State == notifier.StateInactive {
 			continue
 		}
-		alerts = append(alerts, NewAlertAPI(ar, a))
+		alerts = append(alerts, newAlertAPI(ar, a))
 	}
 	return alerts
 }
 
-// AlertToAPI generates apiAlert object from alert by its id(hash)
-func (ar *AlertingRule) AlertToAPI(id uint64) *ApiAlert {
+// alertToAPI generates apiAlert object from alert by its id(hash)
+func alertToAPI(ar *rule.AlertingRule, id uint64) *apiAlert {
 	a := ar.GetAlert(id)
 	if a == nil {
 		return nil
 	}
-	return NewAlertAPI(ar, a)
+	return newAlertAPI(ar, a)
 }
 
 // NewAlertAPI creates apiAlert for notifier.Alert
-func NewAlertAPI(ar *AlertingRule, a *notifier.Alert) *ApiAlert {
-	aa := &ApiAlert{
+func newAlertAPI(ar *rule.AlertingRule, a *notifier.Alert) *apiAlert {
+	aa := &apiAlert{
 		// encode as strings to avoid rounding
 		ID:      fmt.Sprintf("%d", a.ID),
 		GroupID: fmt.Sprintf("%d", a.GroupID),
@@ -235,8 +328,8 @@ func NewAlertAPI(ar *AlertingRule, a *notifier.Alert) *ApiAlert {
 		Restored:    a.Restored,
 		Value:       strconv.FormatFloat(a.Value, 'f', -1, 32),
 	}
-	if notifier.AlertURLGeneratorFn != nil {
-		aa.SourceLink = notifier.AlertURLGeneratorFn(*a)
+	if alertURLGeneratorFn != nil {
+		aa.SourceLink = alertURLGeneratorFn(*a)
 	}
 	if a.State == notifier.StateFiring && !a.KeepFiringSince.IsZero() {
 		aa.Stabilizing = true
@@ -244,11 +337,9 @@ func NewAlertAPI(ar *AlertingRule, a *notifier.Alert) *ApiAlert {
 	return aa
 }
 
-// ToAPI returns ApiGroup representation of g
-func (g *Group) ToAPI() *ApiGroup {
-	g.mu.RLock()
-	defer g.mu.RUnlock()
-	ag := ApiGroup{
+func groupToAPI(g *rule.Group) *apiGroup {
+	g = g.DeepCopy()
+	ag := apiGroup{
 		// encode as string to avoid rounding
 		ID:              strconv.FormatUint(g.GetID(), 10),
 		Name:            g.Name,
@@ -268,9 +359,9 @@ func (g *Group) ToAPI() *ApiGroup {
 	if g.EvalDelay != nil {
 		ag.EvalDelay = g.EvalDelay.Seconds()
 	}
-	ag.Rules = make([]ApiRule, 0)
+	ag.Rules = make([]apiRule, 0)
 	for _, r := range g.Rules {
-		ag.Rules = append(ag.Rules, r.ToAPI())
+		ag.Rules = append(ag.Rules, ruleToAPI(r))
 	}
 	return &ag
 }

app/vmalert/web_types_test.go

@@ -1,4 +1,4 @@
-package rule
+package main
 
 import (
 	"fmt"
@@ -8,6 +8,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
+	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/rule"
 )
 
 func TestRecordingToApi(t *testing.T) {
@@ -16,7 +17,7 @@ func TestRecordingToApi(t *testing.T) {
 		Values: []float64{1}, Timestamps: []int64{0},
 	})
 	entriesLimit := 44
-	g := NewGroup(config.Group{
+	g := rule.NewGroup(config.Group{
 		Name:        "group",
 		File:        "rules.yaml",
 		Concurrency: 1,
@@ -30,24 +31,24 @@ func TestRecordingToApi(t *testing.T) {
 			},
 		},
 	}, fq, 1*time.Minute, nil)
-	rr := g.Rules[0].(*RecordingRule)
+	rr := g.Rules[0].(*rule.RecordingRule)
 
-	expectedRes := ApiRule{
+	expectedRes := apiRule{
 		Name:           "record_name",
 		Query:          "up",
 		Labels:         map[string]string{"label": "value"},
 		Health:         "ok",
-		Type:           TypeRecording,
+		Type:           ruleTypeRecording,
 		DatasourceType: "prometheus",
 		ID:             "1248",
 		GroupID:        fmt.Sprintf("%d", g.CreateID()),
 		GroupName:      "group",
 		File:           "rules.yaml",
 		MaxUpdates:     44,
-		Updates:        make([]StateEntry, 0),
+		Updates:        make([]rule.StateEntry, 0),
 	}
 
-	res := rr.ToAPI()
+	res := recordingToAPI(rr)
 
 	if !reflect.DeepEqual(res, expectedRes) {
 		t.Fatalf("expected to have: \n%v;\ngot: \n%v", expectedRes, res)

app/vmauth/auth_config.go

@@ -41,9 +41,6 @@ var (
 		"See https://docs.victoriametrics.com/victoriametrics/vmauth/#load-balancing for details")
 	defaultLoadBalancingPolicy = flag.String("loadBalancingPolicy", "least_loaded", "The default load balancing policy to use for backend urls specified inside url_prefix section. "+
 		"Supported policies: least_loaded, first_available. See https://docs.victoriametrics.com/victoriametrics/vmauth/#load-balancing")
-	defaultMergeQueryArgs = flagutil.NewArrayString("mergeQueryArgs", "An optional list of client query arg names, which must be merged with args at backend urls. "+
-		"The rest of client query args are replaced by the corresponding query args from backend urls for security reasons; "+
-		"see https://docs.victoriametrics.com/victoriametrics/vmauth/#query-args-handling")
 	discoverBackendIPsGlobal = flag.Bool("discoverBackendIPs", false, "Whether to discover backend IPs via periodic DNS queries to hostnames specified in url_prefix. "+
 		"This may be useful when url_prefix points to a hostname with dynamically scaled instances behind it. See https://docs.victoriametrics.com/victoriametrics/vmauth/#discovering-backend-ips")
 	discoverBackendIPsInterval = flag.Duration("discoverBackendIPsInterval", 10*time.Second, "The interval for re-discovering backend IPs if -discoverBackendIPs command-line flag is set. "+
@@ -78,7 +75,6 @@ type UserInfo struct {
 	DefaultURL             *URLPrefix  `yaml:"default_url,omitempty"`
 	RetryStatusCodes       []int       `yaml:"retry_status_codes,omitempty"`
 	LoadBalancingPolicy    string      `yaml:"load_balancing_policy,omitempty"`
-	MergeQueryArgs         []string    `yaml:"merge_query_args,omitempty"`
 	DropSrcPathPrefixParts *int        `yaml:"drop_src_path_prefix_parts,omitempty"`
 	TLSCAFile              string      `yaml:"tls_ca_file,omitempty"`
 	TLSCertFile            string      `yaml:"tls_cert_file,omitempty"`
@@ -186,11 +182,6 @@ type URLMap struct {
 	// LoadBalancingPolicy is load balancing policy among UrlPrefix backends.
 	LoadBalancingPolicy string `yaml:"load_balancing_policy,omitempty"`
 
-	// MergeQueryArgs is a list of client query args, which must be merged with the existing backend query args.
-	//
-	// The rest of client query args are replaced with the corresponding backend query args for security reasons.
-	MergeQueryArgs []string `yaml:"merge_query_args,omitempty"`
-
 	// DropSrcPathPrefixParts is the number of `/`-delimited request path prefix parts to drop before proxying the request to backend.
 	DropSrcPathPrefixParts *int `yaml:"drop_src_path_prefix_parts,omitempty"`
 }
@@ -237,7 +228,7 @@ func (qa *QueryArg) MarshalYAML() (any, error) {
 	return qa.sOriginal, nil
 }
 
-// URLPrefix represents the `url_prefix` from auth config.
+// URLPrefix represents passed `url_prefix`
 type URLPrefix struct {
 	// requests are re-tried on other backend urls for these http response status codes
 	retryStatusCodes []int
@@ -245,11 +236,6 @@ type URLPrefix struct {
 	// load balancing policy used
 	loadBalancingPolicy string
 
-	// the list of client query args, which must be merged with backend query args.
-	//
-	// By default backend query args replace all the client query args for security reasons.
-	mergeQueryArgs []string
-
 	// how many request path prefix parts to drop before routing the request to backendURL
 	dropSrcPathPrefixParts int
 
@@ -870,7 +856,6 @@ func (ui *UserInfo) getMetricLabels() (string, error) {
 func (ui *UserInfo) initURLs() error {
 	retryStatusCodes := defaultRetryStatusCodes.Values()
 	loadBalancingPolicy := *defaultLoadBalancingPolicy
-	mergeQueryArgs := *defaultMergeQueryArgs
 	dropSrcPathPrefixParts := 0
 	discoverBackendIPs := *discoverBackendIPsGlobal
 	if ui.RetryStatusCodes != nil {
@@ -879,9 +864,6 @@ func (ui *UserInfo) initURLs() error {
 	if ui.LoadBalancingPolicy != "" {
 		loadBalancingPolicy = ui.LoadBalancingPolicy
 	}
-	if len(ui.MergeQueryArgs) != 0 {
-		mergeQueryArgs = ui.MergeQueryArgs
-	}
 	if ui.DropSrcPathPrefixParts != nil {
 		dropSrcPathPrefixParts = *ui.DropSrcPathPrefixParts
 	}
@@ -889,18 +871,16 @@ func (ui *UserInfo) initURLs() error {
 		discoverBackendIPs = *ui.DiscoverBackendIPs
 	}
 
-	up := ui.URLPrefix
-	if up != nil {
-		if err := up.sanitizeAndInitialize(); err != nil {
+	if ui.URLPrefix != nil {
+		if err := ui.URLPrefix.sanitizeAndInitialize(); err != nil {
 			return err
 		}
-		up.retryStatusCodes = retryStatusCodes
-		up.dropSrcPathPrefixParts = dropSrcPathPrefixParts
-		up.discoverBackendIPs = discoverBackendIPs
-		if err := up.setLoadBalancingPolicy(loadBalancingPolicy); err != nil {
+		ui.URLPrefix.retryStatusCodes = retryStatusCodes
+		ui.URLPrefix.dropSrcPathPrefixParts = dropSrcPathPrefixParts
+		ui.URLPrefix.discoverBackendIPs = discoverBackendIPs
+		if err := ui.URLPrefix.setLoadBalancingPolicy(loadBalancingPolicy); err != nil {
 			return err
 		}
-		up.mergeQueryArgs = mergeQueryArgs
 	}
 	if ui.DefaultURL != nil {
 		if err := ui.DefaultURL.sanitizeAndInitialize(); err != nil {
@@ -919,7 +899,6 @@ func (ui *UserInfo) initURLs() error {
 		}
 		rscs := retryStatusCodes
 		lbp := loadBalancingPolicy
-		mqa := mergeQueryArgs
 		dsp := dropSrcPathPrefixParts
 		dbd := discoverBackendIPs
 		if e.RetryStatusCodes != nil {
@@ -928,9 +907,6 @@ func (ui *UserInfo) initURLs() error {
 		if e.LoadBalancingPolicy != "" {
 			lbp = e.LoadBalancingPolicy
 		}
-		if len(e.MergeQueryArgs) != 0 {
-			mqa = e.MergeQueryArgs
-		}
 		if e.DropSrcPathPrefixParts != nil {
 			dsp = *e.DropSrcPathPrefixParts
 		}
@@ -941,7 +917,6 @@ func (ui *UserInfo) initURLs() error {
 		if err := e.URLPrefix.setLoadBalancingPolicy(lbp); err != nil {
 			return err
 		}
-		e.URLPrefix.mergeQueryArgs = mqa
 		e.URLPrefix.dropSrcPathPrefixParts = dsp
 		e.URLPrefix.discoverBackendIPs = dbd
 	}

app/vmauth/auth_config_test.go

@@ -280,7 +280,7 @@ users:
 }
 
 func TestParseAuthConfigSuccess(t *testing.T) {
-	f := func(s string, expectedAuthConfig map[string]*UserInfo, expectedUnauthorizedUserConfig *UserInfo) {
+	f := func(s string, expectedAuthConfig map[string]*UserInfo) {
 		t.Helper()
 		ac, err := parseAuthConfig([]byte(s))
 		if err != nil {
@@ -294,19 +294,15 @@ func TestParseAuthConfigSuccess(t *testing.T) {
 		if err := areEqualConfigs(m, expectedAuthConfig); err != nil {
 			t.Fatal(err)
 		}
-
-		if err := areEqualConfigs(ac.UnauthorizedUser, expectedUnauthorizedUserConfig); err != nil {
-			t.Fatal(err)
-		}
 	}
 
 	insecureSkipVerifyTrue := true
 
 	// Empty config
-	f(``, map[string]*UserInfo{}, nil)
+	f(``, map[string]*UserInfo{})
 
 	// Empty users
-	f(`users: []`, map[string]*UserInfo{}, nil)
+	f(`users: []`, map[string]*UserInfo{})
 
 	// Single user
 	f(`
@@ -324,7 +320,7 @@ users:
 			MaxConcurrentRequests: 5,
 			TLSInsecureSkipVerify: &insecureSkipVerifyTrue,
 		},
-	}, nil)
+	})
 
 	// Single user with auth_token
 	f(`
@@ -348,7 +344,7 @@ users:
 			TLSCertFile:           "foo/baz",
 			TLSKeyFile:            "foo/foo",
 		},
-	}, nil)
+	})
 
 	// Multiple url_prefix entries
 	insecureSkipVerifyFalse := false
@@ -363,7 +359,6 @@ users:
   tls_insecure_skip_verify: false
   retry_status_codes: [500, 501]
   load_balancing_policy: first_available
-  merge_query_args: [foo, bar]
   drop_src_path_prefix_parts: 1
   discover_backend_ips: true
 `, map[string]*UserInfo{
@@ -377,11 +372,10 @@ users:
 			TLSInsecureSkipVerify:  &insecureSkipVerifyFalse,
 			RetryStatusCodes:       []int{500, 501},
 			LoadBalancingPolicy:    "first_available",
-			MergeQueryArgs:         []string{"foo", "bar"},
 			DropSrcPathPrefixParts: intp(1),
 			DiscoverBackendIPs:     &discoverBackendIPsTrue,
 		},
-	}, nil)
+	})
 
 	// Multiple users
 	f(`
@@ -399,7 +393,7 @@ users:
 			Username:  "bar",
 			URLPrefix: mustParseURL("https://bar/x/"),
 		},
-	}, nil)
+	})
 
 	// non-empty URLMap
 	sharedUserInfo := &UserInfo{
@@ -449,7 +443,7 @@ users:
 `, map[string]*UserInfo{
 		getHTTPAuthBearerToken("foo"):    sharedUserInfo,
 		getHTTPAuthBasicToken("foo", ""): sharedUserInfo,
-	}, nil)
+	})
 
 	// Multiple users with the same name - this should work, since these users have different passwords
 	f(`
@@ -471,7 +465,7 @@ users:
 			Password:  "bar",
 			URLPrefix: mustParseURL("https://bar/x"),
 		},
-	}, nil)
+	})
 
 	// with default url
 	keepOriginalHost := true
@@ -487,8 +481,6 @@ users:
     - "foo: bar"
     - "xxx: y"
     keep_original_host: true
-    load_balancing_policy: first_available
-    merge_query_args: [foo, bar]
   default_url:
   - http://default1/select/0/prometheus
   - http://default2/select/0/prometheus
@@ -513,8 +505,6 @@ users:
 						},
 						KeepOriginalHost: &keepOriginalHost,
 					},
-					LoadBalancingPolicy: "first_available",
-					MergeQueryArgs:      []string{"foo", "bar"},
 				},
 			},
 			DefaultURL: mustParseURLs([]string{
@@ -542,8 +532,6 @@ users:
 						},
 						KeepOriginalHost: &keepOriginalHost,
 					},
-					LoadBalancingPolicy: "first_available",
-					MergeQueryArgs:      []string{"foo", "bar"},
 				},
 			},
 			DefaultURL: mustParseURLs([]string{
@@ -551,7 +539,7 @@ users:
 				"http://default2/select/0/prometheus",
 			}),
 		},
-	}, nil)
+	})
 
 	// With metric_labels
 	f(`
@@ -603,23 +591,6 @@ users:
 				},
 			},
 		},
-	}, nil)
-
-	// unauthorized_user
-	f(`
-unauthorized_user:
-  merge_query_args: [extra_filters]
-  url_map:
-  - src_paths: ["/select/.+"]
-    url_prefix: 'http://victoria-logs:9428/?extra_filters={env="prod"}'
-`, nil, &UserInfo{
-		MergeQueryArgs: []string{"extra_filters"},
-		URLMaps: []URLMap{
-			{
-				SrcPaths:  getRegexs([]string{"/select/.+"}),
-				URLPrefix: mustParseURL(`http://victoria-logs:9428/?extra_filters={env="prod"}`),
-			},
-		},
 	})
 }
 
@@ -913,7 +884,7 @@ func removeMetrics(m map[string]*UserInfo) {
 	}
 }
 
-func areEqualConfigs(a, b any) error {
+func areEqualConfigs(a, b map[string]*UserInfo) error {
 	aData, err := yaml.Marshal(a)
 	if err != nil {
 		return fmt.Errorf("cannot marshal a: %w", err)

app/vmauth/main.go

@@ -269,7 +269,7 @@ func processRequest(w http.ResponseWriter, r *http.Request, ui *UserInfo) {
 			query.Set("request_path", u.String())
 			targetURL.RawQuery = query.Encode()
 		} else { // Update path for regular routes.
-			targetURL = mergeURLs(targetURL, u, up.dropSrcPathPrefixParts, up.mergeQueryArgs)
+			targetURL = mergeURLs(targetURL, u, up.dropSrcPathPrefixParts)
 		}
 
 		wasLocalRetry := false
@@ -372,54 +372,20 @@ func tryProcessingRequest(w http.ResponseWriter, r *http.Request, targetURL *url
 	updateHeadersByConfig(w.Header(), hc.ResponseHeaders)
 	w.WriteHeader(res.StatusCode)
 
-	err = copyStreamToClient(w, res.Body)
+	copyBuf := copyBufPool.Get()
+	copyBuf.B = bytesutil.ResizeNoCopyNoOverallocate(copyBuf.B, 16*1024)
+	_, err = io.CopyBuffer(w, res.Body, copyBuf.B)
+	copyBufPool.Put(copyBuf)
 	_ = res.Body.Close()
-	if err != nil && !netutil.IsTrivialNetworkError(err) && !errors.Is(err, context.Canceled) {
+	if err != nil && !netutil.IsTrivialNetworkError(err) {
 		remoteAddr := httpserver.GetQuotedRemoteAddr(r)
 		requestURI := httpserver.GetRequestURI(r)
-
 		logger.Warnf("remoteAddr: %s; requestURI: %s; error when proxying response body from %s: %s", remoteAddr, requestURI, targetURL, err)
 		return true, false
 	}
 	return true, false
 }
 
-func copyStreamToClient(client io.Writer, backend io.Reader) error {
-	copyBuf := copyBufPool.Get()
-	copyBuf.B = bytesutil.ResizeNoCopyNoOverallocate(copyBuf.B, 16*1024)
-	defer copyBufPool.Put(copyBuf)
-	buf := copyBuf.B
-
-	flusher, ok := client.(http.Flusher)
-	if !ok {
-		logger.Panicf("BUG: client must implement net/http.Flusher interface; got %T", client)
-	}
-
-	for {
-		n, backendErr := backend.Read(buf)
-		if n > 0 {
-			data := buf[:n]
-			n, clientErr := client.Write(data)
-			if clientErr != nil {
-				return fmt.Errorf("cannot write data to client: %w", clientErr)
-			}
-			if n != len(data) {
-				logger.Panicf("BUG: unexpected number of bytes written returned by client.Write; got %d; want %d", n, len(data))
-			}
-			// Flush the read data from the backend to the client as fast as possible
-			// in order to reduce delays for data propagation.
-			// See https://github.com/VictoriaMetrics/VictoriaLogs/issues/667
-			flusher.Flush()
-		}
-		if backendErr != nil {
-			if backendErr == io.EOF {
-				return nil
-			}
-			return fmt.Errorf("cannot read data from backend: %w", backendErr)
-		}
-	}
-}
-
 var copyBufPool bytesutil.ByteBufferPool
 
 func copyHeader(dst, src http.Header) {

app/vmauth/main_test.go

@@ -514,11 +514,6 @@ func (w *fakeResponseWriter) getResponse() string {
 	return w.bb.String()
 }
 
-// Flush implements net/http.Flusher
-func (w *fakeResponseWriter) Flush() {
-	// Nothing to do.
-}
-
 func (w *fakeResponseWriter) Header() http.Header {
 	if w.h == nil {
 		w.h = http.Header{}

app/vmauth/target_url.go

@@ -8,42 +8,29 @@ import (
 	"strings"
 )
 
-func mergeURLs(uiURL, requestURI *url.URL, dropSrcPathPrefixParts int, mergeQueryArgs []string) *url.URL {
+func mergeURLs(uiURL, requestURI *url.URL, dropSrcPathPrefixParts int) *url.URL {
 	targetURL := *uiURL
-
 	srcPath := dropPrefixParts(requestURI.Path, dropSrcPathPrefixParts)
 	if strings.HasPrefix(srcPath, "/") {
 		targetURL.Path = strings.TrimSuffix(targetURL.Path, "/")
 	}
 	targetURL.Path += srcPath
 	requestParams := requestURI.Query()
-
+	// fast path
 	if len(requestParams) == 0 {
 		return &targetURL
 	}
-
-	// Merge client query args with backend query args
-	targetParams := targetURL.Query()
-	uiParams := url.Values{}
-
-	// Copy all the target query args
-	for k, v := range targetParams {
-		for i := range v {
-			uiParams.Add(k, v[i])
-		}
-	}
-
-	// Copy the client query args if they do not clash with target args.
+	// merge query parameters from requests.
+	uiParams := targetURL.Query()
 	for k, v := range requestParams {
-		if targetParams.Has(k) && !slices.Contains(mergeQueryArgs, k) {
-			// Skip clashed client query params for security reasons
+		// skip clashed query params from original request
+		if exist := uiParams.Get(k); len(exist) > 0 {
 			continue
 		}
 		for i := range v {
 			uiParams.Add(k, v[i])
 		}
 	}
-
 	targetURL.RawQuery = uiParams.Encode()
 	return &targetURL
 }

app/vmauth/target_url_test.go

@@ -101,7 +101,7 @@ func TestCreateTargetURLSuccess(t *testing.T) {
 			return
 		}
 		bu := up.getBackendURL()
-		target := mergeURLs(bu.url, u, up.dropSrcPathPrefixParts, up.mergeQueryArgs)
+		target := mergeURLs(bu.url, u, up.dropSrcPathPrefixParts)
 		bu.put()
 
 		gotTarget := target.String()
@@ -352,7 +352,7 @@ func TestUserInfoGetBackendURL_SRV(t *testing.T) {
 			return
 		}
 		bu := up.getBackendURL()
-		target := mergeURLs(bu.url, u, up.dropSrcPathPrefixParts, up.mergeQueryArgs)
+		target := mergeURLs(bu.url, u, up.dropSrcPathPrefixParts)
 		bu.put()
 
 		gotTarget := target.String()
@@ -528,43 +528,3 @@ func (r *fakeResolver) LookupIPAddr(_ context.Context, host string) ([]net.IPAdd
 func (r *fakeResolver) LookupMX(_ context.Context, _ string) ([]*net.MX, error) {
 	return nil, nil
 }
-
-func TestMergeURLs(t *testing.T) {
-	f := func(clientURL, backendURL string, dropSrcPathPrefixParts int, mergeQueryArgs []string, resultURLExpected string) {
-		t.Helper()
-
-		cu, err := url.Parse(clientURL)
-		if err != nil {
-			t.Fatalf("cannot parse client url %q: %s", clientURL, err)
-		}
-		cu = normalizeURL(cu)
-
-		bu, err := url.Parse(backendURL)
-		if err != nil {
-			t.Fatalf("cannot parse backend url %q: %s", backendURL, err)
-		}
-
-		ru := mergeURLs(bu, cu, dropSrcPathPrefixParts, mergeQueryArgs)
-		resultURL := ru.String()
-		if resultURL != resultURLExpected {
-			t.Fatalf("unexpected resultURL\ngot\n%s\nwant\n%s", resultURL, resultURLExpected)
-		}
-	}
-
-	f("http://foo:1234", "https://backend/foo/bar?baz=abc&de", 0, nil, "https://backend/foo/bar?baz=abc&de")
-	f("http://foo:1234", "https://backend/foo/bar/?baz=abc&de", 0, nil, "https://backend/foo/bar/?baz=abc&de")
-	f("https://foo:1234/", "https://backend/foo/bar?baz=abc&de", 0, nil, "https://backend/foo/bar?baz=abc&de")
-	f("https://foo:1234/", "http://backend:8888/foo/bar/?baz=abc&de", 0, nil, "http://backend:8888/foo/bar/?baz=abc&de")
-
-	// merge paths
-	f("http://foo:1234/x/y?z=xxx", "https://backend/foo/bar?baz=abc&de", 0, nil, "https://backend/foo/bar/x/y?baz=abc&de=&z=xxx")
-
-	// "hacky" url
-	f("http://foo:1234/../../x/../y?z=xxx", "https://backend/foo/bar?baz=abc&de", 0, nil, "https://backend/foo/bar/y?baz=abc&de=&z=xxx")
-
-	// make sure that the client args are overridden by server args by default
-	f("http://foo:1234/x/y?password=hack&qqq=www", "https://backend/foo/bar?password=abc", 0, nil, "https://backend/foo/bar/x/y?password=abc&qqq=www")
-
-	// allow overriding the selected query args
-	f("http://foo:1234/x/y?baz=xxx&qqq=www", "https://backend/foo/bar?baz=abc", 0, []string{"baz"}, "https://backend/foo/bar/x/y?baz=abc&baz=xxx&qqq=www")
-}

app/vmbackup/main.go

@@ -115,7 +115,7 @@ func main() {
 	if err != nil {
 		logger.Fatalf("cannot create backup: %s", err)
 	}
-	pushmetrics.StopAndPush()
+	pushmetrics.Stop()
 
 	startTime := time.Now()
 	logger.Infof("gracefully shutting down http server for metrics at %q", listenAddrs)

app/vmctl/vm/timeseries.go

@@ -63,7 +63,10 @@ func (ts *TimeSeries) write(w io.Writer) (int, error) {
 		// Split long lines with more than 10K samples into multiple JSON lines.
 		// This should limit memory usage at VictoriaMetrics during data ingestion,
 		// since it allocates memory for the whole JSON line and processes it in one go.
-		batchSize := min(10000, len(timestamps))
+		batchSize := 10000
+		if batchSize > len(timestamps) {
+			batchSize = len(timestamps)
+		}
 		timestampsBatch := timestamps[:batchSize]
 		valuesBatch := values[:batchSize]
 		timestamps = timestamps[batchSize:]

app/vminsert/prometheusimport/request_handler.go

@@ -6,8 +6,8 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/common"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vminsert/relabel"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prommetadata"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompb"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/prometheus/stream"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/protoparser/protoparserutil"
@@ -30,7 +30,7 @@ func InsertHandler(req *http.Request) error {
 		return err
 	}
 	encoding := req.Header.Get("Content-Encoding")
-	return stream.Parse(req.Body, defaultTimestamp, encoding, true, prommetadata.IsEnabled(), func(rows []prometheus.Row, _ []prometheus.Metadata) error {
+	return stream.Parse(req.Body, defaultTimestamp, encoding, true, promscrape.IsMetadataEnabled(), func(rows []prometheus.Row, _ []prometheus.Metadata) error {
 		return insertRows(rows, extraLabels)
 	}, func(s string) {
 		httpserver.LogError(req, s)

app/vmrestore/main.go

@@ -68,7 +68,7 @@ func main() {
 	if err := a.Run(ctx); err != nil {
 		logger.Fatalf("cannot restore from backup: %s", err)
 	}
-	pushmetrics.StopAndPush()
+	pushmetrics.Stop()
 	srcFS.MustStop()
 	dstFS.MustStop()
 

app/vmselect/graphite/eval.go

@@ -142,12 +142,6 @@ func (s *series) summarize(aggrFunc aggrFunc, startTime, endTime, step int64, xF
 }
 
 func execExpr(ec *evalConfig, query string) (nextSeriesFunc, error) {
-	// Validate query length to prevent memory exhaustion
-	maxLen := searchutil.GetMaxQueryLen()
-	if len(query) > maxLen {
-		return nil, fmt.Errorf("too long query; got %d bytes; mustn't exceed `-search.maxQueryLen=%d` bytes", len(query), maxLen)
-	}
-
 	expr, err := graphiteql.Parse(query)
 	if err != nil {
 		return nil, fmt.Errorf("cannot parse %q: %w", query, err)
@@ -197,13 +191,13 @@ func newNextSeriesForSearchQuery(ec *evalConfig, sq *storage.SearchQuery, expr g
 			}
 			s.summarize(aggrAvg, ec.startTime, ec.endTime, ec.storageStep, 0)
 			t := timerpool.Get(30 * time.Second)
-			defer timerpool.Put(t)
 			select {
 			case seriesCh <- s:
 			case <-t.C:
 				logger.Errorf("resource leak when processing the %s (full query: %s); please report this error to VictoriaMetrics developers",
 					expr.AppendString(nil), ec.originalQuery)
 			}
+			timerpool.Put(t)
 			return nil
 		})
 		close(seriesCh)

app/vmselect/graphite/eval_test.go

@@ -4070,9 +4070,6 @@ func TestExecExprFailure(t *testing.T) {
 
 	f(`holtWintersConfidenceArea(group(time("foo.baz",15),time("foo.baz",15)))`)
 	f(`holtWintersConfidenceArea()`)
-
-	// too long query
-	f(`sumSeries(` + strings.Repeat("metric.very.long.name.that.takes.space,", 500) + `metric.final)`)
 }
 
 func compareSeries(ss, ssExpected []*series, expr graphiteql.Expr) error {

app/vmselect/graphite/transform.go

@@ -1218,7 +1218,10 @@ func transformDelay(ec *evalConfig, fe *graphiteql.FuncExpr) (nextSeriesFunc, er
 		values := s.Values
 		stepsLocal := steps
 		if stepsLocal < 0 {
-			stepsLocal = min(-stepsLocal, len(values))
+			stepsLocal = -stepsLocal
+			if stepsLocal > len(values) {
+				stepsLocal = len(values)
+			}
 			copy(values, values[stepsLocal:])
 			for i := len(values) - 1; i >= len(values)-stepsLocal; i-- {
 				values[i] = nan
@@ -4660,14 +4663,20 @@ func transformSubstr(ec *evalConfig, fe *graphiteql.FuncExpr) (nextSeriesFunc, e
 		if start > len(splitName) {
 			start = len(splitName)
 		} else if start < 0 {
-			start = max(len(splitName)+start, 0)
+			start = len(splitName) + start
+			if start < 0 {
+				start = 0
+			}
 		}
 		if stop == 0 {
 			stop = len(splitName)
 		} else if stop > len(splitName) {
 			stop = len(splitName)
 		} else if stop < 0 {
-			stop = max(len(splitName)+stop, 0)
+			stop = len(splitName) + stop
+			if stop < 0 {
+				stop = 0
+			}
 		}
 		if stop < start {
 			stop = start

app/vmselect/main.go

@@ -2,7 +2,6 @@ package vmselect
 
 import (
 	"embed"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"net/http"
@@ -11,8 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/VictoriaMetrics/metrics"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/graphite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/prometheus"
@@ -20,7 +17,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/searchutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/stats"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmstorage"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/cgroup"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
@@ -30,6 +26,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timerpool"
+	"github.com/VictoriaMetrics/metrics"
 )
 
 var (
@@ -51,10 +48,13 @@ var (
 var slowQueries = metrics.NewCounter(`vm_slow_queries_total`)
 
 func getDefaultMaxConcurrentRequests() int {
-	// A single request can saturate all the CPU cores, so there is no sense
-	// in allowing higher number of concurrent requests - they will just contend
-	// for unavailable CPU time.
-	n := min(cgroup.AvailableCPUs()*2, 16)
+	n := cgroup.AvailableCPUs() * 2
+	if n > 16 {
+		// A single request can saturate all the CPU cores, so there is no sense
+		// in allowing higher number of concurrent requests - they will just contend
+		// for unavailable CPU time.
+		n = 16
+	}
 	return n
 }
 
@@ -67,7 +67,6 @@ func Init() {
 	prometheus.InitMaxUniqueTimeseries(*maxConcurrentRequests)
 
 	concurrencyLimitCh = make(chan struct{}, *maxConcurrentRequests)
-	initVMUIConfig()
 	initVMAlertProxy()
 }
 
@@ -129,7 +128,10 @@ func RequestHandler(w http.ResponseWriter, r *http.Request) bool {
 	default:
 		// Sleep for a while until giving up. This should resolve short bursts in requests.
 		concurrencyLimitReached.Inc()
-		d := min(searchutil.GetMaxQueryDuration(r), *maxQueueDuration)
+		d := searchutil.GetMaxQueryDuration(r)
+		if d > *maxQueueDuration {
+			d = *maxQueueDuration
+		}
 		t := timerpool.Get(d)
 		select {
 		case concurrencyLimitCh <- struct{}{}:
@@ -260,6 +262,13 @@ func RequestHandler(w http.ResponseWriter, r *http.Request) bool {
 			return true
 		}
 		return true
+	case "/api/v1/config":
+		httpserver.EnableCORS(w, r)
+		if err := prometheus.ConfigHandler(qt, startTime, w, r); err != nil {
+			httpserver.SendPrometheusError(w, r, err)
+			return true
+		}
+		return true
 	case "/api/v1/export":
 		exportRequests.Inc()
 		if err := prometheus.ExportHandler(startTime, w, r); err != nil {
@@ -458,11 +467,6 @@ func handleStaticAndSimpleRequests(w http.ResponseWriter, r *http.Request, path
 		return true
 	}
 	if strings.HasPrefix(path, "/vmui/") {
-		if path == "/vmui/config.json" {
-			w.Header().Set("Content-Type", "application/json")
-			fmt.Fprint(w, vmuiConfig)
-			return true
-		}
 		if strings.HasPrefix(path, "/vmui/static/") {
 			// Allow clients caching static contents for long period of time, since it shouldn't change over time.
 			// Path to static contents (such as js and css) must be changed whenever its contents is changed.
@@ -541,6 +545,13 @@ func handleStaticAndSimpleRequests(w http.ResponseWriter, r *http.Request, path
 		expandWithExprsRequests.Inc()
 		prometheus.ExpandWithExprs(w, r)
 		return true
+	case "/extract-metric-exprs":
+		startTime := time.Now()
+		if err := prometheus.ExtractMetricExprsHandler(startTime, w, r); err != nil {
+			httpserver.Errorf(w, r, "%s", err)
+			return true
+		}
+		return true
 	case "/prettify-query":
 		prettifyQueryRequests.Inc()
 		prometheus.PrettifyQuery(w, r)
@@ -737,40 +748,8 @@ func proxyVMAlertRequests(w http.ResponseWriter, r *http.Request) {
 var (
 	vmalertProxyHost string
 	vmalertProxy     *nethttputil.ReverseProxy
-	vmuiConfig       string
 )
 
-func initVMUIConfig() {
-	var cfg struct {
-		Version string `json:"version"`
-		License struct {
-			Type string `json:"type"`
-		} `json:"license"`
-		VMAlert struct {
-			Enabled bool `json:"enabled"`
-		} `json:"vmalert"`
-	}
-	data, err := vmuiFiles.ReadFile("vmui/config.json")
-	if err != nil {
-		logger.Fatalf("cannot read vmui default config: %s", err)
-	}
-	err = json.Unmarshal(data, &cfg)
-	if err != nil {
-		logger.Fatalf("cannot parse vmui default config: %s", err)
-	}
-	cfg.Version = buildinfo.ShortVersion()
-	if cfg.Version == "" {
-		// buildinfo.ShortVersion() may return empty result for builds without tags
-		cfg.Version = buildinfo.Version
-	}
-	cfg.VMAlert.Enabled = len(*vmalertProxyURL) != 0
-	data, err = json.Marshal(&cfg)
-	if err != nil {
-		logger.Fatalf("cannot create vmui config: %s", err)
-	}
-	vmuiConfig = string(data)
-}
-
 // initVMAlertProxy must be called after flag.Parse(), since it uses command-line flags.
 func initVMAlertProxy() {
 	if len(*vmalertProxyURL) == 0 {

app/vmselect/netstorage/netstorage.go

@@ -63,10 +63,18 @@ type Results struct {
 	packedTimeseries []packedTimeseries
 	sr               *storage.Search
 	tbf              *tmpBlocksFile
+
+	// the result is simulated
+	isSimulated     bool
+	simulatedSeries []*storage.SimulatedSamples
 }
 
 // Len returns the number of results in rss.
 func (rss *Results) Len() int {
+	if rss.isSimulated {
+		return len(rss.simulatedSeries)
+	}
+
 	return len(rss.packedTimeseries)
 }
 
@@ -203,7 +211,10 @@ var defaultMaxWorkersPerQuery = func() int {
 	// for processing an average query, without significant impact on inter-CPU communications.
 	const maxWorkersLimit = 32
 
-	n := min(gomaxprocs, maxWorkersLimit)
+	n := gomaxprocs
+	if n > maxWorkersLimit {
+		n = maxWorkersLimit
+	}
 	return n
 }()
 
@@ -215,6 +226,10 @@ var defaultMaxWorkersPerQuery = func() int {
 //
 // rss becomes unusable after the call to RunParallel.
 func (rss *Results) RunParallel(qt *querytracer.Tracer, f func(rs *Result, workerID uint) error) error {
+	if rss.isSimulated {
+		return rss.runParallelSimulated(qt, f)
+	}
+
 	qt = qt.NewChild("parallel process of fetched data")
 	defer rss.mustClose()
 
@@ -230,6 +245,87 @@ func (rss *Results) RunParallel(qt *querytracer.Tracer, f func(rs *Result, worke
 	return err
 }
 
+func (rss *Results) runParallelSimulated(qt *querytracer.Tracer, f func(rs *Result, workerID uint) error) error {
+	qt = qt.NewChild("parallel process of fetched data")
+
+	cb := f
+	tmpResult := getTmpResult()
+	defer putTmpResult(tmpResult)
+
+	// For simplicity, let's process serially first. Parallelization can be added if needed.
+	// If parallelization is desired, it would mirror the worker pool logic of the original runParallel,
+	// but iterating over rss.simulatedSamples entries.
+	workerID := uint(0)
+	var firstErr error
+	for _, metric := range rss.simulatedSeries {
+		r := &tmpResult.rs
+		r.reset()
+		r.MetricName.CopyFrom(&metric.Name)
+		for i, ts := range metric.Timestamps {
+			if ts >= rss.tr.MinTimestamp && ts <= rss.tr.MaxTimestamp {
+				r.Values = append(r.Values, metric.Value[i])
+				r.Timestamps = append(r.Timestamps, ts)
+			}
+		}
+
+		// Sort timestamps chronologically to match real storage behavior.
+		// Real storage ensures chronological order through:
+		// 1. Block-level sorting by MinTimestamp
+		// 2. Within-block timestamp ordering via encoding.EnsureNonDecreasingSequence()
+		if len(r.Timestamps) > 1 {
+			// Create pairs for sorting
+			type timestampValue struct {
+				timestamp int64
+				value     float64
+			}
+			pairs := make([]timestampValue, len(r.Timestamps))
+			for i := range r.Timestamps {
+				pairs[i] = timestampValue{
+					timestamp: r.Timestamps[i],
+					value:     r.Values[i],
+				}
+			}
+
+			// Sort by timestamp
+			sort.Slice(pairs, func(i, j int) bool {
+				return pairs[i].timestamp < pairs[j].timestamp
+			})
+
+			// Extract back to separate slices
+			for i := range pairs {
+				r.Timestamps[i] = pairs[i].timestamp
+				r.Values[i] = pairs[i].value
+			}
+		}
+
+		// The input from the client is most likely already deduplicated, since it's emitted by
+		// vmselect. However, the client may modify the input instead of using the returned one.
+		dedupInterval := storage.GetDedupInterval()
+		if dedupInterval > 0 && len(r.Timestamps) > 0 {
+			r.Timestamps, r.Values = storage.DeduplicateSamples(r.Timestamps, r.Values, dedupInterval)
+		}
+
+		rowProcessed := len(r.Timestamps)
+
+		if rowProcessed > 0 {
+			err := cb(r, workerID)
+			if err != nil {
+				firstErr = err
+				break
+			}
+		}
+	}
+
+	// Count total samples across all series
+	totalSamples := 0
+	for _, metric := range rss.simulatedSeries {
+		totalSamples += len(metric.Timestamps)
+	}
+	qt.Donef("series=%d, samples=%d", len(rss.simulatedSeries), totalSamples)
+
+	return firstErr
+}
+
 func (rss *Results) runParallel(qt *querytracer.Tracer, f func(rs *Result, workerID uint) error) (int, error) {
 	tswsLen := len(rss.packedTimeseries)
 	if tswsLen == 0 {
@@ -276,7 +372,10 @@ func (rss *Results) runParallel(qt *querytracer.Tracer, f func(rs *Result, worke
 	}
 
 	// Prepare worker channels.
-	workers := min(len(tsws), maxWorkers)
+	workers := len(tsws)
+	if workers > maxWorkers {
+		workers = maxWorkers
+	}
 	itemsPerWorker := (len(tsws) + workers - 1) / workers
 	workChs := make([]chan *timeseriesWork, workers)
 	for i := range workChs {
@@ -491,7 +590,10 @@ func (pts *packedTimeseries) unpackTo(dst []*sortBlock, tbf *tmpBlocksFile, tr s
 	}
 
 	// Prepare worker channels.
-	workers := min(len(upws), gomaxprocs)
+	workers := len(upws)
+	if workers > gomaxprocs {
+		workers = gomaxprocs
+	}
 	if workers < 1 {
 		workers = 1
 	}
@@ -1110,6 +1212,10 @@ func SearchMetricNames(qt *querytracer.Tracer, sq *storage.SearchQuery, deadline
 //
 // Results.RunParallel or Results.Cancel must be called on the returned Results.
 func ProcessSearchQuery(qt *querytracer.Tracer, sq *storage.SearchQuery, deadline searchutil.Deadline) (*Results, error) {
+	if len(sq.SimulatedSeries) > 0 {
+		return processSearchSimulated(qt, sq, deadline)
+	}
+
 	qt = qt.NewChild("fetch matching series: %s", sq)
 	defer qt.Done()
 	if deadline.Exceeded() {
@@ -1144,7 +1250,10 @@ func ProcessSearchQuery(qt *querytracer.Tracer, sq *storage.SearchQuery, deadlin
 	// metricNamesBuf is used for holding all the loaded unique metric names at m and orderedMetricNames.
 	// It should reduce pressure on Go GC by reducing the number of string allocations
 	// when constructing metricName string from byte slice.
-	metricNamesBufCap := min(maxSeriesCount*100, maxFastAllocBlockSize)
+	metricNamesBufCap := maxSeriesCount * 100
+	if metricNamesBufCap > maxFastAllocBlockSize {
+		metricNamesBufCap = maxFastAllocBlockSize
+	}
 	metricNamesBuf := make([]byte, 0, metricNamesBufCap)
 
 	// brssPool is used for holding all the blockRefs objects across all the loaded time series.
@@ -1153,7 +1262,10 @@ func ProcessSearchQuery(qt *querytracer.Tracer, sq *storage.SearchQuery, deadlin
 
 	// brsPool is used for holding the most of blockRefs.brs slices across all the loaded time series.
 	// It should reduce pressure on Go GC by reducing the number of allocations for blockRefs.brs slices.
-	brsPoolCap := min(uintptr(maxSeriesCount), maxFastAllocBlockSize/unsafe.Sizeof(blockRef{}))
+	brsPoolCap := uintptr(maxSeriesCount)
+	if brsPoolCap > maxFastAllocBlockSize/unsafe.Sizeof(blockRef{}) {
+		brsPoolCap = maxFastAllocBlockSize / unsafe.Sizeof(blockRef{})
+	}
 	brsPool := make([]blockRef, 0, brsPoolCap)
 
 	// m maps from metricName to the index of blockRefs inside brssPool
@@ -1276,6 +1388,41 @@ func ProcessSearchQuery(qt *querytracer.Tracer, sq *storage.SearchQuery, deadlin
 	return &rss, nil
 }
 
+func processSearchSimulated(qt *querytracer.Tracer, sq *storage.SearchQuery, deadline searchutil.Deadline) (*Results, error) {
+	qt = qt.NewChild("fetch matching series (simulated): %s", sq)
+	defer qt.Done()
+	if deadline.Exceeded() {
+		return nil, fmt.Errorf("timeout exceeded before starting the query processing: %s", deadline.String())
+	}
+
+	tr := storage.TimeRange{
+		MinTimestamp: sq.MinTimestamp,
+		MaxTimestamp: sq.MaxTimestamp,
+	}
+
+	// Process simulated samples.
+	matchedSamples, err := storage.MatchSimulatedSamples(sq.SimulatedSeries, sq.TagFilterss)
+	if err != nil {
+		return nil, fmt.Errorf("cannot match simulated samples: %w", err)
+	}
+
+	// Create a result set similar to ProcessSearchQuery
+	rss := &Results{
+		tr:              tr,
+		deadline:        deadline,
+		isSimulated:     true,
+		simulatedSeries: matchedSamples,
+	}
+
+	if len(matchedSamples) == 0 {
+		qt.Printf("no matching series found")
+	} else {
+		qt.Printf("found %d series", len(rss.simulatedSeries))
+	}
+
+	return rss, nil
+}
+
 type blockRef struct {
 	partRef storage.PartRef
 	addr    tmpBlockAddr

app/vmselect/prometheus/config_response.qtpl

@@ -0,0 +1,20 @@
+{% import (
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
+) %}
+
+{% stripspace %}
+
+ConfigResponse generates response for /api/v1/config .
+{% func ConfigResponse(config *ConfigData, qt *querytracer.Tracer) %}
+{
+	"status":"success",
+	"data":{
+		"minStalenessInterval": {%q= config.MinStalenessInterval %},
+		"maxStalenessInterval": {%q= config.MaxStalenessInterval %}
+	}
+	{% code	qt.Done() %}
+	{%= dumpQueryTrace(qt) %}
+}
+{% endfunc %}
+
+{% endstripspace %} 

app/vmselect/prometheus/config_response.qtpl.go

@@ -0,0 +1,73 @@
+// Code generated by qtc from "config_response.qtpl". DO NOT EDIT.
+// See https://github.com/valyala/quicktemplate for details.
+
+//line app/vmselect/prometheus/config_response.qtpl:1
+package prometheus
+
+//line app/vmselect/prometheus/config_response.qtpl:1
+import (
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
+)
+
+// ConfigResponse generates response for /api/v1/config .
+
+//line app/vmselect/prometheus/config_response.qtpl:8
+import (
+	qtio422016 "io"
+
+	qt422016 "github.com/valyala/quicktemplate"
+)
+
+//line app/vmselect/prometheus/config_response.qtpl:8
+var (
+	_ = qtio422016.Copy
+	_ = qt422016.AcquireByteBuffer
+)
+
+//line app/vmselect/prometheus/config_response.qtpl:8
+func StreamConfigResponse(qw422016 *qt422016.Writer, config *ConfigData, qt *querytracer.Tracer) {
+//line app/vmselect/prometheus/config_response.qtpl:8
+	qw422016.N().S(`{"status":"success","data":{"minStalenessInterval":`)
+//line app/vmselect/prometheus/config_response.qtpl:12
+	qw422016.N().Q(config.MinStalenessInterval)
+//line app/vmselect/prometheus/config_response.qtpl:12
+	qw422016.N().S(`,"maxStalenessInterval":`)
+//line app/vmselect/prometheus/config_response.qtpl:13
+	qw422016.N().Q(config.MaxStalenessInterval)
+//line app/vmselect/prometheus/config_response.qtpl:13
+	qw422016.N().S(`}`)
+//line app/vmselect/prometheus/config_response.qtpl:15
+	qt.Done()
+
+//line app/vmselect/prometheus/config_response.qtpl:16
+	streamdumpQueryTrace(qw422016, qt)
+//line app/vmselect/prometheus/config_response.qtpl:16
+	qw422016.N().S(`}`)
+//line app/vmselect/prometheus/config_response.qtpl:18
+}
+
+//line app/vmselect/prometheus/config_response.qtpl:18
+func WriteConfigResponse(qq422016 qtio422016.Writer, config *ConfigData, qt *querytracer.Tracer) {
+//line app/vmselect/prometheus/config_response.qtpl:18
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line app/vmselect/prometheus/config_response.qtpl:18
+	StreamConfigResponse(qw422016, config, qt)
+//line app/vmselect/prometheus/config_response.qtpl:18
+	qt422016.ReleaseWriter(qw422016)
+//line app/vmselect/prometheus/config_response.qtpl:18
+}
+
+//line app/vmselect/prometheus/config_response.qtpl:18
+func ConfigResponse(config *ConfigData, qt *querytracer.Tracer) string {
+//line app/vmselect/prometheus/config_response.qtpl:18
+	qb422016 := qt422016.AcquireByteBuffer()
+//line app/vmselect/prometheus/config_response.qtpl:18
+	WriteConfigResponse(qb422016, config, qt)
+//line app/vmselect/prometheus/config_response.qtpl:18
+	qs422016 := string(qb422016.B)
+//line app/vmselect/prometheus/config_response.qtpl:18
+	qt422016.ReleaseByteBuffer(qb422016)
+//line app/vmselect/prometheus/config_response.qtpl:18
+	return qs422016
+//line app/vmselect/prometheus/config_response.qtpl:18
+}

app/vmselect/prometheus/extract_metric_exprs_response.qtpl

@@ -0,0 +1,18 @@
+{% stripspace %}
+
+ExtractMetricExprsResponse generates response for /extract-metric-exprs .
+{% func ExtractMetricExprsResponse(metrics []string) %}
+{
+	"status":"success",
+	"data":[
+		{% if len(metrics) > 0 %}
+			{%q= metrics[0] %}
+			{% for i := 1; i < len(metrics); i++ %}
+				,{%q= metrics[i] %}
+			{% endfor %}
+		{% endif %}
+	]
+}
+{% endfunc %}
+
+{% endstripspace %} 

app/vmselect/prometheus/extract_metric_exprs_response.qtpl.go

@@ -0,0 +1,69 @@
+// Code generated by qtc from "extract_metric_exprs_response.qtpl". DO NOT EDIT.
+// See https://github.com/valyala/quicktemplate for details.
+
+// ExtractMetricExprsResponse generates response for /extract-metric-exprs .
+
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:4
+package prometheus
+
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:4
+import (
+	qtio422016 "io"
+
+	qt422016 "github.com/valyala/quicktemplate"
+)
+
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:4
+var (
+	_ = qtio422016.Copy
+	_ = qt422016.AcquireByteBuffer
+)
+
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:4
+func StreamExtractMetricExprsResponse(qw422016 *qt422016.Writer, metrics []string) {
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:4
+	qw422016.N().S(`{"status":"success","data":[`)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:8
+	if len(metrics) > 0 {
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:9
+		qw422016.N().Q(metrics[0])
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:10
+		for i := 1; i < len(metrics); i++ {
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:10
+			qw422016.N().S(`,`)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:11
+			qw422016.N().Q(metrics[i])
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:12
+		}
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:13
+	}
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:13
+	qw422016.N().S(`]}`)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+}
+
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+func WriteExtractMetricExprsResponse(qq422016 qtio422016.Writer, metrics []string) {
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	qw422016 := qt422016.AcquireWriter(qq422016)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	StreamExtractMetricExprsResponse(qw422016, metrics)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	qt422016.ReleaseWriter(qw422016)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+}
+
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+func ExtractMetricExprsResponse(metrics []string) string {
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	qb422016 := qt422016.AcquireByteBuffer()
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	WriteExtractMetricExprsResponse(qb422016, metrics)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	qs422016 := string(qb422016.B)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	qt422016.ReleaseByteBuffer(qb422016)
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+	return qs422016
+//line app/vmselect/prometheus/extract_metric_exprs_response.qtpl:16
+}

app/vmselect/prometheus/prometheus.go

@@ -1,8 +1,10 @@
 package prometheus
 
 import (
+	"encoding/json"
 	"flag"
 	"fmt"
+	"io"
 	"math"
 	"net/http"
 	"runtime"
@@ -20,10 +22,12 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/promql"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/querystats"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/searchutil"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/auth"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bufferedwriter"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/bytesutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/encoding"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httpserver"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
@@ -37,9 +41,13 @@ var (
 	latencyOffset = flag.Duration("search.latencyOffset", time.Second*30, "The time when data points become visible in query results after the collection. "+
 		"It can be overridden on per-query basis via latency_offset arg. "+
 		"Too small value can result in incomplete last points for query results")
+	maxQueryLen = flagutil.NewBytes("search.maxQueryLen", 16*1024, "The maximum search query length in bytes")
 	maxLookback = flag.Duration("search.maxLookback", 0, "Synonym to -query.lookback-delta from Prometheus. "+
 		"The value is dynamically detected from interval between time series datapoints if not set. It can be overridden on per-query basis via max_lookback arg. "+
 		"See also '-search.maxStalenessInterval' flag, which has the same meaning due to historical reasons")
+	minStalenessInterval = flag.Duration("search.minStalenessInterval", 0, "The minimum interval for staleness calculations. "+
+		"This flag could be useful for removing gaps on graphs generated from time series with irregular intervals between samples. "+
+		"See also '-search.maxStalenessInterval'")
 	maxStalenessInterval = flag.Duration("search.maxStalenessInterval", 0, "The maximum interval for staleness calculations. "+
 		"By default, it is automatically calculated from the median interval between samples. This flag could be useful for tuning "+
 		"Prometheus data model closer to Influx-style data model. See https://prometheus.io/docs/prometheus/latest/querying/basics/#staleness for details. "+
@@ -114,7 +122,7 @@ func FederateHandler(startTime time.Time, w http.ResponseWriter, r *http.Request
 	if err != nil {
 		return err
 	}
-	lookbackDelta, err := getMaxLookback(r)
+	lookbackDelta, err := getMaxLookback(r, *maxStalenessInterval)
 	if err != nil {
 		return err
 	}
@@ -609,6 +617,55 @@ func TSDBStatusHandler(qt *querytracer.Tracer, startTime time.Time, w http.Respo
 
 var tsdbStatusDuration = metrics.NewSummary(`vm_request_duration_seconds{path="/api/v1/status/tsdb"}`)
 
+// ConfigData holds the current configuration values for search-related flags
+type ConfigData struct {
+	MinStalenessInterval string
+	MaxStalenessInterval string
+}
+
+// ConfigHandler processes /api/v1/config request.
+//
+// It returns the current configuration for search-related flags.
+func ConfigHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseWriter, _ *http.Request) error {
+	config := &ConfigData{
+		MinStalenessInterval: (*minStalenessInterval).String(),
+		MaxStalenessInterval: (*maxStalenessInterval).String(),
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	bw := bufferedwriter.Get(w)
+	defer bufferedwriter.Put(bw)
+	WriteConfigResponse(bw, config, qt)
+	if err := bw.Flush(); err != nil {
+		return fmt.Errorf("cannot send config response to remote client: %w", err)
+	}
+	return nil
+}
+
+// ExtractMetricExprsHandler processes /extract-metric-exprs request.
+//
+// It extracts metric expressions from a given PromQL query.
+func ExtractMetricExprsHandler(startTime time.Time, w http.ResponseWriter, r *http.Request) error {
+	query := r.FormValue("query")
+	if len(query) == 0 {
+		return fmt.Errorf("missing `query` arg")
+	}
+
+	metrics, err := promql.ExtractMetricsFromQuery(query)
+	if err != nil {
+		return fmt.Errorf("cannot extract metrics from query: %w", err)
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	bw := bufferedwriter.Get(w)
+	defer bufferedwriter.Put(bw)
+	WriteExtractMetricExprsResponse(bw, metrics)
+	if err := bw.Flush(); err != nil {
+		return fmt.Errorf("cannot send extract metric exprs response to remote client: %w", err)
+	}
+	return nil
+}
+
 // LabelsHandler processes /api/v1/labels request.
 //
 // See https://prometheus.io/docs/prometheus/latest/querying/api/#getting-label-names
@@ -710,7 +767,8 @@ func QueryHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseWr
 
 	ct := startTime.UnixNano() / 1e6
 	deadline := searchutil.GetDeadlineForQuery(r, startTime)
-	mayCache := !httputil.GetBool(r, "nocache")
+	isDebug := httputil.GetBool(r, "debug")
+	noCache := httputil.GetBool(r, "nocache") || isDebug
 	query := r.FormValue("query")
 	if len(query) == 0 {
 		return fmt.Errorf("missing `query` arg")
@@ -719,7 +777,7 @@ func QueryHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseWr
 	if err != nil {
 		return err
 	}
-	lookbackDelta, err := getMaxLookback(r)
+	lookbackDelta, err := getMaxLookback(r, *maxStalenessInterval)
 	if err != nil {
 		return err
 	}
@@ -731,9 +789,8 @@ func QueryHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseWr
 		step = defaultStep
 	}
 
-	maxLen := searchutil.GetMaxQueryLen()
-	if len(query) > maxLen {
-		return fmt.Errorf("too long query; got %d bytes; mustn't exceed `-search.maxQueryLen=%d` bytes", len(query), maxLen)
+	if len(query) > maxQueryLen.IntN() {
+		return fmt.Errorf("too long query; got %d bytes; mustn't exceed `-search.maxQueryLen=%d` bytes", len(query), maxQueryLen.N)
 	}
 	etfs, err := searchutil.GetExtraTagFilters(r)
 	if err != nil {
@@ -806,23 +863,14 @@ func QueryHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseWr
 	} else {
 		queryOffset = 0
 	}
-	ec := &promql.EvalConfig{
-		Start:               start,
-		End:                 start,
-		Step:                step,
-		MaxPointsPerSeries:  *maxPointsPerTimeseries,
-		MaxSeries:           GetMaxUniqueTimeSeries(),
-		QuotedRemoteAddr:    httpserver.GetQuotedRemoteAddr(r),
-		Deadline:            deadline,
-		MayCache:            mayCache,
-		LookbackDelta:       lookbackDelta,
-		RoundDigits:         getRoundDigits(r),
-		EnforcedTagFilterss: etfs,
-		CacheTagFilters:     etfs,
-		GetRequestURI: func() string {
-			return httpserver.GetRequestURI(r)
-		},
+	ec := newEvalConfig(r, start, start, step, deadline, noCache, lookbackDelta, isDebug, etfs)
+	if isDebug {
+		if err := populateSimulatedData(r, nil, ec); err != nil {
+			_ = r.Body.Close()
+			return fmt.Errorf("cannot read simulated samples: %w", err)
+		}
 	}
+	_ = r.Body.Close()
 	qs := promql.NewQueryStats(query, nil, ec)
 	ec.QueryStats = qs
 
@@ -896,16 +944,16 @@ func QueryRangeHandler(qt *querytracer.Tracer, startTime time.Time, w http.Respo
 func queryRangeHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseWriter, query string,
 	start, end, step int64, r *http.Request, ct int64, etfs [][]storage.TagFilter) error {
 	deadline := searchutil.GetDeadlineForQuery(r, startTime)
-	mayCache := !httputil.GetBool(r, "nocache")
-	lookbackDelta, err := getMaxLookback(r)
+	isDebug := httputil.GetBool(r, "debug")
+	noCache := httputil.GetBool(r, "nocache") || isDebug
+	lookbackDelta, err := getMaxLookback(r, *maxStalenessInterval)
 	if err != nil {
 		return err
 	}
 
 	// Validate input args.
-	maxLen := searchutil.GetMaxQueryLen()
-	if len(query) > maxLen {
-		return fmt.Errorf("too long query; got %d bytes; mustn't exceed `-search.maxQueryLen=%d` bytes", len(query), maxLen)
+	if len(query) > maxQueryLen.IntN() {
+		return fmt.Errorf("too long query; got %d bytes; mustn't exceed `-search.maxQueryLen=%d` bytes", len(query), maxQueryLen.N)
 	}
 	if start > end {
 		end = start + defaultStep
@@ -913,27 +961,19 @@ func queryRangeHandler(qt *querytracer.Tracer, startTime time.Time, w http.Respo
 	if err := promql.ValidateMaxPointsPerSeries(start, end, step, *maxPointsPerTimeseries); err != nil {
 		return fmt.Errorf("%w; (see -search.maxPointsPerTimeseries command-line flag)", err)
 	}
-	if mayCache {
+	if !noCache {
 		start, end = promql.AdjustStartEnd(start, end, step)
 	}
 
-	ec := &promql.EvalConfig{
-		Start:               start,
-		End:                 end,
-		Step:                step,
-		MaxPointsPerSeries:  *maxPointsPerTimeseries,
-		MaxSeries:           GetMaxUniqueTimeSeries(),
-		QuotedRemoteAddr:    httpserver.GetQuotedRemoteAddr(r),
-		Deadline:            deadline,
-		MayCache:            mayCache,
-		LookbackDelta:       lookbackDelta,
-		RoundDigits:         getRoundDigits(r),
-		EnforcedTagFilterss: etfs,
-		CacheTagFilters:     etfs,
-		GetRequestURI: func() string {
-			return httpserver.GetRequestURI(r)
-		},
+	ec := newEvalConfig(r, start, end, step, deadline, noCache, lookbackDelta, isDebug, etfs)
+	if isDebug {
+		if err := populateSimulatedData(r, nil, ec); err != nil {
+			_ = r.Body.Close()
+			return fmt.Errorf("cannot read simulated samples: %w", err)
+		}
 	}
+	_ = r.Body.Close()
+
 	qs := promql.NewQueryStats(query, nil, ec)
 	ec.QueryStats = qs
 
@@ -969,6 +1009,93 @@ func queryRangeHandler(qt *querytracer.Tracer, startTime time.Time, w http.Respo
 	return nil
 }
 
+func newEvalConfig(r *http.Request, start, end, step int64, deadline searchutil.Deadline, noCache bool, lookbackDelta int64, isDebug bool, etfs [][]storage.TagFilter) *promql.EvalConfig {
+	ec := &promql.EvalConfig{
+		Start:                start,
+		End:                  end,
+		Step:                 step,
+		MaxPointsPerSeries:   *maxPointsPerTimeseries,
+		MaxSeries:            GetMaxUniqueTimeSeries(),
+		MinStalenessInterval: *minStalenessInterval,
+		QuotedRemoteAddr:     httpserver.GetQuotedRemoteAddr(r),
+		Deadline:             deadline,
+		MayCache:             !noCache,
+		LookbackDelta:        lookbackDelta,
+		RoundDigits:          getRoundDigits(r),
+		EnforcedTagFilterss:  etfs,
+		CacheTagFilters:      etfs,
+		GetRequestURI: func() string {
+			return httpserver.GetRequestURI(r)
+		},
+	}
+
+	return ec
+}
+
+func populateSimulatedData(r *http.Request, at *auth.Token, evalConfig *promql.EvalConfig) error {
+	type jsonExportBlockInput struct {
+		Metric     map[string]string `json:"metric"`
+		Values     []float64         `json:"values"`
+		Timestamps []int64           `json:"timestamps"`
+	}
+
+	// --- Read and Parse Input Samples from r.Body ---
+	var simulatedSeries []*storage.SimulatedSamples
+	decoder := json.NewDecoder(r.Body)
+	lineNum := 0
+	for {
+		var jeb jsonExportBlockInput
+		if err := decoder.Decode(&jeb); err == io.EOF {
+			break
+		} else if err != nil {
+			return fmt.Errorf("error decoding input JSON on line %d: %w", lineNum, err)
+		}
+
+		// Validate that values and timestamps arrays have the same length
+		if len(jeb.Values) != len(jeb.Timestamps) {
+			return fmt.Errorf("mismatched values and timestamps arrays length in debug data on line %d: values=%d, timestamps=%d", lineNum, len(jeb.Values), len(jeb.Timestamps))
+		}
+
+		var mn = storage.GetMetricName()
+		defer storage.PutMetricName(mn)
+		for k, v := range jeb.Metric {
+			mn.AddTag(k, v)
+		}
+
+		ss := &storage.SimulatedSamples{
+			Value:      jeb.Values,
+			Timestamps: jeb.Timestamps,
+		}
+		ss.Name.CopyFrom(mn)
+		simulatedSeries = append(simulatedSeries, ss)
+		lineNum++
+	}
+
+	// It doesn't make sense to debug with empty samples
+	if len(simulatedSeries) == 0 {
+		return fmt.Errorf("no simulated samples found")
+	}
+
+	minStalenessInterval, err := httputil.GetDurationRaw(r, "min_staleness_interval", evalConfig.MinStalenessInterval)
+	if err != nil {
+		return fmt.Errorf("cannot parse `min_staleness_interval` arg: %w", err)
+	}
+
+	maxStalenessInterval, err := httputil.GetDurationRaw(r, "max_staleness_interval", *maxStalenessInterval)
+	if err != nil {
+		return fmt.Errorf("cannot parse `max_staleness_interval` arg: %w", err)
+	}
+
+	evalConfig.SimulatedSamples = simulatedSeries
+	evalConfig.MinStalenessInterval = minStalenessInterval
+	evalConfig.LookbackDelta, err = getMaxLookback(r, maxStalenessInterval)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func removeEmptyValuesAndTimeseries(tss []netstorage.Result) []netstorage.Result {
 	dst := tss[:0]
 	for i := range tss {
@@ -1044,7 +1171,7 @@ func adjustLastPoints(tss []netstorage.Result, start, end int64) []netstorage.Re
 	return tss
 }
 
-func getMaxLookback(r *http.Request) (int64, error) {
+func getMaxLookback(r *http.Request, maxStalenessInterval time.Duration) (int64, error) {
 	d := maxLookback.Milliseconds()
 	if d == 0 {
 		d = maxStalenessInterval.Milliseconds()
@@ -1089,9 +1216,12 @@ func getRoundDigits(r *http.Request) int {
 }
 
 func getLatencyOffsetMilliseconds(r *http.Request) (int64, error) {
-	// Zero latency offset may be useful for some use cases.
-	// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2061#issuecomment-1299109836
-	d := max(latencyOffset.Milliseconds(), 0)
+	d := latencyOffset.Milliseconds()
+	if d < 0 {
+		// Zero latency offset may be useful for some use cases.
+		// See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2061#issuecomment-1299109836
+		d = 0
+	}
 	return httputil.GetDuration(r, "latency_offset", d)
 }
 

app/vmselect/promql/aggr.go

@@ -161,8 +161,11 @@ func aggrFuncAny(afa *aggrFuncArg) ([]*timeseries, error) {
 	afe := func(tss []*timeseries, _ *metricsql.ModifierExpr) []*timeseries {
 		return tss[:1]
 	}
-	// Only a single time series per group must be returned
-	limit := min(afa.ae.Limit, 1)
+	limit := afa.ae.Limit
+	if limit > 1 {
+		// Only a single time series per group must be returned
+		limit = 1
+	}
 	return aggrFuncExt(afe, tss, &afa.ae.Modifier, limit, true)
 }
 

app/vmselect/promql/eval.go

@@ -134,6 +134,10 @@ type EvalConfig struct {
 	// LookbackDelta is analog to `-query.lookback-delta` from Prometheus.
 	LookbackDelta int64
 
+	// MaxStalenessInterval corresponds to -search.maxStalenessInterval,
+	// but customized per query request.
+	MinStalenessInterval time.Duration
+
 	// How many decimal digits after the point to leave in response.
 	RoundDigits int
 
@@ -158,6 +162,9 @@ type EvalConfig struct {
 
 	timestamps     []int64
 	timestampsOnce sync.Once
+
+	// Simulated samples
+	SimulatedSamples []*storage.SimulatedSamples
 }
 
 // copyEvalConfig returns src copy.
@@ -176,6 +183,8 @@ func copyEvalConfig(src *EvalConfig) *EvalConfig {
 	ec.CacheTagFilters = src.CacheTagFilters
 	ec.GetRequestURI = src.GetRequestURI
 	ec.QueryStats = src.QueryStats
+	ec.MinStalenessInterval = src.MinStalenessInterval
+	ec.SimulatedSamples = src.SimulatedSamples
 
 	// do not copy src.timestamps - they must be generated again.
 	return &ec
@@ -929,7 +938,7 @@ func evalRollupFuncWithSubquery(qt *querytracer.Tracer, ec *EvalConfig, funcName
 	}
 
 	ecSQ := copyEvalConfig(ec)
-	ecSQ.Start -= window + step + maxSilenceInterval()
+	ecSQ.Start -= window + step + maxSilenceInterval(ec.MinStalenessInterval)
 	ecSQ.End += step
 	ecSQ.Step = step
 	ecSQ.MaxPointsPerSeries = *maxPointsSubqueryPerTimeseries
@@ -946,7 +955,7 @@ func evalRollupFuncWithSubquery(qt *querytracer.Tracer, ec *EvalConfig, funcName
 		return nil, nil
 	}
 	sharedTimestamps := getTimestamps(ec.Start, ec.End, ec.Step, ec.MaxPointsPerSeries)
-	preFunc, rcs, err := getRollupConfigs(funcName, rf, expr, ec.Start, ec.End, ec.Step, ec.MaxPointsPerSeries, window, ec.LookbackDelta, sharedTimestamps)
+	preFunc, rcs, err := getRollupConfigs(funcName, rf, expr, ec.Start, ec.End, ec.Step, ec.MaxPointsPerSeries, window, ec.LookbackDelta, sharedTimestamps, ec.MinStalenessInterval)
 	if err != nil {
 		return nil, err
 	}
@@ -1002,7 +1011,10 @@ func getKeepMetricNames(expr metricsql.Expr) bool {
 }
 
 func doParallel(tss []*timeseries, f func(ts *timeseries, values []float64, timestamps []int64, workerID uint) ([]float64, []int64)) {
-	workers := min(netstorage.MaxWorkers(), len(tss))
+	workers := netstorage.MaxWorkers()
+	if workers > len(tss) {
+		workers = len(tss)
+	}
 	seriesPerWorker := (len(tss) + workers - 1) / workers
 	workChs := make([]chan *timeseries, workers)
 	for i := range workChs {
@@ -1076,7 +1088,10 @@ func evalInstantRollup(qt *querytracer.Tracer, ec *EvalConfig, funcName string,
 		return evalRollupFuncNoCache(qt, ecCopy, funcName, rf, expr, me, iafc, window, pointsPerSeries)
 	}
 	tooBigOffset := func(offset int64) bool {
-		maxOffset := min(window/2, 1800*1000)
+		maxOffset := window / 2
+		if maxOffset > 1800*1000 {
+			maxOffset = 1800 * 1000
+		}
 		return offset >= maxOffset
 	}
 	deleteCachedSeries := func(qt *querytracer.Tracer) {
@@ -1150,23 +1165,15 @@ func evalInstantRollup(qt *querytracer.Tracer, ec *EvalConfig, funcName string,
 		}
 		qt.Printf("optimized calculation for instant rollup avg_over_time(m[d]) as (sum_over_time(m[d]) / count_over_time(m[d]))")
 		fe := expr.(*metricsql.FuncExpr)
-		// copy RollupExpr to drop possible offset,
-		// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9762
-		newArg := copyRollupExpr(fe.Args[0].(*metricsql.RollupExpr))
-		newArg.Offset = nil
+		feSum := *fe
+		feSum.Name = "sum_over_time"
+		feCount := *fe
+		feCount.Name = "count_over_time"
 		be := &metricsql.BinaryOpExpr{
 			Op:              "/",
 			KeepMetricNames: fe.KeepMetricNames,
-			Left: &metricsql.FuncExpr{
-				Name:            "sum_over_time",
-				Args:            []metricsql.Expr{newArg},
-				KeepMetricNames: fe.KeepMetricNames,
-			},
-			Right: &metricsql.FuncExpr{
-				Name:            "count_over_time",
-				Args:            []metricsql.Expr{newArg},
-				KeepMetricNames: fe.KeepMetricNames,
-			},
+			Left:            &feSum,
+			Right:           &feCount,
 		}
 		return evalExpr(qt, ec, be)
 	case "rate":
@@ -1180,12 +1187,8 @@ func evalInstantRollup(qt *querytracer.Tracer, ec *EvalConfig, funcName string,
 			fe := afe.Args[0].(*metricsql.FuncExpr)
 			feIncrease := *fe
 			feIncrease.Name = "increase"
-			// copy RollupExpr to drop possible offset,
-			// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9762
-			newArg := copyRollupExpr(fe.Args[0].(*metricsql.RollupExpr))
-			newArg.Offset = nil
-			feIncrease.Args = []metricsql.Expr{newArg}
-			d := newArg.Window.Duration(ec.Step)
+			re := fe.Args[0].(*metricsql.RollupExpr)
+			d := re.Window.Duration(ec.Step)
 			if d == 0 {
 				d = ec.Step
 			}
@@ -1205,12 +1208,8 @@ func evalInstantRollup(qt *querytracer.Tracer, ec *EvalConfig, funcName string,
 		fe := expr.(*metricsql.FuncExpr)
 		feIncrease := *fe
 		feIncrease.Name = "increase"
-		// copy RollupExpr to drop possible offset,
-		// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9762
-		newArg := copyRollupExpr(fe.Args[0].(*metricsql.RollupExpr))
-		newArg.Offset = nil
-		feIncrease.Args = []metricsql.Expr{newArg}
-		d := newArg.Window.Duration(ec.Step)
+		re := fe.Args[0].(*metricsql.RollupExpr)
+		d := re.Window.Duration(ec.Step)
 		if d == 0 {
 			d = ec.Step
 		}
@@ -1694,7 +1693,7 @@ func evalRollupFuncNoCache(qt *querytracer.Tracer, ec *EvalConfig, funcName stri
 	}
 	// Obtain rollup configs before fetching data from db, so type errors could be caught earlier.
 	sharedTimestamps := getTimestamps(ec.Start, ec.End, ec.Step, ec.MaxPointsPerSeries)
-	preFunc, rcs, err := getRollupConfigs(funcName, rf, expr, ec.Start, ec.End, ec.Step, ec.MaxPointsPerSeries, window, ec.LookbackDelta, sharedTimestamps)
+	preFunc, rcs, err := getRollupConfigs(funcName, rf, expr, ec.Start, ec.End, ec.Step, ec.MaxPointsPerSeries, window, ec.LookbackDelta, sharedTimestamps, ec.MinStalenessInterval)
 	if err != nil {
 		return nil, err
 	}
@@ -1704,7 +1703,7 @@ func evalRollupFuncNoCache(qt *querytracer.Tracer, ec *EvalConfig, funcName stri
 	tfss = searchutil.JoinTagFilterss(tfss, ec.EnforcedTagFilterss)
 	minTimestamp := ec.Start
 	if needSilenceIntervalForRollupFunc[funcName] {
-		minTimestamp -= maxSilenceInterval()
+		minTimestamp -= maxSilenceInterval(ec.MinStalenessInterval)
 	}
 	if window > ec.Step {
 		minTimestamp -= window
@@ -1712,6 +1711,8 @@ func evalRollupFuncNoCache(qt *querytracer.Tracer, ec *EvalConfig, funcName stri
 		minTimestamp -= ec.Step
 	}
 	sq := storage.NewSearchQuery(minTimestamp, ec.End, tfss, ec.MaxSeries)
+	sq.SimulatedSeries = ec.SimulatedSamples
+
 	rss, err := netstorage.ProcessSearchQuery(qt, sq, ec.Deadline)
 	if err != nil {
 		return nil, err
@@ -1797,7 +1798,7 @@ func getRollupMemoryLimiter() *memoryLimiter {
 	return &rollupMemoryLimiter
 }
 
-func maxSilenceInterval() int64 {
+func maxSilenceInterval(minStalenessInterval time.Duration) int64 {
 	d := minStalenessInterval.Milliseconds()
 	if d <= 0 {
 		d = 5 * 60 * 1000
@@ -2015,23 +2016,3 @@ func dropStaleNaNs(funcName string, values []float64, timestamps []int64) ([]flo
 	}
 	return dstValues, dstTimestamps
 }
-
-func copyRollupExpr(re *metricsql.RollupExpr) *metricsql.RollupExpr {
-	var newRe metricsql.RollupExpr
-	newRe.Expr = re.Expr
-	newRe.InheritStep = re.InheritStep
-	newRe.At = re.At
-	if re.Window != nil {
-		newRe.Window = &metricsql.DurationExpr{}
-		*newRe.Window = *re.Window
-	}
-	if re.Offset != nil {
-		newRe.Offset = &metricsql.DurationExpr{}
-		*newRe.Offset = *re.Offset
-	}
-	if re.Step != nil {
-		newRe.Step = &metricsql.DurationExpr{}
-		*newRe.Step = *re.Step
-	}
-	return &newRe
-}

app/vmselect/promql/exec.go

@@ -61,12 +61,15 @@ func Exec(qt *querytracer.Tracer, ec *EvalConfig, q string, isFirstPointOnly boo
 		}
 	}
 
+	var rv []*timeseries
+
 	qid := activeQueriesV.Add(ec, q)
-	rv, err := evalExpr(qt, ec, e)
+	rv, err = evalExpr(qt, ec, e)
 	activeQueriesV.Remove(qid)
 	if err != nil {
 		return nil, err
 	}
+
 	if isFirstPointOnly {
 		// Remove all the points except the first one from every time series.
 		for _, ts := range rv {
@@ -325,3 +328,23 @@ func escapeDots(s string) string {
 	}
 	return string(result)
 }
+
+// ExtractMetricsFromQuery visits all the expressions in query and returns all the metrics found in the query.
+func ExtractMetricsFromQuery(query string) ([]string, error) {
+	expr, err := metricsql.Parse(query)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing query: %w", err)
+	}
+
+	var metrics []string
+	metricsql.VisitAll(expr, func(e metricsql.Expr) {
+		if me, ok := e.(*metricsql.MetricExpr); ok {
+			metricStr := string(me.AppendString(nil))
+			if metricStr != "" {
+				metrics = append(metrics, metricStr)
+			}
+		}
+	})
+
+	return metrics, nil
+}

app/vmselect/promql/exec_debug_test.go

@@ -0,0 +1,313 @@
+package promql
+
+import (
+	"math"
+	"slices"
+	"testing"
+	"time"
+
+	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
+	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/searchutil"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+)
+
+func TestSimulatedExec(t *testing.T) {
+	accountID := uint32(123)
+	projectID := uint32(567)
+	start := int64(1000e3)
+	end := int64(2000e3)
+	step := int64(200e3)
+
+	// Base EvalConfig that will be copied for each test
+	baseEC := EvalConfig{
+		Start:              start,
+		End:                end,
+		Step:               step,
+		MaxPointsPerSeries: 1e4,
+		MaxSeries:          1000,
+		Deadline:           searchutil.NewDeadline(time.Now(), time.Hour, ""),
+		RoundDigits:        100,
+		MayCache:           false,
+	}
+
+	t.Run(`simple_metric_exact_match`, func(t *testing.T) {
+		t.Skip()
+		ec := copyEvalConfig(&baseEC)
+		mn := newMetric(accountID, projectID,
+			"__name__", "test_metric",
+			"a", "b",
+		)
+
+		ec.SimulatedSamples = []*storage.SimulatedSamples{mn.build()}
+
+		q := `test_metric{a="b"}`
+		result, err := Exec(nil, ec, q, false)
+		if err != nil {
+			t.Fatalf(`unexpected error when executing %q: %s`, q, err)
+		}
+
+		// Expected result
+		expectedMN := storage.MetricName{
+			MetricGroup: []byte("test_metric"),
+			Tags: []storage.Tag{
+				{
+					Key:   []byte("a"),
+					Value: []byte("b"),
+				},
+			},
+		}
+		expectedResult := []netstorage.Result{
+			{
+				MetricName: expectedMN,
+				Values:     mn.Value,
+				Timestamps: mn.Timestamps,
+			},
+		}
+
+		testResultsEqual(t, result, expectedResult)
+	})
+
+	t.Run(`filtered_by_tag_value`, func(t *testing.T) {
+		t.Skip()
+
+		// Create a copy of base EvalConfig
+		ec := copyEvalConfig(&baseEC)
+		mn := metricBuilders{
+			newMetric(accountID, projectID,
+				"__name__", "test_metric",
+				"a", "b",
+				"region", "us-west",
+			),
+			newMetric(accountID, projectID,
+				"__name__", "test_metric",
+				"a", "b",
+				"region", "us-east",
+			),
+		}
+		ec.SimulatedSamples = mn.build()
+
+		q := `test_metric{region="us-west"}`
+		result, err := Exec(nil, ec, q, false)
+		if err != nil {
+			t.Fatalf(`unexpected error when executing %q: %s`, q, err)
+		}
+
+		// Expected result
+		expectedMN := storage.MetricName{
+			MetricGroup: []byte("test_metric"),
+			Tags: []storage.Tag{
+				{
+					Key:   []byte("a"),
+					Value: []byte("b"),
+				},
+				{
+					Key:   []byte("region"),
+					Value: []byte("us-west"),
+				},
+			},
+		}
+		expectedResult := []netstorage.Result{
+			{
+				MetricName: expectedMN,
+				Values:     mn[0].Value,
+				Timestamps: mn[0].Timestamps,
+			},
+		}
+
+		testResultsEqual(t, result, expectedResult)
+	})
+
+	t.Run(`regex_match_on_tag`, func(t *testing.T) {
+		ec := copyEvalConfig(&baseEC)
+		mn := metricBuilders{
+			newMetric(accountID, projectID,
+				"__name__", "test_metric",
+				"env", "prod",
+			),
+			newMetric(accountID, projectID,
+				"__name__", "test_metric",
+				"env", "staging",
+			),
+			newMetric(accountID, projectID,
+				"__name__", "test_metric",
+				"env", "dev",
+			),
+		}
+		ec.SimulatedSamples = mn.build()
+
+		q := `test_metric{env=~"prod|staging"}`
+		result, err := Exec(nil, ec, q, false)
+		if err != nil {
+			t.Fatalf(`unexpected error when executing %q: %s`, q, err)
+		}
+
+		expectedResult := []netstorage.Result{mn[0].toResult(), mn[1].toResult()}
+		testResultsEqual(t, result, expectedResult)
+	})
+}
+
+func TestSumOverTime(t *testing.T) {
+	accountID := uint32(123)
+	projectID := uint32(567)
+	start := int64(1000e3)
+	end := int64(1300e3)
+	step := int64(30e3)
+
+	baseEC := EvalConfig{
+		Start:              start,
+		End:                end,
+		Step:               step,
+		MaxPointsPerSeries: 1e4,
+		MaxSeries:          1000,
+		Deadline:           searchutil.NewDeadline(time.Now(), time.Hour, ""),
+		RoundDigits:        100,
+		MayCache:           false,
+	}
+
+	t.Run(`basic_sum_over_time`, func(t *testing.T) {
+		ec := copyEvalConfig(&baseEC)
+
+		metric := newMetric(accountID, projectID,
+			"__name__", "test_metric",
+			"app", "api-server",
+		).withValues(1, 2, 3, 4, 5, 6).withUnix(1000, 1015, 1030, 1045, 1060, 1075)
+		ec.SimulatedSamples = []*storage.SimulatedSamples{metric.build()}
+
+		q := `sum_over_time(test_metric[30s])`
+		result, err := Exec(nil, ec, q, false)
+		if err != nil {
+			t.Fatalf(`unexpected error when executing %q: %s`, q, err)
+		}
+
+		expectedResult := []netstorage.Result{
+			newMetric(accountID, projectID,
+				"app", "api-server",
+			).withValues(1, 5, 9, 6).withUnix(1000, 1030, 1060, 1090).toResult(),
+		}
+
+		testSimulatedResultsEqual(t, result, expectedResult)
+	})
+}
+
+type metricBuilder storage.SimulatedSamples
+
+func newMetric(accountID uint32, projectID uint32, pairs ...string) *metricBuilder {
+	mn := storage.MetricName{}
+	for i := 0; i < len(pairs); i += 2 {
+		mn.AddTag(pairs[i], pairs[i+1])
+	}
+	return &metricBuilder{
+		Name:       mn,
+		Value:      []float64{10, 20, 30, 40, 50, 60},
+		Timestamps: []int64{1000e3, 1200e3, 1400e3, 1600e3, 1800e3, 2000e3},
+	}
+}
+
+func (b *metricBuilder) withUnix(unix ...int64) *metricBuilder {
+	b.Timestamps = make([]int64, len(unix))
+	for i := range unix {
+		b.Timestamps[i] = unix[i] * 1e3
+	}
+	return b
+}
+
+func (b *metricBuilder) withValues(values ...float64) *metricBuilder {
+	b.Value = values
+	return b
+}
+
+func (b *metricBuilder) build() *storage.SimulatedSamples {
+	return (*storage.SimulatedSamples)(b)
+}
+
+func (b *metricBuilder) toResult() netstorage.Result {
+	return netstorage.Result{
+		MetricName: b.Name,
+		Values:     b.Value,
+		Timestamps: b.Timestamps,
+	}
+}
+
+type metricBuilders []*metricBuilder
+
+func (b metricBuilders) build() []*storage.SimulatedSamples {
+	ss := make([]*storage.SimulatedSamples, len(b))
+	for i := range b {
+		ss[i] = b[i].build()
+	}
+	return ss
+}
+
+func testSimulatedResultsEqual(t *testing.T, result, resultExpected []netstorage.Result) {
+	t.Helper()
+	result = removeEmptyValuesAndTimeseries(result)
+
+	if len(result) != len(resultExpected) {
+		t.Fatalf(`unexpected timeseries count; got %d; want %d`, len(result), len(resultExpected))
+	}
+	for i := range result {
+		r := &result[i]
+		rExpected := &resultExpected[i]
+		testMetricNamesEqual(t, &r.MetricName, &rExpected.MetricName, i)
+		testRowsEqual(t, r.Values, r.Timestamps, rExpected.Values, rExpected.Timestamps)
+	}
+}
+
+func removeEmptyValuesAndTimeseries(tss []netstorage.Result) []netstorage.Result {
+	dst := tss[:0]
+	for i := range tss {
+		ts := &tss[i]
+		hasNaNs := slices.ContainsFunc(ts.Values, math.IsNaN)
+		if !hasNaNs {
+			// Fast path: nothing to remove.
+			if len(ts.Values) > 0 {
+				dst = append(dst, *ts)
+			}
+			continue
+		}
+
+		// Slow path: remove NaNs.
+		srcTimestamps := ts.Timestamps
+		dstValues := ts.Values[:0]
+		// Do not reuse ts.Timestamps for dstTimestamps, since ts.Timestamps
+		// may be shared among multiple time series.
+		dstTimestamps := make([]int64, 0, len(ts.Timestamps))
+		for j, v := range ts.Values {
+			if math.IsNaN(v) {
+				continue
+			}
+			dstValues = append(dstValues, v)
+			dstTimestamps = append(dstTimestamps, srcTimestamps[j])
+		}
+		ts.Values = dstValues
+		ts.Timestamps = dstTimestamps
+		if len(ts.Values) > 0 {
+			dst = append(dst, *ts)
+		}
+	}
+	return dst
+}
+
+func TestExtractMetricsFromQuery(t *testing.T) {
+	query := `(vm_free_disk_space_bytes{job=~"$job", instance=~"$instance"}-vm_free_disk_space_limit_bytes{job=~"$job", instance=~"$instance"}) 
+/ 
+ignoring(path) (
+    (rate(vm_rows_added_to_storage_total{job=~"$job", instance=~"$instance"}[1d]) - 
+        sum(rate(vm_deduplicated_samples_total{job=~"$job", instance=~"$instance"}[1d])) without (type)) * 
+    (
+        sum(vm_data_size_bytes{job=~"$job", instance=~"$instance", type!~"indexdb.*"}) without(type) /
+        sum(vm_rows{job=~"$job", instance=~"$instance", type!~"indexdb.*"}) without(type)
+    )
+    +
+    rate(vm_new_timeseries_created_total{job=~"$job", instance=~"$instance"}[1d]) * 
+    (
+        sum(vm_data_size_bytes{job=~"$job", instance=~"$instance", type="indexdb/file"}) /
+        sum(vm_rows{job=~"$job", instance=~"$instance", type="indexdb/file"})
+    )
+)`
+	metrics, err := ExtractMetricsFromQuery(query)
+	if err != nil {
+		t.Fatalf(`unexpected error when extracting metrics from query: %s`, err)
+	}
+	t.Logf(`metrics: %v`, metrics)
+}

app/vmselect/promql/rollup.go

@@ -1,12 +1,12 @@
 package promql
 
 import (
-	"flag"
 	"fmt"
 	"math"
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/VictoriaMetrics/metrics"
 	"github.com/VictoriaMetrics/metricsql"
@@ -17,10 +17,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 )
 
-var minStalenessInterval = flag.Duration("search.minStalenessInterval", 0, "The minimum interval for staleness calculations. "+
-	"This flag could be useful for removing gaps on graphs generated from time series with irregular intervals between samples. "+
-	"See also '-search.maxStalenessInterval'")
-
 var rollupFuncs = map[string]newRollupFunc{
 	"absent_over_time":        newRollupFuncOneArg(rollupAbsent),
 	"aggr_over_time":          newRollupFuncTwoArgs(rollupFake),
@@ -372,7 +368,7 @@ func getRollupTag(expr metricsql.Expr) (string, error) {
 }
 
 func getRollupConfigs(funcName string, rf rollupFunc, expr metricsql.Expr, start, end, step int64, maxPointsPerSeries int,
-	window, lookbackDelta int64, sharedTimestamps []int64) (
+	window, lookbackDelta int64, sharedTimestamps []int64, minStalenessInterval time.Duration) (
 	func(values []float64, timestamps []int64), []*rollupConfig, error) {
 	preFunc := func(_ []float64, _ []int64) {}
 	funcName = strings.ToLower(funcName)
@@ -408,6 +404,7 @@ func getRollupConfigs(funcName string, rf rollupFunc, expr metricsql.Expr, start
 			Timestamps:            sharedTimestamps,
 			isDefaultRollup:       funcName == "default_rollup",
 			samplesScannedPerCall: samplesScannedPerCall,
+			minStalenessInterval:  minStalenessInterval,
 		}
 	}
 
@@ -600,6 +597,9 @@ type rollupConfig struct {
 	//
 	// If zero, then it is considered that Func scans all the samples passed to it.
 	samplesScannedPerCall int
+
+	// The minimum interval for staleness calculations.
+	minStalenessInterval time.Duration
 }
 
 func (rc *rollupConfig) getTimestamps() []int64 {
@@ -723,8 +723,8 @@ func (rc *rollupConfig) doInternal(dstValues []float64, tsm *timeseriesMap, valu
 	if rc.LookbackDelta > 0 && maxPrevInterval > rc.LookbackDelta {
 		maxPrevInterval = rc.LookbackDelta
 	}
-	if *minStalenessInterval > 0 {
-		if msi := minStalenessInterval.Milliseconds(); msi > 0 && maxPrevInterval < msi {
+	if rc.minStalenessInterval > 0 {
+		if msi := rc.minStalenessInterval.Milliseconds(); msi > 0 && maxPrevInterval < msi {
 			maxPrevInterval = msi
 		}
 	}
@@ -820,11 +820,17 @@ func seekFirstTimestampIdxAfter(timestamps []int64, seekTimestamp int64, nHint i
 	if len(timestamps) == 0 || timestamps[0] > seekTimestamp {
 		return 0
 	}
-	startIdx := max(nHint-2, 0)
+	startIdx := nHint - 2
+	if startIdx < 0 {
+		startIdx = 0
+	}
 	if startIdx >= len(timestamps) {
 		startIdx = len(timestamps) - 1
 	}
-	endIdx := min(nHint+2, len(timestamps))
+	endIdx := nHint + 2
+	if endIdx > len(timestamps) {
+		endIdx = len(timestamps)
+	}
 	if startIdx > 0 && timestamps[startIdx] <= seekTimestamp {
 		timestamps = timestamps[startIdx:]
 		endIdx -= startIdx

app/vmselect/searchutil/searchutil.go

@@ -7,12 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/VictoriaMetrics/metricsql"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/fasttime"
-	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
+	"github.com/VictoriaMetrics/metricsql"
 )
 
 var (
@@ -22,7 +20,6 @@ var (
 	maxStatusRequestDuration = flag.Duration("search.maxStatusRequestDuration", time.Minute*5, "The maximum duration for /api/v1/status/* requests")
 	maxLabelsAPIDuration     = flag.Duration("search.maxLabelsAPIDuration", time.Second*5, "The maximum duration for /api/v1/labels, /api/v1/label/.../values and /api/v1/series requests. "+
 		"See also -search.maxLabelsAPISeries and -search.ignoreExtraFiltersAtLabelsAPI")
-	maxQueryLen = flagutil.NewBytes("search.maxQueryLen", 16*1024, "The maximum search query length in bytes")
 )
 
 // GetMaxQueryDuration returns the maximum duration for query from r.
@@ -230,8 +227,3 @@ func toTagFilter(dst *storage.TagFilter, src *metricsql.LabelFilter) {
 	dst.IsRegexp = src.IsRegexp
 	dst.IsNegative = src.IsNegative
 }
-
-// GetMaxQueryLen returns the current value of the search.maxQueryLen flag.
-func GetMaxQueryLen() int {
-	return maxQueryLen.IntN()
-}

app/vmselect/vmui/assets/MetricsQL-SZIbYz92.md

@@ -21,7 +21,7 @@ However, there are some [intentional differences](https://medium.com/@romanhavro
 
 [Standalone MetricsQL package](https://godoc.org/github.com/VictoriaMetrics/metricsql) can be used for parsing MetricsQL in external apps.
 
-If you are unfamiliar with PromQL, we suggest reading [this tutorial for beginners](https://medium.com/@valyala/promql-tutorial-for-beginners-9ab455142085)
+If you are unfamiliar with PromQL, then it is suggested reading [this tutorial for beginners](https://medium.com/@valyala/promql-tutorial-for-beginners-9ab455142085)
 and introduction into [basic querying via MetricsQL](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#metricsql).
 
 The following functionality is implemented differently in MetricsQL compared to PromQL. This improves user experience:
@@ -69,13 +69,13 @@ The list of MetricsQL features on top of PromQL:
   See [these docs](https://docs.victoriametrics.com/victoriametrics/integrations/graphite/#selecting-graphite-metrics).
   VictoriaMetrics can be used as Graphite datasource in Grafana. See [these docs](https://docs.victoriametrics.com/victoriametrics/integrations/graphite/#graphite-api-usage) for details.
   See also [label_graphite_group](#label_graphite_group) function, which can be used for extracting the given groups from Graphite metric name.
-* The lookbehind window in square brackets for [rollup functions](#rollup-functions) may be omitted. VictoriaMetrics automatically selects the lookbehind window
+* Lookbehind window in square brackets for [rollup functions](#rollup-functions) may be omitted. VictoriaMetrics automatically selects the lookbehind window
   depending on the `step` query arg passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query)
   and the real interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) (aka `scrape_interval`).
   For instance, the following query is valid in VictoriaMetrics: `rate(node_network_receive_bytes_total)`.
   It is roughly equivalent to `rate(node_network_receive_bytes_total[$__interval])` when used in Grafana.
   The difference is documented in [rate() docs](#rate).
-* Numeric values may include underscore delimiters for better readability. For example, `1_234_567_890` can be used in queries instead of `1234567890`.
+* Numeric values can contain `_` delimiters for better readability. For example, `1_234_567_890` can be used in queries instead of `1234567890`.
 * [Series selectors](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering) accept multiple `or` filters. For example, `{env="prod",job="a" or env="dev",job="b"}`
   selects series with `{env="prod",job="a"}` or `{env="dev",job="b"}` labels.
   See [these docs](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering-by-multiple-or-filters) for details.
@@ -111,8 +111,8 @@ The list of MetricsQL features on top of PromQL:
 * Metric names and labels names may contain escaped chars. For example, `foo\-bar{baz\=aa="b"}` is valid expression.
   It returns time series with name `foo-bar` containing label `baz=aa` with value `b`.
   Additionally, the following escape sequences are supported:
-  * `\xXX`, where `XX` is hexadecimal representation of the escaped ascii char.
-  * `\uXXXX`, where `XXXX` is a hexadecimal representation of the escaped unicode char.
+  - `\xXX`, where `XX` is hexadecimal representation of the escaped ascii char.
+  - `\uXXXX`, where `XXXX` is a hexadecimal representation of the escaped unicode char.
 * Aggregate functions support optional `limit N` suffix in order to limit the number of output series.
   For example, `sum(x) by (y) limit 3` limits the number of output time series after the aggregation to 3.
   All the other time series are dropped.
@@ -138,9 +138,8 @@ This may result in `duplicate time series` error when the function is applied to
 This error can be fixed by applying `keep_metric_names` modifier to the function or binary operator.
 
 For example:
-
-* `rate({__name__=~"foo|bar"}) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
-* `({__name__=~"foo|bar"} / 10) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
+- `rate({__name__=~"foo|bar"}) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
+- `({__name__=~"foo|bar"} / 10) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
 
 ## MetricsQL functions
 
@@ -167,10 +166,10 @@ Additional details:
 * If the given [series selector](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering) returns multiple time series,
   then rollups are calculated individually per each returned series.
 * If lookbehind window in square brackets is missing, then it is automatically set to the following value:
-  * To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
+  - To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
     for all the [rollup functions](#rollup-functions) except of [default_rollup](#default_rollup) and [rate](#rate). This value is known as `$__interval` in Grafana or `1i` in MetricsQL.
     For example, `avg_over_time(temperature)` is automatically transformed to `avg_over_time(temperature[1i])`.
-  * To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
+  - To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
     for [default_rollup](#default_rollup) and [rate](#rate) functions. This allows avoiding unexpected gaps on the graph when `step` is smaller than `scrape_interval`.
 * Every [series selector](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering) in MetricsQL must be wrapped into a rollup function.
   Otherwise, it is automatically wrapped into [default_rollup](#default_rollup). For example, `foo{bar="baz"}`
@@ -667,9 +666,8 @@ This function is usually applied to [gauges](https://docs.victoriametrics.com/vi
 
 `outlier_iqr_over_time(series_selector[d])` is a [rollup function](#rollup-functions), which returns the last sample on the given lookbehind window `d`
 if its value is either smaller than the `q25-1.5*iqr` or bigger than `q75+1.5*iqr` where:
-
-* `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`
-* `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`.
+- `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`
+- `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`.
 
 The `outlier_iqr_over_time()` is useful for detecting anomalies in gauge values based on the previous history of values.
 For example, `outlier_iqr_over_time(memory_usage_bytes[1h])` triggers when `memory_usage_bytes` suddenly goes outside the usual value range for the last hour.
@@ -761,6 +759,7 @@ This function is usually applied to [counters](https://docs.victoriametrics.com/
 
 See also [increase_prometheus](#increase_prometheus) and [rate](#rate).
 
+
 #### rate_over_sum
 
 `rate_over_sum(series_selector[d])` is a [rollup function](#rollup-functions), which calculates per-second rate over the sum of [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
@@ -1107,6 +1106,7 @@ This function is usually applied to [gauges](https://docs.victoriametrics.com/vi
 
 See also [zscore](#zscore), [range_trim_zscore](#range_trim_zscore) and [outlier_iqr_over_time](#outlier_iqr_over_time).
 
+
 ### Transform functions
 
 **Transform functions** calculate transformations over [rollup results](#rollup-functions).
@@ -1851,6 +1851,7 @@ The list of supported label manipulation functions:
 `alias(q, "name")` is [label manipulation function](#label-manipulation-functions), which sets the given `name` to all the time series returned by `q`.
 For example, `alias(up, "foobar")` would rename `up` series to `foobar` series.
 
+
 #### drop_common_labels
 
 `drop_common_labels(q1, ...., qN)` is [label manipulation function](#label-manipulation-functions), which drops common `label="value"` pairs
@@ -1876,7 +1877,7 @@ For example, `label_graphite_group({__graphite__="foo*.bar.*"}, 0, 2)` would sub
 
 This function is useful for aggregating Graphite metrics with [aggregate functions](#aggregate-functions). For example, the following query would return per-app memory usage:
 
-```metricsql
+```
 sum by (__name__) (
     label_graphite_group({__graphite__="app*.host*.memory_usage"}, 0)
 )
@@ -2002,6 +2003,7 @@ would return series in the following order of `bar` label values: `101`, `15`, `
 
 See also [sort_by_label_numeric](#sort_by_label_numeric) and [sort_by_label_desc](#sort_by_label_desc).
 
+
 ### Aggregate functions
 
 **Aggregate functions** calculate aggregates over groups of [rollup results](#rollup-functions).
@@ -2177,9 +2179,8 @@ per each `group_labels` for all the time series returned by `q`. The aggregate i
 `outliers_iqr(q)` is [aggregate function](#aggregate-functions), which returns time series from `q` with at least a single point
 outside e.g. [Interquartile range outlier bounds](https://en.wikipedia.org/wiki/Interquartile_range) `[q25-1.5*iqr .. q75+1.5*iqr]`
 comparing to other time series at the given point, where:
-
-* `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) calculated independently per each point on the graph across `q` series.
-* `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) calculated independently per each point on the graph across `q` series.
+- `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) calculated independently per each point on the graph across `q` series.
+- `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) calculated independently per each point on the graph across `q` series.
 
 The `outliers_iqr()` is useful for detecting anomalous series in the group of series. For example, `outliers_iqr(temperature) by (country)` returns
 per-country series with anomalous outlier values comparing to the rest of per-country series.
@@ -2348,10 +2349,10 @@ VictoriaMetrics performs subqueries in the following way:
 VictoriaMetrics performs the following implicit conversions for incoming queries before starting the calculations:
 
 * If lookbehind window in square brackets is missing inside [rollup function](#rollup-functions), then it is automatically set to the following value:
-  * To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
+  - To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
     for all the [rollup functions](#rollup-functions) except of [default_rollup](#default_rollup) and [rate](#rate). This value is known as `$__interval` in Grafana or `1i` in MetricsQL.
     For example, `avg_over_time(temperature)` is automatically transformed to `avg_over_time(temperature[1i])`.
-  * To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
+  - To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
     for [default_rollup](#default_rollup) and [rate](#rate) functions. This allows avoiding unexpected gaps on the graph when `step` is smaller than `scrape_interval`.
 * All the [series selectors](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering),
   which aren't wrapped into [rollup functions](#rollup-functions), are automatically wrapped into [default_rollup](#default_rollup) function.

app/vmselect/vmui/index.html

@@ -36,10 +36,10 @@
   <meta property="og:title" content="UI for VictoriaMetrics">
   <meta property="og:url" content="https://victoriametrics.com/">
   <meta property="og:description" content="Explore and troubleshoot your VictoriaMetrics data">
-  <script type="module" crossorigin src="./assets/index-DQcPcJrn.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/vendor-DY9kCvzk.js">
+  <script type="module" crossorigin src="./assets/index-Ck5nH8JI.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/vendor-BVRvRxZ2.js">
   <link rel="stylesheet" crossorigin href="./assets/vendor-D1GxaB_c.css">
-  <link rel="stylesheet" crossorigin href="./assets/index-dWApsAEM.css">
+  <link rel="stylesheet" crossorigin href="./assets/index-BHg4iVVe.css">
 </head>
 <body>
 <noscript>You need to enable JavaScript to run this app.</noscript>

app/vmstorage/main.go

@@ -683,7 +683,7 @@ func writeStorageMetrics(w io.Writer, strg *storage.Storage) {
 	metrics.WriteCounterUint64(w, `vm_cache_eviction_bytes_total{type="storage/metricIDs", reason="miss_percentage"}`, m.MetricIDCacheMissEvictionBytes)
 	metrics.WriteCounterUint64(w, `vm_cache_eviction_bytes_total{type="storage/metricIDs", reason="expiration"}`, m.MetricIDCacheExpireEvictionBytes)
 
-	metrics.WriteCounterUint64(w, `vm_deleted_metrics_total{type="indexdb"}`, m.DeletedMetricsCount)
+	metrics.WriteCounterUint64(w, `vm_deleted_metrics_total{type="indexdb"}`, idbm.DeletedMetricsCount)
 
 	metrics.WriteCounterUint64(w, `vm_cache_collisions_total{type="storage/tsid"}`, m.TSIDCacheCollisions)
 	metrics.WriteCounterUint64(w, `vm_cache_collisions_total{type="storage/metricName"}`, m.MetricNameCacheCollisions)

app/vmui/Dockerfile-build

@@ -1,4 +1,4 @@
-FROM node:22-alpine3.22
+FROM node:20-alpine3.19
 
 # Sets a custom location for the npm cache, preventing access errors in system directories
 ENV NPM_CONFIG_CACHE=/build/.npm

app/vmui/Dockerfile-web

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

app/vmui/packages/vmui/index.html

@@ -6,7 +6,6 @@
   <link rel="apple-touch-icon" href="/favicon.svg"/>
   <link rel="mask-icon" href="/favicon.svg" color="#000000">
 
-  <meta name="robots" content="noindex">
   <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"/>

app/vmui/packages/vmui/package-lock.json

@@ -17,7 +17,7 @@
         "react-input-mask": "^2.0.4",
         "react-router-dom": "^7.6.3",
         "uplot": "^1.6.32",
-        "vite": "^7.1.5",
+        "vite": "^7.0.4",
         "web-vitals": "^5.0.3"
       },
       "devDependencies": {
@@ -1177,7 +1177,7 @@
       "version": "0.3.12",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
       "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -1188,36 +1188,24 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
-      "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
       "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.29",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
       "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -1262,316 +1250,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
-      }
-    },
-    "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/@preact/preset-vite": {
       "version": "2.10.2",
       "resolved": "https://registry.npmjs.org/@preact/preset-vite/-/preset-vite-2.10.2.tgz",
@@ -2072,9 +1750,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
-      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
+      "version": "24.0.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.12.tgz",
+      "integrity": "sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -2543,7 +2221,7 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -2845,7 +2523,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -2894,14 +2572,6 @@
       "devOptional": true,
       "license": "MIT/X11"
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/cac": {
       "version": "6.7.14",
       "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
@@ -3032,23 +2702,6 @@
         "node": ">= 16"
       }
     },
-    "node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/classnames": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
@@ -3097,14 +2750,6 @@
       "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3415,20 +3060,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -4177,7 +3808,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -4891,7 +4522,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -4946,7 +4577,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -4985,7 +4616,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -5488,7 +5119,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -5553,14 +5184,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/node-html-parser": {
       "version": "6.1.13",
       "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
@@ -5889,7 +5512,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -6131,21 +5754,6 @@
         "react-dom": ">=18"
       }
     },
-    "node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -6446,28 +6054,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/sass": {
-      "version": "1.89.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
-      "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "chokidar": "^4.0.0",
-        "immutable": "^5.0.2",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher": "^2.4.1"
-      }
-    },
     "node_modules/sass-embedded": {
       "version": "1.89.2",
       "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.89.2.tgz",
@@ -6997,29 +6583,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/stack-trace": {
       "version": "1.0.0-pre2",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz",
@@ -7286,26 +6849,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/terser": {
-      "version": "5.43.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
-      "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.14.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/tinybench": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
@@ -7321,13 +6864,13 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -7337,13 +6880,10 @@
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -7354,9 +6894,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -7419,7 +6959,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -7660,17 +7200,17 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.5.tgz",
-      "integrity": "sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
+      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.3",
+        "fdir": "^6.4.6",
+        "picomatch": "^4.0.2",
         "postcss": "^8.5.6",
-        "rollup": "^4.43.0",
-        "tinyglobby": "^0.2.15"
+        "rollup": "^4.40.0",
+        "tinyglobby": "^0.2.14"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -7775,13 +7315,10 @@
       }
     },
     "node_modules/vite/node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -7792,9 +7329,9 @@
       }
     },
     "node_modules/vite/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"

app/vmui/packages/vmui/package.json

@@ -29,7 +29,7 @@
     "react-input-mask": "^2.0.4",
     "react-router-dom": "^7.6.3",
     "uplot": "^1.6.32",
-    "vite": "^7.1.5",
+    "vite": "^7.0.4",
     "web-vitals": "^5.0.3"
   },
   "devDependencies": {

app/vmui/packages/vmui/src/App.tsx

@@ -18,96 +18,84 @@ import QueryAnalyzer from "./pages/QueryAnalyzer";
 import DownsamplingFilters from "./pages/DownsamplingFilters";
 import RetentionFilters from "./pages/RetentionFilters";
 import RawQueryPage from "./pages/RawQueryPage";
-import ExploreRules from "./pages/ExploreAlerts/ExploreRules";
-import ExploreNotifiers from "./pages/ExploreAlerts/ExploreNotifiers";
 
 const App: FC = () => {
   const [loadedTheme, setLoadedTheme] = useState(false);
 
-  return (
-    <>
-      <HashRouter>
-        <AppContextProvider>
-          <>
-            <ThemeProvider onLoaded={setLoadedTheme} />
-            {loadedTheme && (
-              <Routes>
+  return <>
+    <HashRouter>
+      <AppContextProvider>
+        <>
+          <ThemeProvider onLoaded={setLoadedTheme}/>
+          {loadedTheme && (
+            <Routes>
+              <Route
+                path={"/"}
+                element={<MainLayout/>}
+              >
                 <Route
-                  path={"/"}
-                  element={<MainLayout />}
-                >
-                  <Route
-                    path={router.home}
-                    element={<CustomPanel />}
-                  />
-                  <Route
-                    path={router.rawQuery}
-                    element={<RawQueryPage />}
-                  />
-                  <Route
-                    path={router.metrics}
-                    element={<ExploreMetrics />}
-                  />
-                  <Route
-                    path={router.cardinality}
-                    element={<CardinalityPanel />}
-                  />
-                  <Route
-                    path={router.topQueries}
-                    element={<TopQueries />}
-                  />
-                  <Route
-                    path={router.trace}
-                    element={<TracePage />}
-                  />
-                  <Route
-                    path={router.queryAnalyzer}
-                    element={<QueryAnalyzer />}
-                  />
-                  <Route
-                    path={router.dashboards}
-                    element={<DashboardsLayout />}
-                  />
-                  <Route
-                    path={router.withTemplate}
-                    element={<WithTemplate />}
-                  />
-                  <Route
-                    path={router.relabel}
-                    element={<Relabel />}
-                  />
-                  <Route
-                    path={router.activeQueries}
-                    element={<ActiveQueries />}
-                  />
-                  <Route
-                    path={router.icons}
-                    element={<PreviewIcons />}
-                  />
-                  <Route
-                    path={router.downsamplingDebug}
-                    element={<DownsamplingFilters />}
-                  />
-                  <Route
-                    path={router.retentionDebug}
-                    element={<RetentionFilters />}
-                  />
-                  <Route
-                    path={router.rules}
-                    element={<ExploreRules />}
-                  />
-                  <Route
-                    path={router.notifiers}
-                    element={<ExploreNotifiers />}
-                  />
-                </Route>
-              </Routes>
-            )}
-          </>
-        </AppContextProvider>
-      </HashRouter>
-    </>
-  );
+                  path={router.home}
+                  element={<CustomPanel/>}
+                />
+                <Route
+                  path={router.rawQuery}
+                  element={<RawQueryPage/>}
+                />
+                <Route
+                  path={router.metrics}
+                  element={<ExploreMetrics/>}
+                />
+                <Route
+                  path={router.cardinality}
+                  element={<CardinalityPanel/>}
+                />
+                <Route
+                  path={router.topQueries}
+                  element={<TopQueries/>}
+                />
+                <Route
+                  path={router.trace}
+                  element={<TracePage/>}
+                />
+                <Route
+                  path={router.queryAnalyzer}
+                  element={<QueryAnalyzer/>}
+                />
+                <Route
+                  path={router.dashboards}
+                  element={<DashboardsLayout/>}
+                />
+                <Route
+                  path={router.withTemplate}
+                  element={<WithTemplate/>}
+                />
+                <Route
+                  path={router.relabel}
+                  element={<Relabel/>}
+                />
+                <Route
+                  path={router.activeQueries}
+                  element={<ActiveQueries/>}
+                />
+                <Route
+                  path={router.icons}
+                  element={<PreviewIcons/>}
+                />
+                <Route
+                  path={router.downsamplingDebug}
+                  element={<DownsamplingFilters/>}
+                />
+                <Route
+                  path={router.retentionDebug}
+                  element={<RetentionFilters/>}
+                />
+              </Route>
+            </Routes>
+          )}
+        </>
+      </AppContextProvider>
+    </HashRouter>
+  </>;
 };
 
 export default App;

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

@@ -1,2 +1,2 @@
-import { getUrlWithoutTenant } from "../utils/tenants";
-export const getAccountIds = (server: string) => `${getUrlWithoutTenant(server)}/admin/tenants`;
+export const getAccountIds = (server: string) =>
+  `${server.replace(/^(.+)(\/select.+)/, "$1")}/admin/tenants`;

app/vmui/packages/vmui/src/api/explore-alerts.ts

@@ -1,23 +0,0 @@
-export const getGroupsUrl = (server: string): string => {
-  return `${server}/vmalert/api/v1/rules?datasource_type=prometheus`;
-};
-
-export const getItemUrl = (
-  server: string,
-  groupId: string,
-  id: string,
-  mode: string,
-): string => {
-  return `${server}/vmalert/api/v1/${mode}?group_id=${groupId}&${mode}_id=${id}`;
-};
-
-export const getGroupUrl = (
-  server: string,
-  id: string,
-): string => {
-  return `${server}/vmalert/api/v1/group?group_id=${id}`;
-};
-
-export const getNotifiersUrl = (server: string): string => {
-  return `${server}/vmalert/api/v1/notifiers`;
-};

app/vmui/packages/vmui/src/assets/MetricsQL.md

@@ -21,7 +21,7 @@ However, there are some [intentional differences](https://medium.com/@romanhavro
 
 [Standalone MetricsQL package](https://godoc.org/github.com/VictoriaMetrics/metricsql) can be used for parsing MetricsQL in external apps.
 
-If you are unfamiliar with PromQL, we suggest reading [this tutorial for beginners](https://medium.com/@valyala/promql-tutorial-for-beginners-9ab455142085)
+If you are unfamiliar with PromQL, then it is suggested reading [this tutorial for beginners](https://medium.com/@valyala/promql-tutorial-for-beginners-9ab455142085)
 and introduction into [basic querying via MetricsQL](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#metricsql).
 
 The following functionality is implemented differently in MetricsQL compared to PromQL. This improves user experience:
@@ -69,13 +69,13 @@ The list of MetricsQL features on top of PromQL:
   See [these docs](https://docs.victoriametrics.com/victoriametrics/integrations/graphite/#selecting-graphite-metrics).
   VictoriaMetrics can be used as Graphite datasource in Grafana. See [these docs](https://docs.victoriametrics.com/victoriametrics/integrations/graphite/#graphite-api-usage) for details.
   See also [label_graphite_group](#label_graphite_group) function, which can be used for extracting the given groups from Graphite metric name.
-* The lookbehind window in square brackets for [rollup functions](#rollup-functions) may be omitted. VictoriaMetrics automatically selects the lookbehind window
+* Lookbehind window in square brackets for [rollup functions](#rollup-functions) may be omitted. VictoriaMetrics automatically selects the lookbehind window
   depending on the `step` query arg passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query)
   and the real interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) (aka `scrape_interval`).
   For instance, the following query is valid in VictoriaMetrics: `rate(node_network_receive_bytes_total)`.
   It is roughly equivalent to `rate(node_network_receive_bytes_total[$__interval])` when used in Grafana.
   The difference is documented in [rate() docs](#rate).
-* Numeric values may include underscore delimiters for better readability. For example, `1_234_567_890` can be used in queries instead of `1234567890`.
+* Numeric values can contain `_` delimiters for better readability. For example, `1_234_567_890` can be used in queries instead of `1234567890`.
 * [Series selectors](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering) accept multiple `or` filters. For example, `{env="prod",job="a" or env="dev",job="b"}`
   selects series with `{env="prod",job="a"}` or `{env="dev",job="b"}` labels.
   See [these docs](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering-by-multiple-or-filters) for details.
@@ -111,8 +111,8 @@ The list of MetricsQL features on top of PromQL:
 * Metric names and labels names may contain escaped chars. For example, `foo\-bar{baz\=aa="b"}` is valid expression.
   It returns time series with name `foo-bar` containing label `baz=aa` with value `b`.
   Additionally, the following escape sequences are supported:
-  * `\xXX`, where `XX` is hexadecimal representation of the escaped ascii char.
-  * `\uXXXX`, where `XXXX` is a hexadecimal representation of the escaped unicode char.
+  - `\xXX`, where `XX` is hexadecimal representation of the escaped ascii char.
+  - `\uXXXX`, where `XXXX` is a hexadecimal representation of the escaped unicode char.
 * Aggregate functions support optional `limit N` suffix in order to limit the number of output series.
   For example, `sum(x) by (y) limit 3` limits the number of output time series after the aggregation to 3.
   All the other time series are dropped.
@@ -138,9 +138,8 @@ This may result in `duplicate time series` error when the function is applied to
 This error can be fixed by applying `keep_metric_names` modifier to the function or binary operator.
 
 For example:
-
-* `rate({__name__=~"foo|bar"}) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
-* `({__name__=~"foo|bar"} / 10) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
+- `rate({__name__=~"foo|bar"}) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
+- `({__name__=~"foo|bar"} / 10) keep_metric_names` leaves `foo` and `bar` metric names in the returned time series.
 
 ## MetricsQL functions
 
@@ -167,10 +166,10 @@ Additional details:
 * If the given [series selector](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering) returns multiple time series,
   then rollups are calculated individually per each returned series.
 * If lookbehind window in square brackets is missing, then it is automatically set to the following value:
-  * To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
+  - To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
     for all the [rollup functions](#rollup-functions) except of [default_rollup](#default_rollup) and [rate](#rate). This value is known as `$__interval` in Grafana or `1i` in MetricsQL.
     For example, `avg_over_time(temperature)` is automatically transformed to `avg_over_time(temperature[1i])`.
-  * To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
+  - To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
     for [default_rollup](#default_rollup) and [rate](#rate) functions. This allows avoiding unexpected gaps on the graph when `step` is smaller than `scrape_interval`.
 * Every [series selector](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering) in MetricsQL must be wrapped into a rollup function.
   Otherwise, it is automatically wrapped into [default_rollup](#default_rollup). For example, `foo{bar="baz"}`
@@ -667,9 +666,8 @@ This function is usually applied to [gauges](https://docs.victoriametrics.com/vi
 
 `outlier_iqr_over_time(series_selector[d])` is a [rollup function](#rollup-functions), which returns the last sample on the given lookbehind window `d`
 if its value is either smaller than the `q25-1.5*iqr` or bigger than `q75+1.5*iqr` where:
-
-* `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`
-* `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`.
+- `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`
+- `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) over [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples) on the lookbehind window `d`.
 
 The `outlier_iqr_over_time()` is useful for detecting anomalies in gauge values based on the previous history of values.
 For example, `outlier_iqr_over_time(memory_usage_bytes[1h])` triggers when `memory_usage_bytes` suddenly goes outside the usual value range for the last hour.
@@ -761,6 +759,7 @@ This function is usually applied to [counters](https://docs.victoriametrics.com/
 
 See also [increase_prometheus](#increase_prometheus) and [rate](#rate).
 
+
 #### rate_over_sum
 
 `rate_over_sum(series_selector[d])` is a [rollup function](#rollup-functions), which calculates per-second rate over the sum of [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
@@ -1107,6 +1106,7 @@ This function is usually applied to [gauges](https://docs.victoriametrics.com/vi
 
 See also [zscore](#zscore), [range_trim_zscore](#range_trim_zscore) and [outlier_iqr_over_time](#outlier_iqr_over_time).
 
+
 ### Transform functions
 
 **Transform functions** calculate transformations over [rollup results](#rollup-functions).
@@ -1851,6 +1851,7 @@ The list of supported label manipulation functions:
 `alias(q, "name")` is [label manipulation function](#label-manipulation-functions), which sets the given `name` to all the time series returned by `q`.
 For example, `alias(up, "foobar")` would rename `up` series to `foobar` series.
 
+
 #### drop_common_labels
 
 `drop_common_labels(q1, ...., qN)` is [label manipulation function](#label-manipulation-functions), which drops common `label="value"` pairs
@@ -1876,7 +1877,7 @@ For example, `label_graphite_group({__graphite__="foo*.bar.*"}, 0, 2)` would sub
 
 This function is useful for aggregating Graphite metrics with [aggregate functions](#aggregate-functions). For example, the following query would return per-app memory usage:
 
-```metricsql
+```
 sum by (__name__) (
     label_graphite_group({__graphite__="app*.host*.memory_usage"}, 0)
 )
@@ -2002,6 +2003,7 @@ would return series in the following order of `bar` label values: `101`, `15`, `
 
 See also [sort_by_label_numeric](#sort_by_label_numeric) and [sort_by_label_desc](#sort_by_label_desc).
 
+
 ### Aggregate functions
 
 **Aggregate functions** calculate aggregates over groups of [rollup results](#rollup-functions).
@@ -2177,9 +2179,8 @@ per each `group_labels` for all the time series returned by `q`. The aggregate i
 `outliers_iqr(q)` is [aggregate function](#aggregate-functions), which returns time series from `q` with at least a single point
 outside e.g. [Interquartile range outlier bounds](https://en.wikipedia.org/wiki/Interquartile_range) `[q25-1.5*iqr .. q75+1.5*iqr]`
 comparing to other time series at the given point, where:
-
-* `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) calculated independently per each point on the graph across `q` series.
-* `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) calculated independently per each point on the graph across `q` series.
+- `iqr` is an [Interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) calculated independently per each point on the graph across `q` series.
+- `q25` and `q75` are 25th and 75th [percentiles](https://en.wikipedia.org/wiki/Percentile) calculated independently per each point on the graph across `q` series.
 
 The `outliers_iqr()` is useful for detecting anomalous series in the group of series. For example, `outliers_iqr(temperature) by (country)` returns
 per-country series with anomalous outlier values comparing to the rest of per-country series.
@@ -2348,10 +2349,10 @@ VictoriaMetrics performs subqueries in the following way:
 VictoriaMetrics performs the following implicit conversions for incoming queries before starting the calculations:
 
 * If lookbehind window in square brackets is missing inside [rollup function](#rollup-functions), then it is automatically set to the following value:
-  * To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
+  - To `step` value passed to [/api/v1/query_range](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#range-query) or [/api/v1/query](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#instant-query)
     for all the [rollup functions](#rollup-functions) except of [default_rollup](#default_rollup) and [rate](#rate). This value is known as `$__interval` in Grafana or `1i` in MetricsQL.
     For example, `avg_over_time(temperature)` is automatically transformed to `avg_over_time(temperature[1i])`.
-  * To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
+  - To the `max(step, scrape_interval)`, where `scrape_interval` is the interval between [raw samples](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#raw-samples)
     for [default_rollup](#default_rollup) and [rate](#rate) functions. This allows avoiding unexpected gaps on the graph when `step` is smaller than `scrape_interval`.
 * All the [series selectors](https://docs.victoriametrics.com/victoriametrics/keyconcepts/#filtering),
   which aren't wrapped into [rollup functions](#rollup-functions), are automatically wrapped into [default_rollup](#default_rollup) function.

app/vmui/packages/vmui/src/components/Configurators/TimeRangeSettings/ExecutionControls/ExecutionControls.tsx

@@ -30,13 +30,7 @@ const delayOptions: AutoRefreshOption[] = [
   { seconds: 7200, title: "2h" }
 ];
 
-interface ExecutionControlsProps {
-  tooltip: string;
-  useAutorefresh?: boolean;
-  closeModal: () => void;
-}
-
-export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAutorefresh, closeModal }) => {
+export const ExecutionControls: FC = () => {
   const { isMobile } = useDeviceDetect();
 
   const dispatch = useTimeDispatch();
@@ -62,9 +56,6 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
 
   const handleUpdate = () => {
     dispatch({ type: "RUN_QUERY" });
-    if (!useAutorefresh && isMobile) {
-      closeModal();
-    }
   };
 
   useEffect(() => {
@@ -86,118 +77,91 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
     handleChange(d);
   };
 
-  return (
-    <>
-      <div className="vm-execution-controls">
-        <div
-          className={classNames({
-            "vm-execution-controls-buttons": true,
-            "vm-execution-controls-buttons_mobile": isMobile,
-            "vm-header-button": !appModeEnable,
-            "vm-autorefresh": useAutorefresh,
-          })}
-        >
-          {useAutorefresh ? (
-            isMobile ? (
-              <div
-                className="vm-mobile-option"
-                onClick={toggleOpenOptions}
-              >
-                <span className="vm-mobile-option__icon"><RestartIcon/></span>
-                <div className="vm-mobile-option-text">
-                  <span className="vm-mobile-option-text__label">Auto-refresh</span>
-                  <span className="vm-mobile-option-text__value">{selectedDelay.title}</span>
-                </div>
-                <span className="vm-mobile-option__arrow"><ArrowDownIcon/></span>
-              </div>
-            ) : (
-              <>
-                <Tooltip title={tooltip}>
-                  <Button
-                    variant="contained"
-                    color="primary"
-                    onClick={handleUpdate}
-                    startIcon={<RefreshIcon/>}
-                    ariaLabel={tooltip}
-                  />
-                </Tooltip>
-                <Tooltip title="Auto-refresh control">
-                  <div ref={optionsButtonRef}>
-                    <Button
-                      variant="contained"
-                      color="primary"
-                      fullWidth
-                      endIcon={(
-                        <div
-                          className={classNames({
-                            "vm-execution-controls-buttons__arrow": true,
-                            "vm-execution-controls-buttons__arrow_open": openOptions,
-                          })}
-                        >
-                          <ArrowDownIcon/>
-                        </div>
-                      )}
-                      onClick={toggleOpenOptions}
-                    >
-                      {selectedDelay.title}
-                    </Button>
-                  </div>
-                </Tooltip>
-              </>
-            )
-          ) : (
-            isMobile ? (
-              <div
-                className="vm-mobile-option"
-                onClick={handleUpdate}
-              >
-                <span className="vm-mobile-option__icon"><RestartIcon/></span>
-                <div className="vm-mobile-option-text">
-                  <span className="vm-mobile-option-text__label">Refresh</span>
-                </div>
-              </div>
-            ) : (
+  return <>
+    <div className="vm-execution-controls">
+      <div
+        className={classNames({
+          "vm-execution-controls-buttons": true,
+          "vm-execution-controls-buttons_mobile": isMobile,
+          "vm-header-button": !appModeEnable,
+        })}
+      >
+        {!isMobile && (
+          <Tooltip title="Refresh dashboard">
+            <Button
+              variant="contained"
+              color="primary"
+              onClick={handleUpdate}
+              startIcon={<RefreshIcon/>}
+              ariaLabel="refresh dashboard"
+            />
+          </Tooltip>
+        )}
+        {isMobile ? (
+          <div
+            className="vm-mobile-option"
+            onClick={toggleOpenOptions}
+          >
+            <span className="vm-mobile-option__icon"><RestartIcon/></span>
+            <div className="vm-mobile-option-text">
+              <span className="vm-mobile-option-text__label">Auto-refresh</span>
+              <span className="vm-mobile-option-text__value">{selectedDelay.title}</span>
+            </div>
+            <span className="vm-mobile-option__arrow"><ArrowDownIcon/></span>
+          </div>
+        ) : (
+          <Tooltip title="Auto-refresh control">
+            <div ref={optionsButtonRef}>
               <Button
                 variant="contained"
                 color="primary"
-                onClick={handleUpdate}
-                startIcon={<RefreshIcon/>}
-                ariaLabel={tooltip}
-              />
-            )
-          )}
-        </div>
+                fullWidth
+                endIcon={(
+                  <div
+                    className={classNames({
+                      "vm-execution-controls-buttons__arrow": true,
+                      "vm-execution-controls-buttons__arrow_open": openOptions,
+                    })}
+                  >
+                    <ArrowDownIcon/>
+                  </div>
+                )}
+                onClick={toggleOpenOptions}
+              >
+                {selectedDelay.title}
+              </Button>
+            </div>
+          </Tooltip>
+        )}
       </div>
-      {useAutorefresh && (
-        <Popper
-          open={openOptions}
-          placement="bottom-right"
-          onClose={handleCloseOptions}
-          buttonRef={optionsButtonRef}
-          title={isMobile ? "Auto-refresh duration" : undefined}
-        >
+    </div>
+    <Popper
+      open={openOptions}
+      placement="bottom-right"
+      onClose={handleCloseOptions}
+      buttonRef={optionsButtonRef}
+      title={isMobile ? "Auto-refresh duration" : undefined}
+    >
+      <div
+        className={classNames({
+          "vm-execution-controls-list": true,
+          "vm-execution-controls-list_mobile": isMobile,
+        })}
+      >
+        {delayOptions.map(d => (
           <div
             className={classNames({
-              "vm-execution-controls-list": true,
-              "vm-execution-controls-list_mobile": isMobile,
+              "vm-list-item": true,
+              "vm-list-item_mobile": isMobile,
+              "vm-list-item_active": d.seconds === selectedDelay.seconds
             })}
+            key={d.seconds}
+            onClick={createHandlerChange(d)}
           >
-            {delayOptions.map(d => (
-              <div
-                className={classNames({
-                  "vm-list-item": true,
-                  "vm-list-item_mobile": isMobile,
-                  "vm-list-item_active": d.seconds === selectedDelay.seconds
-                })}
-                key={d.seconds}
-                onClick={createHandlerChange(d)}
-              >
-                {d.title}
-              </div>
-            ))}
+            {d.title}
           </div>
-        </Popper>
-      )}
-    </>
-  );
+        ))}
+      </div>
+    </Popper>
+  </>;
 };

app/vmui/packages/vmui/src/components/Configurators/TimeRangeSettings/ExecutionControls/style.scss

@@ -7,10 +7,7 @@
     display: flex;
     justify-content: space-between;
     border-radius: calc($button-radius + 1px);
-
-    :is(.vm-autorefresh) {
-      min-width: 107px;
-    }
+    min-width: 107px;
 
     &_mobile {
       flex-direction: column;

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

@@ -1,34 +0,0 @@
-import "./style.scss";
-import { ReactNode } from "react";
-
-export type BadgeColor = "firing" | "inactive" | "pending" | "no-match" | "unhealthy" | "ok" | "passive";
-
-interface BadgeItem {
-  value?: number | string;
-  color: BadgeColor;  
-}
-
-interface BadgesProps {
-  items: Record<string, BadgeItem>;
-  align?: "center" | "start" | "end";
-  children?: ReactNode;
-}
-
-const Badges = ({ items, children, align = "start" }: BadgesProps) => {
-  return (
-    <div
-      className="vm-badges"
-      style={{ "justify-content": align }}
-    >
-      {Object.entries(items).map(([name, props]) => (
-        <span
-          key={name}
-          className={`vm-badge ${props.color}`}
-        >{props.value ? `${name}: ${props.value}` : name}</span>
-      ))}
-      {children}
-    </div>
-  );
-};
-
-export default Badges;

app/vmui/packages/vmui/src/components/ExploreAlerts/Badges/style.scss

@@ -1,69 +0,0 @@
-@use "src/styles/variables" as *;
-
-$badge-colors: (
-  "firing": $color-error,
-  "inactive": $color-success,
-  "pending": $color-warning,
-  "no-match": $color-notice,
-  "unhealthy": $color-broken,
-  "ok": $color-info,
-  "passive": $color-passive,
-  "all": $color-passive,
-);
-
-.vm-badges {
-  display: flex;
-  flex-wrap: wrap;
-  gap: $padding-small;
-  &.align-center {
-    justify-content: center;
-  }
-  .vm-badge {
-    padding: 0 $padding-tiny;
-    width: fit-content;
-    @each $class, $color in $badge-colors {
-      &.#{$class} {
-        border: 1px solid $color;
-        color: $color;
-      }
-    }
-  }
-}
-
-.vm-badge-base {
-  font-weight: 400;
-  border-radius: $border-radius-small;
-}
-
-.vm-badge-menu-item {
-  @extend .vm-badge-base;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  line-height: 22px;
-  @each $class, $color in $badge-colors {
-    &.#{$class} {
-      border-right: $border-radius-small solid $color;
-    }
-  }
-}
-
-.vm-badge-item {
-  @extend .vm-badge-base;
-  @each $class, $color in $badge-colors {
-    &.#{$class} {
-      border-left: $border-radius-small solid $color;
-    }
-  }
-}
-
-.vm-badge {
-  @extend .vm-badge-base;
-  background-color: transparent;
-  padding: 0 $padding-tiny;
-  line-height: 22px;
-  max-width: 300px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}

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

@@ -1,106 +0,0 @@
-import { useMemo } from "preact/compat";
-import "./style.scss";
-import { Alert as APIAlert } from "../../../types";
-import { createSearchParams } from "react-router-dom";
-import Button from "../../Main/Button/Button";
-import Badges, { BadgeColor } from "../Badges";
-import {
-  SearchIcon,
-} from "../../Main/Icons";
-import dayjs from "dayjs";
-import CodeExample from "../../Main/CodeExample/CodeExample";
-
-interface BaseAlertProps {
-  item: APIAlert;
-}
-
-const BaseAlert = ({ item }: BaseAlertProps) => {
-  const query = item?.expression;
-  const alertLabels = item?.labels || {};
-  const alertLabelsItems = useMemo(() => {
-    return Object.fromEntries(Object.entries(alertLabels).map(([name, value]) => [name, {
-      color: "passive" as BadgeColor,
-      value: value,
-    }]));
-  }, [alertLabels]);
-
-  const openQueryLink = () => {
-    const params = {
-      "g0.expr": query,
-      "g0.end_time": ""
-    };
-    window.open(`#/?${createSearchParams(params).toString()}`, "_blank", "noopener noreferrer");
-  };
-
-  return (
-    <div className="vm-explore-alerts-alert-item">
-      <table>
-        <colgroup>
-          <col className="vm-col-md"/>
-          <col/>
-        </colgroup>
-        <tbody>
-          <tr>
-            <td
-              style={{ "text-align": "end" }}
-              colSpan={2}
-            >
-              <Button
-                size="small"
-                variant="outlined"
-                color="gray"
-                startIcon={<SearchIcon />}
-                onClick={openQueryLink}
-              >
-                <span className="vm-button-text">Run query</span>
-              </Button>
-            </td>
-          </tr>
-          <tr>
-            <td>Query</td>
-            <td>
-              <CodeExample
-                code={query}
-              />
-            </td>
-          </tr>
-          <tr>
-            <td>Active at</td>
-            <td>{dayjs(item.activeAt).format("DD MMM YYYY HH:mm:ss")}</td>
-          </tr>
-          {!!Object.keys(alertLabels).length && (
-            <tr>
-              <td>Labels</td>
-              <td>
-                <Badges
-                  items={alertLabelsItems}
-                />
-              </td>
-            </tr>
-          )}
-        </tbody>
-      </table>
-      {!!Object.keys(item.annotations || {}).length && (
-        <>
-          <span className="title">Annotations</span>
-          <table>
-            <colgroup>
-              <col className="vm-col-md"/>
-              <col/>
-            </colgroup>
-            <tbody>
-              {Object.entries(item.annotations || {}).map(([name, value]) => (
-                <tr key={name}>
-                  <td>{name}</td>
-                  <td>{value}</td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </>
-      )}
-    </div>
-  );
-};
-
-export default BaseAlert;

app/vmui/packages/vmui/src/components/ExploreAlerts/BaseAlert/style.scss

@@ -1,52 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-modal.vm-explore-alerts {
-  .vm-modal-content {
-    overflow-y: scroll;
-  }
-}
-
-.vm-explore-alerts-alert-item {
-  row-gap: $padding-global;
-  margin: $padding-global;
-  display: flex;
-  flex-direction: column;
-
-  .title {
-    font-weight: bold;
-    text-align: center;
-  }
-
-  .vm-col-md {
-    width: 20%;
-  }
-
-  .vm-button {
-    color: $color-passive;
-    border: 1px solid $color-passive;
-  }
-
-  .vm-code-example {
-    .vm-button {
-      background-color: $color-code;
-    }
-  }
-
-  table {
-    word-break: break-word;
-    table-layout: fixed;
-    width: 100%;
-    td, th {
-      line-height: 30px;
-      padding: 4px $padding-small;
-      white-space: nowrap;
-      text-align: left;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    th {
-      font-weight: bold;
-      padding: 0 $padding-small;
-    }
-  }
-}

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

@@ -1,127 +0,0 @@
-import { useMemo } from "preact/compat";
-import "./style.scss";
-import { Group as APIGroup } from "../../../types";
-import dayjs from "dayjs";
-import { formatDuration } from "../helpers";
-import Badges, { BadgeColor } from "../Badges";
-
-interface BaseGroupProps {
-  group: APIGroup;
-}
-
-const BaseGroup = ({ group }: BaseGroupProps) => {
-  const groupLabels = group?.labels || {};
-  const groupLabelsItems = useMemo(() => {
-    return Object.fromEntries(Object.entries(groupLabels).map(([name, value]) => [name, {
-      color: "passive" as BadgeColor,
-      value: value,
-    }]));
-  }, [groupLabels]);
-
-  const groupParams = group?.params || [];
-  const groupParamsItems = useMemo(() => {
-    return Object.fromEntries(groupParams.map(value => [value, {
-      color: "passive" as BadgeColor,
-    }]));
-  }, [groupParams]);
-
-  const groupHeaders = group?.headers || [];
-  const groupHeadersItems = useMemo(() => {
-    return Object.fromEntries(groupHeaders.map(value => [value, {
-      color: "passive" as BadgeColor,
-    }]));
-  }, [groupHeaders]);
-
-  const groupNotifierHeaders = group?.notifier_headers || [];
-  const groupNotifierHeadersItems = useMemo(() => {
-    return Object.fromEntries(groupNotifierHeaders.map(value => [value, {
-      color: "passive" as BadgeColor,
-    }]));
-  }, [groupNotifierHeaders]);
-  return (
-    <div className="vm-explore-alerts-group">
-      <table>
-        <tbody>
-          {!!group.interval && (
-            <tr>
-              <td className="vm-col-md">Interval</td>
-              <td>{formatDuration(group.interval)}</td>
-            </tr>
-          )}
-          {!!group.lastEvaluation && (
-            <tr>
-              <td className="vm-col-md">Last evaluation</td>
-              <td>{dayjs(group.lastEvaluation).format("DD MMM YYYY HH:mm:ss")}</td>
-            </tr>
-          )}
-          {!!group.eval_offset && (
-            <tr>
-              <td className="vm-col-md">Eval offset</td>
-              <td>{formatDuration(group.eval_offset)}</td>
-            </tr>
-          )}
-          {!!group.eval_delay && (
-            <tr>
-              <td className="vm-col-md">Eval delay</td>
-              <td>{formatDuration(group.eval_delay)}</td>
-            </tr>
-          )}
-          {!!group.file && (
-            <tr>
-              <td className="vm-col-md">File</td>
-              <td>{group.file}</td>
-            </tr>
-          )}
-          {!!group.concurrency && (
-            <tr>
-              <td className="vm-col-md">Concurrency</td>
-              <td>{group.concurrency}</td>
-            </tr>
-          )}
-          {!!Object.keys(groupLabels).length && (
-            <tr>
-              <td className="vm-col-md">Labels</td>
-              <td>
-                <Badges
-                  items={groupLabelsItems}
-                />
-              </td>
-            </tr>
-          )}
-          {!!groupParams.length && (
-            <tr>
-              <td className="vm-col-md">Params</td>
-              <td>
-                <Badges
-                  items={groupParamsItems}
-                />
-              </td>
-            </tr>
-          )}
-          {!!groupHeaders.length && (
-            <tr>
-              <td className="vm-col-md">Headers</td>
-              <td>
-                <Badges
-                  items={groupHeadersItems}
-                />
-              </td>
-            </tr>
-          )}
-          {!!groupNotifierHeaders.length && (
-            <tr>
-              <td className="vm-col-md">Notifier headers</td>
-              <td>
-                <Badges
-                  items={groupNotifierHeadersItems}
-                />
-              </td>
-            </tr>
-          )}
-        </tbody>
-      </table>
-    </div>
-  );
-};
-
-export default BaseGroup;

app/vmui/packages/vmui/src/components/ExploreAlerts/BaseGroup/style.scss

@@ -1,69 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-modal.vm-explore-alerts {
-  .vm-modal-content {
-    overflow-y: scroll;
-  }
-}
-
-.vm-explore-alerts-group {
-  row-gap: $padding-global;
-  margin: $padding-global;
-  display: flex;
-  flex-direction: column;
-
-  .title {
-    font-weight: bold;
-    text-align: center;
-  }
-
-  pre {
-    position: relative;
-    background-color: $color-background-badge;
-    padding: 0 $padding-global;
-    border-radius: $border-radius-small;
-    word-break: break-word;
-    white-space: pre-wrap;
-    .keyword,
-    .function,
-    .attr-name,
-    .range-duration {
-      color: $color-keyword;
-    }
-    div {
-      position: absolute;
-      top: 0;
-      right: 0;
-      display: flex;
-      column-gap: 4px;
-    }
-  }
-
-  .vm-col-md {
-    width: 20%;
-  }
-
-  table {
-    width: 100%;
-    table-layout: fixed;
-    tr.hoverable {
-      cursor: pointer;
-      &:hover {
-        background-color: $color-background-hover;
-      }
-    }
-    td, th {
-      line-height: 30px;
-      padding: 4px $padding-small;
-      white-space: nowrap;
-      text-align: left;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    th {
-      font-weight: bold;
-      text-align: center;
-      padding: 0 $padding-small;
-    }
-  }
-}

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

@@ -1,225 +0,0 @@
-import { useMemo } from "preact/compat";
-import "./style.scss";
-import { Rule as APIRule } from "../../../types";
-import { useNavigate, createSearchParams } from "react-router-dom";
-import { SearchIcon, DetailsIcon } from "../../Main/Icons";
-import Button from "../../Main/Button/Button";
-import Alert from "../../Main/Alert/Alert";
-import Badges, { BadgeColor } from "../Badges";
-import dayjs from "dayjs";
-import { formatDuration } from "../helpers";
-import CodeExample from "../../Main/CodeExample/CodeExample";
-
-interface BaseRuleProps {
-  item: APIRule;
-}
-
-const BaseRule = ({ item }: BaseRuleProps) => {
-  const query = item?.query;
-  const navigate = useNavigate();
-  const openAlertLink = (id: string) => {
-    return () => {
-      navigate({
-        pathname: "/rules",
-        search:   `group_id=${item.group_id}&alert_id=${id}`,
-      });
-    };
-  };
-
-  const ruleLabels = item?.labels || {};
-  const ruleLabelsItems = useMemo(() => {
-    return Object.fromEntries(Object.entries(ruleLabels).map(([name, value]) => [name, {
-      color: "passive" as BadgeColor,
-      value: value,
-    }]));
-  }, [ruleLabels]);
-
-  const openQueryLink = () => {
-    const params = {
-      "g0.expr": query,
-      "g0.end_time": ""
-    };
-    window.open(`#/?${createSearchParams(params).toString()}`, "_blank", "noopener noreferrer");
-  };
-
-  return (
-    <div className="vm-explore-alerts-rule-item">
-      <table>
-        <colgroup>
-          <col className="vm-col-md"/>
-          <col/>
-        </colgroup>
-        <tbody>
-          <tr>
-            <td
-              style={{ "text-align": "end" }}
-              colSpan={2}
-            >
-              <Button
-                size="small"
-                variant="outlined"
-                color="gray"
-                startIcon={<SearchIcon />}
-                onClick={openQueryLink}
-              >
-                <span className="vm-button-text">Run query</span>
-              </Button>
-            </td>
-          </tr>
-          <tr>
-            <td>Query</td>
-            <td>
-              <CodeExample
-                code={query}
-              />
-            </td>
-          </tr>
-          {!!item.duration && (
-            <tr>
-              <td>For</td>
-              <td>{formatDuration(item.duration)}</td>
-            </tr>
-          )}
-          {!!item.lastEvaluation && (
-            <tr>
-              <td>Last evaluation</td>
-              <td>{dayjs(item.lastEvaluation).format("DD MMM YYYY HH:mm:ss")}</td>
-            </tr>
-          )}
-          {!!item.lastError && item.health !== "ok" && (
-            <tr>
-              <td>Last error</td>
-              <td>
-                <Alert variant="error">{item.lastError}</Alert>
-              </td>
-            </tr>
-          )}
-          {!!Object.keys(ruleLabelsItems).length && (
-            <tr>
-              <td>Labels</td>
-              <td>
-                <Badges
-                  items={ruleLabelsItems}
-                />
-              </td>
-            </tr>
-          )}
-        </tbody>
-      </table>
-      {!!Object.keys(item?.annotations || {}).length && (
-        <>
-          <span className="title">Annotations</span>
-          <table>
-            <colgroup>
-              <col className="vm-col-md"/>
-              <col/>
-            </colgroup>
-            <tbody>
-              {Object.entries(item.annotations || {}).map(([name, value]) => (
-                <tr key={name}>
-                  <td>{name}</td>
-                  <td>{value}</td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </>
-      )}
-      {!!item?.updates?.length && (
-        <>
-          <span className="title">{`Last updates ${item.updates.length}/${item.max_updates_entries}`}</span>
-          <table>
-            <thead>
-              <tr>
-                <th>Updated at</th>
-                <th>Series returned</th>
-                <th>Series fetched</th>
-                <th>Duration</th>
-                <th>Executed at</th>
-              </tr>
-            </thead>
-            <tbody>
-              {item.updates.map((update) => (
-                <tr
-                  key={update.at}
-                >
-                  <td>{dayjs(update.time).format("DD MMM YYYY HH:mm:ss")}</td>
-                  <td>{update.samples}</td>
-                  <td>{update.series_fetched}</td>
-                  <td>{formatDuration(update.duration / 1e9)}</td>
-                  <td>{dayjs(update.at).format("DD MMM YYYY HH:mm:ss")}</td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </>
-      )}
-      {!!item?.alerts?.length && (
-        <>
-          <span className="title">Alerts</span>
-          <table>
-            <colgroup>
-              <col className="vm-col-sm"/>
-              <col className="vm-col-sm"/>
-              <col className="vm-col-sm"/>
-              <col/>
-              <col className="vm-col-hidden"/>
-            </colgroup>
-            <thead>
-              <tr>
-                <th>Active since</th>
-                <th>State</th>
-                <th>Value</th>
-                <th className="title">Labels</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              {item.alerts.map((alert) => (
-                <tr
-                  id={`alert-${alert.id}`}
-                  key={alert.id}
-                >
-                  <td>
-                    {dayjs(alert.activeAt).format("DD MMM YYYY HH:mm:ss")}
-                  </td>
-                  <td>
-                    <Badges
-                      items={{ [alert.state]: { color: alert.state as BadgeColor } }}
-                    />
-                  </td>
-                  <td>
-                    <Badges
-                      items={{ [alert.value]: { color: "passive" } }}
-                    />
-                  </td>
-                  <td>
-                    <Badges
-                      align="center"
-                      items={Object.fromEntries(Object.entries(alert.labels || {}).map(([name, value]) => [name, {
-                        color: "passive",
-                        value: value,
-                      }]))}
-                    />
-                  </td>
-                  <td>
-                    <Button
-                      className="vm-button-borderless"
-                      size="small"
-                      variant="outlined"
-                      color="gray"
-                      startIcon={<DetailsIcon />}
-                      onClick={openAlertLink(alert.id)}
-                    />
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </>
-      )}
-    </div>
-  );
-};
-
-export default BaseRule;

app/vmui/packages/vmui/src/components/ExploreAlerts/BaseRule/style.scss

@@ -1,64 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-modal.vm-explore-alerts {
-  .vm-modal-content {
-    overflow-y: scroll;
-  }
-}
-
-.vm-explore-alerts-rule-item {
-  row-gap: $padding-global;
-  margin: $padding-global;
-  display: flex;
-  flex-direction: column;
-
-  .title {
-    font-weight: bold;
-    text-align: center;
-  }
-
-  .vm-col-hidden {
-    width: 40px;
-  }
-
-  .vm-button {
-    color: $color-passive;
-    border: 1px solid $color-passive;
-  }
-
-  .vm-code-example {
-    .vm-button {
-      background-color: $color-code;
-    }
-  }
-
-  .vm-col-sm {
-    width: 15%;
-  }
-
-  .vm-col-md {
-    width: 20%;
-  }
-
-  table {
-    word-break: break-word;
-    table-layout: fixed;
-    width: 100%;
-    td, th {
-      line-height: 30px;
-      padding: 4px $padding-small;
-      vertical-align: middle;
-      white-space: nowrap;
-      text-align: left;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    td.align-center {
-      text-align: center
-    }
-    th {
-      font-weight: bold;
-      padding: 0 $padding-small;
-    }
-  }
-}

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

@@ -1,59 +0,0 @@
-import { FC } from "preact/compat";
-import "./style.scss";
-import useDeviceDetect from "../../../hooks/useDeviceDetect";
-import { useNavigate } from "react-router-dom";
-import { Group as APIGroup } from "../../../types";
-import { DetailsIcon } from "../../Main/Icons";
-import Button from "../../Main/Button/Button";
-import Badges, { BadgeColor } from "../Badges";
-import classNames from "classnames";
-interface GroupHeaderControlsProps {
-  group: APIGroup;
-}
-
-const GroupHeaderHeader: FC<GroupHeaderControlsProps> = ({ group }) => {
-  const { isMobile } = useDeviceDetect();
-  const navigate = useNavigate();
-
-  const openGroupModal = async () => {
-    navigate({
-      pathname: "/rules",
-      search:   `group_id=${group.id}`,
-    });
-  };
-
-  const headerClasses = classNames({
-    "vm-explore-alerts-group-header": true,
-    "vm-explore-alerts-group-header_mobile": isMobile,
-  });
-
-  return (
-    <div className={headerClasses}>
-      <div className="vm-explore-alerts-group-header__desc">
-        <div className="vm-explore-alerts-group-header__name">{group.name}</div>
-        {!isMobile && (
-          <div className="vm-explore-alerts-group-header__file">{group.file}</div>
-        )}
-      </div>
-      <div className="vm-explore-alerts-controls">
-        <Badges
-          align="end"
-          items={Object.fromEntries(Object.entries(group.states || {}).map(([name, value]) => [name.toLowerCase(), {
-            color: name.toLowerCase().replace(" ", "-") as BadgeColor,
-            value: value,
-          }]))}
-        />
-        <Button
-          className="vm-button-borderless"
-          size="small"
-          color="gray"
-          variant="outlined"
-          startIcon={<DetailsIcon />}
-          onClick={openGroupModal}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default GroupHeaderHeader;

app/vmui/packages/vmui/src/components/ExploreAlerts/GroupHeader/style.scss

@@ -1,65 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-explore-alerts-group-header {
-  display: flex;
-  align-items: center;
-  padding: $padding-tiny 0 $padding-tiny $padding-global;
-  justify-content: space-between;
-
-  .vm-button_small {
-    padding: 4px;
-  }
-
-  .vm-button-borderless {
-    border: 0;
-  }
-
-  @media(max-width: 768px) {
-    .vm-button-text {
-      display: none;
-    }
-  }
-
-  &_mobile {
-    .vm-button-text {
-      display: none;
-    }
-  }
-
-  &__desc {
-    display: flex;
-    flex-direction: column;
-    gap: $padding-tiny;
-  }
-
-  &__index {
-    color: $color-text-secondary;
-    font-size: $font-size-small;
-  }
-
-  &__name {
-    flex-grow: 1;
-    font-weight: bold;
-    max-width: 100%;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    line-height: 130%;
-    word-break: break-word;
-  }
-
-  &__file {
-    color: $color-text-disabled;
-  }
-
-  code {
-    padding: 0.2em 0.4em;
-    font-size: 85%;
-    background-color: $color-hover-black;
-    border-radius: 6px;
-  }
-}
-
-.vm-explore-alerts-controls {
-  display: flex;
-  column-gap: $padding-global;
-}

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

@@ -1,133 +0,0 @@
-import { FC, useMemo } from "preact/compat";
-import "./style.scss";
-import useDeviceDetect from "../../../hooks/useDeviceDetect";
-import useCopyToClipboard from "../../../hooks/useCopyToClipboard";
-import { useAppState } from "../../../state/common/StateContext";
-import Tooltip from "../../Main/Tooltip/Tooltip";
-import classNames from "classnames";
-import { useNavigate } from "react-router-dom";
-import Badges, { BadgeColor } from "../Badges";
-import {
-  LinkIcon,
-  GroupIcon,
-  AlertIcon,
-  AlertingRuleIcon,
-  RecordingRuleIcon,
-  DetailsIcon,
-} from "../../Main/Icons";
-import Button from "../../Main/Button/Button";
-
-interface ItemHeaderControlsProps {
-  entity: string;
-  type?: string;
-  groupId: string;
-  states?: Record<string, number>;
-  id?: string;
-  name: string;
-  onClose?: () => void;
-}
-
-const ItemHeader: FC<ItemHeaderControlsProps> = ({ name, id, groupId, entity, type, states, onClose }) => {
-  const { isMobile } = useDeviceDetect();
-  const { serverUrl } = useAppState();
-  const navigate = useNavigate();
-  const copyToClipboard = useCopyToClipboard();
-
-  const openItemLink = () => {
-    navigate({
-      pathname: "/rules",
-      search:   `group_id=${groupId}&${entity}_id=${id}`,
-    });
-  };
-
-  const copyLink = async () => {
-    let link = `${serverUrl}/vmui/#/rules?group_id=${groupId}`;
-    if (type) link = `${link}&${entity}_id=${id}`;
-    await copyToClipboard(link, `Link to ${entity} has been copied`);
-  };
-
-  const headerClasses = classNames({
-    "vm-explore-alerts-item-header": true,
-    "vm-explore-alerts-item-header_mobile": isMobile,
-  });
-
-  const renderIcon = () => {
-    switch(entity) {
-      case "alert":
-        return (
-          <Tooltip title="Alert">
-            <AlertIcon />
-          </Tooltip>
-        );
-      case "group":
-        return (
-          <Tooltip title="Group">
-            <GroupIcon />
-          </Tooltip>
-        );
-      default:
-        switch(type) {
-          case "alerting":
-            return (
-              <Tooltip title="Alerting rule">
-                <AlertingRuleIcon />
-              </Tooltip>
-            );
-          default:
-            return (
-              <Tooltip title="Recording rule">
-                <RecordingRuleIcon />
-              </Tooltip>
-            );
-        }
-    }
-  };
-
-  const badgesItems = useMemo(() => {
-    return Object.fromEntries(Object.entries(states || {}).map(([name,  value]) => [name, {
-      color: name.toLowerCase().replace(" ", "-") as BadgeColor,
-      value: value == 1 ? 0 : value,
-    }]));
-  }, [states]);
-
-  return (
-    <div
-      className={headerClasses}
-      id={`rule-${id}`}
-    >
-      <div className="vm-explore-alerts-item-header__title">
-        {renderIcon()}
-        <div className="vm-explore-alerts-item-header__name">{name}</div>
-      </div>
-      <div className="vm-explore-alerts-controls">
-        <Badges
-          align="end"
-          items={badgesItems}
-        />
-        {onClose ? (
-          <Button
-            className="vm-back-button"
-            size="small"
-            variant="outlined"
-            color="gray"
-            startIcon={<LinkIcon />}
-            onClick={copyLink}
-          >
-            <span className="vm-button-text">Copy Link</span>
-          </Button>
-        ) : (
-          <Button
-            className="vm-button-borderless"
-            size="small"
-            variant="outlined"
-            color="gray"
-            startIcon={<DetailsIcon />}
-            onClick={openItemLink}
-          />
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default ItemHeader;

app/vmui/packages/vmui/src/components/ExploreAlerts/ItemHeader/style.scss

@@ -1,75 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-explore-alerts-item-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: $padding-global;
-
-  .vm-button_small {
-    padding: 4px;
-  }
-
-  @media(max-width: 768px) {
-    .vm-button-text {
-      display: none;
-    }
-  }
-
-  .vm-button-borderless {
-    border: 0;
-  }
-
-  .vm-back-button {
-    svg {
-      transform: rotate(90deg);
-    }
-  }
-
-  &_mobile {
-    .vm-button-text {
-      display: none;
-    }
-  }
-
-  &__index {
-    color: $color-text-secondary;
-    font-size: $font-size-small;
-  }
-
-  &__name {
-    font-weight: bold;
-    max-width: 100%;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    line-height: 130%;
-    word-break: break-word;
-  }
-
-  &__title {
-    display: flex;
-    column-gap: $padding-global;
-    overflow: hidden;
-    svg {
-      fill: $color-text-disabled;
-      width: 14px;
-      min-width: 14px;
-    }
-  }
-
-  &__file {
-    color: $color-text-disabled;
-  }
-
-  code {
-    padding: 0.2em 0.4em;
-    font-size: 85%;
-    background-color: $color-hover-black;
-    border-radius: 6px;
-  }
-}
-
-.vm-explore-alerts-controls {
-  display: flex;
-  column-gap: $padding-global;
-}

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

@@ -1,30 +0,0 @@
-import { FC } from "preact/compat";
-import "./style.scss";
-import useDeviceDetect from "../../../hooks/useDeviceDetect";
-import { Notifier } from "../../../types";
-import classNames from "classnames";
-
-interface NotifierHeaderControlsProps {
-  notifier: Notifier;
-}
-
-const NotifierHeaderHeader: FC<NotifierHeaderControlsProps> = ({
-  notifier,
-}) => {
-  const { isMobile } = useDeviceDetect();
-
-  return (
-    <div
-      className={classNames({
-        "vm-explore-alerts-notifier-header": true,
-        "vm-explore-alerts-notifier-header_mobile": isMobile,
-      })}
-    >
-      <div className="vm-explore-alerts-notifier-header__name">
-        {notifier.kind}
-      </div>
-    </div>
-  );
-};
-
-export default NotifierHeaderHeader;

app/vmui/packages/vmui/src/components/ExploreAlerts/NotifierHeader/style.scss

@@ -1,38 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-explore-alerts-notifier-header {
-  display: flex;
-  align-items: center;
-  padding: $padding-global;
-  justify-content: space-between;
-  gap: $padding-global;
-
-  &_mobile {
-    padding: $padding-small $padding-global;
-  }
-
-  &__index {
-    color: $color-text-secondary;
-    font-size: $font-size-small;
-  }
-
-  &__name {
-    flex-grow: 1;
-    font-weight: bold;
-    max-width: 100%;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    line-height: 130%;
-  }
-
-  &__file {
-    color: $color-text-disabled;
-  }
-
-  code {
-    padding: 0.2em 0.4em;
-    font-size: 85%;
-    background-color: $color-hover-black;
-    border-radius: 6px;
-  }
-}

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

@@ -1,59 +0,0 @@
-import { FC } from "preact/compat";
-import Select from "../../Main/Select/Select";
-import { SearchIcon } from "../../Main/Icons";
-import TextField from "../../Main/TextField/TextField";
-import "./style.scss";
-import classNames from "classnames";
-import useDeviceDetect from "../../../hooks/useDeviceDetect";
-
-interface NotifiersHeaderProps {
-  kinds: string[];
-  allKinds: string[];
-  onChangeKinds: (input: string) => void;
-  onChangeSearch: (input: string) => void;
-}
-
-const NotifiersHeader: FC<NotifiersHeaderProps> = ({
-  kinds,
-  allKinds,
-  onChangeKinds,
-  onChangeSearch,
-}) => {
-  const { isMobile } = useDeviceDetect();
-
-  return (
-    <>
-      <div
-        className={classNames({
-          "vm-explore-alerts-header": true,
-          "vm-explore-alerts-header_mobile": isMobile,
-          "vm-block": true,
-          "vm-block_mobile": isMobile,
-        })}
-      >
-        <div className="vm-explore-alerts-header__rule_type">
-          <Select
-            value={kinds}
-            list={allKinds}
-            label="Notifier type"
-            placeholder="Please select notifier type"
-            onChange={onChangeKinds}
-            autofocus={!!kinds.length && !isMobile}
-            includeAll
-            searchable
-          />
-        </div>
-        <div className="vm-explore-alerts-header-search">
-          <TextField
-            label="Search"
-            placeholder="Filter by kind, address or labels"
-            startIcon={<SearchIcon />}
-            onChange={onChangeSearch}
-          />
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default NotifiersHeader;

app/vmui/packages/vmui/src/components/ExploreAlerts/NotifiersHeader/style.scss

@@ -1,65 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-explore-alerts-header {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: flex-start;
-  gap: $padding-global calc($padding-small + 10px);
-  width: 100%;
-
-  &_mobile {
-    flex-direction: column;
-    align-items: stretch;
-  }
-
-  &__rule_type {
-    min-width: 120px;
-  }
-
-  &__state {
-    min-width: 150px;
-  }
-
-  &-description {
-    display: grid;
-    grid-template-columns: 1fr auto;
-    align-items: flex-start;
-    gap: $padding-small;
-
-    ul {
-      list-style-position: inside;
-    }
-
-    button {
-      color: inherit;
-      min-height: 29px;
-    }
-
-    code {
-      margin: 0 3px;
-    }
-  }
-
-  &-search {
-    flex-grow: 1;
-    .vm-text-field__input {
-      padding: 11px 28px;
-    }
-    .vm-text-field__icon-start {
-      height: 42px;
-    }
-  }
-
-  &__clear-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 2px;
-    cursor: pointer;
-
-    &:hover {
-      opacity: 0.7;
-    }
-  }
-}

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

@@ -1,34 +0,0 @@
-import { FC } from "preact/compat";
-import ItemHeader from "../ItemHeader";
-import Accordion from "../../Main/Accordion/Accordion";
-import "./style.scss";
-import { Rule as APIRule } from "../../../types";
-import BaseRule from "../BaseRule";
-
-interface RuleProps {
-  states: Record<string, number>;
-  rule: APIRule;
-}
-
-const Rule: FC<RuleProps> = ({ states, rule }) => {
-  const state = Object.keys(states).length > 0 ? Object.keys(states)[0] : "ok";
-  return (
-    <div className={`vm-explore-alerts-rule vm-badge-item ${state.replace(" ", "-")}`}>
-      <Accordion
-        key={`rule-${rule.id}`}
-        title={<ItemHeader
-          entity="rule"
-          type={rule.type}
-          groupId={rule.group_id}
-          states={states}
-          id={rule.id}
-          name={rule.name}
-        />}
-      >
-        <BaseRule item={rule} />
-      </Accordion>
-    </div>
-  );
-};
-
-export default Rule;

app/vmui/packages/vmui/src/components/ExploreAlerts/Rule/style.scss

@@ -1,18 +0,0 @@
-@use "src/styles/variables" as *;
-
-.vm-explore-alerts-rule {
-  padding: $padding-tiny;
-  padding-right: 0;
-  display: flex;
-  row-gap: $padding-tiny;
-  flex-direction: column;
-  position: relative;
-
-  &:has(>details[open]) {
-    background-color: $color-background-item;
-  }
-
-  &:hover {
-    background-color: $color-background-item;
-  }
-}

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

@@ -1,82 +0,0 @@
-import { FC, useMemo } from "preact/compat";
-import Select from "../../Main/Select/Select";
-import { SearchIcon } from "../../Main/Icons";
-import TextField from "../../Main/TextField/TextField";
-import "./style.scss";
-import classNames from "classnames";
-import useDeviceDetect from "../../../hooks/useDeviceDetect";
-
-interface RulesHeaderProps {
-  types: string[];
-  allTypes: string[];
-  allStates: string[];
-  states: string[];
-  onChangeTypes: (input: string) => void;
-  onChangeStates: (input: string) => void;
-  onChangeSearch: (input: string) => void;
-}
-
-const RulesHeader: FC<RulesHeaderProps> = ({
-  types,
-  allTypes,
-  allStates,
-  states,
-  onChangeTypes,
-  onChangeStates,
-  onChangeSearch,
-}) => {
-  const noStateText = useMemo(
-    () => (types.length ? "" : "No states. Please select rule states"),
-    [types],
-  );
-  const { isMobile } = useDeviceDetect();
-
-  return (
-    <>
-      <div
-        className={classNames({
-          "vm-explore-alerts-header": true,
-          "vm-explore-alerts-header_mobile": isMobile,
-          "vm-block": true,
-          "vm-block_mobile": isMobile,
-        })}
-      >
-        <div className="vm-explore-alerts-header__rule_type">
-          <Select
-            value={types}
-            list={allTypes}
-            label="Rules type"
-            placeholder="Please select rule type"
-            onChange={onChangeTypes}
-            autofocus={!!types.length && !isMobile}
-            includeAll
-            searchable
-          />
-        </div>
-        <div className="vm-explore-alerts-header__state">
-          <Select
-            itemClassName="vm-badge-menu-item"
-            value={states}
-            list={allStates}
-            label="State"
-            placeholder="Please rule state"
-            onChange={onChangeStates}
-            noOptionsText={noStateText}
-            includeAll
-            searchable
-          />
-        </div>
-        <div className="vm-explore-alerts-header-search">
-          <TextField
-            label="Search"
-            placeholder="Filter by rule, name or labels"
-            startIcon={<SearchIcon />}
-            onChange={onChangeSearch}
-          />
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default RulesHeader;