lib/timerpool: remove check of Reset output value

This reverts commit ccf97a4143.

reason for revert: this change may break tests, which expect that ServesMetrics.GetMetric() fails
when the given metric doesn't exist in the output.

It is better to add 'TryGetMetric() (float64, bool)' function, which would return '(0, false)'
when the given metric doesn't exist, so the caller could decide what to do next.

Updates https://github.com/VictoriaMetrics/VictoriaMetrics/pull/9773

.github/workflows/build.yml

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

.github/workflows/check-licenses.yml

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

.github/workflows/test.yml

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

SECURITY.md

@@ -4,12 +4,11 @@
 
 The following versions of VictoriaMetrics receive regular security fixes:
 
-| 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:                |
+| 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:                |
 
 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/
+See the docs at https://docs.victoriametrics.com/victoriametrics/
 `
 	flagutil.Usage(s)
 }

app/vmalert-tool/unittest/unittest.go

@@ -132,7 +132,7 @@ func UnitTest(files []string, disableGroupLabel bool, externalLabels []string, e
 		}
 		labels[s[:n]] = s[n+1:]
 	}
-	_, err = notifier.Init(nil, labels, externalURL)
+	_, err = notifier.Init(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 < 0 {
-		return fmt.Errorf("invalid limit %d, shouldn't be less than 0", g.Limit)
+	if g.Limit != nil && *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,9 +181,10 @@ 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: -1,
+		Limit: &limit,
 	}, false, "invalid limit")
 
 	f(&Group{

app/vmalert/main.go

@@ -7,7 +7,6 @@ import (
 	"net/url"
 	"os"
 	"sort"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -83,8 +82,7 @@ absolute path to all .tpl files in root.
 )
 
 var (
-	alertURLGeneratorFn notifier.AlertURLGenerator
-	extURL              *url.URL
+	extURL *url.URL
 )
 
 func main() {
@@ -121,7 +119,7 @@ func main() {
 		return
 	}
 
-	alertURLGeneratorFn, err = getAlertURLGenerator(extURL, *externalAlertSource, *validateTemplates)
+	err = notifier.InitAlertURLGeneratorFn(extURL, *externalAlertSource, *validateTemplates)
 	if err != nil {
 		logger.Fatalf("failed to init `external.alert.source`: %s", err)
 	}
@@ -228,7 +226,7 @@ func newManager(ctx context.Context) (*manager, error) {
 		labels[s[:n]] = s[n+1:]
 	}
 
-	nts, err := notifier.Init(alertURLGeneratorFn, labels, *externalURL)
+	nts, err := notifier.Init(labels, *externalURL)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init notifier: %w", err)
 	}
@@ -292,35 +290,6 @@ 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,30 +49,6 @@ 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

@@ -30,7 +30,7 @@ type manager struct {
 }
 
 // groupAPI generates apiGroup object from group by its ID(hash)
-func (m *manager) groupAPI(gID uint64) (*apiGroup, error) {
+func (m *manager) groupAPI(gID uint64) (*rule.ApiGroup, error) {
 	m.groupsMu.RLock()
 	defer m.groupsMu.RUnlock()
 
@@ -38,28 +38,28 @@ func (m *manager) groupAPI(gID uint64) (*apiGroup, error) {
 	if !ok {
 		return nil, fmt.Errorf("can't find group with id %d", gID)
 	}
-	return groupToAPI(g), nil
+	return g.ToAPI(), nil
 }
 
 // ruleAPI generates apiRule object from alert by its ID(hash)
-func (m *manager) ruleAPI(gID, rID uint64) (apiRule, error) {
+func (m *manager) ruleAPI(gID, rID uint64) (rule.ApiRule, error) {
 	m.groupsMu.RLock()
 	defer m.groupsMu.RUnlock()
 
 	g, ok := m.groups[gID]
 	if !ok {
-		return apiRule{}, fmt.Errorf("can't find group with id %d", gID)
+		return rule.ApiRule{}, fmt.Errorf("can't find group with id %d", gID)
 	}
-	for _, rule := range g.Rules {
-		if rule.ID() == rID {
-			return ruleToAPI(rule), nil
+	for _, r := range g.Rules {
+		if r.ID() == rID {
+			return r.ToAPI(), nil
 		}
 	}
-	return apiRule{}, fmt.Errorf("can't find rule with id %d in group %q", rID, g.Name)
+	return rule.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) (*apiAlert, error) {
+func (m *manager) alertAPI(gID, aID uint64) (*rule.ApiAlert, error) {
 	m.groupsMu.RLock()
 	defer m.groupsMu.RUnlock()
 
@@ -72,7 +72,7 @@ func (m *manager) alertAPI(gID, aID uint64) (*apiAlert, error) {
 		if !ok {
 			continue
 		}
-		if apiAlert := alertToAPI(ar, aID); apiAlert != nil {
+		if apiAlert := ar.AlertToAPI(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(nil, extLabels, extURL)
+	_, err := Init(extLabels, extURL)
 	checkErr(t, err)
 
 	f := func(alert *Alert, annotations map[string]string, tplExpected map[string]string) {

app/vmalert/notifier/init.go

@@ -4,10 +4,13 @@ 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"
 )
@@ -57,6 +60,42 @@ 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.
@@ -90,7 +129,7 @@ var (
 //   - configuration via file. Supports live reloads and service discovery.
 //
 // Init returns an error if both mods are used.
-func Init(gen AlertURLGenerator, extLabels map[string]string, extURL string) (func() []Notifier, error) {
+func Init(extLabels map[string]string, extURL string) (func() []Notifier, error) {
 	externalURL = extURL
 	externalLabels = extLabels
 	_, err := url.Parse(externalURL)
@@ -117,7 +156,7 @@ func Init(gen AlertURLGenerator, extLabels map[string]string, extURL string) (fu
 	}
 
 	if len(*addrs) > 0 {
-		notifiers, err := notifiersFromFlags(gen)
+		notifiers, err := notifiersFromFlags(AlertURLGeneratorFn)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create notifier from flag values: %w", err)
 		}
@@ -127,7 +166,7 @@ func Init(gen AlertURLGenerator, extLabels map[string]string, extURL string) (fu
 		return staticNotifiersFn, nil
 	}
 
-	cw, err = newWatcher(*configPath, gen)
+	cw, err = newWatcher(*configPath, AlertURLGeneratorFn)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init config watcher: %w", err)
 	}

app/vmalert/notifier/init_test.go

@@ -1,6 +1,8 @@
 package notifier
 
 import (
+	"fmt"
+	"net/url"
 	"testing"
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil"
@@ -12,7 +14,7 @@ func TestInit(t *testing.T) {
 
 	*addrs = flagutil.ArrayString{"127.0.0.1", "127.0.0.2"}
 
-	fn, err := Init(nil, nil, "")
+	fn, err := Init(nil, "")
 	if err != nil {
 		t.Fatalf("%s", err)
 	}
@@ -52,7 +54,7 @@ func TestInitNegative(t *testing.T) {
 		*configPath = path
 		*addrs = flagutil.ArrayString{addr}
 		*blackHole = bh
-		if _, err := Init(nil, nil, ""); err == nil {
+		if _, err := Init(nil, ""); err == nil {
 			t.Fatalf("expected to get error; got nil instead")
 		}
 	}
@@ -69,7 +71,7 @@ func TestBlackHole(t *testing.T) {
 
 	*blackHole = true
 
-	fn, err := Init(nil, nil, "")
+	fn, err := Init(nil, "")
 	if err != nil {
 		t.Fatalf("%s", err)
 	}
@@ -91,3 +93,30 @@ 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/web.go

@@ -0,0 +1,19 @@
+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,6 +187,54 @@ 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,7 +2,6 @@ package rule
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"flag"
 	"fmt"
@@ -25,6 +24,10 @@ 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.")
@@ -112,7 +115,6 @@ 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,
@@ -129,6 +131,11 @@ 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
 	}
@@ -289,7 +296,7 @@ func (g *Group) InterruptEval() {
 	}
 }
 
-// Close stops the group and it's rules, unregisters group metrics
+// Close stops the group and its rules, unregisters group metrics
 func (g *Group) Close() {
 	if g.doneCh == nil {
 		return
@@ -298,10 +305,6 @@ func (g *Group) Close() {
 	g.InterruptEval()
 	<-g.finishedCh
 
-	g.closeGroupMetrics()
-}
-
-func (g *Group) closeGroupMetrics() {
 	metrics.UnregisterSet(g.metrics.set, true)
 }
 
@@ -331,7 +334,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 in order to reduce load on datasource.
+	// over time to reduce the load on datasource.
 	if !SkipRandSleepOnGroupStart {
 		sleepBeforeStart := delayBeforeStart(evalTS, g.GetID(), g.Interval, g.EvalOffset)
 		g.infof("will start in %v", sleepBeforeStart)
@@ -472,18 +475,6 @@ 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,6 +81,37 @@ 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,6 +21,8 @@ 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)
@@ -68,39 +70,6 @@ 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/rule/web.go

@@ -1,4 +1,4 @@
-package main
+package rule
 
 import (
 	"fmt"
@@ -8,81 +8,28 @@ 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"
+	ParamRuleID = "rule_id"
+
+	// TypeRecording is a RecordingRule type
+	TypeRecording = "recording"
+	// TypeAlerting is an AlertingRule type
+	TypeAlerting = "alerting"
 )
 
-type apiNotifier struct {
-	Kind    string       `json:"kind"`
-	Targets []*apiTarget `json:"targets"`
-}
-
-type apiTarget struct {
-	Address string            `json:"address"`
-	Labels  map[string]string `json:"labels"`
-	// LastError contains the error faced while sending to notifier.
-	LastError string `json:"lastError"`
-}
-
-// 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 {
+// ApiGroup represents a Group for web view
+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
@@ -111,27 +58,27 @@ type apiGroup struct {
 	// EvalDelay will adjust the `time` parameter of rule evaluation requests to compensate intentional query delay from datasource.
 	EvalDelay float64 `json:"eval_delay,omitempty"`
 	// Unhealthy unhealthy rules count
-	unhealthy int
+	Unhealthy int
 	// Healthy passing rules count
-	healthy int
+	Healthy int
 	// NoMatch not matching rules count
-	noMatch int
+	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)
+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.
@@ -153,7 +100,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"`
@@ -184,143 +131,96 @@ 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 []rule.StateEntry `json:"-"`
+	Updates []StateEntry `json:"-"`
 }
 
-// apiRuleWithUpdates represents apiRule but with extra fields for marshalling
-type apiRuleWithUpdates struct {
-	apiRule
-	// Updates contains the ordered list of recorded ruleStateEntry objects
-	StateUpdates []rule.StateEntry `json:"updates,omitempty"`
-}
+// 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"`
 
-// APILink returns a link to the rule's JSON representation.
-func (ar apiRule) APILink() string {
-	return fmt.Sprintf("api/v1/rule?%s=%s&%s=%s",
-		paramGroupID, ar.GroupID, paramRuleID, ar.ID)
+	// 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 (ar apiRule) WebLink() string {
+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
+	// Updates contains the ordered list of recorded ruleStateEntry objects
+	StateUpdates []StateEntry `json:"updates,omitempty"`
+}
+
+// APILink returns a link to the rule's JSON representation.
+func (ar ApiRule) APILink() string {
+	return fmt.Sprintf("api/v1/rule?%s=%s&%s=%s",
+		ParamGroupID, ar.GroupID, ParamRuleID, ar.ID)
+}
+
+// WebLink returns a link to the alert which can be used in UI.
+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)
 }
 
-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
+// AlertsToAPI returns list of ApiAlert objects from existing alerts
+func (ar *AlertingRule) AlertsToAPI() []*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 alertToAPI(ar *rule.AlertingRule, id uint64) *apiAlert {
+// AlertToAPI generates apiAlert object from alert by its id(hash)
+func (ar *AlertingRule) AlertToAPI(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 *rule.AlertingRule, a *notifier.Alert) *apiAlert {
-	aa := &apiAlert{
+func NewAlertAPI(ar *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),
@@ -335,8 +235,8 @@ func newAlertAPI(ar *rule.AlertingRule, a *notifier.Alert) *apiAlert {
 		Restored:    a.Restored,
 		Value:       strconv.FormatFloat(a.Value, 'f', -1, 32),
 	}
-	if alertURLGeneratorFn != nil {
-		aa.SourceLink = alertURLGeneratorFn(*a)
+	if notifier.AlertURLGeneratorFn != nil {
+		aa.SourceLink = notifier.AlertURLGeneratorFn(*a)
 	}
 	if a.State == notifier.StateFiring && !a.KeepFiringSince.IsZero() {
 		aa.Stabilizing = true
@@ -344,9 +244,11 @@ func newAlertAPI(ar *rule.AlertingRule, a *notifier.Alert) *apiAlert {
 	return aa
 }
 
-func groupToAPI(g *rule.Group) *apiGroup {
-	g = g.DeepCopy()
-	ag := apiGroup{
+// ToAPI returns ApiGroup representation of g
+func (g *Group) ToAPI() *ApiGroup {
+	g.mu.RLock()
+	defer g.mu.RUnlock()
+	ag := ApiGroup{
 		// encode as string to avoid rounding
 		ID:              strconv.FormatUint(g.GetID(), 10),
 		Name:            g.Name,
@@ -366,9 +268,9 @@ func groupToAPI(g *rule.Group) *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, ruleToAPI(r))
+		ag.Rules = append(ag.Rules, r.ToAPI())
 	}
 	return &ag
 }

app/vmalert/rule/web_test.go

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

app/vmalert/web.go

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

app/vmalert/web.qtpl

@@ -8,6 +8,7 @@
     "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) %}
@@ -93,7 +94,7 @@
     {%= tpl.Footer(r) %}
 {% endfunc %}
 
-{% func ListGroups(r *http.Request, groups []*apiGroup, filter string) %}
+{% func ListGroups(r *http.Request, groups []*rule.ApiGroup, filter string) %}
     {%code
         prefix := vmalertutil.Prefix(r.URL.Path)
         filters := map[string]string{
@@ -113,7 +114,7 @@
         {%= Controls(prefix, currentIcon, currentText, icons, filters, true) %}
         {%  if len(groups) > 0 %}
             {% for _, g := range groups %}
-                <div id="group-{%s g.ID %}" class="d-flex w-100 border-0 flex-column group-items{% if g.unhealthy > 0 %} alert-danger{% endif %}">
+                <div id="group-{%s g.ID %}" class="d-flex w-100 border-0 flex-column group-items{% if g.Unhealthy > 0 %} alert-danger{% endif %}">
                     <span class="d-flex justify-content-between">
                         <a href="#group-{%s g.ID %}">{%s g.Name %}{% if g.Type != "prometheus" %} ({%s g.Type %}){% endif %} (every {%f.0 g.Interval %}s) #</a>
                         <span
@@ -123,9 +124,9 @@
                             data-bs-target="#sub-{%s g.ID %}"
                         >
                             <span class="d-flex gap-2">
-                                {% if g.unhealthy > 0 %}<span class="badge bg-danger" title="Number of rules with status Error">{%d g.unhealthy %}</span> {% endif %}
-                                {% if g.noMatch > 0 %}<span class="badge bg-warning" title="Number of rules with status NoMatch">{%d g.noMatch %}</span> {% endif %}
-                                <span class="badge bg-success" title="Number of rules with status Ok">{%d g.healthy %}</span>
+                                {% if g.Unhealthy > 0 %}<span class="badge bg-danger" title="Number of rules with status Error">{%d g.Unhealthy %}</span> {% endif %}
+                                {% if g.NoMatch > 0 %}<span class="badge bg-warning" title="Number of rules with status NoMatch">{%d g.NoMatch %}</span> {% endif %}
+                                <span class="badge bg-success" title="Number of rules with status Ok">{%d g.Healthy %}</span>
                             </span>
                         </span>
                     </span>
@@ -222,7 +223,7 @@
 {% endfunc %}
 
 
-{% func ListAlerts(r *http.Request, groupAlerts []groupAlerts) %}
+{% func ListAlerts(r *http.Request, groupAlerts []rule.GroupAlerts) %}
     {%code prefix := vmalertutil.Prefix(r.URL.Path) %}
     {%= tpl.Header(r, navItems, "Alerts", getLastConfigError()) %}
     {%= Controls(prefix, "", "", nil, nil, true) %}
@@ -231,7 +232,7 @@
              {%code
                  g := ga.Group
                  var keys []string
-                 alertsByRule := make(map[string][]*apiAlert)
+                 alertsByRule := make(map[string][]*rule.ApiAlert)
                  for _, alert := range ga.Alerts {
                      if len(alertsByRule[alert.RuleID]) < 1 {
                          keys = append(keys, alert.RuleID)
@@ -378,7 +379,7 @@
     {%= tpl.Footer(r) %}
 {% endfunc %}
 
-{% func Alert(r *http.Request, alert *apiAlert) %}
+{% func Alert(r *http.Request, alert *rule.ApiAlert) %}
     {%code prefix := vmalertutil.Prefix(r.URL.Path) %}
     {%= tpl.Header(r, navItems, "", getLastConfigError()) %}
     {%code
@@ -464,7 +465,7 @@
 {% endfunc %}
 
 
-{% func RuleDetails(r *http.Request, rule apiRule) %}
+{% func RuleDetails(r *http.Request, rule rule.ApiRule) %}
     {%code prefix := vmalertutil.Prefix(r.URL.Path) %}
     {%= tpl.Header(r, navItems, "", getLastConfigError()) %}
     {%code
@@ -649,7 +650,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 apiRule) %}
+{% func seriesFetchedWarn(prefix string, r rule.ApiRule) %}
 {% if isNoMatch(r) %}
 <svg
     data-bs-toggle="tooltip"
@@ -663,7 +664,7 @@
 {% endfunc %}
 
 {%code
-  func isNoMatch (r apiRule) bool {
+  func isNoMatch (r rule.ApiRule) bool {
     return r.LastSamples == 0 && r.LastSeriesFetched != nil && *r.LastSeriesFetched == 0
   }
 %}

app/vmalert/web_test.go

@@ -85,22 +85,22 @@ func TestHandler(t *testing.T) {
 	})
 
 	t.Run("/vmalert/rule", func(t *testing.T) {
-		a := ruleToAPI(ar)
+		a := ar.ToAPI()
 		getResp(t, ts.URL+"/vmalert/"+a.WebLink(), nil, 200)
-		r := ruleToAPI(rr)
+		r := rr.ToAPI()
 		getResp(t, ts.URL+"/vmalert/"+r.WebLink(), nil, 200)
 	})
 	t.Run("/vmalert/alert", func(t *testing.T) {
-		alerts := ruleToAPIAlert(ar)
+		alerts := ar.AlertsToAPI()
 		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", paramGroupID, paramRuleID)
+		params := fmt.Sprintf("?%s=0&%s=1", rule.ParamGroupID, rule.ParamRuleID)
 		getResp(t, ts.URL+"/vmalert/rule"+params, nil, 404)
 
-		params = fmt.Sprintf("?%s=1&%s=0", paramGroupID, paramRuleID)
+		params = fmt.Sprintf("?%s=1&%s=0", rule.ParamGroupID, rule.ParamRuleID)
 		getResp(t, ts.URL+"/vmalert/rule"+params, nil, 404)
 	})
 
@@ -127,14 +127,14 @@ func TestHandler(t *testing.T) {
 		}
 	})
 	t.Run("/api/v1/alert?alertID&groupID", func(t *testing.T) {
-		expAlert := newAlertAPI(ar, ar.GetAlerts()[0])
-		alert := &apiAlert{}
+		expAlert := rule.NewAlertAPI(ar, ar.GetAlerts()[0])
+		alert := &rule.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 = &apiAlert{}
+		alert = &rule.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 +142,16 @@ func TestHandler(t *testing.T) {
 	})
 
 	t.Run("/api/v1/alert?badParams", func(t *testing.T) {
-		params := fmt.Sprintf("?%s=0&%s=1", paramGroupID, paramAlertID)
+		params := fmt.Sprintf("?%s=0&%s=1", rule.ParamGroupID, rule.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", paramGroupID, paramAlertID)
+		params = fmt.Sprintf("?%s=1&%s=0", rule.ParamGroupID, rule.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", paramGroupID)
+		params = fmt.Sprintf("?%s=1", rule.ParamGroupID)
 		getResp(t, ts.URL+"/api/v1/alert"+params, nil, 400)
 		getResp(t, ts.URL+"/vmalert/api/v1/alert"+params, nil, 400)
 	})
@@ -170,22 +170,22 @@ func TestHandler(t *testing.T) {
 		}
 	})
 	t.Run("/api/v1/rule?ruleID&groupID", func(t *testing.T) {
-		expRule := ruleToAPI(ar)
-		gotRule := apiRule{}
+		expRule := ar.ToAPI()
+		gotRule := rule.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 = apiRule{}
+		gotRule = rule.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 := apiRuleWithUpdates{}
+		gotRuleWithUpdates := rule.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)
@@ -194,13 +194,13 @@ func TestHandler(t *testing.T) {
 	t.Run("/api/v1/group?groupID", func(t *testing.T) {
 		id := groupIDs[0]
 		g := m.groups[id]
-		expGroup := groupToAPI(g)
-		gotGroup := apiGroup{}
+		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 = apiGroup{}
+		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)

app/vmauth/auth_config.go

@@ -41,6 +41,9 @@ 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. "+
@@ -75,6 +78,7 @@ 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"`
@@ -182,6 +186,11 @@ 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"`
 }
@@ -228,7 +237,7 @@ func (qa *QueryArg) MarshalYAML() (any, error) {
 	return qa.sOriginal, nil
 }
 
-// URLPrefix represents passed `url_prefix`
+// URLPrefix represents the `url_prefix` from auth config.
 type URLPrefix struct {
 	// requests are re-tried on other backend urls for these http response status codes
 	retryStatusCodes []int
@@ -236,6 +245,11 @@ 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
 
@@ -856,6 +870,7 @@ 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 {
@@ -864,6 +879,9 @@ 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
 	}
@@ -871,16 +889,18 @@ func (ui *UserInfo) initURLs() error {
 		discoverBackendIPs = *ui.DiscoverBackendIPs
 	}
 
-	if ui.URLPrefix != nil {
-		if err := ui.URLPrefix.sanitizeAndInitialize(); err != nil {
+	up := ui.URLPrefix
+	if up != nil {
+		if err := up.sanitizeAndInitialize(); err != nil {
 			return err
 		}
-		ui.URLPrefix.retryStatusCodes = retryStatusCodes
-		ui.URLPrefix.dropSrcPathPrefixParts = dropSrcPathPrefixParts
-		ui.URLPrefix.discoverBackendIPs = discoverBackendIPs
-		if err := ui.URLPrefix.setLoadBalancingPolicy(loadBalancingPolicy); err != nil {
+		up.retryStatusCodes = retryStatusCodes
+		up.dropSrcPathPrefixParts = dropSrcPathPrefixParts
+		up.discoverBackendIPs = discoverBackendIPs
+		if err := up.setLoadBalancingPolicy(loadBalancingPolicy); err != nil {
 			return err
 		}
+		up.mergeQueryArgs = mergeQueryArgs
 	}
 	if ui.DefaultURL != nil {
 		if err := ui.DefaultURL.sanitizeAndInitialize(); err != nil {
@@ -899,6 +919,7 @@ func (ui *UserInfo) initURLs() error {
 		}
 		rscs := retryStatusCodes
 		lbp := loadBalancingPolicy
+		mqa := mergeQueryArgs
 		dsp := dropSrcPathPrefixParts
 		dbd := discoverBackendIPs
 		if e.RetryStatusCodes != nil {
@@ -907,6 +928,9 @@ 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
 		}
@@ -917,6 +941,7 @@ 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) {
+	f := func(s string, expectedAuthConfig map[string]*UserInfo, expectedUnauthorizedUserConfig *UserInfo) {
 		t.Helper()
 		ac, err := parseAuthConfig([]byte(s))
 		if err != nil {
@@ -294,15 +294,19 @@ 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{})
+	f(``, map[string]*UserInfo{}, nil)
 
 	// Empty users
-	f(`users: []`, map[string]*UserInfo{})
+	f(`users: []`, map[string]*UserInfo{}, nil)
 
 	// Single user
 	f(`
@@ -320,7 +324,7 @@ users:
 			MaxConcurrentRequests: 5,
 			TLSInsecureSkipVerify: &insecureSkipVerifyTrue,
 		},
-	})
+	}, nil)
 
 	// Single user with auth_token
 	f(`
@@ -344,7 +348,7 @@ users:
 			TLSCertFile:           "foo/baz",
 			TLSKeyFile:            "foo/foo",
 		},
-	})
+	}, nil)
 
 	// Multiple url_prefix entries
 	insecureSkipVerifyFalse := false
@@ -359,6 +363,7 @@ 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{
@@ -372,10 +377,11 @@ users:
 			TLSInsecureSkipVerify:  &insecureSkipVerifyFalse,
 			RetryStatusCodes:       []int{500, 501},
 			LoadBalancingPolicy:    "first_available",
+			MergeQueryArgs:         []string{"foo", "bar"},
 			DropSrcPathPrefixParts: intp(1),
 			DiscoverBackendIPs:     &discoverBackendIPsTrue,
 		},
-	})
+	}, nil)
 
 	// Multiple users
 	f(`
@@ -393,7 +399,7 @@ users:
 			Username:  "bar",
 			URLPrefix: mustParseURL("https://bar/x/"),
 		},
-	})
+	}, nil)
 
 	// non-empty URLMap
 	sharedUserInfo := &UserInfo{
@@ -443,7 +449,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(`
@@ -465,7 +471,7 @@ users:
 			Password:  "bar",
 			URLPrefix: mustParseURL("https://bar/x"),
 		},
-	})
+	}, nil)
 
 	// with default url
 	keepOriginalHost := true
@@ -481,6 +487,8 @@ 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
@@ -505,6 +513,8 @@ users:
 						},
 						KeepOriginalHost: &keepOriginalHost,
 					},
+					LoadBalancingPolicy: "first_available",
+					MergeQueryArgs:      []string{"foo", "bar"},
 				},
 			},
 			DefaultURL: mustParseURLs([]string{
@@ -532,6 +542,8 @@ users:
 						},
 						KeepOriginalHost: &keepOriginalHost,
 					},
+					LoadBalancingPolicy: "first_available",
+					MergeQueryArgs:      []string{"foo", "bar"},
 				},
 			},
 			DefaultURL: mustParseURLs([]string{
@@ -539,7 +551,7 @@ users:
 				"http://default2/select/0/prometheus",
 			}),
 		},
-	})
+	}, nil)
 
 	// With metric_labels
 	f(`
@@ -591,6 +603,23 @@ 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"}`),
+			},
+		},
 	})
 }
 
@@ -884,7 +913,7 @@ func removeMetrics(m map[string]*UserInfo) {
 	}
 }
 
-func areEqualConfigs(a, b map[string]*UserInfo) error {
+func areEqualConfigs(a, b any) 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)
+			targetURL = mergeURLs(targetURL, u, up.dropSrcPathPrefixParts, up.mergeQueryArgs)
 		}
 
 		wasLocalRetry := false
@@ -372,20 +372,54 @@ func tryProcessingRequest(w http.ResponseWriter, r *http.Request, targetURL *url
 	updateHeadersByConfig(w.Header(), hc.ResponseHeaders)
 	w.WriteHeader(res.StatusCode)
 
-	copyBuf := copyBufPool.Get()
-	copyBuf.B = bytesutil.ResizeNoCopyNoOverallocate(copyBuf.B, 16*1024)
-	_, err = io.CopyBuffer(w, res.Body, copyBuf.B)
-	copyBufPool.Put(copyBuf)
+	err = copyStreamToClient(w, res.Body)
 	_ = res.Body.Close()
-	if err != nil && !netutil.IsTrivialNetworkError(err) {
+	if err != nil && !netutil.IsTrivialNetworkError(err) && !errors.Is(err, context.Canceled) {
 		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,6 +514,11 @@ 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,29 +8,42 @@ import (
 	"strings"
 )
 
-func mergeURLs(uiURL, requestURI *url.URL, dropSrcPathPrefixParts int) *url.URL {
+func mergeURLs(uiURL, requestURI *url.URL, dropSrcPathPrefixParts int, mergeQueryArgs []string) *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 query parameters from requests.
-	uiParams := targetURL.Query()
+
+	// 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.
 	for k, v := range requestParams {
-		// skip clashed query params from original request
-		if exist := uiParams.Get(k); len(exist) > 0 {
+		if targetParams.Has(k) && !slices.Contains(mergeQueryArgs, k) {
+			// Skip clashed client query params for security reasons
 			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)
+		target := mergeURLs(bu.url, u, up.dropSrcPathPrefixParts, up.mergeQueryArgs)
 		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)
+		target := mergeURLs(bu.url, u, up.dropSrcPathPrefixParts, up.mergeQueryArgs)
 		bu.put()
 
 		gotTarget := target.String()
@@ -528,3 +528,43 @@ 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.Stop()
+	pushmetrics.StopAndPush()
 
 	startTime := time.Now()
 	logger.Infof("gracefully shutting down http server for metrics at %q", listenAddrs)

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.Stop()
+	pushmetrics.StopAndPush()
 	srcFS.MustStop()
 	dstFS.MustStop()
 

app/vmselect/graphite/eval.go

@@ -197,13 +197,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/main.go

@@ -11,6 +11,8 @@ 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"
@@ -18,6 +20,7 @@ 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"
@@ -27,7 +30,6 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/promscrape"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/querytracer"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/timerpool"
-	"github.com/VictoriaMetrics/metrics"
 )
 
 var (
@@ -740,6 +742,7 @@ var (
 
 func initVMUIConfig() {
 	var cfg struct {
+		Version string `json:"version"`
 		License struct {
 			Type string `json:"type"`
 		} `json:"license"`
@@ -755,6 +758,11 @@ func initVMUIConfig() {
 	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 {

app/vmselect/promql/eval.go

@@ -1150,15 +1150,23 @@ 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)
-		feSum := *fe
-		feSum.Name = "sum_over_time"
-		feCount := *fe
-		feCount.Name = "count_over_time"
+		// copy RollupExpr to drop possible offset,
+		// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9762
+		newArg := copyRollupExpr(fe.Args[0].(*metricsql.RollupExpr))
+		newArg.Offset = nil
 		be := &metricsql.BinaryOpExpr{
 			Op:              "/",
 			KeepMetricNames: fe.KeepMetricNames,
-			Left:            &feSum,
-			Right:           &feCount,
+			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,
+			},
 		}
 		return evalExpr(qt, ec, be)
 	case "rate":
@@ -1172,8 +1180,12 @@ func evalInstantRollup(qt *querytracer.Tracer, ec *EvalConfig, funcName string,
 			fe := afe.Args[0].(*metricsql.FuncExpr)
 			feIncrease := *fe
 			feIncrease.Name = "increase"
-			re := fe.Args[0].(*metricsql.RollupExpr)
-			d := re.Window.Duration(ec.Step)
+			// 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)
 			if d == 0 {
 				d = ec.Step
 			}
@@ -1193,8 +1205,12 @@ func evalInstantRollup(qt *querytracer.Tracer, ec *EvalConfig, funcName string,
 		fe := expr.(*metricsql.FuncExpr)
 		feIncrease := *fe
 		feIncrease.Name = "increase"
-		re := fe.Args[0].(*metricsql.RollupExpr)
-		d := re.Window.Duration(ec.Step)
+		// 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)
 		if d == 0 {
 			d = ec.Step
 		}
@@ -1999,3 +2015,23 @@ 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/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-DK22yiEQ.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/vendor-DBOs1yKE.js">
+  <script type="module" crossorigin src="./assets/index-DQcPcJrn.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/vendor-DY9kCvzk.js">
   <link rel="stylesheet" crossorigin href="./assets/vendor-D1GxaB_c.css">
-  <link rel="stylesheet" crossorigin href="./assets/index-Ccv_zSYG.css">
+  <link rel="stylesheet" crossorigin href="./assets/index-dWApsAEM.css">
 </head>
 <body>
 <noscript>You need to enable JavaScript to run this app.</noscript>

app/vmui/Dockerfile-web

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

app/vmui/packages/vmui/index.html

@@ -6,6 +6,7 @@
   <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.0.4",
+        "vite": "^7.1.5",
         "web-vitals": "^5.0.3"
       },
       "devDependencies": {
@@ -7321,13 +7321,13 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -7337,10 +7337,13 @@
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -7351,9 +7354,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -7657,17 +7660,17 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
-      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.5.tgz",
+      "integrity": "sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.4.6",
-        "picomatch": "^4.0.2",
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
-        "rollup": "^4.40.0",
-        "tinyglobby": "^0.2.14"
+        "rollup": "^4.43.0",
+        "tinyglobby": "^0.2.15"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -7772,10 +7775,13 @@
       }
     },
     "node_modules/vite/node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -7786,9 +7792,9 @@
       }
     },
     "node_modules/vite/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "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.0.4",
+    "vite": "^7.1.5",
     "web-vitals": "^5.0.3"
   },
   "devDependencies": {

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

@@ -1,8 +1,9 @@
+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 from "../Badges";
+import Badges, { BadgeColor } from "../Badges";
 import {
   SearchIcon,
 } from "../../Main/Icons";
@@ -15,6 +16,13 @@ interface BaseAlertProps {
 
 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 = {
@@ -27,6 +35,10 @@ const BaseAlert = ({ item }: BaseAlertProps) => {
   return (
     <div className="vm-explore-alerts-alert-item">
       <table>
+        <colgroup>
+          <col className="vm-col-md"/>
+          <col/>
+        </colgroup>
         <tbody>
           <tr>
             <td
@@ -45,7 +57,7 @@ const BaseAlert = ({ item }: BaseAlertProps) => {
             </td>
           </tr>
           <tr>
-            <td className="vm-col-md">Query</td>
+            <td>Query</td>
             <td>
               <CodeExample
                 code={query}
@@ -53,18 +65,15 @@ const BaseAlert = ({ item }: BaseAlertProps) => {
             </td>
           </tr>
           <tr>
-            <td className="vm-col-md">Active at</td>
+            <td>Active at</td>
             <td>{dayjs(item.activeAt).format("DD MMM YYYY HH:mm:ss")}</td>
           </tr>
-          {!!Object.keys(item?.labels || {}).length && (
+          {!!Object.keys(alertLabels).length && (
             <tr>
-              <td className="vm-col-md">Labels</td>
+              <td>Labels</td>
               <td>
                 <Badges
-                  items={Object.fromEntries(Object.entries(item.labels).map(([name, value]) => [name, {
-                    color: "passive",
-                    value: value,
-                  }]))}
+                  items={alertLabelsItems}
                 />
               </td>
             </tr>
@@ -75,10 +84,14 @@ const BaseAlert = ({ item }: BaseAlertProps) => {
         <>
           <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 className="vm-col-md">{name}</td>
+                  <td>{name}</td>
                   <td>{value}</td>
                 </tr>
               ))}

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

@@ -1,16 +1,14 @@
 @use "src/styles/variables" as *;
 
-.vm-modal {
-  .vm-explore-alerts-alert-item {
-    table {
-      width: auto;
-    }
+.vm-modal.vm-explore-alerts {
+  .vm-modal-content {
+    overflow-y: scroll;
   }
 }
 
 .vm-explore-alerts-alert-item {
   row-gap: $padding-global;
-  margin-right: $padding-global;
+  margin: $padding-global;
   display: flex;
   flex-direction: column;
 
@@ -19,36 +17,35 @@
     text-align: center;
   }
 
-  .vm-col-sm {
-    width: 10%;
-    white-space: nowrap;
-    text-align: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
   .vm-col-md {
-    width: 15%;
-    white-space: nowrap;
-    text-align: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    width: 20%;
   }
 
   .vm-button {
     color: $color-passive;
-    border: 1px solid var(--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;
-      text-align: center;
       padding: 0 $padding-small;
     }
   }

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

@@ -1,17 +1,45 @@
+import { useMemo } from "preact/compat";
 import "./style.scss";
 import { Group as APIGroup } from "../../../types";
 import dayjs from "dayjs";
 import { formatDuration } from "../helpers";
-import Badges from "../Badges";
+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">
-      <div></div>
       <table>
         <tbody>
           {!!group.interval && (
@@ -50,51 +78,42 @@ const BaseGroup = ({ group }: BaseGroupProps) => {
               <td>{group.concurrency}</td>
             </tr>
           )}
-          {!!group?.labels?.length && (
+          {!!Object.keys(groupLabels).length && (
             <tr>
               <td className="vm-col-md">Labels</td>
               <td>
                 <Badges
-                  items={Object.fromEntries(Object.entries(group.labels).map(([name, value]) => [name, {
-                    color: "passive",
-                    value: value,
-                  }]))}
+                  items={groupLabelsItems}
                 />
               </td>
             </tr>
           )}
-          {!!group?.params?.length && (
+          {!!groupParams.length && (
             <tr>
               <td className="vm-col-md">Params</td>
               <td>
                 <Badges
-                  items={Object.fromEntries(group.params.map(value => [value, {
-                    color: "passive",
-                  }]))}
+                  items={groupParamsItems}
                 />
               </td>
             </tr>
           )}
-          {!!group?.headers?.length && (
+          {!!groupHeaders.length && (
             <tr>
               <td className="vm-col-md">Headers</td>
               <td>
                 <Badges
-                  items={Object.fromEntries(group.headers.map(value => [value, {
-                    color: "passive",
-                  }]))}
+                  items={groupHeadersItems}
                 />
               </td>
             </tr>
           )}
-          {!!group?.notifier_headers?.length && (
+          {!!groupNotifierHeaders.length && (
             <tr>
               <td className="vm-col-md">Notifier headers</td>
               <td>
                 <Badges
-                  items={Object.fromEntries(group.notifier_headers.map(value => [value, {
-                    color: "passive",
-                  }]))}
+                  items={groupNotifierHeadersItems}
                 />
               </td>
             </tr>

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

@@ -1,16 +1,14 @@
 @use "src/styles/variables" as *;
 
-.vm-modal {
-  .vm-explore-alerts-group {
-    table {
-      width: auto;
-    }
+.vm-modal.vm-explore-alerts {
+  .vm-modal-content {
+    overflow-y: scroll;
   }
 }
 
 .vm-explore-alerts-group {
   row-gap: $padding-global;
-  margin-right: $padding-global;
+  margin: $padding-global;
   display: flex;
   flex-direction: column;
 
@@ -41,24 +39,13 @@
     }
   }
 
-  .vm-col-sm {
-    width: 10%;
-    white-space: nowrap;
-    text-align: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
   .vm-col-md {
-    width: 15%;
-    white-space: nowrap;
-    text-align: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    width: 20%;
   }
 
   table {
     width: 100%;
+    table-layout: fixed;
     tr.hoverable {
       cursor: pointer;
       &:hover {
@@ -68,6 +55,10 @@
     td, th {
       line-height: 30px;
       padding: 4px $padding-small;
+      white-space: nowrap;
+      text-align: left;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
     th {
       font-weight: bold;

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

@@ -1,3 +1,4 @@
+import { useMemo } from "preact/compat";
 import "./style.scss";
 import { Rule as APIRule } from "../../../types";
 import { useNavigate, createSearchParams } from "react-router-dom";
@@ -25,6 +26,14 @@ const BaseRule = ({ item }: BaseRuleProps) => {
     };
   };
 
+  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,
@@ -35,8 +44,11 @@ const BaseRule = ({ item }: BaseRuleProps) => {
 
   return (
     <div className="vm-explore-alerts-rule-item">
-      <div></div>
       <table>
+        <colgroup>
+          <col className="vm-col-md"/>
+          <col/>
+        </colgroup>
         <tbody>
           <tr>
             <td
@@ -55,7 +67,7 @@ const BaseRule = ({ item }: BaseRuleProps) => {
             </td>
           </tr>
           <tr>
-            <td className="vm-col-md">Query</td>
+            <td>Query</td>
             <td>
               <CodeExample
                 code={query}
@@ -64,33 +76,30 @@ const BaseRule = ({ item }: BaseRuleProps) => {
           </tr>
           {!!item.duration && (
             <tr>
-              <td className="vm-col-md">For</td>
+              <td>For</td>
               <td>{formatDuration(item.duration)}</td>
             </tr>
           )}
           {!!item.lastEvaluation && (
             <tr>
-              <td className="vm-col-md">Last evaluation</td>
+              <td>Last evaluation</td>
               <td>{dayjs(item.lastEvaluation).format("DD MMM YYYY HH:mm:ss")}</td>
             </tr>
           )}
           {!!item.lastError && item.health !== "ok" && (
             <tr>
-              <td className="vm-col-md">Last error</td>
+              <td>Last error</td>
               <td>
                 <Alert variant="error">{item.lastError}</Alert>
               </td>
             </tr>
           )}
-          {!!Object.keys(item?.labels || {}).length && (
+          {!!Object.keys(ruleLabelsItems).length && (
             <tr>
-              <td className="vm-col-md">Labels</td>
+              <td>Labels</td>
               <td>
                 <Badges
-                  items={Object.fromEntries(Object.entries(item.labels).map(([name, value]) => [name, {
-                    color: "passive",
-                    value: value,
-                  }]))}
+                  items={ruleLabelsItems}
                 />
               </td>
             </tr>
@@ -100,11 +109,15 @@ const BaseRule = ({ item }: BaseRuleProps) => {
       {!!Object.keys(item?.annotations || {}).length && (
         <>
           <span className="title">Annotations</span>
-          <table className="fixed">
+          <table>
+            <colgroup>
+              <col className="vm-col-md"/>
+              <col/>
+            </colgroup>
             <tbody>
               {Object.entries(item.annotations || {}).map(([name, value]) => (
                 <tr key={name}>
-                  <td className="vm-col-md">{name}</td>
+                  <td>{name}</td>
                   <td>{value}</td>
                 </tr>
               ))}
@@ -115,14 +128,14 @@ const BaseRule = ({ item }: BaseRuleProps) => {
       {!!item?.updates?.length && (
         <>
           <span className="title">{`Last updates ${item.updates.length}/${item.max_updates_entries}`}</span>
-          <table className="fixed">
+          <table>
             <thead>
               <tr>
-                <th className="vm-col-md">Updated at</th>
-                <th className="vm-col-md">Series returned</th>
-                <th className="vm-col-md">Series fetched</th>
-                <th className="vm-col-md">Duration</th>
-                <th className="vm-col-md">Executed at</th>
+                <th>Updated at</th>
+                <th>Series returned</th>
+                <th>Series fetched</th>
+                <th>Duration</th>
+                <th>Executed at</th>
               </tr>
             </thead>
             <tbody>
@@ -130,11 +143,11 @@ const BaseRule = ({ item }: BaseRuleProps) => {
                 <tr
                   key={update.at}
                 >
-                  <td className="vm-col-md">{dayjs(update.time).format("DD MMM YYYY HH:mm:ss")}</td>
-                  <td className="vm-col-md">{update.samples}</td>
-                  <td className="vm-col-md">{update.series_fetched}</td>
-                  <td className="vm-col-md">{formatDuration(update.duration / 1e9)}</td>
-                  <td className="vm-col-md">{dayjs(update.at).format("DD MMM YYYY HH:mm:ss")}</td>
+                  <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>
@@ -144,14 +157,21 @@ const BaseRule = ({ item }: BaseRuleProps) => {
       {!!item?.alerts?.length && (
         <>
           <span className="title">Alerts</span>
-          <table className="fixed">
+          <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 className="vm-col-sm">Active since</th>
-                <th className="vm-col-sm">State</th>
-                <th className="vm-col-sm">Value</th>
-                <th>Labels</th>
-                <th className="vm-col-hidden"></th>
+                <th>Active since</th>
+                <th>State</th>
+                <th>Value</th>
+                <th className="title">Labels</th>
+                <th></th>
               </tr>
             </thead>
             <tbody>
@@ -160,15 +180,15 @@ const BaseRule = ({ item }: BaseRuleProps) => {
                   id={`alert-${alert.id}`}
                   key={alert.id}
                 >
-                  <td className="vm-col-sm">
+                  <td>
                     {dayjs(alert.activeAt).format("DD MMM YYYY HH:mm:ss")}
                   </td>
-                  <td className="vm-col-sm">
+                  <td>
                     <Badges
                       items={{ [alert.state]: { color: alert.state as BadgeColor } }}
                     />
                   </td>
-                  <td className="vm-col-sm">
+                  <td>
                     <Badges
                       items={{ [alert.value]: { color: "passive" } }}
                     />
@@ -182,7 +202,7 @@ const BaseRule = ({ item }: BaseRuleProps) => {
                       }]))}
                     />
                   </td>
-                  <td className="vm-col-hidden">
+                  <td>
                     <Button
                       className="vm-button-borderless"
                       size="small"

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

@@ -1,16 +1,14 @@
 @use "src/styles/variables" as *;
 
-.vm-modal {
-  .vm-explore-alerts-rule-item {
-    table {
-      width: auto;
-    }
+.vm-modal.vm-explore-alerts {
+  .vm-modal-content {
+    overflow-y: scroll;
   }
 }
 
 .vm-explore-alerts-rule-item {
   row-gap: $padding-global;
-  margin-right: $padding-global;
+  margin: $padding-global;
   display: flex;
   flex-direction: column;
 
@@ -20,46 +18,46 @@
   }
 
   .vm-col-hidden {
-    width: 30px;
+    width: 40px;
   }
 
   .vm-button {
     color: $color-passive;
-    border: 1px solid var(--color-passive);
+    border: 1px solid $color-passive;
+  }
+
+  .vm-code-example {
+    .vm-button {
+      background-color: $color-code;
+    }
   }
 
   .vm-col-sm {
-    width: 10%;
-    white-space: nowrap;
-    text-align: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    width: 15%;
   }
 
   .vm-col-md {
-    width: 15%;
-    white-space: nowrap;
-    text-align: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    width: 20%;
   }
 
   table {
-    &.fixed {
-      table-layout: fixed;
-    }
+    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;
-      text-align: center;
       padding: 0 $padding-small;
     }
   }

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

@@ -35,12 +35,14 @@ const GroupHeaderHeader: FC<GroupHeaderControlsProps> = ({ group }) => {
           <div className="vm-explore-alerts-group-header__file">{group.file}</div>
         )}
       </div>
-      <Badges
-        items={Object.fromEntries(Object.entries(group.states || {}).map(([name, value]) => [name.toLowerCase(), {
-          color: name.toLowerCase().replace(" ", "-") as BadgeColor,
-          value: value,
-        }]))}
-      >
+      <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"
@@ -49,7 +51,7 @@ const GroupHeaderHeader: FC<GroupHeaderControlsProps> = ({ group }) => {
           startIcon={<DetailsIcon />}
           onClick={openGroupModal}
         />
-      </Badges>
+      </div>
     </div>
   );
 };

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

@@ -58,3 +58,8 @@
     border-radius: 6px;
   }
 }
+
+.vm-explore-alerts-controls {
+  display: flex;
+  column-gap: $padding-global;
+}

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

@@ -1,4 +1,4 @@
-import { FC } from "preact/compat";
+import { FC, useMemo } from "preact/compat";
 import "./style.scss";
 import useDeviceDetect from "../../../hooks/useDeviceDetect";
 import useCopyToClipboard from "../../../hooks/useCopyToClipboard";
@@ -83,6 +83,13 @@ const ItemHeader: FC<ItemHeaderControlsProps> = ({ name, id, groupId, entity, ty
     }
   };
 
+  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}
@@ -92,12 +99,11 @@ const ItemHeader: FC<ItemHeaderControlsProps> = ({ name, id, groupId, entity, ty
         {renderIcon()}
         <div className="vm-explore-alerts-item-header__name">{name}</div>
       </div>
-      <Badges
-        items={Object.fromEntries(Object.entries(states || {}).map(([name, value]) => [name, {
-          color: name.toLowerCase().replace(" ", "-") as BadgeColor,
-          value: value == 1 ? 0 : value,
-        }]))}
-      >
+      <div className="vm-explore-alerts-controls">
+        <Badges
+          align="end"
+          items={badgesItems}
+        />
         {onClose ? (
           <Button
             className="vm-back-button"
@@ -119,7 +125,7 @@ const ItemHeader: FC<ItemHeaderControlsProps> = ({ name, id, groupId, entity, ty
             onClick={openItemLink}
           />
         )}
-      </Badges>
+      </div>
     </div>
   );
 };

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

@@ -2,7 +2,6 @@
 
 .vm-explore-alerts-item-header {
   display: flex;
-  grid-template-columns: auto 1fr auto auto;
   align-items: center;
   justify-content: space-between;
   gap: $padding-global;
@@ -28,7 +27,6 @@
   }
 
   &_mobile {
-    grid-template-columns: 1fr auto;
     .vm-button-text {
       display: none;
     }
@@ -51,9 +49,11 @@
   &__title {
     display: flex;
     column-gap: $padding-global;
+    overflow: hidden;
     svg {
       fill: $color-text-disabled;
       width: 14px;
+      min-width: 14px;
     }
   }
 
@@ -68,3 +68,8 @@
     border-radius: 6px;
   }
 }
+
+.vm-explore-alerts-controls {
+  display: flex;
+  column-gap: $padding-global;
+}

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

@@ -2,14 +2,12 @@
 
 .vm-explore-alerts-notifier-header {
   display: flex;
-  grid-template-columns: auto 1fr auto auto;
   align-items: center;
   padding: $padding-global;
   justify-content: space-between;
   gap: $padding-global;
 
   &_mobile {
-    grid-template-columns: 1fr auto;
     padding: $padding-small $padding-global;
   }
 

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

@@ -21,26 +21,6 @@
     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 {

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

@@ -1,9 +1,9 @@
-import { FC } from "preact/compat";
+import { FC, useMemo } from "preact/compat";
 import "./style.scss";
 import { Target as APITarget } from "../../../types";
 import Alert from "../../Main/Alert/Alert";
 import Accordion from "../../Main/Accordion/Accordion";
-import Badges from "../Badges";
+import Badges, { BadgeColor } from "../Badges";
 
 interface TargetProps {
   target: APITarget;
@@ -11,6 +11,13 @@ interface TargetProps {
 
 const Target: FC<TargetProps> = ({ target }) => {
   const state = target?.lastError ? "unhealthy" : "ok";
+  const targetLabels = target?.labels || {};
+  const badgesItems = useMemo(() => {
+    return Object.fromEntries(Object.entries(targetLabels).map(([name, value]) => [name, {
+      value: value,
+      color: "passive" as BadgeColor,
+    }]));
+  }, [targetLabels]);
   return (
     <div className={`vm-explore-alerts-target vm-badge-item ${state.replace(" ", "-")}`}>
       {(!!target?.labels?.length || !!target?.lastError) ? (
@@ -23,15 +30,12 @@ const Target: FC<TargetProps> = ({ target }) => {
           <div className="vm-explore-alerts-target-item">
             <table>
               <tbody>
-                {!!target?.labels?.length && (
+                {!!Object.keys(targetLabels).length && (
                   <tr>      
                     <td className="vm-col-md">Labels</td>
                     <td>
                       <Badges
-                        items={Object.fromEntries(Object.entries(target.labels).map(([name, value]) => [name, {
-                          value: value,
-                          color: "passive",
-                        }]))}
+                        items={badgesItems}
                       />
                     </td>
                   </tr>

app/vmui/packages/vmui/src/components/ExploreMetrics/ExploreMetricItem/ExploreMetricItem.tsx

@@ -27,8 +27,8 @@ const ExploreMetricItem: FC<ExploreMetricItemProps> = ({
   onChangeOrder,
 }) => {
 
-  const isCounter = useMemo(() => /_sum?|_total?|_count?/.test(name), [name]);
-  const isBucket = useMemo(() => /_bucket?/.test(name), [name]);
+  const isCounter = useMemo(() => /_sum$|_total$|_count$/.test(name), [name]);
+  const isBucket = useMemo(() => /_bucket$/.test(name), [name]);
 
   const [rateEnabled, setRateEnabled] = useState(isCounter);
 

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

@@ -6,8 +6,9 @@
   padding: $padding-global;
   white-space: pre-wrap;
   border-radius: $border-radius-small;
-  background-color: rgba($color-black, 0.05);
+  background-color: $color-code;
   overflow: auto;
+  text-overflow: ellipsis;
 
   &__copy {
     position: absolute;

app/vmui/packages/vmui/src/components/Main/DatePicker/Calendar/Calendar.tsx

@@ -13,6 +13,8 @@ import Button from "../../Button/Button";
 interface DatePickerProps {
   date: Date | Dayjs
   format?: string
+  minDate?: Date | Dayjs
+  maxDate?: Date | Dayjs
   onChange: (date: string) => void
 }
 
@@ -24,6 +26,8 @@ enum CalendarTypeView {
 
 const Calendar: FC<DatePickerProps> = ({
   date,
+  minDate,
+  maxDate,
   format = DATE_TIME_FORMAT,
   onChange,
 }) => {
@@ -34,6 +38,8 @@ const Calendar: FC<DatePickerProps> = ({
   const today = dayjs.tz();
   const viewDateIsToday = today.format(DATE_FORMAT) === viewDate.format(DATE_FORMAT);
   const { isMobile } = useDeviceDetect();
+  const min = minDate ? dayjs(minDate) : undefined;
+  const max = maxDate ? dayjs(maxDate) : undefined;
 
   const toggleDisplayYears = () => {
     setViewType(prev => prev === CalendarTypeView.years ? CalendarTypeView.days : CalendarTypeView.years);
@@ -75,9 +81,13 @@ const Calendar: FC<DatePickerProps> = ({
         onChangeViewDate={handleChangeViewDate}
         toggleDisplayYears={toggleDisplayYears}
         showArrowNav={viewType === CalendarTypeView.days}
+        hasPrev={viewType === CalendarTypeView.days && (!min || viewDate.startOf("month").isAfter(min))}
+        hasNext={viewType === CalendarTypeView.days && (!max || viewDate.endOf("month").isBefore(max))}
       />
       {viewType === CalendarTypeView.days && (
         <CalendarBody
+          minDate={min}
+          maxDate={max}
           viewDate={viewDate}
           selectDate={selectDate}
           onChangeSelectDate={handleChangeSelectDate}
@@ -85,12 +95,16 @@ const Calendar: FC<DatePickerProps> = ({
       )}
       {viewType === CalendarTypeView.years && (
         <YearsList
+          minDate={min}
+          maxDate={max}
           viewDate={viewDate}
           onChangeViewDate={handleChangeViewDate}
         />
       )}
       {viewType === CalendarTypeView.months && (
         <MonthsList
+          minDate={min}
+          maxDate={max}
           selectDate={selectDate}
           viewDate={viewDate}
           onChangeViewDate={handleChangeViewDate}

app/vmui/packages/vmui/src/components/Main/DatePicker/Calendar/CalendarBody/CalendarBody.tsx

@@ -4,6 +4,8 @@ import classNames from "classnames";
 import Tooltip from "../../../Tooltip/Tooltip";
 
 interface CalendarBodyProps {
+  minDate?: Dayjs
+  maxDate?: Dayjs
   viewDate: Dayjs
   selectDate: Dayjs
   onChangeSelectDate: (date: Dayjs) => void
@@ -11,7 +13,7 @@ interface CalendarBodyProps {
 
 const weekday = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
 
-const CalendarBody: FC<CalendarBodyProps> = ({ viewDate: date, selectDate, onChangeSelectDate }) => {
+const CalendarBody: FC<CalendarBodyProps> = ({ minDate, maxDate, viewDate: date, selectDate, onChangeSelectDate }) => {
   const format = "YYYY-MM-DD";
   const today = dayjs.tz();
   const viewDate = dayjs(date.format(format));
@@ -44,21 +46,25 @@ const CalendarBody: FC<CalendarBodyProps> = ({ viewDate: date, selectDate, onCha
         </Tooltip>
       ))}
 
-      {days.map((d, i) => (
-        <div
-          className={classNames({
-            "vm-calendar-body-cell": true,
-            "vm-calendar-body-cell_day": true,
-            "vm-calendar-body-cell_day_empty": !d,
-            "vm-calendar-body-cell_day_active": (d && d.format(format)) === selectDate.format(format),
-            "vm-calendar-body-cell_day_today": (d && d.format(format)) === today.format(format)
-          })}
-          key={d ? d.format(format) : i}
-          onClick={createHandlerSelectDate(d)}
-        >
-          {d && d.format("D")}
-        </div>
-      ))}
+      {days.map((d, i) => {
+        const isDisabled = d && ((minDate && d.isBefore(minDate)) || (maxDate && d.isAfter(maxDate)));
+        return (
+          <div
+            className={classNames({
+              "vm-calendar-body-cell": true,
+              "vm-calendar-body-cell_day": true,
+              "vm-calendar-body-cell_day_empty": !d,
+              "vm-calendar-body-cell_day_active": (d && d.format(format)) === selectDate.format(format),
+              "vm-calendar-body-cell_day_today": (d && d.format(format)) === today.format(format),
+              "vm-calendar-body-cell_day_disabled": isDisabled,
+            })}
+            key={d ? d.format(format) : i}
+            onClick={createHandlerSelectDate(d)}
+          >
+            {d && d.format("D")}
+          </div>
+        );
+      })}
     </div>
   );
 };

app/vmui/packages/vmui/src/components/Main/DatePicker/Calendar/CalendarHeader/CalendarHeader.tsx

@@ -1,15 +1,18 @@
 import { FC } from "preact/compat";
 import { Dayjs } from "dayjs";
 import { ArrowDownIcon, ArrowDropDownIcon } from "../../../Icons";
+import classNames from "classnames";
 
 interface CalendarHeaderProps {
   viewDate: Dayjs
   onChangeViewDate: (date: Dayjs) => void
   showArrowNav: boolean
   toggleDisplayYears: () => void
+  hasNext: boolean
+  hasPrev: boolean
 }
 
-const CalendarHeader: FC<CalendarHeaderProps> = ({ viewDate, showArrowNav, onChangeViewDate, toggleDisplayYears }) => {
+const CalendarHeader: FC<CalendarHeaderProps> = ({ hasPrev, hasNext, viewDate, showArrowNav, onChangeViewDate, toggleDisplayYears }) => {
 
   const setPrevMonth = () => {
     onChangeViewDate(viewDate.subtract(1, "month"));
@@ -35,14 +38,20 @@ const CalendarHeader: FC<CalendarHeaderProps> = ({ viewDate, showArrowNav, onCha
       {showArrowNav && (
         <div className="vm-calendar-header-right">
           <div
-            className="vm-calendar-header-right__prev"
-            onClick={setPrevMonth}
+            className={classNames({
+              "vm-calendar-header-right__prev": true,
+              "vm-calendar-header-right_disabled": !hasPrev,
+            })}
+            onClick={hasPrev ? setPrevMonth : undefined}
           >
             <ArrowDownIcon/>
           </div>
           <div
-            className="vm-calendar-header-right__next"
-            onClick={setNextMonth}
+            className={classNames({
+              "vm-calendar-header-right__next": true,
+              "vm-calendar-header-right_disabled": !hasNext,
+            })}
+            onClick={hasNext ? setNextMonth : undefined}
           >
             <ArrowDownIcon/>
           </div>

app/vmui/packages/vmui/src/components/Main/DatePicker/Calendar/MonthsList/MonthsList.tsx

@@ -3,13 +3,14 @@ import dayjs, { Dayjs } from "dayjs";
 import classNames from "classnames";
 
 interface CalendarMonthsProps {
+  minDate?: Dayjs
+  maxDate?: Dayjs
   viewDate: Dayjs,
   selectDate: Dayjs
-
   onChangeViewDate: (date: Dayjs) => void
 }
 
-const MonthsList: FC<CalendarMonthsProps> = ({ viewDate, selectDate, onChangeViewDate }) => {
+const MonthsList: FC<CalendarMonthsProps> = ({ minDate, maxDate, viewDate, selectDate, onChangeViewDate }) => {
 
   const today = dayjs().format("MM");
   const currentMonths = useMemo(() => selectDate.format("MM"), [selectDate]);
@@ -29,20 +30,24 @@ const MonthsList: FC<CalendarMonthsProps> = ({ viewDate, selectDate, onChangeVie
 
   return (
     <div className="vm-calendar-years">
-      {months.map(m => (
-        <div
-          className={classNames({
-            "vm-calendar-years__year": true,
-            "vm-calendar-years__year_selected": m.format("MM") === currentMonths,
-            "vm-calendar-years__year_today": m.format("MM") === today
-          })}
-          id={`vm-calendar-year-${m.format("MM")}`}
-          key={m.format("MM")}
-          onClick={createHandlerClick(m)}
-        >
-          {m.format("MMMM")}
-        </div>
-      ))}
+      {months.map(m => {
+        const isDisabled = m && ((minDate && m.isBefore(minDate)) || (maxDate && m.isAfter(maxDate)));
+        return (
+          <div
+            className={classNames({
+              "vm-calendar-years__year": true,
+              "vm-calendar-years__year_selected": m.format("MM") === currentMonths,
+              "vm-calendar-years__year_today": m.format("MM") === today,
+              "vm-calendar-years__year_disabled": isDisabled,
+            })}
+            id={`vm-calendar-year-${m.format("MM")}`}
+            key={m.format("MM")}
+            onClick={isDisabled ? undefined : createHandlerClick(m)}
+          >
+            {m.format("MMMM")}
+          </div>
+        );
+      })}
     </div>
   );
 };

app/vmui/packages/vmui/src/components/Main/DatePicker/Calendar/YearsList/YearsList.tsx

@@ -3,11 +3,13 @@ import dayjs, { Dayjs } from "dayjs";
 import classNames from "classnames";
 
 interface CalendarYearsProps {
+  minDate?: Dayjs
+  maxDate?: Dayjs
   viewDate: Dayjs
   onChangeViewDate: (date: Dayjs) => void
 }
 
-const YearsList: FC<CalendarYearsProps> = ({ viewDate, onChangeViewDate }) => {
+const YearsList: FC<CalendarYearsProps> = ({ minDate, maxDate, viewDate, onChangeViewDate }) => {
 
   const today = dayjs().format("YYYY");
   const currentYear = useMemo(() => viewDate.format("YYYY"), [viewDate]);
@@ -30,20 +32,24 @@ const YearsList: FC<CalendarYearsProps> = ({ viewDate, onChangeViewDate }) => {
 
   return (
     <div className="vm-calendar-years">
-      {years.map(y => (
-        <div
-          className={classNames({
-            "vm-calendar-years__year": true,
-            "vm-calendar-years__year_selected": y.format("YYYY") === currentYear,
-            "vm-calendar-years__year_today": y.format("YYYY") === today
-          })}
-          id={`vm-calendar-year-${y.format("YYYY")}`}
-          key={y.format("YYYY")}
-          onClick={createHandlerClick(y)}
-        >
-          {y.format("YYYY")}
-        </div>
-      ))}
+      {years.map(y => {
+        const isDisabled = y && (minDate && y.isBefore(minDate)) || (maxDate && y.isAfter(maxDate));
+        return (
+          <div
+            className={classNames({
+              "vm-calendar-years__year": true,
+              "vm-calendar-years__year_selected": y.format("YYYY") === currentYear,
+              "vm-calendar-years__year_today": y.format("YYYY") === today,
+              "vm-calendar-years__year_disabled": isDisabled,
+            })}
+            id={`vm-calendar-year-${y.format("YYYY")}`}
+            key={y.format("YYYY")}
+            onClick={isDisabled ? undefined : createHandlerClick(y)}
+          >
+            {y.format("YYYY")}
+          </div>
+        );
+      })}
     </div>
   );
 };

app/vmui/packages/vmui/src/components/Main/DatePicker/Calendar/style.scss

@@ -69,6 +69,10 @@
         }
       }
 
+      &_disabled {
+        color: $color-text-disabled;
+      }
+
       &__prev {
         transform: rotate(90deg);
       }
@@ -108,7 +112,12 @@
         cursor: pointer;
         transition: color 200ms ease, background-color 300ms ease-in-out;
 
-        &:hover {
+        &_disabled {
+          cursor: unset;
+          color: $color-text-disabled;
+        }
+
+        &:not(&_disabled):hover {
           background-color: $color-hover-black;
         }
 
@@ -148,7 +157,12 @@
       cursor: pointer;
       transition: color 200ms ease, background-color 300ms ease-in-out;
 
-      &:hover {
+      &_disabled {
+        cursor: unset;
+        color: $color-text-disabled;
+      }
+
+      &:not(&_disabled):hover {
         background-color: $color-hover-black;
       }
 

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

@@ -10,8 +10,10 @@ import useEventListener from "../../../hooks/useEventListener";
 interface DatePickerProps {
   date: string | Date | Dayjs,
   targetRef: React.RefObject<HTMLElement>;
-  format?: string
-  label?: string
+  format?: string;
+  label?: string;
+  minDate?: Date | Dayjs;
+  maxDate?: Date | Dayjs;
   onChange: (val: string) => void
 }
 
@@ -20,7 +22,9 @@ const DatePicker = forwardRef<HTMLDivElement, DatePickerProps>(({
   targetRef,
   format = DATE_TIME_FORMAT,
   onChange,
-  label
+  label,
+  minDate,
+  maxDate
 }, ref) => {
   const dateDayjs = useMemo(() => dayjs(date).isValid() ? dayjs.tz(date) : dayjs().tz(), [date]);
   const { isMobile } = useDeviceDetect();
@@ -56,6 +60,8 @@ const DatePicker = forwardRef<HTMLDivElement, DatePickerProps>(({
           date={dateDayjs}
           format={format}
           onChange={handleChangeDate}
+          minDate={minDate}
+          maxDate={maxDate}
         />
       </div>
     </Popper>

app/vmui/packages/vmui/src/components/Main/DatePicker/DateTimeInput/DateTimeInput.tsx

@@ -3,37 +3,52 @@ import { ChangeEvent, KeyboardEvent } from "react";
 import { CalendarIcon } from "../../Icons";
 import DatePicker from "../DatePicker";
 import Button from "../../Button/Button";
-import { DATE_TIME_FORMAT } from "../../../../constants/date";
+import { DATE_ISO_FORMAT, DATE_FORMAT, DATE_TIME_FORMAT } from "../../../../constants/date";
 import InputMask from "react-input-mask";
-import dayjs from "dayjs";
+import dayjs, { Dayjs } from "dayjs";
 import classNames from "classnames";
 import "./style.scss";
 
-const formatStringDate = (val: string) => {
-  return dayjs(val).isValid() ? dayjs.tz(val).format(DATE_TIME_FORMAT) : val;
+const formatStringDate = (val: string, format: string) => {
+  return dayjs(val).isValid() ? dayjs.tz(val).format(format) : val;
 };
 
 interface DateTimeInputProps {
   value?:  string;
   label: string;
   pickerLabel: string;
+  format?: string;
   pickerRef: React.RefObject<HTMLDivElement>;
   onChange: (date: string) => void;
   onEnter: () => void;
+  disabled?: boolean;
+  minDate?: Date | Dayjs;
+  maxDate?: Date | Dayjs;
 }
 
+const masks: Record<string, string> = {
+  [DATE_ISO_FORMAT]: "9999-99-99T99:99:99",
+  [DATE_FORMAT]: "9999-99-99",
+  [DATE_TIME_FORMAT]: "9999-99-99 99:99:99"
+};
+
 const DateTimeInput: FC<DateTimeInputProps> = ({
   value = "",
+  format = DATE_TIME_FORMAT,
+  minDate,
+  maxDate,
   label,
   pickerLabel,
   pickerRef,
   onChange,
-  onEnter
+  onEnter,
+  disabled
 }) => {
   const wrapperRef = useRef<HTMLDivElement>(null);
   const [inputRef, setInputRef] = useState<HTMLInputElement | null>(null);
+  const mask = masks[format];
 
-  const [maskedValue, setMaskedValue] = useState(formatStringDate(value));
+  const [maskedValue, setMaskedValue] = useState(formatStringDate(value, format));
   const [focusToTime, setFocusToTime] = useState(false);
   const [awaitChangeForEnter, setAwaitChangeForEnter] = useState(false);
   const error = dayjs(maskedValue).isValid() ? "" : "Invalid date format";
@@ -59,7 +74,7 @@ const DateTimeInput: FC<DateTimeInputProps> = ({
   };
 
   useEffect(() => {
-    const newValue = formatStringDate(value);
+    const newValue = formatStringDate(value, format);
     if (newValue !== maskedValue) {
       setMaskedValue(newValue);
     }
@@ -82,15 +97,16 @@ const DateTimeInput: FC<DateTimeInputProps> = ({
     <div
       className={classNames({
         "vm-date-time-input": true,
-        "vm-date-time-input_error": error
+        "vm-date-time-input_error": error,
+        "vm-date-time-input_disabled": disabled,
       })}
     >
       <label>{label}</label>
       <InputMask
         tabIndex={1}
         inputRef={setInputRef}
-        mask="9999-99-99 99:99:99"
-        placeholder="YYYY-MM-DD HH:mm:ss"
+        mask={mask}
+        placeholder={format}
         value={maskedValue}
         autoCapitalize={"none"}
         inputMode={"numeric"}
@@ -98,6 +114,7 @@ const DateTimeInput: FC<DateTimeInputProps> = ({
         onChange={handleMaskedChange}
         onBlur={handleBlur}
         onKeyUp={handleKeyUp}
+        disabled={disabled}
       />
       {error && (
         <span className="vm-date-time-input__error-text">{error}</span>
@@ -112,6 +129,7 @@ const DateTimeInput: FC<DateTimeInputProps> = ({
           size="small"
           startIcon={<CalendarIcon/>}
           ariaLabel="calendar"
+          disabled={disabled}
         />
       </div>
       <DatePicker
@@ -120,6 +138,9 @@ const DateTimeInput: FC<DateTimeInputProps> = ({
         date={maskedValue}
         onChange={handleChangeDate}
         targetRef={wrapperRef}
+        minDate={minDate}
+        maxDate={maxDate}
+        format={format}
       />
     </div>
   );

app/vmui/packages/vmui/src/components/Main/DatePicker/DateTimeInput/style.scss

@@ -23,6 +23,14 @@
     user-select: none;
   }
 
+  &_disabled {
+    cursor: default;
+    pointer-events: none;
+    * {
+      color: $color-text-disabled !important;
+    }
+  }
+
   &__icon {
     position: absolute;
     bottom: 2px;

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

@@ -22,8 +22,8 @@ interface PopperProps {
   children: ReactNode
   open: boolean
   onClose: () => void
-  buttonRef: React.RefObject<HTMLElement>
-  placement?: "bottom-right" | "bottom-left" | "top-left" | "top-right" | "fixed"
+  buttonRef?: React.RefObject<HTMLElement>
+  placement?: "bottom-right" | "bottom-left" | "top-left" | "top-right" | "center-left" | "center-right" | "fixed"
   placementPosition?: { top: number, left: number } | null
   animation?: string
   offset?: { top: number, left: number }
@@ -32,6 +32,7 @@ interface PopperProps {
   title?: string
   disabledFullScreen?: boolean
   variant?: "default" | "dark"
+  classes?: string[]
 }
 
 const Popper: FC<PopperProps> = ({
@@ -46,6 +47,7 @@ const Popper: FC<PopperProps> = ({
   fullWidth,
   title,
   disabledFullScreen,
+  classes,
   variant
 }) => {
   const { isMobile } = useDeviceDetect();
@@ -78,6 +80,7 @@ const Popper: FC<PopperProps> = ({
   }, [popperRef]);
 
   const popperStyle = useMemo(() => {
+    if (!buttonRef) return {};
     const buttonEl = buttonRef.current;
 
     if (!buttonEl || !isOpen) return {};
@@ -90,8 +93,9 @@ const Popper: FC<PopperProps> = ({
       width: "auto"
     };
 
-    const needAlignRight = placement === "bottom-right" || placement === "top-right";
+    const needAlignRight = placement?.includes("right");
     const needAlignTop = placement?.includes("top");
+    const needAlignCenter = placement?.includes("center");
 
     const offsetTop = offset?.top || 0;
     const offsetLeft = offset?.left || 0;
@@ -101,6 +105,7 @@ const Popper: FC<PopperProps> = ({
 
     if (needAlignRight) position.left = buttonPos.right - popperSize.width;
     if (needAlignTop) position.top = buttonPos.top - popperSize.height - offsetTop;
+    if (needAlignCenter) position.top = buttonPos.top + (buttonPos.height - popperSize.height) / 2 - offsetTop;
 
     if (placement === "fixed" && placementPosition) {
       position.top = Math.max(placementPosition.top + offset.top, 0);
@@ -161,6 +166,10 @@ const Popper: FC<PopperProps> = ({
   useEventListener("scroll", handleClose);
   useEventListener("popstate", handlePopstate);
   useClickOutside(popperRef, handleClickOutside, buttonRef);
+  const classMap: Record<string, boolean> = {};
+  (classes || []).forEach((cls) => {
+    classMap[cls] = true;
+  });
 
   return (
     <>
@@ -171,6 +180,7 @@ const Popper: FC<PopperProps> = ({
             [`vm-popper_${variant}`]: variant,
             "vm-popper_mobile": isMobile && !disabledFullScreen,
             "vm-popper_open": (isMobile || Object.keys(popperStyle).length) && isOpen,
+            ...classMap,
           })}
           ref={popperRef}
           style={(isMobile && !disabledFullScreen) ? {} : popperStyle}

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

@@ -46,11 +46,12 @@ const Select: FC<SelectProps> = ({
   const autocompleteAnchorEl = useRef<HTMLDivElement>(null);
   const [wrapperRef, setWrapperRef] = useState<React.RefObject<HTMLElement> | null>(null);
   const [openList, setOpenList] = useState(false);
+  const resultList = [...list];
 
   const inputRef = useRef<HTMLInputElement>(null);
 
   const isMultiple = Array.isArray(value);
-  const selectedValues = Array.isArray(value) ? value.slice() : [];
+  let selectedValues = Array.isArray(value) ? value.slice() : [];
   const hideInput = isMobile && isMultiple && !!selectedValues?.length;
 
   const textFieldValue = useMemo(() => {
@@ -77,7 +78,7 @@ const Select: FC<SelectProps> = ({
   };
 
   const handleBlur = () => {
-    list.includes(search) && onChange(search);
+    resultList.includes(search) && onChange(search);
   };
 
   const handleToggleList = (e: MouseEvent<HTMLDivElement>) => {
@@ -123,8 +124,10 @@ const Select: FC<SelectProps> = ({
   useEventListener("keyup", handleKeyUp);
   useClickOutside(autocompleteAnchorEl, handleCloseList, wrapperRef);
 
-  includeAll && !list.includes("All") && list.push("All");
-  includeAll && !selectedValues?.length && selectedValues.push("All");
+  if (includeAll && !resultList.includes("All")) resultList.push("All");
+  if (includeAll && (!selectedValues?.length || selectedValues?.length === resultList?.length)) {
+    selectedValues = ["All"];
+  }
 
   return (
     <div
@@ -155,6 +158,7 @@ const Select: FC<SelectProps> = ({
               onInput={handleChange}
               onFocus={handleFocus}
               onBlur={handleBlur}
+              disabled={disabled}
               ref={inputRef}
               readOnly={isMobile || !searchable}
             />
@@ -182,7 +186,7 @@ const Select: FC<SelectProps> = ({
         itemClassName={itemClassName}
         label={label}
         value={autocompleteValue}
-        options={list.map(l => ({ value: l }))}
+        options={resultList.map(l => ({ value: l }))}
         anchor={autocompleteAnchorEl}
         selected={selectedValues}
         minLength={1}

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

@@ -128,8 +128,14 @@
   }
 
   &_disabled {
+    pointer-events: none;
     * {
-      cursor: not-allowed;
+      color: var(--color-text-disabled);
+      cursor: default;
+    }
+
+    input::placeholder {
+      color: var(--color-text-disabled);
     }
 
     .vm-select-input {

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

@@ -9,6 +9,7 @@ $switch-border-radius: $switch-handle-size + ($switch-padding * 2);
 .vm-switch {
   font-size: $font-size-small;
   display: flex;
+  column-gap: $padding-small;
   align-items: center;
   justify-content: flex-start;
   cursor: pointer;
@@ -19,10 +20,6 @@ $switch-border-radius: $switch-handle-size + ($switch-padding * 2);
     flex-direction: row-reverse;
   }
 
-  &_full-width &__label {
-    margin-left: 0;
-  }
-
   &_disabled {
     opacity: 0.6;
     cursor: default;
@@ -74,7 +71,6 @@ $switch-border-radius: $switch-handle-size + ($switch-padding * 2);
   &__label {
     white-space: nowrap;
     font-size: inherit;
-    margin-left: $padding-small;
     transition: color 200ms ease;
     color: $color-text-secondary;
   }

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

@@ -72,7 +72,6 @@ const TextField: FC<TextFieldProps> = ({
     "vm-text-field__input_error": error,
     "vm-text-field__input_warning": !error && warning,
     "vm-text-field__input_icon-start": startIcon,
-    "vm-text-field__input_disabled": disabled,
     "vm-text-field__input_textarea": type === "textarea",
   });
 
@@ -136,7 +135,8 @@ const TextField: FC<TextFieldProps> = ({
     className={classNames({
       "vm-text-field": true,
       "vm-text-field_textarea": type === "textarea",
-      "vm-text-field_dark": isDarkTheme
+      "vm-text-field_dark": isDarkTheme,
+      "vm-text-field_disabled": disabled
     })}
     data-replicated-value={value}
   >

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

@@ -6,6 +6,15 @@
   margin: 6px 0;
   width: 100%;
 
+  &_disabled {
+    color: $color-text-disabled;
+    pointer-events: none;
+  }
+
+  &:is(&_disabled) > &__label {
+    color: $color-text-disabled;
+  }
+
   &_textarea:after {
     content: attr(data-replicated-value) " ";
     white-space: pre-wrap;

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

@@ -1,20 +1,28 @@
-import { useState, useMemo } from "react";
+import { createRef, useEffect, useState, useMemo } from "react";
 import classNames from "classnames";
 import { ArrowDropDownIcon, CopyIcon, DoneIcon } from "../Main/Icons";
 import { getComparator, stableSort } from "./helpers";
 import Tooltip from "../Main/Tooltip/Tooltip";
 import Button from "../Main/Button/Button";
-import { useEffect } from "preact/compat";
 import useCopyToClipboard from "../../hooks/useCopyToClipboard";
 
 type OrderDir = "asc" | "desc"
 
+export interface TableColumn<T> {
+  key: keyof T;
+  title?: string;
+  format?: (obj: T) => string;
+  className?: string;
+}
+
 interface TableProps<T> {
   rows: T[];
-  columns: { title?: string, key: keyof Partial<T>, className?: string }[];
+  columns: TableColumn<T>[];
   defaultOrderBy: keyof T;
   copyToClipboard?: keyof T;
   defaultOrderDir?: OrderDir;
+  rowClasses?: (obj: T) => Record<string, boolean>;
+  rowAction?: (ref: React.RefObject<HTMLElement>) => () => void;
   // TODO: Remove when pagination is implemented on the backend.
   paginationOffset: {
     startIndex: number;
@@ -22,12 +30,34 @@ interface TableProps<T> {
   }
 }
 
-const Table = <T extends object>({ rows, columns, defaultOrderBy, defaultOrderDir, copyToClipboard, paginationOffset }: TableProps<T>) => {
+interface TableRow {
+  id: string;
+}
+
+const Table = <T extends TableRow>({
+  rows,
+  columns,
+  defaultOrderBy,
+  defaultOrderDir,
+  copyToClipboard,
+  paginationOffset,
+  rowClasses,
+  rowAction = (_ref: React.RefObject<HTMLElement>) => () => {},
+}: TableProps<T>) => {
   const handleCopyToClipboard = useCopyToClipboard();
 
   const [orderBy, setOrderBy] = useState<keyof T>(defaultOrderBy);
   const [orderDir, setOrderDir] = useState<OrderDir>(defaultOrderDir || "desc");
   const [copied, setCopied] = useState<number | null>(null);
+  const [rowRefs, setRowRefs] = useState(new Map());
+
+  useEffect(() => {
+    const newRowRefs = new Map();
+    rows.forEach(row => {
+      newRowRefs.set(row.id, createRef());
+    });
+    setRowRefs(newRowRefs);
+  }, [rows]);
 
   // const sortedList = useMemo(() => stableSort(rows as [], getComparator(orderDir, orderBy)),
   //   [rows, orderBy, orderDir]);
@@ -58,6 +88,8 @@ const Table = <T extends object>({ rows, columns, defaultOrderBy, defaultOrderDi
     return () => clearTimeout(timeout);
   }, [copied]);
 
+  const copyCol = copyToClipboard && columns.find((col) => col.key == copyToClipboard);
+
   return (
     <table className="vm-table">
       <thead className="vm-table-header">
@@ -90,8 +122,14 @@ const Table = <T extends object>({ rows, columns, defaultOrderBy, defaultOrderDi
       <tbody className="vm-table-body">
         {sortedList.map((row, rowIndex) => (
           <tr
-            className="vm-table__row"
+            className={classNames({
+              "vm-table__row": true,
+              ...(rowClasses ? rowClasses(row) : {}),
+            })}
+            id={row.id}
             key={rowIndex}
+            ref={rowRefs.get(row.id)}
+            onClick={rowAction(rowRefs.get(row.id))}
           >
             {columns.map((col) => (
               <td
@@ -101,10 +139,10 @@ const Table = <T extends object>({ rows, columns, defaultOrderBy, defaultOrderDi
                 })}
                 key={String(col.key)}
               >
-                {row[col.key] || "-"}
+                {(col.format ? col.format(row) : String(row[col.key])) || "-"}
               </td>
             ))}
-            {copyToClipboard && (
+            {copyToClipboard && copyCol && (
               <td className="vm-table-cell vm-table-cell_right">
                 {row[copyToClipboard] && (
                   <div className="vm-table-cell__content">
@@ -114,7 +152,7 @@ const Table = <T extends object>({ rows, columns, defaultOrderBy, defaultOrderDi
                         color={copied === rowIndex ? "success" : "gray"}
                         size="small"
                         startIcon={copied === rowIndex ? <DoneIcon/> : <CopyIcon/>}
-                        onClick={createCopyHandler(row[copyToClipboard], rowIndex)}
+                        onClick={createCopyHandler(copyCol.format ? copyCol.format(row) : String(row[copyToClipboard]), rowIndex)}
                         ariaLabel="copy row"
                       />
                     </Tooltip>

app/vmui/packages/vmui/src/components/Table/helpers.ts

@@ -41,12 +41,12 @@ export function descendingComparator<T>(a: T, b: T, orderBy: keyof T) {
   return 0;
 }
 
-export function getComparator<Key extends (string | number | symbol)>(
+export function getComparator<T extends object>(
   order: Order,
-  orderBy: Key,
+  orderBy: keyof T,
 ): (
-  a: { [key in Key]: number | string },
-  b: { [key in Key]: number | string },
+  a: T,
+  b: T,
 ) => number {
   return order === "desc"
     ? (a, b) => descendingComparator(a, b, orderBy)
@@ -55,7 +55,7 @@ export function getComparator<Key extends (string | number | symbol)>(
 
 // This method is created for cross-browser compatibility, if you don't
 // need to support IE11, you can use Array.prototype.sort() directly
-export function stableSort<T>(array: readonly T[], comparator: (a: T, b: T) => number) {
+export function stableSort<T>(array: readonly T[], comparator: (a: T, b: T) => number): T[] {
   const stabilizedThis = array.map((el, index) => [el, index] as [T, number]);
   stabilizedThis.sort((a, b) => {
     const order = comparator(a[0], b[0]);

app/vmui/packages/vmui/src/constants/palette.ts

@@ -10,6 +10,7 @@ export const darkPalette = {
   "color-success": "#57ab5a",
   "color-background-success": "#0e1b0e",
   "color-passive": "#a7acb3",
+  "color-code": "#4e5a6a",
   "color-background-body": "#22272e",
   "color-background-block": "#2d333b",
   "color-background-tooltip": "rgba(22, 22, 22, 0.8)",
@@ -44,6 +45,7 @@ export const lightPalette = {
   "color-success": "#4caf50",
   "color-background-success": "#d4ecd5",
   "color-passive": "#5d6267",
+  "color-code": "ecedee",
   "color-background-body": "#FEFEFF",
   "color-background-block": "#FFFFFF",
   "color-background-tooltip": "rgba(80,80,80,0.9)",

app/vmui/packages/vmui/src/hooks/useFetchAppConfig.ts

@@ -1,9 +1,10 @@
-import { useAppDispatch } from "../state/common/StateContext";
+import { useAppDispatch, useAppState } from "../state/common/StateContext";
 import { useEffect, useState } from "preact/compat";
 import { ErrorTypes } from "../types";
 import { APP_TYPE_VM } from "../constants/appType";
 
 const useFetchAppConfig = () => {
+  const { serverUrl } = useAppState();
   const dispatch = useAppDispatch();
 
   const [isLoading, setIsLoading] = useState(false);
@@ -16,7 +17,7 @@ const useFetchAppConfig = () => {
       setIsLoading(true);
 
       try {
-        const data = await fetch("./config.json");
+        const data = await fetch(`${serverUrl}/vmui/config.json`);
         const config = await data.json();
         dispatch({ type: "SET_APP_CONFIG", payload: config || {} });
       } catch (e) {
@@ -26,7 +27,7 @@ const useFetchAppConfig = () => {
     };
 
     fetchAppConfig();
-  }, []);
+  }, [serverUrl]);
 
   return { isLoading, error };
 };

app/vmui/packages/vmui/src/layouts/Footer/Footer.tsx

@@ -2,6 +2,7 @@ import { FC, memo } from "preact/compat";
 import { LogoShortIcon } from "../../components/Main/Icons";
 import "./style.scss";
 import { footerLinksByDefault } from "../../constants/footerLinks";
+import { useAppState } from "../../state/common/StateContext";
 
 interface Props {
   links?: {
@@ -13,10 +14,12 @@ interface Props {
 
 const Footer: FC<Props> = memo(({ links = footerLinksByDefault }) => {
   const copyrightYears = `2019-${new Date().getFullYear()}`;
+  const { appConfig } = useAppState();
+  const version = appConfig?.version;
 
   return <footer className="vm-footer">
     <a
-      className="vm-link vm-footer__website"
+      className="vm-link vm-footer__link"
       target="_blank"
       href="https://victoriametrics.com/"
       rel="me noreferrer"
@@ -37,7 +40,8 @@ const Footer: FC<Props> = memo(({ links = footerLinksByDefault }) => {
       </a>
     ))}
     <div className="vm-footer__copyright">
-      &copy; {copyrightYears} VictoriaMetrics
+      &copy; {copyrightYears} VictoriaMetrics.
+      {version && <span className="vm-footer__version">&nbsp;Version: {version}</span>}
     </div>
   </footer>;
 });

app/vmui/packages/vmui/src/layouts/Header/Header.tsx

@@ -31,7 +31,7 @@ const Header: FC<HeaderProps> = ({ controlsComponent }) => {
   const { isMobile } = useDeviceDetect();
 
   const windowSize = useWindowSize();
-  const displaySidebar = useMemo(() => window.innerWidth < 1000, [windowSize]);
+  const displaySidebar = useMemo(() => window.innerWidth < 1230, [windowSize]);
 
   const { isDarkTheme } = useAppState();
   const appModeEnable = getAppModeEnable();

app/vmui/packages/vmui/src/layouts/Header/HeaderControls/HeaderControls.tsx

@@ -53,7 +53,7 @@ const HeaderControls: FC<ControlsProps & HeaderProps> = ({
   if (isMobile) {
     return (
       <>
-        <div>
+        <div className="vm-header-controls">
           <Button
             className={classNames({
               "vm-header-button": !appModeEnable

app/vmui/packages/vmui/src/layouts/Header/HeaderNav/NavSubItem.tsx

@@ -23,7 +23,7 @@ const NavSubItem: FC<NavItemProps> = ({
   color,
   background,
   submenu,
-  direction
+  direction = "row"
 }) => {
   const { pathname } = useLocation();
 
@@ -37,8 +37,9 @@ const NavSubItem: FC<NavItemProps> = ({
   } = useBoolean(false);
 
   const handleOpenSubmenu = () => {
-    setOpenSubmenu();
-    if (menuTimeout) clearTimeout(menuTimeout);
+    if (direction === "row" || !openSubmenu) setOpenSubmenu();
+    if (direction === "column" && openSubmenu) handleCloseSubmenu();
+    if (direction === "row" && menuTimeout) clearTimeout(menuTimeout);
   };
 
   const handleMouseLeave = () => {
@@ -55,50 +56,31 @@ const NavSubItem: FC<NavItemProps> = ({
     handleCloseSubmenu();
   }, [pathname]);
 
-  if (direction === "column") {
-    return (
-      <>
-        {submenu.map(sm => (
-          <NavItem
-            key={sm.value}
-            activeMenu={activeMenu}
-            value={sm.value || ""}
-            label={sm.label || ""}
-            type={sm.type || NavigationItemType.internalLink}
-          />
-        ))}
-      </>
-    );
-  }
-
   return (
     <div
       className={classNames({
-        "vm-header-nav-item": true,
-        "vm-header-nav-item_sub": true,
         "vm-header-nav-item_open": openSubmenu,
-        "vm-header-nav-item_active": submenu.find(m => m.value === activeMenu)
       })}
       style={{ color }}
-      onMouseEnter={handleOpenSubmenu}
-      onMouseLeave={handleMouseLeave}
+      onMouseEnter={direction === "column" ? undefined : handleOpenSubmenu}
+      onMouseLeave={direction === "column" ? undefined : handleMouseLeave}
+      onClick={direction === "column" ? handleOpenSubmenu : undefined}
       ref={buttonRef}
     >
-      {label}
-      <ArrowDropDownIcon/>
-
-      <Popper
-        open={openSubmenu}
-        placement="bottom-left"
-        offset={{ top: 12, left: 0 }}
-        onClose={handleCloseSubmenu}
-        buttonRef={buttonRef}
+      <div
+        className={classNames({
+          "vm-header-nav-item": true,
+          "vm-header-nav-item_sub": true,
+          "vm-header-nav-item_active": submenu.find(m => m.value === activeMenu),
+        })}
       >
+        {label}
+        <ArrowDropDownIcon/>
+      </div>
+      {direction === "column" ? (
         <div
           className="vm-header-nav-item-submenu"
           style={{ background }}
-          onMouseLeave={handleMouseLeave}
-          onMouseEnter={handleMouseEnterPopup}
         >
           {submenu.map(sm => (
             <NavItem
@@ -111,7 +93,33 @@ const NavSubItem: FC<NavItemProps> = ({
             />
           ))}
         </div>
-      </Popper>
+      ) : (
+        <Popper
+          open={openSubmenu}
+          placement="bottom-left"
+          offset={{ top: 12, left: 0 }}
+          onClose={handleCloseSubmenu}
+          buttonRef={buttonRef}
+        >
+          <div
+            className="vm-header-nav-item-submenu"
+            style={{ background }}
+            onMouseLeave={handleMouseLeave}
+            onMouseEnter={handleMouseEnterPopup}
+          >
+            {submenu.map(sm => (
+              <NavItem
+                key={sm.value}
+                activeMenu={activeMenu}
+                value={sm.value || ""}
+                label={sm.label || ""}
+                color={color}
+                type={sm.type || NavigationItemType.internalLink}
+              />
+            ))}
+          </div>
+        </Popper>
+      )}
     </div>
   );
 };

app/vmui/packages/vmui/src/layouts/Header/HeaderNav/style.scss

@@ -20,6 +20,14 @@
     }
   }
 
+  &_column &-item-submenu {
+    display: none;
+  }
+
+  &_column &-item_open &-item-submenu {
+    display: grid;
+  }
+
   &-item {
     position: relative;
     padding: $padding-global $padding-small;
@@ -44,6 +52,7 @@
     }
 
     &_active {
+      padding: $padding-global $padding-small 10px $padding-small;
       border-bottom: 2px solid rgba($color-black, 0.2);
     }
 
@@ -60,7 +69,6 @@
 
     &-submenu {
       display: grid;
-      white-space: nowrap;
       padding: $padding-small;
       color: $color-white;
       border-radius: $border-radius-small;

app/vmui/packages/vmui/src/layouts/Header/SidebarNav/SidebarHeader.tsx

@@ -52,7 +52,7 @@ const SidebarHeader: FC<SidebarHeaderProps> = ({
         "vm-header-sidebar-menu_open": openMenu
       })}
     >
-      <div>
+      <div className="vm-header-sidebar-scrollable">
         <HeaderNav
           color={color}
           background={background}

app/vmui/packages/vmui/src/layouts/Header/SidebarNav/style.scss

@@ -25,7 +25,13 @@ $sidebar-transition: cubic-bezier(0.280, 0.840, 0.420, 1);
       z-index: 102;
     }
   }
-
+  &-scrollable {
+    overflow-y: scroll;
+    scrollbar-width: none;
+  }
+  &-scrollable::-webkit-scrollbar {
+    display: none;
+  }
   &-menu {
     position: fixed;
     top: 0;

app/vmui/packages/vmui/src/layouts/Header/style.scss

@@ -22,15 +22,9 @@
   }
 
   &_sidebar {
-    display: grid;
-    grid-template-columns: 40px auto 1fr;
-    box-shadow: $color-background-body 0 1px 1px 0px;
-  }
-
-  &_mobile {
-    display: grid;
-    grid-template-columns: 33px 1fr 33px;
+    display: flex;
     justify-content: space-between;
+    box-shadow: $color-background-body 0 1px 1px 0px;
   }
 
   &_dark {

app/vmui/packages/vmui/src/pages/ExploreAlerts/ExploreRules.tsx

@@ -155,15 +155,18 @@ const ExploreRules: FC = () => {
     [groups, types, states, searchInput]
   );
 
+  const selectedTypes = allTypes.size === types.length ? [] : types;
+  const selectedStates = allStates.size === states.length ? [] : states;
+
   return (
     <>
       {modalOpen && getModal()}
       {(!modalOpen || !!allStates?.size) && (
         <div className="vm-explore-alerts">
           <RulesHeader
-            types={types}
+            types={selectedTypes}
             allTypes={Array.from(allTypes)}
-            states={states}
+            states={selectedStates}
             allStates={Array.from(allStates)}
             onChangeTypes={handleChangeTypes}
             onChangeStates={handleChangeStates}

app/vmui/packages/vmui/src/pages/TopQueries/TopQueryTable/TopQueryTable.tsx

@@ -15,7 +15,7 @@ const TopQueryTable:FC<TopQueryPanelProps> = ({ rows, columns, defaultOrderBy })
   const [orderBy, setOrderBy] = useState<keyof TopQuery>(defaultOrderBy || "count");
   const [orderDir, setOrderDir] = useState<"asc" | "desc">("desc");
 
-  const sortedList = useMemo(() => stableSort(rows as [], getComparator(orderDir, orderBy)) as TopQuery[],
+  const sortedList = useMemo(() => stableSort(rows, getComparator(orderDir, orderBy)),
     [rows, orderBy, orderDir]);
 
   const onSortHandler = (key: keyof TopQuery) => {

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

@@ -15,7 +15,7 @@
 
     &-fields {
       display: flex;
-      align-items: center;
+      align-items: flex-start;
       flex-wrap: wrap;
       gap: $padding-medium;
 

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

@@ -20,6 +20,7 @@ $color-error-text: var(--color-error-text);
 $color-warning-text: var(--color-warning-text);
 $color-info-text: var(--color-info-text);
 $color-success-text: var(--color-success-text);
+$color-code: var(--color-code);
 
 $color-text: var(--color-text);
 $color-text-secondary: var(--color-text-secondary);

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

@@ -183,6 +183,7 @@ export interface AppConfig {
   vmalert?: {
     enabled: boolean;
   };
+  version?: string;
 }
 
 export interface Group {

app/vmui/packages/vmui/src/utils/default-server-url.test.ts

@@ -0,0 +1,26 @@
+import { describe, it, expect } from "vitest";
+import { getDefaultURL } from "./default-server-url";
+
+describe("test server urls", () => {
+  describe("getDefaultURL()", () => {
+    it("/select/0/vmui/", () => {
+      const result = getDefaultURL("https://localhost:1111/select/0/vmui/");
+      expect(result).toBe("https://localhost:1111/select/0/prometheus");
+    });
+
+    it("/any/path/prefix/select/multitenant/vmui/#/rules?q=test", () => {
+      const result = getDefaultURL("http://test/any/path/prefix/select/multitenant/vmui/#/rules?q=test");
+      expect(result).toBe("http://test/any/path/prefix/select/multitenant/prometheus");
+    });
+
+    it("/test/select/1:1/prometheus/graph/", () => {
+      const result = getDefaultURL("https://domain.com/test/select/1:1/prometheus/graph/");
+      expect(result).toBe("https://domain.com/test/select/1:1/prometheus");
+    });
+
+    it("https://play.vm.com/#/rules?q=test", () => {
+      const result = getDefaultURL("https://play.vm.com/#/rules?q=test");
+      expect(result).toBe("https://play.vm.com");
+    });
+  });
+});

app/vmui/packages/vmui/src/utils/default-server-url.ts

@@ -3,12 +3,15 @@ import { replaceTenantId } from "./tenants";
 import { APP_TYPE, AppType } from "../constants/appType";
 import { getFromStorage } from "./storage";
 
+export const getDefaultURL = (u: string) => {
+  return u.replace(/(\/(?:prometheus\/)?(?:graph|vmui)\/.*|\/#\/.*)/, "").replace(/(\/select\/[^/]+)$/, "$1/prometheus");
+};
+
 export const getDefaultServer = (tenantId?: string): string => {
   const { serverURL } = getAppModeParams();
   const storageURL = getFromStorage("SERVER_URL") as string;
   const anomalyURL = `${window.location.origin}${window.location.pathname.replace(/^\/vmui/, "")}`;
-  const baseURL = window.location.href.replace(/(\/(?:prometheus\/)?(?:graph|vmui)\/.*|\/#\/.*)/, "");
-  const defaultURL = baseURL.replace(/(\/select\/[\d:]+)$/, "$1/prometheus");
+  const defaultURL = getDefaultURL(window.location.href);
   const url = serverURL || storageURL || defaultURL;
 
   switch (APP_TYPE) {

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

@@ -1,4 +1,4 @@
-const regexp = /(\/select\/)(\d+|\d.+)(\/)(.+)/;
+const regexp = /(\/select\/)([^/])(\/)(.+)/;
 
 export const replaceTenantId = (serverUrl: string, tenantId: string) => {
   return serverUrl.replace(regexp, `$1${tenantId}/$4`);

apptest/model.go

@@ -1,11 +1,8 @@
 package apptest
 
 import (
-	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"io"
 	"math"
 	"net/url"
 	"slices"
@@ -503,44 +500,3 @@ func sortTSDBStatusResponseEntries(entries []TSDBStatusResponseEntry) {
 		return left.Count < right.Count
 	})
 }
-
-// LogsQLQueryResponse is an in-memory representation of the
-// /select/logsql/query response.
-type LogsQLQueryResponse struct {
-	LogLines []string
-}
-
-// NewLogsQLQueryResponse is a test helper function that creates a new
-// instance of LogsQLQueryResponse by unmarshalling a json string.
-func NewLogsQLQueryResponse(t *testing.T, s string) *LogsQLQueryResponse {
-	t.Helper()
-	res := &LogsQLQueryResponse{}
-	if len(s) == 0 {
-		return res
-	}
-	bs := bytes.NewBufferString(s)
-	for {
-		logLine, err := bs.ReadString('\n')
-		if err != nil {
-			if errors.Is(err, io.EOF) {
-				if len(logLine) > 0 {
-					t.Fatalf("BUG: unexpected non-empty line=%q with io.EOF", logLine)
-				}
-				break
-			}
-			t.Fatalf("BUG: cannot read logline from buffer: %s", err)
-		}
-		var lv map[string]any
-		if err := json.Unmarshal([]byte(logLine), &lv); err != nil {
-			t.Fatalf("cannot parse log line=%q: %s", logLine, err)
-		}
-		delete(lv, "_stream_id")
-		normalizedLine, err := json.Marshal(lv)
-		if err != nil {
-			t.Fatalf("cannot marshal parsed logline=%q: %s", logLine, err)
-		}
-		res.LogLines = append(res.LogLines, string(normalizedLine))
-	}
-
-	return res
-}

apptest/tests/special_query_regression_test.go

@@ -52,6 +52,7 @@ func testSpecialQueryRegression(tc *apptest.TestCase, sut apptest.PrometheusWrit
 	testTooBigLookbehindWindow(tc, sut)
 	testMatchSeries(tc, sut)
 	testNegativeIncrease(tc, sut)
+	testInstantQueryWithOffsetUsingCache(tc, sut)
 
 	// graphite
 	testComparisonNotInfNotNan(tc, sut)
@@ -292,6 +293,45 @@ func testNegativeIncrease(tc *apptest.TestCase, sut apptest.PrometheusWriteQueri
 	})
 }
 
+func testInstantQueryWithOffsetUsingCache(tc *apptest.TestCase, sut apptest.PrometheusWriteQuerier) {
+	t := tc.T()
+
+	// unexpected /api/v1/query response due to wrong applied offset to request range
+	// see https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9762
+	sut.PrometheusAPIV1ImportPrometheus(t, []string{
+		`vm_http_requests_total 1 1758196800000`, // 2025-09-18 12:00:00
+		`vm_http_requests_total 2 1758218400000`, // 2025-09-18 18:00:00
+		`vm_http_requests_total 3 1758240000000`, // 2025-09-19 00:00:00
+		`vm_http_requests_total 4 1758261600000`, // 2025-09-19 06:00:00
+		`vm_http_requests_total 5 1758283200000`, // 2025-09-19 12:00:00
+		`vm_http_requests_total 6 1758304800000`, // 2025-09-19 18:00:00
+		`vm_http_requests_total 7 1758326400000`, // 2025-09-20 00:00:00
+	}, apptest.QueryOpts{})
+	sut.ForceFlush(t)
+
+	tc.Assert(&apptest.AssertOptions{
+		Msg:        "unexpected /api/v1/query response",
+		DoNotRetry: true,
+		Got: func() any {
+			return sut.PrometheusAPIV1Query(t, `avg_over_time(vm_http_requests_total[1d] offset 12h)`, apptest.QueryOpts{
+				Time: "2025-09-20T12:00:00.000Z",
+			})
+		},
+		Want: &apptest.PrometheusAPIV1QueryResponse{
+			Status: "success",
+			Data: &apptest.QueryData{
+				ResultType: "vector",
+				Result: []*apptest.QueryResult{
+					{
+						Metric: map[string]string{},
+						Sample: &apptest.Sample{Timestamp: 1758369600000, Value: 5.5},
+					},
+				},
+			},
+		},
+	})
+}
+
 func testComparisonNotInfNotNan(tc *apptest.TestCase, sut apptest.PrometheusWriteQuerier) {
 	t := tc.T()
 

dashboards/backupmanager.json

@@ -1786,4 +1786,4 @@
   "uid": "gF-lxRdVz",
   "version": 1,
   "weekStart": ""
-}
+}